diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974e9df22c295761050dc62de5b6feda5184f400..c440cb6de5ba6c2aadf602efccab92fc4bacbcc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,43 @@
+2.0.0.0-dev54
+=============
+* Modularity improvements:
+  * Breakdown of the Adminhtml module:
+     * Moved Newsletter, Report logic to the respective modules
+     * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
+  * Removed application dependencies from the library
+* Move Magento\Core common blocks in the library
+* Application areas rework:
+  * Areas are independent from Store
+  * Removed deprecated annotation from the getArea methods
+* GitHub requests:
+  * [#245](https://github.com/magento/magento2/pull/245) -- Resolve design flaws in core URL helper
+  * [#247](https://github.com/magento/magento2/pull/247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
+  * [#259](https://github.com/magento/magento2/pull/259) -- Turkish Lira (TRY) is supported for Turkish members.
+  * [#262](https://github.com/magento/magento2/pull/262) -- Update Rule.php
+  * [#373](https://github.com/magento/magento2/pull/373) -- [Magento/Sales] Fixed typos
+  * [#382](https://github.com/magento/magento2/pull/382) -- [Magento/Core] Fixed typos
+  * [#304](https://github.com/magento/magento2/pull/304) -- Removed Erroneous closing "
+  * [#323](https://github.com/magento/magento2/pull/323) -- InstanceController.php - made setBody protected
+  * [#349](https://github.com/magento/magento2/pull/349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
+  * [#265](https://github.com/magento/magento2/pull/265) -- Update Merge.php
+  * [#271](https://github.com/magento/magento2/pull/271) -- Check Data should validate gallery information
+  * [#305](https://github.com/magento/magento2/pull/305) -- Extra ", tidied up nested quotes
+  * [#352](https://github.com/magento/magento2/pull/352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
+  * [#224](https://github.com/magento/magento2/pull/224) -- Tax formatting is locale aware and should not
+  * [#338](https://github.com/magento/magento2/pull/338) -- Correcting SQL for required_options column
+  * [#327](https://github.com/magento/magento2/pull/327) -- cart api bug fix & partial invoice credit memo divide by zero warning
+* Themes update:
+  * Old frontend (magento_demo) and backend (magento_basic) themes are removed
+  * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
+* Fixed bugs:
+  * Fixed the error when  Magento cannot be reinstalled to the same database with table prefix
+  * Fixed report Products in Cart
+  * Fixed error on attempt to insert image to CMS pages under version control
+  * Fixed order status grid so that you can assign state, edit, and view custom order status
+  * Fixed Related Products Rule page so that category can be selected on conditions tab
+  * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
+  * Fixed the bug with international DHL quotes
+
 2.0.0.0-dev53
 =============
 * Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module
@@ -10,9 +50,9 @@
 * GitHub requests:
   * [#238](https://github.com/magento/magento2/pull/238) -- Improve escaping HTML entities in URL
   * [#199](https://github.com/magento/magento2/pull/199) -- Replaced function calls to array_push with adding the elements directly
-  * [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods.
+  * [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods
   * [#233](https://github.com/magento/magento2/pull/233) -- Google Rich Snippet Code
-  * [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation.
+  * [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation
   * [#232](https://github.com/magento/magento2/pull/232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632)
 * Fixed bugs:
   * Fixed JavaScript error when printing orders from the frontend
@@ -29,11 +69,10 @@
   * Moved Magento\Core\Model\Theme to the Magento\View component
   * Moved Magento\Core\Model\Design to the Magento\View component
   * Consistent declaration of page-types
-  * The Framework part of the Cache functionality moved out from modules
 * Themes update:
   * Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme
   * Refactored and removed duplicate Persistent module templates
-  * Plushe theme made responsive
+  * Plushe theme is responsive now
 * Fixed bugs:
   * Fixed inability to print order, invoice, or creditmemo in the frontend
   * Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test
diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
index 4477bb68e9db713305694effa4110547044c0366..4eb3679fa78848a5ce9d9a16d35ee32473296362 100644
--- a/app/code/Magento/AdminNotification/Model/Feed.php
+++ b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -49,9 +49,9 @@ class Feed extends \Magento\Core\Model\AbstractModel
     protected $_feedUrl;
 
     /**
-     * @var \Magento\Core\Model\Store\Config
+     * @var \Magento\Backend\App\ConfigInterface
      */
-    protected $_coreStoreConfig;
+    protected $_backendConfig;
 
     /**
      * @var \Magento\AdminNotification\Model\InboxFactory
@@ -61,7 +61,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
     /**
      * @param \Magento\Core\Model\Context $context
      * @param \Magento\Core\Model\Registry $registry
-     * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
      * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
      * @param \Magento\Core\Model\Resource\AbstractResource $resource
      * @param \Magento\Data\Collection\Db $resourceCollection
@@ -70,14 +70,14 @@ class Feed extends \Magento\Core\Model\AbstractModel
     public function __construct(
         \Magento\Core\Model\Context $context,
         \Magento\Core\Model\Registry $registry,
-        \Magento\Core\Model\Store\Config $coreStoreConfig,
+        \Magento\Backend\App\ConfigInterface $backendConfig,
         \Magento\AdminNotification\Model\InboxFactory $inboxFactory,
         \Magento\Core\Model\Resource\AbstractResource $resource = null,
         \Magento\Data\Collection\Db $resourceCollection = null,
         array $data = array()
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-        $this->_coreStoreConfig = $coreStoreConfig;
+        $this->_backendConfig = $backendConfig;
         $this->_inboxFactory = $inboxFactory;
     }
 
@@ -97,9 +97,9 @@ class Feed extends \Magento\Core\Model\AbstractModel
      */
     public function getFeedUrl()
     {
-        $httpPath = $this->_coreStoreConfig->getConfigFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
+        $httpPath = $this->_backendConfig->getFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
         if (is_null($this->_feedUrl)) {
-            $this->_feedUrl = $httpPath . $this->_coreStoreConfig->getConfig(self::XML_FEED_URL_PATH);
+            $this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH);
         }
         return $this->_feedUrl;
     }
@@ -158,7 +158,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
      */
     public function getFrequency()
     {
-        return $this->_coreStoreConfig->getConfig(self::XML_FREQUENCY_PATH) * 3600;
+        return $this->_backendConfig->getValue(self::XML_FREQUENCY_PATH) * 3600;
     }
 
     /**
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index ed4045d5c38e17687398a51aabf3257d48082081..e24551a102af9bf52213e3ade16e6abeaf167a76 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -50,9 +50,9 @@ class Security
     protected $_cache;
 
     /**
-     * @var \Magento\Core\Model\Store\Config
+     * @var \Magento\Backend\App\ConfigInterface
      */
-    protected $_storeConfig;
+    protected $_backendConfig;
 
     /**
      * @var \Magento\Core\Model\Config
@@ -66,18 +66,18 @@ class Security
 
     /**
      * @param \Magento\App\CacheInterface $cache
-     * @param \Magento\Core\Model\Store\Config $storeConfig
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
      * @param \Magento\Core\Model\Config $config
      * @param \Magento\HTTP\Adapter\CurlFactory $curlFactory
      */
     public function __construct(
         \Magento\App\CacheInterface $cache,
-        \Magento\Core\Model\Store\Config $storeConfig,
+        \Magento\Backend\App\ConfigInterface $backendConfig,
         \Magento\Core\Model\Config $config,
         \Magento\HTTP\Adapter\CurlFactory $curlFactory
     ) {
         $this->_cache = $cache;
-        $this->_storeConfig = $storeConfig;
+        $this->_backendConfig = $backendConfig;
         $this->_config = $config;
         $this->_curlFactory = $curlFactory;
     }
@@ -97,7 +97,7 @@ class Security
             return true;
         }
 
-        $adminSessionLifetime = (int) $this->_storeConfig->getConfig('admin/security/session_lifetime');
+        $adminSessionLifetime = (int) $this->_backendConfig->getValue('admin/security/session_lifetime');
         $this->_cache->save(true, self::VERIFICATION_RESULT_CACHE_KEY, array(), $adminSessionLifetime);
         return false;
     }
diff --git a/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php b/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php
deleted file mode 100644
index d51fdb7698d05de241c2253e6d02633b683004d6..0000000000000000000000000000000000000000
--- a/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Adminhtml
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-/**
- * Template text preview field renderer
- *
- * @category   Magento
- * @package    Magento_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Adminhtml\Model\Newsletter\Renderer;
-
-class Text implements \Magento\Data\Form\Element\Renderer\RendererInterface
-{
-
-    public function render(\Magento\Data\Form\Element\AbstractElement $element)
-    {
-        $html = '<tr><td class="label">'."\n";
-        if ($element->getLabel()) {
-            $html.= '<label for="'.$element->getHtmlId().'">'.$element->getLabel().'</label>'."\n";
-        }
-        $html.= '</td><td class="value">
-<iframe src="' . $element->getValue() . '" id="' . $element->getHtmlId() . '" frameborder="0" class="template-preview"> </iframe>';
-        $html.= '</td><td></td></tr>'."\n";
-
-        return $html;
-    }
-}
diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/events.xml b/app/code/Magento/Adminhtml/etc/adminhtml/events.xml
deleted file mode 100644
index e2cb639c2d64d407c2c7e28ae961188aa4a65fed..0000000000000000000000000000000000000000
--- a/app/code/Magento/Adminhtml/etc/adminhtml/events.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<config>
-    <event name="admin_system_config_changed_section_admin">
-        <observer name="bind_locale" instance="Magento\Backend\Model\Config\Backend\Admin\Observer" method="afterCustomUrlChanged" />
-    </event>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml b/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml
deleted file mode 100644
index 27d92ec34c8d4416ab5582163bbe05f2ad521b42..0000000000000000000000000000000000000000
--- a/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Adminhtml
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<config>
-    <menu>
-        <add id="Magento_Adminhtml::dashboard" title="Dashboard" module="Magento_Adminhtml" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Adminhtml::dashboard"/>
-        <add id="Magento_Adminhtml::system" title="System" module="Magento_Adminhtml" sortOrder="80" resource="Magento_Adminhtml::system"/>
-        <add id="Magento_Adminhtml::system_tools" title="Tools" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::tools"/>
-        <add id="Magento_Adminhtml::system_design" title="Design" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::design"/>
-        <add id="Magento_Adminhtml::system_convert" title="Data Transfer" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::convert"/>
-        <add id="Magento_Adminhtml::system_cache" title="Cache Management" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system_tools" action="adminhtml/cache" resource="Magento_Adminhtml::cache"/>
-
-        <add id="Magento_Catalog::inventory" title="Inventory" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::catalog" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
-
-        <add id="Magento_Adminhtml::marketing" title="Marketing" module="Magento_Adminhtml" sortOrder="40" resource="Magento_Adminhtml::marketing"/>
-        <add id="Magento_Adminhtml::marketing_communications" title="Communications" module="Magento_Adminhtml" sortOrder="30" parent="Magento_Adminhtml::marketing"  resource="Magento_Adminhtml::marketing_communications"/>
-        <add id="Magento_Adminhtml::marketing_seo" title="SEO &amp; Search" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::marketing"  resource="Magento_Adminhtml::marketing_seo"/>
-        <add id="Magento_Adminhtml::marketing_user_content" title="User Content" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::marketing"  resource="Magento_Adminhtml::marketing_user_content"/>
-
-        <add id="Magento_Adminhtml::content" title="Content" module="Magento_Adminhtml" sortOrder="50" resource="Magento_Adminhtml::content"/>
-        <add id="Magento_Adminhtml::content_elements" title="Elements" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::content_elements"/>
-
-        <add id="Magento_Adminhtml::stores" title="Stores" module="Magento_Adminhtml" sortOrder="70" resource="Magento_Adminhtml::stores"/>
-        <add id="Magento_Adminhtml::stores_settings" title="Settings" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_settings"/>
-        <add id="Magento_Adminhtml::stores_attributes" title="Attributes" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_attributes"/>
-        <add id="Magento_Adminhtml::other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_other_settings"/>
-
-        <add id="Magento_Adminhtml::system_other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="80" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::system_other_settings"/>
-    </menu>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/config.xml b/app/code/Magento/Adminhtml/etc/config.xml
deleted file mode 100644
index bcff89c470e2d873f05e04999da6d6a0206b9fdb..0000000000000000000000000000000000000000
--- a/app/code/Magento/Adminhtml/etc/config.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Adminhtml
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<config>
-    <default>
-        <system>
-            <dashboard>
-                <enable_charts>1</enable_charts>
-            </dashboard>
-        </system>
-        <general>
-            <file>
-                <sitemap_generate_valid_paths>
-                    <available>
-                        <any_path>/*/sitemap.xml</any_path>
-                    </available>
-                </sitemap_generate_valid_paths>
-            </file>
-            <validator_data>
-                <input_types>
-                    <price>price</price>
-                    <media_image>media_image</media_image>
-                    <gallery>gallery</gallery>
-                </input_types>
-            </validator_data>
-        </general>
-    </default>
-    <stores>
-        <admin>
-            <design>
-                <package>
-                    <name>default</name>
-                </package>
-                <theme>
-                    <default>default</default>
-                </theme>
-            </design>
-        </admin>
-    </stores>
-    <websites>
-        <admin>
-            <web>
-                <routers>
-                    <frontend>
-                        <disabled>true</disabled>
-                    </frontend>
-                </routers>
-                <default>
-                    <no_route>admin/noroute/index</no_route>
-                </default>
-            </web>
-        </admin>
-    </websites>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/di.xml b/app/code/Magento/Adminhtml/etc/di.xml
deleted file mode 100644
index d4a999e0e2e315d56f71e7986607e32017352e14..0000000000000000000000000000000000000000
--- a/app/code/Magento/Adminhtml/etc/di.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<config>
-    <type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute">
-        <param name="attributeLabelCache">
-            <instance type="Magento\App\Cache\Type\Translate" />
-        </param>
-    </type>
-    <type name="Magento\Backend\Helper\Dashboard\Data">
-        <param name="installDate">
-            <value type="argument">Magento\App\State::PARAM_INSTALL_DATE</value>
-        </param>
-    </type>
-    <type name="Magento\Rating\Block\Adminhtml\Edit\Tab\Form">
-        <param name="session">
-            <instance type="Magento\Adminhtml\Model\Session" />
-        </param>
-    </type>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/module.xml b/app/code/Magento/Adminhtml/etc/module.xml
index 4c589cb95b45aabd9afcefb495be8354ad7a819a..d6a5997479c7355f304fddf42b2ed36600c695e1 100755
--- a/app/code/Magento/Adminhtml/etc/module.xml
+++ b/app/code/Magento/Adminhtml/etc/module.xml
@@ -27,26 +27,7 @@
     <module name="Magento_Adminhtml" version="0.7.1" active="true">
         <depends>
             <module name="Magento_Core"/>
-            <module name="Magento_Reports"/>
-            <module name="Magento_Customer"/>
-            <module name="Magento_Newsletter"/>
-            <module name="Magento_Sales"/>
-            <module name="Magento_Sitemap"/>
             <module name="Magento_Backend"/>
-            <module name="Magento_Catalog"/>
-            <module name="Magento_Cms"/>
-            <module name="Magento_Review"/>
-            <module name="Magento_Rating"/>
-            <module name="Magento_Tax"/>
-            <module name="Magento_Eav"/>
-            <module name="Magento_CatalogSearch"/>
-            <module name="Magento_SalesRule"/>
-            <module name="Magento_Downloadable"/>
-            <module name="Magento_Shipping"/>
-            <module name="Magento_Backup"/>
-            <module name="Magento_Checkout"/>
-            <module name="Magento_Page"/>
-            <module name="Magento_GiftMessage"/>
             <module name="Magento_Weee"/>
         </depends>
     </module>
diff --git a/app/code/Magento/Adminhtml/etc/sales.xml b/app/code/Magento/Adminhtml/etc/sales.xml
deleted file mode 100644
index d18d4b5dfa01b7802c0b46baeeea300d43bfec94..0000000000000000000000000000000000000000
--- a/app/code/Magento/Adminhtml/etc/sales.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<config>
-    <order>
-        <available_product_type name="simple"/>
-        <available_product_type name="virtual"/>
-        <available_product_type name="configurable"/>
-        <available_product_type name="grouped"/>
-    </order>
-</config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
deleted file mode 100644
index 8b77671e35619b590629dee2d7c816111385f8c7..0000000000000000000000000000000000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Adminhtml\Block\Page" name="root" output="1" template="admin/page.phtml">
-        <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
-            <action method="setTitle">
-                <argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
-            </action>
-            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-jquery-no-conflict-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/jquery-no-conflict.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-ui-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery-ui.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="head-load-min-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">head.load.min.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="underscore-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">underscore.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-magento-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/mage.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-tmpl-min-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-validate-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-translate-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/translate.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-bootstrap-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/backend/bootstrap.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-floating-header-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/backend/floating-header.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="prototype-prototype-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">prototype/prototype.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="prototype-window-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">prototype/window.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-builder-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">scriptaculous/builder.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-effects-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">scriptaculous/effects.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-dragdrop-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">scriptaculous/dragdrop.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-controls-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">scriptaculous/controls.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-slider-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">scriptaculous/slider.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="lib-ccard-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">lib/ccard.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="prototype-validation-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">prototype/validation.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="varien-js-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">varien/js.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-hash-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/hash.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-events-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/events.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-varienloader-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/varienLoader.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-grid-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/grid.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-tabs-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/backend/tabs.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-form-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/form.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-accordion-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/accordion.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-tools-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/tools.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">Magento_Catalog::catalog/product.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="lib-ds-sleight-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">lib/ds-sleight.js</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string">defer</item>
-                        <item name="ie_condition" xsi:type="string">lt IE 7</item>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Css" name="magento-calendar-css">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/calendar.css</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string"/>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-ui-timepicker-addon-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-calendar-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/calendar.js</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">extjs/ext-tree.js</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string"/>
-                        <item name="ie_condition" xsi:type="string"/>
-                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-checkbox-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">extjs/ext-tree-checkbox.js</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string"/>
-                        <item name="ie_condition" xsi:type="string"/>
-                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ext-all-css">
-                <arguments>
-                    <argument name="file" xsi:type="string">extjs/resources/css/ext-all.css</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string"/>
-                        <item name="ie_condition" xsi:type="string"/>
-                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ytheme-magento-css">
-                <arguments>
-                    <argument name="file" xsi:type="string">extjs/resources/css/ytheme-magento.css</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string"/>
-                        <item name="ie_condition" xsi:type="string"/>
-                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-promo-rules-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">Magento_Rule::rules.js</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string"/>
-                        <item name="ie_condition" xsi:type="string"/>
-                        <item name="flag_name" xsi:type="string">can_load_rules_js</item>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-wysiwyg-tiny-mce-setup-js">
-                <arguments>
-                    <argument name="file" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/setup.js</argument>
-                    <argument name="properties" xsi:type="array">
-                        <item name="attributes" xsi:type="string"/>
-                        <item name="ie_condition" xsi:type="string"/>
-                        <item name="flag_name" xsi:type="string">can_load_tiny_mce</item>
-                    </argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Js\Components" name="head.components" as="components" template="Magento_Adminhtml::page/js/components.phtml"/>
-            <block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Adminhtml::page/js/calendar.phtml"/>
-        </block>
-        <block class="Magento\Adminhtml\Block\Page\Notices" name="global_notices" as="global_notices" template="page/notices.phtml"/>
-        <block class="Magento\Adminhtml\Block\Page\Header" name="header" as="header">
-            <block class="Magento\Backend\Block\GlobalSearch" as="search" acl="Magento_Adminhtml::global_search"/>
-        </block>
-        <block class="Magento\Adminhtml\Block\Widget\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
-        <!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in \Magento\Core\Model\Layout::createBlock() -->
-        <block class="Magento\Adminhtml\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Adminhtml::admin/formkey.phtml"/>
-        <!-- deprecated since 1.7.0.0 see \Magento\Page\Block\Js\Translate -->
-        <block class="Magento\Page\Block\Js\Translate" name="js_translate" as="js_translate" template="Magento_Adminhtml::page/js/translate.phtml"/>
-        <container name="main-top" label="main-top" as="main-top">
-            <block class="Magento\Page\Block\Html\Title" name="page-title" template="title.phtml"/>
-        </container>
-        <container name="left" as="left" label="Left Column"/>
-        <container name="content" as="content" label="Content"/>
-        <block class="Magento\View\Block\Messages" name="messages" as="messages"/>
-        <container name="js" as="js" label="JavaScript"/>
-        <block class="Magento\Adminhtml\Block\Page\Footer" name="footer" as="footer">
-            <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
-            <action method="setBugreportUrl">
-                <argument name="url" xsi:type="string">http://www.magentocommerce.com/bug-tracking</argument>
-            </action>
-        </block>
-        <container name="before_body_end" as="before_body_end" label="Before Body End"/>
-    </block>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml b/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml
index 99cb75e01ff6392900c46b18a3e3386141bf7a1a..95e2cc91ba3a9af5782487f71c204edeb7ecf8fb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml
@@ -35,7 +35,7 @@
         <div class="field field-url-rewrite-option-select">
             <label for="url-rewrite-option-select" class="label"><?php echo $this->getSelectorLabel() ?></label>
             <div class="control">
-                <?php $url = $this->helper('Magento\Adminhtml\Helper\Data')->getUrl('adminhtml/*/*')?>
+                <?php $url = $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/*/*')?>
                 <select id="url-rewrite-option-select" class="select" onchange="window.location = this.value;">
                 <?php foreach ($this->getModes() as $mode => $label): ?>
                     <option <?php echo ($this->isMode($mode) ? 'selected="selected" ' :'' ) ?>value="<?php echo $url . $mode ?>"><?php echo $label ?></option>
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
index 97bc41b2154a54858d64c637e867e70b6035bc38..668acee53e7a45507ad7d2cfd41afb302ce48cc6 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
@@ -187,7 +187,7 @@ class Payment
             && isset($redirectParams['x_invoice_num'])
             && isset($redirectParams['controller_action_name'])
         ) {
-            $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data')
+            $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\HelperInterface')
                 ->getSuccessOrderUrl($redirectParams);
             $this->_getDirectPostSession()->unsetData('quote_id');
             //cancel old order
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
index fbf2630b3eb5daf988d614665cc607bf58b7b904..41a4a06e4523905b5f8fd88044e47fcac65f9fc7 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
@@ -112,7 +112,7 @@ class Payment extends \Magento\App\Action\Action
             }
             $result['controller_action_name'] = $data['controller_action_name'];
             $result['is_secure'] = isset($data['is_secure']) ? $data['is_secure'] : false;
-            $params['redirect'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data')
+            $params['redirect'] = $this->_objectManager->get('Magento\Authorizenet\Helper\HelperInterface')
                 ->getRedirectIframeUrl($result);
         }
 
@@ -134,7 +134,7 @@ class Payment extends \Magento\App\Action\Action
             && isset($redirectParams['controller_action_name'])
         ) {
             $this->_getDirectPostSession()->unsetData('quote_id');
-            $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data')
+            $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\HelperInterface')
                 ->getSuccessOrderUrl($redirectParams);
         }
         if (!empty($redirectParams['error_msg'])) {
diff --git a/app/code/Magento/Authorizenet/Helper/Backend.php b/app/code/Magento/Authorizenet/Helper/Backend.php
new file mode 100644
index 0000000000000000000000000000000000000000..45d87e23703449612ad47694794532da4ea84014
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Helper/Backend.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Authorizenet
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Authorizenet\Helper;
+
+/**
+ * Authorizenet Backend Data Helper
+ */
+class Backend extends Data
+{
+    /**
+     * @var \Magento\Backend\Model\Url
+     */
+    protected $_urlBuilder;
+
+    /**
+     * @param \Magento\App\Helper\Context $context
+     * @param \Magento\Core\Model\StoreManager $storeManager
+     * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param \Magento\Backend\Model\Url $urlBuilder
+     */
+    public function __construct(
+        \Magento\App\Helper\Context $context,
+        \Magento\Core\Model\StoreManager $storeManager,
+        \Magento\Sales\Model\OrderFactory $orderFactory,
+        \Magento\Backend\Model\Url $urlBuilder
+    ) {
+        parent::__construct($context, $storeManager, $orderFactory);
+        $this->_urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * Return URL for admin area
+     *
+     * @param string $route
+     * @param array $params
+     * @return string
+     */
+    protected function _getUrl($route, $params = array())
+    {
+        return $this->_urlBuilder->getUrl($route, $params);
+    }
+
+    /**
+     * Retrieve place order url in admin
+     *
+     * @return  string
+     */
+    public function getPlaceOrderAdminUrl()
+    {
+        return $this->_getUrl('*/authorizenet_directpost_payment/place', array());
+    }
+
+    /**
+     * Retrieve place order url
+     *
+     * @param array params
+     * @return  string
+     */
+    public function getSuccessOrderUrl($params)
+    {
+        $param = array();
+        $route = 'sales/order/view';
+        $order = $this->_orderFactory->create()->loadByIncrementId($params['x_invoice_num']);
+        $param['order_id'] = $order->getId();
+        return $this->_getUrl($route, $param);
+    }
+
+    /**
+     * Retrieve redirect ifrmae url
+     *
+     * @param array params
+     * @return string
+     */
+    public function getRedirectIframeUrl($params)
+    {
+        return $this->_getUrl('adminhtml/authorizenet_directpost_payment/redirect', $params);
+    }
+}
diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php
index 3e61e8c4f12951279113ac95ce2e4501d0de02f5..4413106ef1860df1b2e7cb44166b4a7d9ea8ff62 100644
--- a/app/code/Magento/Authorizenet/Helper/Data.php
+++ b/app/code/Magento/Authorizenet/Helper/Data.php
@@ -24,16 +24,12 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Authorizenet\Helper;
+
 /**
  * Authorizenet Data Helper
- *
- * @category   Magento
- * @package    Magento_Authorizenet
- * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Authorizenet\Helper;
-
-class Data extends \Magento\App\Helper\AbstractHelper
+class Data extends \Magento\App\Helper\AbstractHelper implements HelperInterface
 {
     /**
      * @var \Magento\Core\Model\StoreManagerInterface
@@ -45,39 +41,19 @@ class Data extends \Magento\App\Helper\AbstractHelper
      */
     protected $_orderFactory;
 
-    /**
-     * @var \Magento\Backend\Model\Url
-     */
-    protected $_urlBuilder;
-
     /**
      * @param \Magento\App\Helper\Context $context
      * @param \Magento\Core\Model\StoreManagerInterface $storeManager
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
-     * @param \Magento\Backend\Model\Url $urlBuilder
      */
     public function __construct(
         \Magento\App\Helper\Context $context,
         \Magento\Core\Model\StoreManagerInterface $storeManager,
-        \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Backend\Model\Url $urlBuilder
+        \Magento\Sales\Model\OrderFactory $orderFactory
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
         $this->_orderFactory = $orderFactory;
-        $this->_urlBuilder = $urlBuilder;
-    }
-
-    /**
-     * Return URL for admin area
-     *
-     * @param string $route
-     * @param array $params
-     * @return string
-     */
-    public function getAdminUrl($route, $params)
-    {
-        return $this->_urlBuilder->getUrl($route, $params);
     }
 
     /**
@@ -141,11 +117,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
                 $route = 'authorizenet/directpost_payment/redirect';
                 break;
 
-            case 'sales_order_create':
-            case 'sales_order_edit':
-                $route = 'adminhtml/authorizenet_directpost_payment/redirect';
-                return $this->getAdminUrl($route, $params);
-
             default:
                 $route = 'authorizenet/directpost_payment/redirect';
                 break;
@@ -164,16 +135,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
         return $this->_getUrl('authorizenet/directpost_payment/place');
     }
 
-    /**
-     * Retrieve place order url in admin
-     *
-     * @return  string
-     */
-    public function getPlaceOrderAdminUrl()
-    {
-        return $this->getAdminUrl('*/authorizenet_directpost_payment/place', array());
-    }
-
     /**
      * Retrieve place order url
      *
@@ -188,13 +149,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
                 $route = 'checkout/onepage/success';
                 break;
 
-            case 'sales_order_create':
-            case 'sales_order_edit':
-                $route = 'sales/order/view';
-                $order = $this->_orderFactory->create()->loadByIncrementId($params['x_invoice_num']);
-                $param['order_id'] = $order->getId();
-                return $this->getAdminUrl($route, $param);
-
             default :
                 $route = 'checkout/onepage/success';
                 break;
diff --git a/app/code/Magento/Adminhtml/Model/Observer.php b/app/code/Magento/Authorizenet/Helper/HelperInterface.php
similarity index 68%
rename from app/code/Magento/Adminhtml/Model/Observer.php
rename to app/code/Magento/Authorizenet/Helper/HelperInterface.php
index 37ecd6d4c9778f703c2bb00cfb873558aa86dc32..1ebe385d5a81a9dee6b1d85aaea05771a6053873 100644
--- a/app/code/Magento/Adminhtml/Model/Observer.php
+++ b/app/code/Magento/Authorizenet/Helper/HelperInterface.php
@@ -19,22 +19,31 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Authorizenet
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Authorizenet\Helper;
 
 /**
- * Backend event observer
- *
- * @category   Magento
- * @package    Magento_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
- * @deprecated Moved to module Magento_Backend
+ * Authorizenet Data Helper
  */
-namespace Magento\Adminhtml\Model;
-
-class Observer extends \Magento\Backend\Model\Observer
+interface HelperInterface
 {
+    /**
+     * Retrieve place order url
+     *
+     * @param array params
+     * @return  string
+     */
+    public function getSuccessOrderUrl($params);
+
+    /**
+     * Retrieve redirect ifrmae url
+     *
+     * @param array params
+     * @return string
+     */
+    public function getRedirectIframeUrl($params);
 }
diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/di.xml b/app/code/Magento/Authorizenet/etc/adminhtml/di.xml
index 8d4a24b5cd88129db2e8bd1fef88ff0dd91e1cfe..dd7d4918ccc91a25ab30c6057178aa50207d25c8 100644
--- a/app/code/Magento/Authorizenet/etc/adminhtml/di.xml
+++ b/app/code/Magento/Authorizenet/etc/adminhtml/di.xml
@@ -24,6 +24,7 @@
  */
 -->
 <config>
+    <preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Backend" />
     <type name="Magento\Authorizenet\Model\Directpost\Session">
         <param name="sessionName">
             <value>adminhtml</value>
diff --git a/app/code/Magento/Authorizenet/etc/frontend/di.xml b/app/code/Magento/Authorizenet/etc/frontend/di.xml
index ad3e6576228951208485acd760b834e1fe4dae79..89220842b876a240ce68b10a228200b81a442ae2 100644
--- a/app/code/Magento/Authorizenet/etc/frontend/di.xml
+++ b/app/code/Magento/Authorizenet/etc/frontend/di.xml
@@ -24,6 +24,7 @@
  */
 -->
 <config>
+    <preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Data" />
     <type name="Magento\Authorizenet\Model\Directpost\Session">
         <param name="sessionName">
             <value>frontend</value>
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml
index d069184e3edb571be85ab7522988191d449530a6..4da6e750acf8dc88153ebe725fd65a11019c49b2 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml
@@ -31,7 +31,7 @@
 <?php
 $_params = $this->getParams();
 /* @var $_helper \Magento\Authorizenet\Helper\Data  */
-$_helper = $this->helper('Magento\Authorizenet\Helper\Data');
+$_helper = $this->helper('Magento\Authorizenet\Helper\HelperInterface');
 ?>
 <html>
 <head>
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml b/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml
index 8d08867396b4d84a38cb04d1ca608146db18a75d..907f1b70343325d56806450c96350b37d9b5d5bc 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml
@@ -33,7 +33,7 @@ $_form = $this;
 $_code = $_form->getMethodCode();
 $_method = $_form->getMethod();
 $_controller = $this->getRequest()->getControllerName();
-$_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderAdminUrl();
+$_orderUrl = $this->helper('Magento\Authorizenet\Helper\Backend')->getPlaceOrderAdminUrl();
 ?>
 <!-- IFRAME for request to our server -->
 <iframe id="order-directpost-iframe" allowtransparency="true" frameborder="0" name="iframeSubmitOrder" style="display:none;width:100%;background-color:transparent" src="<?php echo $this->getViewFileUrl('blank.html') ?>"></iframe>
diff --git a/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml
index 1eb2dbe153f06cf01be975f00640e093eac97ac1..0b406c2ff47211ffe5cf88f038b2816d9baace90 100644
--- a/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml
+++ b/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml
@@ -31,7 +31,7 @@
 <?php
 $_params = $this->getParams();
 /* @var $_helper \Magento\Authorizenet\Helper\Data  */
-$_helper = $this->helper('Magento\Authorizenet\Helper\Data');
+$_helper = $this->helper('Magento\Authorizenet\Helper\HelperInterface');
 ?>
 <html>
 <head>
diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
index 172711098246a996333d0988f222670fdf1a0ab7..5ad474a9b2a079e4f8be08af13d8995b63cb00f7 100644
--- a/app/code/Magento/Backend/App/Area/FrontNameResolver.php
+++ b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -43,15 +43,15 @@ class FrontNameResolver implements \Magento\App\Area\FrontNameResolverInterface
     protected $_defaultFrontName;
 
     /**
-     * @var \Magento\Core\Model\ConfigInterface
+     * @var \Magento\Backend\App\ConfigInterface
      */
     protected $_config;
 
     /**
-     * @param \Magento\Core\Model\ConfigInterface $config
+     * @param \Magento\Backend\App\Config $config
      * @param string $defaultFrontName
      */
-    public function __construct(\Magento\Core\Model\ConfigInterface $config, $defaultFrontName)
+    public function __construct(\Magento\Backend\App\Config $config, $defaultFrontName)
     {
         $this->_config = $config;
         $this->_defaultFrontName = $defaultFrontName;
@@ -64,9 +64,9 @@ class FrontNameResolver implements \Magento\App\Area\FrontNameResolverInterface
      */
     public function getFrontName()
     {
-        $isCustomPathUsed = (bool)(string)$this->_config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH, 'default');
+        $isCustomPathUsed = (bool)(string)$this->_config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH);
         if ($isCustomPathUsed) {
-            return (string)$this->_config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH, 'default');
+            return (string)$this->_config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH);
         }
         return $this->_defaultFrontName;
     }
diff --git a/app/code/Magento/Backend/App/Config.php b/app/code/Magento/Backend/App/Config.php
new file mode 100644
index 0000000000000000000000000000000000000000..118525b69501746caefb3e9b173198e06bf57fc1
--- /dev/null
+++ b/app/code/Magento/Backend/App/Config.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Default application path for backend area
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Backend\App;
+
+/**
+ * Backend config accessor
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * @var \Magento\Core\Model\Config\SectionPool
+     */
+    protected $_sectionPool;
+
+    /**
+     * @param \Magento\Core\Model\Config\SectionPool $sectionPool
+     */
+    public function __construct(\Magento\Core\Model\Config\SectionPool $sectionPool)
+    {
+        $this->_sectionPool = $sectionPool;
+    }
+
+    /**
+     * Retrieve config value by path and scope
+     *
+     * @param string $path
+     * @return mixed
+     */
+    public function getValue($path)
+    {
+        return $this->_sectionPool->getSection('default', null)->getValue($path);
+    }
+
+    /**
+     * Set config value in the corresponding config scope
+     *
+     * @param string $path
+     * @param mixed $value
+     */
+    public function setValue($path, $value)
+    {
+        $this->_sectionPool->getSection('default', null)->setValue($path, $value);
+    }
+
+    /**
+     * Reinitialize configuration
+     *
+     * @return \Magento\Core\Model\Config
+     */
+    public function reinit()
+    {
+        $this->_sectionPool->clean();
+    }
+
+    /**
+     * Retrieve config flag
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function getFlag($path)
+    {
+        return !!$this->_sectionPool->getSection('default', null)->getValue($path);
+    }
+}
diff --git a/app/code/Magento/Backend/App/ConfigInterface.php b/app/code/Magento/Backend/App/ConfigInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee0c31db1ffa5fda476ae38d19a62bf40b595687
--- /dev/null
+++ b/app/code/Magento/Backend/App/ConfigInterface.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Default application path for backend area
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Backend\App;
+
+/**
+ * Backend config accessor
+ */
+interface ConfigInterface
+{
+    /**
+     * Retrieve config value by path
+     *
+     * @param string $path
+     * @return mixed
+     */
+    public function getValue($path);
+
+    /**
+     * Set config value
+     *
+     * @param string $path
+     * @param mixed $value
+     */
+    public function setValue($path, $value);
+
+    /**
+     * Reinitialize config object
+     */
+    public function reinit();
+
+    /**
+     * Retrieve config flag
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function getFlag($path);
+}
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
index b69472565a7c9b5f0b2a6867a3b31e1ac0a951ff..10bd2e58da9a5640156c9a28a1efb3b709ce34b3 100644
--- a/app/code/Magento/Backend/App/DefaultPath.php
+++ b/app/code/Magento/Backend/App/DefaultPath.php
@@ -33,11 +33,11 @@ class DefaultPath implements \Magento\App\DefaultPathInterface
     protected $_parts;
 
     /**
-     * @param \Magento\Core\Model\Config $config
+     * @param \Magento\Backend\App\ConfigInterface $config
      */
-    public function __construct(\Magento\Core\Model\Config $config)
+    public function __construct(\Magento\Backend\App\ConfigInterface $config)
     {
-        $pathParts = explode('/', $config->getValue('web/default/admin', 'default'));
+        $pathParts = explode('/', $config->getValue('web/default/admin'));
 
         $this->_parts = array(
             'area'       => isset($pathParts[0]) ? $pathParts[0] : '',
@@ -57,4 +57,4 @@ class DefaultPath implements \Magento\App\DefaultPathInterface
     {
         return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Backend/App/Router/DefaultRouter.php b/app/code/Magento/Backend/App/Router/DefaultRouter.php
index 8f377599555aabeeab063aeb88bfa8b981775bb5..57c1b9c5d02fe8443fe7c9c5fcdf122b971d1f83 100644
--- a/app/code/Magento/Backend/App/Router/DefaultRouter.php
+++ b/app/code/Magento/Backend/App/Router/DefaultRouter.php
@@ -28,6 +28,59 @@ namespace Magento\Backend\App\Router;
 
 class DefaultRouter extends \Magento\Core\App\Router\Base
 {
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
+
+    /**
+     * @var \Magento\Core\Model\Url|\Magento\UrlInterface $url
+     */
+    protected $_url;
+
+    /**
+     * @var \Magento\Core\Model\Config
+     */
+    protected $_coreConfig;
+
+    /**
+     * @param \Magento\Core\Model\Config $coreConfig
+     * @param \Magento\App\ActionFactory $actionFactory
+     * @param \Magento\App\DefaultPathInterface $defaultPath
+     * @param \Magento\App\ResponseFactory $responseFactory
+     * @param \Magento\App\Route\ConfigInterface $routeConfig
+     * @param \Magento\App\State $appState
+     * @param \Magento\Core\Model\Url|\Magento\UrlInterface $url
+     * @param \Magento\Core\Model\StoreManager|\Magento\Core\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Core\Model\Store\Config $storeConfig
+     * @param \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo
+     * @param $routerId
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
+     * @throws \InvalidArgumentException
+     */
+    public function __construct(
+        \Magento\Core\Model\Config $coreConfig,
+        \Magento\App\ActionFactory $actionFactory,
+        \Magento\App\DefaultPathInterface $defaultPath,
+        \Magento\App\ResponseFactory $responseFactory,
+        \Magento\App\Route\ConfigInterface $routeConfig,
+        \Magento\App\State $appState,
+        \Magento\UrlInterface $url,
+        \Magento\Core\Model\StoreManagerInterface $storeManager,
+        \Magento\Core\Model\Store\Config $storeConfig,
+        \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo,
+        $routerId,
+        \Magento\Backend\App\ConfigInterface $backendConfig
+    ) {
+        parent::__construct(
+            $actionFactory, $defaultPath, $responseFactory, $routeConfig, $appState, $url, $storeManager, $storeConfig,
+            $urlSecurityInfo, $routerId
+        );
+        $this->_coreConfig = $coreConfig;
+        $this->_backendConfig = $backendConfig;
+        $this->_url = $url;
+    }
+
     /**
      * List of required request parameters
      * Order sensitive
@@ -46,7 +99,7 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
      */
     protected function _getDefaultPath()
     {
-        return (string)$this->_storeConfig->getConfig('web/default/admin', 'admin');
+        return (string)$this->_backendConfig->getValue('web/default/admin');
     }
 
     /**
@@ -69,11 +122,9 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
      */
     protected function _shouldBeSecure($path)
     {
-        return substr((string)$this->_storeConfig->getConfig('web/unsecure/base_url'), 0, 5) === 'https'
-            || $this->_storeConfig->getConfigFlag(
-                'web/secure/use_in_adminhtml',
-                \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
-            ) && substr((string)$this->_storeConfig->getConfig('web/secure/base_url'), 0, 5) === 'https';
+        return substr((string)$this->_coreConfig->getValue('web/unsecure/base_url', 'default'), 0, 5) === 'https'
+            || $this->_backendConfig->getFlag('web/secure/use_in_adminhtml')
+            && substr((string)$this->_coreConfig->getValue('web/secure/base_url', 'default'), 0, 5) === 'https';
     }
 
     /**
@@ -84,8 +135,7 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
      */
     protected function _getCurrentSecureUrl($request)
     {
-        return $this->_storeManager->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
-            ->getBaseUrl('link', true) . ltrim($request->getPathInfo(), '/');
+        return $this->_url->getBaseUrl('link', true) . ltrim($request->getPathInfo(), '/');
     }
 
     /**
diff --git a/app/code/Magento/Adminhtml/Block/Admin/Formkey.php b/app/code/Magento/Backend/Block/Admin/Formkey.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Admin/Formkey.php
rename to app/code/Magento/Backend/Block/Admin/Formkey.php
index 69ba7cc3675b9744dbfbc1086b06338c1f9fd72c..0d5e6c6b706246ec5f6a537edae98d626f8d14e9 100644
--- a/app/code/Magento/Adminhtml/Block/Admin/Formkey.php
+++ b/app/code/Magento/Backend/Block/Admin/Formkey.php
@@ -19,15 +19,15 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml form key content block
+ * Backend form key content block
  */
-namespace Magento\Adminhtml\Block\Admin;
+namespace Magento\Backend\Block\Admin;
 
 class Formkey extends \Magento\Backend\Block\Template
 {
diff --git a/app/code/Magento/Adminhtml/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Cache.php
rename to app/code/Magento/Backend/Block/Cache.php
index 9540a3f1cfd67962f5aad8f251cd09f95efcbbd0..0e10790496693546440aed30150029e5597eee22 100644
--- a/app/code/Magento/Adminhtml/Block/Cache.php
+++ b/app/code/Magento/Backend/Block/Cache.php
@@ -19,12 +19,12 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backend\Block;
 
 class Cache extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
diff --git a/app/code/Magento/Adminhtml/Block/Cache/Additional.php b/app/code/Magento/Backend/Block/Cache/Additional.php
similarity index 80%
rename from app/code/Magento/Adminhtml/Block/Cache/Additional.php
rename to app/code/Magento/Backend/Block/Cache/Additional.php
index d4a43697b445d111ac29b8ff4478749f02d95706..386dbacded61ff9cbbd13730af07b08241396054 100644
--- a/app/code/Magento/Adminhtml/Block/Cache/Additional.php
+++ b/app/code/Magento/Backend/Block/Cache/Additional.php
@@ -19,22 +19,22 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Cache;
+namespace Magento\Backend\Block\Cache;
 
-class Additional extends \Magento\Adminhtml\Block\Template
+class Additional extends \Magento\Backend\Block\Template
 {
     public function getCleanImagesUrl()
     {
-        return $this->getUrl('adminhtml/*/cleanImages');
+        return $this->getUrl('*/*/cleanImages');
     }
 
     public function getCleanMediaUrl()
     {
-        return $this->getUrl('adminhtml/*/cleanMedia');
+        return $this->getUrl('*/*/cleanMedia');
     }
 }
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index 309a8c54b3e0099c9e3a81fa767161ccc57ee973..0071f5fd3f586e2eb32509305bc3e77ed8ea0e15 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -26,7 +26,7 @@
 
 namespace Magento\Backend\Block;
 
-class Dashboard extends \Magento\Adminhtml\Block\Template
+class Dashboard extends \Magento\Backend\Block\Template
 {
     protected $_locale;
 
@@ -52,7 +52,7 @@ class Dashboard extends \Magento\Adminhtml\Block\Template
         if ($this->_storeConfig->getConfig(self::XML_PATH_ENABLE_CHARTS)) {
             $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
         } else {
-            $block = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Template')
+            $block = $this->getLayout()->createBlock('Magento\Backend\Block\Template')
                 ->setTemplate('dashboard/graph/disabled.phtml')
                 ->setConfigUrl($this->getUrl('adminhtml/system_config/edit', array('section'=>'admin')));
         }
diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
index 43df3a75d246f3da16bbbdfcf1c9fe1d3501aab8..2b9bf27b8a764738701a2ffeefb0cd973587b965 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
index 72215de3b598aed2981a6ca5b40706aaa1cb22d7..237218ec3db663f6c742d45ad02238ffe39e988f 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -115,7 +115,7 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
             'type'      => 'currency',
             'currency_code'  => $baseCurrencyCode,
             'index'     => 'orders_avg_amount',
-            'renderer'  =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency'
+            'renderer'  =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
         ));
 
         $this->addColumn('orders_sum_amount', array(
@@ -125,7 +125,7 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
             'type'      => 'currency',
             'currency_code'  => $baseCurrencyCode,
             'index'     => 'orders_sum_amount',
-            'renderer'  =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency'
+            'renderer'  =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
         ));
 
         $this->setFilterVisibility(false);
diff --git a/app/code/Magento/Adminhtml/Block/Denied.php b/app/code/Magento/Backend/Block/Denied.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Denied.php
rename to app/code/Magento/Backend/Block/Denied.php
index 96c0fa78b55a9801e81386f56713fdfed40fc602..8de1d49d475874eaa9701a6a01db347316434021 100644
--- a/app/code/Magento/Adminhtml/Block/Denied.php
+++ b/app/code/Magento/Backend/Block/Denied.php
@@ -19,14 +19,14 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backend\Block;
 
-class Denied extends \Magento\Adminhtml\Block\Template
+class Denied extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Backend\Model\Auth\Session
diff --git a/app/code/Magento/Adminhtml/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Media/Uploader.php
rename to app/code/Magento/Backend/Block/Media/Uploader.php
index 0cb0c9c6973d07e0ba1338bd657a0c63c36b39a9..19418d994a0297623d7c2546fe123c15e13957c9 100644
--- a/app/code/Magento/Adminhtml/Block/Media/Uploader.php
+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,7 +27,7 @@
 /**
  * Adminhtml media library uploader
  */
-namespace Magento\Adminhtml\Block\Media;
+namespace Magento\Backend\Block\Media;
 
 class Uploader extends \Magento\Adminhtml\Block\Widget
 {
@@ -39,25 +39,25 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'Magento_Adminhtml::media/uploader.phtml';
+    protected $_template = 'Magento_Backend::media/uploader.phtml';
 
     /**
      * @var \Magento\File\Size
      */
     protected $_fileSizeService;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\File\Size $fileSize
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\File\Size $fileSize
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\File\Size $fileSize,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\File\Size $fileSize,
+        array $data = array()
+    ) {
         $this->_fileSizeService = $fileSize;
         parent::__construct($context, $coreData, $data);
     }
@@ -101,7 +101,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
     /**
      * Prepares layout and set element renderer
      *
-     * @return \Magento\Adminhtml\Block\Media\Uploader
+     * @return \Magento\Backend\Block\Media\Uploader
      */
     protected function _prepareLayout()
     {
@@ -119,7 +119,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive uploader js object name
+     * Retrieve uploader js object name
      *
      * @return string
      */
@@ -129,7 +129,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive config json
+     * Retrieve config json
      *
      * @return string
      */
@@ -139,7 +139,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive config object
+     * Retrieve config object
      *
      * @return \Magento\Object
      */
diff --git a/app/code/Magento/Adminhtml/Block/Page.php b/app/code/Magento/Backend/Block/Page.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Page.php
rename to app/code/Magento/Backend/Block/Page.php
index db5845b304fa11a4f9785f3005a424150be51cfe..451584c43cf8063067c7a595f947c42fc174eb43 100644
--- a/app/code/Magento/Adminhtml/Block/Page.php
+++ b/app/code/Magento/Backend/Block/Page.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml page
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backend\Block;
 
 class Page extends \Magento\Backend\Block\Template
 {
@@ -65,7 +65,7 @@ class Page extends \Magento\Backend\Block\Template
      * Add CSS class to page body tag
      *
      * @param string $className
-     * @return \Magento\Adminhtml\Block\Page
+     * @return \Magento\Backend\Block\Page
      */
     public function addBodyClass($className)
     {
diff --git a/app/code/Magento/Adminhtml/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Page/Footer.php
rename to app/code/Magento/Backend/Block/Page/Footer.php
index d5b876312f5a81c8423171f7a94d97c1ed7cf78a..12c05179d8c643eb3f21c5bc5ed738eb8b1e464f 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Footer.php
+++ b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,12 +29,12 @@
  * Adminhtml footer block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
 
-class Footer extends \Magento\Adminhtml\Block\Template
+class Footer extends \Magento\Backend\Block\Template
 {
     protected $_template = 'page/footer.phtml';
 
diff --git a/app/code/Magento/Adminhtml/Block/Page/Head.php b/app/code/Magento/Backend/Block/Page/Head.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Page/Head.php
rename to app/code/Magento/Backend/Block/Page/Head.php
index f0c549d8ccb50476a1a5cca2a1953f8e41083900..db71c6f792b8706dce29f5cd872b22023098e295 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Head.php
+++ b/app/code/Magento/Backend/Block/Page/Head.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml header block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
 
 class Head extends \Magento\Page\Block\Html\Head
 {
diff --git a/app/code/Magento/Adminhtml/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Page/Header.php
rename to app/code/Magento/Backend/Block/Page/Header.php
index 88d99b1e169c6f73fc06b23c106e3a35653733b7..953723bfeb268b76801480873ab5e5c11f467748 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml header block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
 
-class Header extends \Magento\Adminhtml\Block\Template
+class Header extends \Magento\Backend\Block\Template
 {
     protected $_template = 'page/header.phtml';
 
diff --git a/app/code/Magento/Adminhtml/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Page/Notices.php
rename to app/code/Magento/Backend/Block/Page/Notices.php
index 8b31a6142c594fd26de9d86d87599679cb57ad00..cf52008ba10db65f74776d209f4ad2f874425493 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml header notices block
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
 
-class Notices extends \Magento\Adminhtml\Block\Template
+class Notices extends \Magento\Backend\Block\Template
 {
 
     /**
diff --git a/app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
rename to app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
index 481945d922f4b2e9a4fcbb7e03ce3b4c053524bc..9b039a8957798472a32209d84092233f5ac40af2 100644
--- a/app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
+++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * "Reset to Defaults" button renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Backend
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Page\System\Config\Robots;
+namespace Magento\Backend\Block\Page\System\Config\Robots;
 
 class Reset extends \Magento\Backend\Block\System\Config\Form\Field
 {
diff --git a/app/code/Magento/Backend/Block/System/Design.php b/app/code/Magento/Backend/Block/System/Design.php
index 07cbdd28d744260f0a5141951e4ca0f6a1e764a5..f6b3a5e0f3a66aa6bbfa1e818567d45f2fd04a89 100644
--- a/app/code/Magento/Backend/Block/System/Design.php
+++ b/app/code/Magento/Backend/Block/System/Design.php
@@ -27,7 +27,7 @@
 
 namespace Magento\Backend\Block\System;
 
-class Design extends \Magento\Adminhtml\Block\Template
+class Design extends \Magento\Backend\Block\Template
 {
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
index 35f0a61524f6266f7061ac8aa97f5ebdc1f20767..01542d7b095f663e8063926c123823a105797281 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
@@ -34,7 +34,7 @@
 
 namespace Magento\Backend\Block\System\Store\Delete;
 
-class Group extends \Magento\Adminhtml\Block\Template
+class Group extends \Magento\Backend\Block\Template
 {
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
index 6ece68ecb706f6d6ff5e82683e6f6d0b3342ffa1..e72533c732ed77a4f81bdf42142815441601f367 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Backend\Block\System\Store\Delete;
 
-class Website extends \Magento\Adminhtml\Block\Template
+class Website extends \Magento\Backend\Block\Template
 {
 
     protected function _prepareLayout()
diff --git a/app/code/Magento/Backend/Block/System/Variable.php b/app/code/Magento/Backend/Block/System/Variable.php
index 3218f18310debf185f0ec2e549397c6a191a0578..48e8aa1dc0c218211cef5a6f379bb430b549060b 100644
--- a/app/code/Magento/Backend/Block/System/Variable.php
+++ b/app/code/Magento/Backend/Block/System/Variable.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * Custom Varieble Block
+ * Custom Variable Block
  *
  * @category   Magento
  * @package    Magento_Backend
diff --git a/app/code/Magento/Adminhtml/Block/Text/ListText.php b/app/code/Magento/Backend/Block/Text/ListText.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Text/ListText.php
rename to app/code/Magento/Backend/Block/Text/ListText.php
index 151cd4997b3777ebba895f5589ee1d0be5b046aa..cff54dcb7ad3a367fa0d9544924fca7f1ead38cf 100644
--- a/app/code/Magento/Adminhtml/Block/Text/ListText.php
+++ b/app/code/Magento/Backend/Block/Text/ListText.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,10 +29,10 @@
  * Adminhtml text list block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Text;
+namespace Magento\Backend\Block\Text;
 
 class ListText extends \Magento\View\Block\Text\ListText
 {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
index 277948d31397d3b53841f410b47312a8934e77f6..c2a02a878227d031710cb01546bd51b9f61e44dd 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -540,7 +540,7 @@ class Extended
     }
 
     /**
-     * Retrive massaction block name
+     * Retrieve massaction block name
      *
      * @return string
      */
@@ -562,7 +562,7 @@ class Extended
     }
 
     /**
-     * Retrive massaction block
+     * Retrieve massaction block
      *
      * @return \Magento\Backend\Block\Widget\Grid\Massaction\Extended
      */
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
index 742edfbfb54a50a22bcdf714936cfc4154c08af5..e573b5a3ce26c328b2ff92f25dc32c511fe2482c 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
@@ -52,7 +52,7 @@ class Item extends \Magento\Backend\Block\Widget
     }
 
     /**
-     * Retrive parent massaction block
+     * Retrieve parent massaction block
      *
      * @return \Magento\Backend\Block\Widget\Grid\Massaction\Extended
      */
@@ -97,7 +97,7 @@ class Item extends \Magento\Backend\Block\Widget
     }
 
     /**
-     * Retrive additional action block for this item
+     * Retrieve additional action block for this item
      *
      * @return \Magento\View\Block\AbstractBlock
      */
@@ -107,7 +107,7 @@ class Item extends \Magento\Backend\Block\Widget
     }
 
     /**
-     * Retrive additional action block HTML for this item
+     * Retrieve additional action block HTML for this item
      *
      * @return string
      */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
index 0a3b13f40e2cec4c163814659606aa6de01a14c7..d6e9312a325a1c718ab91449bdadaf2f3f2edecd 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
@@ -121,9 +121,9 @@ class Config extends \Magento\Backend\Controller\Adminhtml\System\AbstractConfig
     public function exportTableratesAction()
     {
         $fileName = 'tablerates.csv';
-        /** @var $gridBlock \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid */
+        /** @var $gridBlock \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid */
         $gridBlock = $this->_view->getLayout()
-            ->createBlock('Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid');
+            ->createBlock('Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid');
         $website = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'));
         if ($this->getRequest()->getParam('conditionName')) {
             $conditionName = $this->getRequest()->getParam('conditionName');
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
index 0965978eb67dce281184482584acb6ac00abd2ff..d54df862667cd639005dab70f3a953fb042082e9 100644
--- a/app/code/Magento/Backend/Model/Auth/Session.php
+++ b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -56,18 +56,26 @@ class Session
      */
     protected $_backendUrl;
 
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_config;
+
     /**
      * @param \Magento\Core\Model\Session\Context $context
      * @param \Magento\Acl\Builder $aclBuilder
      * @param \Magento\Backend\Model\Url $backendUrl
+     * @param \Magento\Backend\App\ConfigInterface $config
      * @param array $data
      */
     public function __construct(
         \Magento\Core\Model\Session\Context $context,
         \Magento\Acl\Builder $aclBuilder,
         \Magento\Backend\Model\Url $backendUrl,
+        \Magento\Backend\App\ConfigInterface $config,
         array $data = array()
     ) {
+        $this->_config = $config;
         $this->_aclBuilder = $aclBuilder;
         $this->_backendUrl = $backendUrl;
         parent::__construct($context, $data);
@@ -153,7 +161,7 @@ class Session
      */
     public function isLoggedIn()
     {
-        $lifetime = $this->_coreStoreConfig->getConfig(self::XML_PATH_SESSION_LIFETIME);
+        $lifetime = $this->_config->getValue(self::XML_PATH_SESSION_LIFETIME);
         $currentTime = time();
 
         /* Validate admin session lifetime that should be more than 60 seconds */
@@ -225,4 +233,25 @@ class Session
         $this->getCookie()->delete($this->getSessionName());
         return $this;
     }
+
+    /**
+     * Skip path validation in backend area
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isValidForPath($path)
+    {
+        return true;
+    }
+
+    /**
+     * Always try to get session id from query in backend area
+     *
+     * @return bool
+     */
+    protected function _isSidUsedFromQueryParam()
+    {
+        return true;
+    }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Template.php b/app/code/Magento/Backend/Model/Cookie.php
similarity index 73%
rename from app/code/Magento/Adminhtml/Block/Template.php
rename to app/code/Magento/Backend/Model/Cookie.php
index 972f11b1ef83758e5c26d59b44a8d342bb121058..13754662d08e1efd45304fdbcc46700033b03e0b 100644
--- a/app/code/Magento/Adminhtml/Block/Template.php
+++ b/app/code/Magento/Backend/Model/Cookie.php
@@ -19,22 +19,26 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Backend\Model;
+
 /**
- * Adminhtml abstract block
- *
- * @category   Magento
- * @package    Magento_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
- * @deprecated Moved to module Magento_Backend
+ * Backend cookie model
  */
-namespace Magento\Adminhtml\Block;
-
-class Template extends \Magento\Backend\Block\Template
+class Cookie extends \Magento\Core\Model\Cookie
 {
-
+    /**
+     * Is https secure request
+     * Use secure on adminhtml only
+     *
+     * @return bool
+     */
+    public function isSecure()
+    {
+        return $this->_getRequest()->isSecure();
+    }
 }
diff --git a/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php b/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
index 7f4deb0556b7ef9b63444366039a3f0770e1a84c..3bdb02b7f1ab4007a7fde8b98de9d8d57dd298bf 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
@@ -67,7 +67,7 @@ abstract class AbstractCommand
     }
 
     /**
-     * Retreive id of element to apply command to
+     * Retrieve id of element to apply command to
      *
      * @return int
      */
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php b/app/code/Magento/Backend/Model/Resource/Translate.php
similarity index 70%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php
rename to app/code/Magento/Backend/Model/Resource/Translate.php
index 53422aa954aad39ae13dd8e9e82b1863f18f95fd..dc3de5f5bc9b8b0f3df0bd5f1c659ce1eb61b75d 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php
+++ b/app/code/Magento/Backend/Model/Resource/Translate.php
@@ -19,22 +19,26 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
- * @subpackage  integration_tests
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Helper;
+namespace Magento\Backend\Model\Resource;
 
 /**
- * @magentoAppArea adminhtml
+ * Backend translate resource model
  */
-class DataTest extends \PHPUnit_Framework_TestCase
+class Translate extends \Magento\Core\Model\Resource\Translate
 {
-    public function testConstructor()
+    /**
+     * Get current store id
+     * Use always default scope for store id
+     *
+     * @return int
+     */
+    protected function _getStoreId()
     {
-        $this->assertInstanceOf('Magento\Backend\Helper\Data',
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Adminhtml\Helper\Data'));
+        return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
     }
 }
diff --git a/app/code/Magento/Backend/Model/Resource/Translate/String.php b/app/code/Magento/Backend/Model/Resource/Translate/String.php
new file mode 100644
index 0000000000000000000000000000000000000000..e05e5824b03bfa56d828e660f9584f4d9beb2e6f
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Resource/Translate/String.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Backend
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Backend\Model\Resource\Translate;
+
+/**
+ * Backend string translate resource model
+ */
+class String extends \Magento\Core\Model\Resource\Translate\String
+{
+    /**
+     * Get current store id
+     * Use always default scope for store id
+     *
+     * @return int
+     */
+    protected function _getStoreId()
+    {
+        return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
+    }
+}
diff --git a/app/code/Magento/Adminhtml/Model/Search/Catalog.php b/app/code/Magento/Backend/Model/Search/Catalog.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Model/Search/Catalog.php
rename to app/code/Magento/Backend/Model/Search/Catalog.php
index 39d6edb9bdd7eb0b7dcfb99cd37d51d933509fce..f06746ee7caff0a9a59c0ff1509f17a54a0f87c7 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Catalog.php
+++ b/app/code/Magento/Backend/Model/Search/Catalog.php
@@ -19,12 +19,12 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Model\Search;
+namespace Magento\Backend\Model\Search;
 
 /**
  * Search Catalog Model
@@ -48,17 +48,17 @@ class Catalog extends \Magento\Object
     /**
      * Adminhtml data
      *
-     * @var \Magento\Adminhtml\Helper\Data
+     * @var \Magento\Backend\Helper\Data
      */
     protected $_adminhtmlData = null;
 
     /**
-     * @param \Magento\Adminhtml\Helper\Data $adminhtmlData
+     * @param \Magento\Backend\Helper\Data $adminhtmlData
      * @param \Magento\Stdlib\String $string
      * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData
      */
     public function __construct(
-        \Magento\Adminhtml\Helper\Data $adminhtmlData,
+        \Magento\Backend\Helper\Data $adminhtmlData,
         \Magento\Stdlib\String $string,
         \Magento\CatalogSearch\Helper\Data $catalogSearchData
     ) {
@@ -70,7 +70,7 @@ class Catalog extends \Magento\Object
     /**
      * Load search results
      *
-     * @return \Magento\Adminhtml\Model\Search\Catalog
+     * @return \Magento\Backend\Model\Search\Catalog
      */
     public function load()
     {
diff --git a/app/code/Magento/Adminhtml/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Model/Search/Customer.php
rename to app/code/Magento/Backend/Model/Search/Customer.php
index fa11df0c69b531554d1513e291a10c8c3c7bfdab..b800647325cba1e48132df994421d09d03e6e80c 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Customer.php
+++ b/app/code/Magento/Backend/Model/Search/Customer.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,17 @@
  * Search Customer Model
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Model\Search;
+namespace Magento\Backend\Model\Search;
 
 class Customer extends \Magento\Object
 {
     /**
      * Adminhtml data
      *
-     * @var \Magento\Adminhtml\Helper\Data
+     * @var \Magento\Backend\Helper\Data
      */
     protected $_adminhtmlData = null;
 
@@ -49,11 +49,11 @@ class Customer extends \Magento\Object
 
     /**
      * @param \Magento\Customer\Model\Resource\Customer\CollectionFactory $collectionFactory
-     * @param \Magento\Adminhtml\Helper\Data $adminhtmlData
+     * @param \Magento\Backend\Helper\Data $adminhtmlData
      */
     public function __construct(
         \Magento\Customer\Model\Resource\Customer\CollectionFactory $collectionFactory,
-        \Magento\Adminhtml\Helper\Data $adminhtmlData
+        \Magento\Backend\Helper\Data $adminhtmlData
     ) {
         $this->_collectionFactory = $collectionFactory;
         $this->_adminhtmlData = $adminhtmlData;
@@ -62,7 +62,7 @@ class Customer extends \Magento\Object
     /**
      * Load search results
      *
-     * @return \Magento\Adminhtml\Model\Search\Customer
+     * @return \Magento\Backend\Model\Search\Customer
      */
     public function load()
     {
diff --git a/app/code/Magento/Adminhtml/Model/Search/Order.php b/app/code/Magento/Backend/Model/Search/Order.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Model/Search/Order.php
rename to app/code/Magento/Backend/Model/Search/Order.php
index e247b9db0dcb3e232109cec0c9311e5948cae082..28b66af4cef8e16cc409bd83b82f06ade0b7b347 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Order.php
+++ b/app/code/Magento/Backend/Model/Search/Order.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,17 @@
  * Search Order Model
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Model\Search;
+namespace Magento\Backend\Model\Search;
 
 class Order extends \Magento\Object
 {
     /**
      * Adminhtml data
      *
-     * @var \Magento\Adminhtml\Helper\Data
+     * @var \Magento\Backend\Helper\Data
      */
     protected $_adminhtmlData = null;
 
@@ -49,11 +49,11 @@ class Order extends \Magento\Object
 
     /**
      * @param \Magento\Sales\Model\Resource\Order\CollectionFactory $collectionFactory
-     * @param \Magento\Adminhtml\Helper\Data $adminhtmlData
+     * @param \Magento\Backend\Helper\Data $adminhtmlData
      */
     public function __construct(
         \Magento\Sales\Model\Resource\Order\CollectionFactory $collectionFactory,
-        \Magento\Adminhtml\Helper\Data $adminhtmlData
+        \Magento\Backend\Helper\Data $adminhtmlData
     ) {
         $this->_collectionFactory = $collectionFactory;
         $this->_adminhtmlData = $adminhtmlData;
@@ -62,7 +62,7 @@ class Order extends \Magento\Object
     /**
      * Load search results
      *
-     * @return \Magento\Adminhtml\Model\Search\Order
+     * @return \Magento\Backend\Model\Search\Order
      */
     public function load()
     {
diff --git a/app/code/Magento/Backend/Model/Session.php b/app/code/Magento/Backend/Model/Session.php
index 7ad1472898804f517897b335bc117c040e698cdc..b5e2226d744293882fb44ce104028eeeee959725 100644
--- a/app/code/Magento/Backend/Model/Session.php
+++ b/app/code/Magento/Backend/Model/Session.php
@@ -36,4 +36,25 @@ class Session extends \Magento\Core\Model\Session\AbstractSession
         parent::__construct($context, $data);
         $this->init('adminhtml');
     }
+
+    /**
+     * Skip path validation in backend area
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isValidForPath($path)
+    {
+        return true;
+    }
+
+    /**
+     * Always try to get session id from query in backend area
+     *
+     * @return bool
+     */
+    protected function _isSidUsedFromQueryParam()
+    {
+        return true;
+    }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Html/Select.php b/app/code/Magento/Backend/Model/Translate/Inline.php
similarity index 70%
rename from app/code/Magento/Adminhtml/Block/Html/Select.php
rename to app/code/Magento/Backend/Model/Translate/Inline.php
index ace827710884f29393db026f1af33d2a74551472..676b8854d1424d5c307aa8cb03ca74ecdaaad0e2 100644
--- a/app/code/Magento/Adminhtml/Block/Html/Select.php
+++ b/app/code/Magento/Backend/Model/Translate/Inline.php
@@ -19,20 +19,25 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Backend
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml HTML select element block
- *
- * @category   Magento
- * @package    Magento_Core
- * @author     Magento Core Team <core@magentocommerce.com>
+ * Inline Translations PHP part
  */
-namespace Magento\Adminhtml\Block\Html;
+namespace Magento\Backend\Model\Translate;
 
-class Select extends \Magento\View\Block\Html\Select
+class Inline extends \Magento\Core\Model\Translate\Inline
 {
+    /**
+     * Return URL for ajax requests
+     *
+     * @return string
+     */
+    protected function _getAjaxUrl()
+    {
+        return $this->_url->getUrl(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE . '/ajax/translate');
+    }
 }
diff --git a/app/code/Magento/Backend/Model/Translate/Inline/Config.php b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a0ce2acee0ac948b8d6147b14b94bbe7eb6326e
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Backend
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Backend Inline Translation config
+ */
+namespace Magento\Backend\Model\Translate\Inline;
+
+class Config implements \Magento\Core\Model\Translate\Inline\ConfigInterface
+{
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_config;
+
+    /**
+     * @param \Magento\Backend\App\ConfigInterface $config
+     */
+    public function __construct(\Magento\Backend\App\ConfigInterface $config)
+    {
+        $this->_config = $config;
+    }
+
+    /**
+     * Check whether inline translation is enabled
+     *
+     * @param int|null $store
+     * @return bool
+     */
+    public function isActive($store = null)
+    {
+        return $this->_config->getFlag('dev/translate_inline/active_admin');
+    }
+}
diff --git a/app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php b/app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac9b647c741125efb606e422b3c4ed597d6722d6
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Backend
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Backend Inline Translation config factory
+ */
+namespace Magento\Backend\Model\Translate\Inline;
+
+class ConfigFactory extends \Magento\Core\Model\Translate\Inline\ConfigFactory
+{
+    /**
+     * @var \Magento\App\State
+     */
+    protected $_appState;
+
+    /**
+     * @param \Magento\ObjectManager $objectManager
+     * @param \Magento\App\State $appState
+     */
+    public function __construct(\Magento\ObjectManager $objectManager, \Magento\App\State $appState)
+    {
+        $this->_appState = $appState;
+        parent::__construct($objectManager);
+    }
+
+    /**
+     * Create instance of inline translate config
+     *
+     * @param string|null $area
+     * @return \Magento\Core\Model\Translate\Inline\ConfigInterface
+     */
+    public function create($area = null)
+    {
+        if (!isset($area)) {
+            $area = $this->_appState->getAreaCode();
+        }
+        if ($area == \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
+            return $this->_objectManager->create('Magento\Backend\Model\Translate\Inline\Config');
+        }
+
+        return parent::create();
+    }
+}
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index 240914ab0d22ab84a3642480dca15f1bb2295bc5..fbc1d4e42607ff9f28447fca1cf8d804c175bf4c 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -91,6 +91,21 @@ class Url extends \Magento\Core\Model\Url
      */
     protected $_encryptor;
 
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_config;
+
+    /**
+     * @var \Magento\Core\Model\StoreFactory
+     */
+    protected $_storeFactory;
+
+    /**
+     * @var \Magento\Core\Model\ConfigInterface
+     */
+    protected $_coreConfig;
+
     /**
      * @param \Magento\App\Route\ConfigInterface $routeConfig
      * @param \Magento\App\RequestInterface $request
@@ -104,6 +119,9 @@ class Url extends \Magento\Core\Model\Url
      * @param \Magento\App\CacheInterface $cache
      * @param Auth\Session $authSession
      * @param \Magento\Encryption\EncryptorInterface $encryptor
+     * @param \Magento\Backend\App\ConfigInterface $config
+     * @param \Magento\Core\Model\StoreFactory $storeFactory
+     * @param \Magento\Core\Model\ConfigInterface $coreConfig
      * @param null $areaCode
      * @param array $data
      */
@@ -120,6 +138,9 @@ class Url extends \Magento\Core\Model\Url
         \Magento\App\CacheInterface $cache,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Encryption\EncryptorInterface $encryptor,
+        \Magento\Backend\App\ConfigInterface $config,
+        \Magento\Core\Model\StoreFactory $storeFactory,
+        \Magento\Core\Model\ConfigInterface $coreConfig,
         $areaCode = null,
         array $data = array()
     ) {
@@ -128,12 +149,15 @@ class Url extends \Magento\Core\Model\Url
             $routeConfig, $request, $urlSecurityInfo, $coreStoreConfig,
             $app, $storeManager, $session, $areaCode, $data
         );
+        $this->_config = $config;
         $this->_startupMenuItemId = $coreStoreConfig->getConfig(self::XML_PATH_STARTUP_MENU_ITEM);
         $this->_backendHelper = $backendHelper;
         $this->_coreSession = $session;
         $this->_menuConfig = $menuConfig;
         $this->_cache = $cache;
         $this->_session = $authSession;
+        $this->_storeFactory = $storeFactory;
+        $this->_coreConfig = $coreConfig;
     }
 
     /**
@@ -146,7 +170,7 @@ class Url extends \Magento\Core\Model\Url
         if ($this->hasData('secure_is_forced')) {
             return $this->getData('secure');
         }
-        return $this->_coreStoreConfig->getConfigFlag('web/secure/use_in_adminhtml');
+        return $this->_config->getFlag('web/secure/use_in_adminhtml');
     }
 
     /**
@@ -164,6 +188,7 @@ class Url extends \Magento\Core\Model\Url
         } else {
             $this->setNoSecret(false);
         }
+        unset($data['_store_to_url']);
         return parent::setRouteParams($data, $unsetOldParams);
     }
 
@@ -250,7 +275,7 @@ class Url extends \Magento\Core\Model\Url
      */
     public function useSecretKey()
     {
-        return $this->_coreStoreConfig->getConfigFlag('admin/security/use_form_key') && !$this->getNoSecret();
+        return $this->_config->getFlag('admin/security/use_form_key') && !$this->getNoSecret();
     }
 
     /**
@@ -386,4 +411,41 @@ class Url extends \Magento\Core\Model\Url
         }
         return $path;
     }
+
+    /**
+     * Get fake store for the url instance
+     *
+     * @return \Magento\Core\Model\Store
+     */
+    public function getStore()
+    {
+        return $this->_storeFactory->create(array('url' => $this, 'data' => array(
+            'code' => 'admin',
+            'force_disable_rewrites' => true,
+            'disable_store_in_url' => true
+        )));
+    }
+
+    /**
+     * Get cache id for config path
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function _getConfigCacheId($path)
+    {
+        return 'admin/' . $path;
+    }
+
+    /**
+     * Get config data by path
+     * Use only global config values for backend
+     *
+     * @param string $path
+     * @return null|string
+     */
+    protected function _getConfig($path)
+    {
+        return $this->_coreConfig->getValue($path, 'default');
+    }
 }
diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/acl.xml b/app/code/Magento/Backend/etc/adminhtml/acl.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/etc/adminhtml/acl.xml
rename to app/code/Magento/Backend/etc/adminhtml/acl.xml
diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
index 57d29fca271a782aaa3d703d107e1efcd15a2026..81f6c2eeb0b10aa77130bbfbe4d54cae68644c29 100644
--- a/app/code/Magento/Backend/etc/adminhtml/di.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -34,8 +34,19 @@
     <preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
     <preference for="Magento\Acl\Resource\ProviderInterface" type="Magento\Acl\Resource\Provider" />
     <preference for="Magento\App\DefaultPathInterface" type="Magento\Backend\App\DefaultPath" />
+    <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
+    <preference for="Magento\Core\Model\Translate\Inline\ConfigFactory" type="Magento\Backend\Model\Translate\Inline\ConfigFactory" />
+    <preference for="Magento\Core\Model\Translate\InlineInterface" type="Magento\Backend\Model\Translate\Inline" />
+    <preference for="Magento\Core\Model\Cookie" type="Magento\Backend\Model\Cookie" />
+    <preference for="Magento\Core\Model\Resource\Translate\String" type="Magento\Backend\Model\Resource\Translate\String" />
+    <preference for="Magento\Core\Model\Resource\Translate" type="Magento\Backend\Model\Resource\Translate" />
     <preference for="Magento\App\Response\Http\FileFactory" type="Magento\Backend\App\Response\Http\FileFactory" />
     <preference for="Magento\App\View" type="Magento\Backend\Model\View" />
+    <type name="Magento\Backend\Model\Translate\Inline">
+        <param name="url">
+            <instance type="Magento\Backend\Model\Url" />
+        </param>
+    </type>
     <type name="Magento\Backend\App\Action\Context">
         <param name="helper">
             <instance type="Magento\Backend\Helper\Data" />
@@ -138,7 +149,6 @@
     </type>
     <type name="Magento\Backend\App\AbstractAction">
         <plugin name="adminAuthentication" type="Magento\Backend\App\Action\Plugin\Authentication" sortOrder="100" />
-        <plugin name="adminStore" type="Magento\Backend\App\Action\Plugin\Store" sortOrder="10" />
         <plugin name="adminMassactionKey" type="Magento\Backend\App\Action\Plugin\MassactionKey" sortOrder="11" />
     </type>
     <type name="Magento\Core\App\Response\Redirect">
@@ -146,4 +156,7 @@
             <value type="bool">false</value>
         </param>
     </type>
+    <type name="Magento\App\Action\Action">
+        <plugin name="storeCheck" disabled="true" />
+    </type>
 </config>
diff --git a/app/code/Magento/Backend/etc/adminhtml/events.xml b/app/code/Magento/Backend/etc/adminhtml/events.xml
index 422fd2615266fbc55da4aa18cd32d00be483a849..6a27a509bd0c58b009c177dfe75c7fca1daa8f1c 100644
--- a/app/code/Magento/Backend/etc/adminhtml/events.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/events.xml
@@ -27,4 +27,7 @@
     <event name="translate_initialization_before">
         <observer name="initialize_translation" instance="Magento\Backend\Model\Observer" method="initializeTranslation" />
     </event>
+    <event name="admin_system_config_changed_section_admin">
+        <observer name="bind_locale" instance="Magento\Backend\Model\Config\Backend\Admin\Observer" method="afterCustomUrlChanged" />
+    </event>
 </config>
diff --git a/app/code/Magento/Backend/etc/adminhtml/menu.xml b/app/code/Magento/Backend/etc/adminhtml/menu.xml
index b054038fd6c1d04efaf2538fe71eeec870205a17..ab157e5e4ab192d497c3a3f0a4a6410ba7bf3ca8 100644
--- a/app/code/Magento/Backend/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/menu.xml
@@ -32,5 +32,22 @@
         <add id="Magento_Adminhtml::system_variable" title="Custom Variables" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::system_other_settings" action="adminhtml/system_variable" resource="Magento_Adminhtml::variable"/>
         <add id="Magento_Adminhtml::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Adminhtml::stores_settings" action="adminhtml/system_store/" resource="Magento_Adminhtml::store"/>
         <add id="Magento_Adminhtml::system_config" title="Configuration" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::stores_settings" action="adminhtml/system_config" resource="Magento_Adminhtml::config"/>
+        <add id="Magento_Adminhtml::dashboard" title="Dashboard" module="Magento_Adminhtml" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Adminhtml::dashboard"/>
+        <add id="Magento_Adminhtml::system" title="System" module="Magento_Adminhtml" sortOrder="80" resource="Magento_Adminhtml::system"/>
+        <add id="Magento_Adminhtml::system_tools" title="Tools" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::tools"/>
+        <add id="Magento_Adminhtml::system_design" title="Design" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::design"/>
+        <add id="Magento_Adminhtml::system_convert" title="Data Transfer" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::convert"/>
+        <add id="Magento_Adminhtml::system_cache" title="Cache Management" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system_tools" action="adminhtml/cache" resource="Magento_Adminhtml::cache"/>
+        <add id="Magento_Adminhtml::marketing" title="Marketing" module="Magento_Adminhtml" sortOrder="40" resource="Magento_Adminhtml::marketing"/>
+        <add id="Magento_Adminhtml::marketing_communications" title="Communications" module="Magento_Adminhtml" sortOrder="30" parent="Magento_Adminhtml::marketing"  resource="Magento_Adminhtml::marketing_communications"/>
+        <add id="Magento_Adminhtml::marketing_seo" title="SEO &amp; Search" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::marketing"  resource="Magento_Adminhtml::marketing_seo"/>
+        <add id="Magento_Adminhtml::marketing_user_content" title="User Content" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::marketing"  resource="Magento_Adminhtml::marketing_user_content"/>
+        <add id="Magento_Adminhtml::content" title="Content" module="Magento_Adminhtml" sortOrder="50" resource="Magento_Adminhtml::content"/>
+        <add id="Magento_Adminhtml::content_elements" title="Elements" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::content_elements"/>
+        <add id="Magento_Adminhtml::stores" title="Stores" module="Magento_Adminhtml" sortOrder="70" resource="Magento_Adminhtml::stores"/>
+        <add id="Magento_Adminhtml::stores_settings" title="Settings" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_settings"/>
+        <add id="Magento_Adminhtml::stores_attributes" title="Attributes" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_attributes"/>
+        <add id="Magento_Adminhtml::other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_other_settings"/>
+        <add id="Magento_Adminhtml::system_other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="80" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::system_other_settings"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Backend/etc/config.xml b/app/code/Magento/Backend/etc/config.xml
index 1d3d42f1288f347977b07eec4ab0ab98ea21d785..9c6dca8ddf097408d71329a18ea4b9e32f42d493 100644
--- a/app/code/Magento/Backend/etc/config.xml
+++ b/app/code/Magento/Backend/etc/config.xml
@@ -26,4 +26,62 @@
  */
 -->
 <config>
+    <default>
+        <system>
+            <media_storage_configuration>
+                <allowed_resources>
+                    <email_folder>email</email_folder>
+                </allowed_resources>
+            </media_storage_configuration>
+            <emails>
+                <forgot_email_template>system_emails_forgot_email_template</forgot_email_template>
+                <forgot_email_identity>general</forgot_email_identity>
+            </emails>
+            <dashboard>
+                <enable_charts>1</enable_charts>
+            </dashboard>
+        </system>
+        <general>
+            <file>
+                <sitemap_generate_valid_paths>
+                    <available>
+                        <any_path>/*/sitemap.xml</any_path>
+                    </available>
+                </sitemap_generate_valid_paths>
+            </file>
+            <validator_data>
+                <input_types>
+                    <price>price</price>
+                    <media_image>media_image</media_image>
+                    <gallery>gallery</gallery>
+                </input_types>
+            </validator_data>
+        </general>
+    </default>
+    <stores>
+        <admin>
+            <design>
+                <package>
+                    <name>default</name>
+                </package>
+                <theme>
+                    <default>default</default>
+                </theme>
+            </design>
+        </admin>
+    </stores>
+    <websites>
+        <admin>
+            <web>
+                <routers>
+                    <frontend>
+                        <disabled>true</disabled>
+                    </frontend>
+                </routers>
+                <default>
+                    <no_route>admin/noroute/index</no_route>
+                </default>
+            </web>
+        </admin>
+    </websites>
 </config>
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 25a442ebb201eabace88eb9389ad095ae9ea4efe..7c9e596e484452ed975d6c25e31cf920e7f3a4aa 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -26,6 +26,11 @@
 <config>
     <preference for="Magento\Core\Model\Config\Storage\WriterInterface" type="Magento\Core\Model\Config\Storage\Writer\Db" />
     <preference for="Magento\App\Request\PathInfoProcessorInterface" type="Magento\Backend\App\Request\PathInfoProcessor" />
+    <preference for="Magento\Backend\Model\Auth\StorageInterface" type="Magento\Backend\Model\Auth\Session" />
+    <preference for="Magento\Backend\Model\Config\Structure\SearchInterface" type="Magento\Backend\Model\Config\Structure" />
+    <preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
+    <preference for="Magento\Backend\Model\Auth\Credential\StorageInterface" type="Magento\User\Model\User" />
+    <preference for="Magento\Adminhtml\Helper\Data" type="Magento\Backend\Helper\Data" />
     <type name="Magento\App\AreaList">
         <param name="areas">
             <value>
@@ -99,15 +104,15 @@
         <param name="searchModules">
             <value>
                 <products>
-                    <class>Magento\Adminhtml\Model\Search\Catalog</class>
+                    <class>Magento\Backend\Model\Search\Catalog</class>
                     <acl>Magento_Catalog::catalog</acl>
                 </products>
                 <customers>
-                    <class>Magento\Adminhtml\Model\Search\Customer</class>
+                    <class>Magento\Backend\Model\Search\Customer</class>
                     <acl>Magento_Customer::customer</acl>
                 </customers>
                 <sales>
-                    <class>Magento\Adminhtml\Model\Search\Order</class>
+                    <class>Magento\Backend\Model\Search\Order</class>
                     <acl>Magento_Sales::sales</acl>
                 </sales>
             </value>
diff --git a/app/code/Magento/Adminhtml/etc/events.xml b/app/code/Magento/Backend/etc/events.xml
similarity index 78%
rename from app/code/Magento/Adminhtml/etc/events.xml
rename to app/code/Magento/Backend/etc/events.xml
index 166dcf93fadb0312d83b9253d6d16430f77215d3..7801b1ac8f469aa1123acf2e99b56bc4d8cf7877 100644
--- a/app/code/Magento/Adminhtml/etc/events.xml
+++ b/app/code/Magento/Backend/etc/events.xml
@@ -24,7 +24,10 @@
  */
 -->
 <config>
+    <event name="adminhtml_controller_action_predispatch_start">
+        <observer name="massaction" instance="Magento\Backend\Model\Observer" method="massactionPrepareKey" />
+    </event>
     <event name="admin_user_authenticate_after">
-        <observer name="configuration_files_access_level_verification" instance="Magento\Adminhtml\Model\Observer" method="clearCacheConfigurationFilesAccessLevelVerification" />
+        <observer name="configuration_files_access_level_verification" instance="Magento\Backend\Model\Observer" method="clearCacheConfigurationFilesAccessLevelVerification" />
     </event>
 </config>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml b/app/code/Magento/Backend/etc/install/di.xml
similarity index 89%
rename from app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml
rename to app/code/Magento/Backend/etc/install/di.xml
index aa84f5017484e686b629f062112701a1c6283124..c538e5dbf4ae5d69a4d9ef93e074c593bf6813be 100644
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml
+++ b/app/code/Magento/Backend/etc/install/di.xml
@@ -23,6 +23,6 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_popup"/>
-</layout>
+<config>
+    <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
+</config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/admin/access_denied.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/access_denied.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/access_denied.phtml
index fbe31b924aeac7282929bb2d98ad97489bc7ce2f..4e3fd4f1a28fcbe1027f44eda92099c691bf34d0 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/admin/access_denied.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/access_denied.phtml
@@ -26,7 +26,7 @@
 ?>
 <?php
 /**
- * @see \Magento\Adminhtml\Block\Denied
+ * @see \Magento\Backend\Block\Denied
  */
 ?>
 <h1 class="page-heading"><?php echo __('Access denied') ?></h1>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/formkey.phtml b/app/code/Magento/Backend/view/adminhtml/admin/formkey.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/formkey.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/formkey.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/overlay_popup.phtml b/app/code/Magento/Backend/view/adminhtml/admin/overlay_popup.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/overlay_popup.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/overlay_popup.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/admin/page.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/page.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/page.phtml
index 1bbac582143570e631bcf457febfdeaa11a50391..a569ffcd121596ca05dcce0c6da32e7bc5dad44b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/admin/page.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/page.phtml
@@ -24,7 +24,7 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php /** @var $this \Magento\Adminhtml\Block\Page */ ?>
+<?php /** @var $this \Magento\Backend\Block\Page */ ?>
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/popup.phtml b/app/code/Magento/Backend/view/adminhtml/admin/popup.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/popup.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/popup.phtml
index 81d21c9c0da936d3a97c3858fc0b2632fb643ff3..a56227e8af3df152fb82bbb86b452f52986dac11 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/admin/popup.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/popup.phtml
@@ -28,12 +28,12 @@
     "label":"Root page layout",
     "type":"Magento\View\Block\Template",
     "children":{
-        "header":{ "label":"Header", "type":"Magento\Adminhtml\Block\Page\Header" },
+        "header":{ "label":"Header", "type":"Magento\Backend\Block\Page\Header" },
         "menu":{ "label":"Top navigation", "type":"Magento\Backend\Block\Menu" },
         "breadcrumbs":{ "label":"Breadcrumbs", "type":"Magento\Adminhtml\Block\Widget\Breadcrumbs" },
         "content":{ "label":"Content block", "type":"Magento\View\Block\Template" },
         "left":{ "label":"Left navigation", "type":"Magento\View\Block\Template" },
-        "footer":{ "label":"Footer", "type":"Magento\Adminhtml\Block\Page\Footer" }
+        "footer":{ "label":"Footer", "type":"Magento\Backend\Block\Page\Footer" }
     },
     "vars":{}
 }*/ ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
index eaa1fda5499f83af79156b7a4b69a43cb1178822..d95e6f7508a0b8eb3fb8e60370e9240f0fa75162 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
@@ -27,7 +27,7 @@
     <update handle="formkey"/>
     <update handle="adminhtml_cache_block"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Cache" name="adminhtml.cache.container"/>
-        <block class="Magento\Adminhtml\Block\Cache\Additional" name="cache.additional" template="Magento_Backend::system/cache/additional.phtml"/>
+        <block class="Magento\Backend\Block\Cache" name="adminhtml.cache.container"/>
+        <block class="Magento\Backend\Block\Cache\Additional" name="cache.additional" template="Magento_Backend::system/cache/additional.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_denied.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_denied.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml
index fe0193a833f950ae7072dffcd5464c0683b20add..27ad2c91e21c09cbfe6848f99241c72be55a9791 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_denied.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/>
+        <block class="Magento\Backend\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_noroute.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_noroute.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index 57203cd51068ae77cae5513ab853462061efc0a6..8093941b8ac89b8b259ac9ce4e2c122ed670bdca 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -24,7 +24,279 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
+    <block class="Magento\Backend\Block\Page" name="root" output="1" template="admin/page.phtml">
+        <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+            <action method="setTitle">
+                <argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
+            </action>
+            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">jquery/jquery.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-jquery-no-conflict-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/jquery-no-conflict.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-ui-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">jquery/jquery-ui.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="head-load-min-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">head.load.min.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="underscore-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">underscore.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-magento-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/mage.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-tmpl-min-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-validate-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-translate-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/translate.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-bootstrap-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/backend/bootstrap.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-floating-header-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/backend/floating-header.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="prototype-prototype-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">prototype/prototype.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="prototype-window-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">prototype/window.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-builder-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">scriptaculous/builder.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-effects-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">scriptaculous/effects.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-dragdrop-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">scriptaculous/dragdrop.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-controls-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">scriptaculous/controls.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-slider-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">scriptaculous/slider.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="lib-ccard-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">lib/ccard.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="prototype-validation-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">prototype/validation.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="varien-js-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">varien/js.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-hash-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/hash.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-events-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/events.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-varienloader-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/varienLoader.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-grid-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/grid.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-tabs-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/backend/tabs.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-form-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/form.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-accordion-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/accordion.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-tools-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/tools.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">Magento_Catalog::catalog/product.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="lib-ds-sleight-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">lib/ds-sleight.js</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string">defer</item>
+                        <item name="ie_condition" xsi:type="string">lt IE 7</item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Css" name="magento-calendar-css">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/calendar.css</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string"/>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-ui-timepicker-addon-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-calendar-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/calendar.js</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">extjs/ext-tree.js</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string"/>
+                        <item name="ie_condition" xsi:type="string"/>
+                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-checkbox-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">extjs/ext-tree-checkbox.js</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string"/>
+                        <item name="ie_condition" xsi:type="string"/>
+                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ext-all-css">
+                <arguments>
+                    <argument name="file" xsi:type="string">extjs/resources/css/ext-all.css</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string"/>
+                        <item name="ie_condition" xsi:type="string"/>
+                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ytheme-magento-css">
+                <arguments>
+                    <argument name="file" xsi:type="string">extjs/resources/css/ytheme-magento.css</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string"/>
+                        <item name="ie_condition" xsi:type="string"/>
+                        <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-promo-rules-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">Magento_Rule::rules.js</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string"/>
+                        <item name="ie_condition" xsi:type="string"/>
+                        <item name="flag_name" xsi:type="string">can_load_rules_js</item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-wysiwyg-tiny-mce-setup-js">
+                <arguments>
+                    <argument name="file" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/setup.js</argument>
+                    <argument name="properties" xsi:type="array">
+                        <item name="attributes" xsi:type="string"/>
+                        <item name="ie_condition" xsi:type="string"/>
+                        <item name="flag_name" xsi:type="string">can_load_tiny_mce</item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Page\Block\Js\Components" name="head.components" as="components" template="Magento_Backend::page/js/components.phtml"/>
+            <block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Backend::page/js/calendar.phtml"/>
+        </block>
         <block class="Magento\Backend\Block\Menu" name="menu" as="menu" template="Magento_Backend::menu.phtml"/>
-    </referenceBlock>
-</layout>
+        <block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="page/notices.phtml"/>
+        <block class="Magento\Backend\Block\Page\Header" name="header" as="header">
+            <block class="Magento\Backend\Block\GlobalSearch" as="search" acl="Magento_Adminhtml::global_search"/>
+        </block>
+        <block class="Magento\Adminhtml\Block\Widget\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
+        <!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in \Magento\Core\Model\Layout::createBlock() -->
+        <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
+        <!-- deprecated since 1.7.0.0 see \Magento\Page\Block\Js\Translate -->
+        <block class="Magento\Page\Block\Js\Translate" name="js_translate" as="js_translate" template="Magento_Backend::page/js/translate.phtml"/>
+        <container name="main-top" label="main-top" as="main-top">
+            <block class="Magento\Page\Block\Html\Title" name="page-title" template="title.phtml"/>
+        </container>
+        <container name="left" as="left" label="Left Column"/>
+        <container name="content" as="content" label="Content"/>
+        <block class="Magento\View\Block\Messages" name="messages" as="messages"/>
+        <container name="js" as="js" label="JavaScript"/>
+        <block class="Magento\Backend\Block\Page\Footer" name="footer" as="footer">
+            <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
+            <action method="setBugreportUrl">
+                <argument name="url" xsi:type="string">http://www.magentocommerce.com/bug-tracking</argument>
+            </action>
+        </block>
+        <container name="before_body_end" as="before_body_end" label="Before Body End"/>
+    </block>
+</layout>
\ No newline at end of file
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/editor.xml b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/editor.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/editor.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/empty.xml b/app/code/Magento/Backend/view/adminhtml/layout/empty.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/empty.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/empty.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/formkey.xml b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml
similarity index 88%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/formkey.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/formkey.xml
index 21f69e5b0b2abc7120f2a5d53add821809fe4c0e..822e3cbc6074b43d308ecfcc0b34ac3cfa847255 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/formkey.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml
@@ -24,5 +24,5 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Adminhtml\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Adminhtml::admin/formkey.phtml"/>
+    <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/overlay_popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/overlay_popup.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/popup.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/popup.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/popup.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/media/uploader.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/media/uploader.phtml
rename to app/code/Magento/Backend/view/adminhtml/media/uploader.phtml
index 5c230a74e1c65b956de6c2616967dcd63b93d130..96bb4092f48bfd86b45979c5755e565686eaac1a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/media/uploader.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/media/uploader.phtml
@@ -24,7 +24,7 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
-/** @var $this \Magento\Adminhtml\Block\Media\Uploader */
+/** @var $this \Magento\Backend\Block\Media\Uploader */
 ?>
 
 <div id="<?php echo $this->getHtmlId() ?>" class="uploader">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml b/app/code/Magento/Backend/view/adminhtml/page/footer.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/footer.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/head.phtml b/app/code/Magento/Backend/view/adminhtml/page/head.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/head.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/head.phtml
index f630c4acbe0e2f5ff330b6845a209e2072a9eb36..ca3282a197b5c58920ed7beaec736b15dc24c375 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/page/head.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/page/head.phtml
@@ -54,7 +54,7 @@
 <?php endif; ?>
 
 <script type="text/javascript">
-    Fieldset.addToPrefix(<?php echo $this->helper('Magento\Adminhtml\Helper\Data')->getCurrentUserId() ?>);
+    Fieldset.addToPrefix(<?php echo $this->helper('Magento\Backend\Helper\Data')->getCurrentUserId() ?>);
 </script>
 
 <?php echo $this->getChildHtml('components'); ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/page/header.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/header.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/header.phtml
index 2f772dbc98307091fd21825a9f24ddbc236a24fb..e741934e8f34f78e03970e98e60e24ec84bc3575 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/page/header.phtml
@@ -24,7 +24,7 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
-/** @var $this \Magento\Adminhtml\Block\Page\Header */
+/** @var $this \Magento\Backend\Block\Page\Header */
 ?>
 <header class="header">
     <div class="header-inner">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/js/calendar.phtml b/app/code/Magento/Backend/view/adminhtml/page/js/calendar.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/js/calendar.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/js/calendar.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/js/components.phtml b/app/code/Magento/Backend/view/adminhtml/page/js/components.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/js/components.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/js/components.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/js/translate.phtml b/app/code/Magento/Backend/view/adminhtml/page/js/translate.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/js/translate.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/js/translate.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/notices.phtml b/app/code/Magento/Backend/view/adminhtml/page/notices.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/notices.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/notices.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/system/config/robots/reset.phtml b/app/code/Magento/Backend/view/adminhtml/page/system/config/robots/reset.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/system/config/robots/reset.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/system/config/robots/reset.phtml
index f036235566d796d70bef2b53829695d091f2bffc..872829ebd469a8aa0eea498f293c635f2ae39d74 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/page/system/config/robots/reset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/page/system/config/robots/reset.phtml
@@ -25,7 +25,7 @@
  */
 
 /**
- * @var $this \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset
+ * @var $this \Magento\Backend\Block\Page\System\Config\Robots\Reset
  * @var $coreHelper \Magento\Core\Helper\Data
  */
 $coreHelper = $this->helper('Magento\Core\Helper\Data');
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/store/switcher/enhanced.phtml b/app/code/Magento/Backend/view/adminhtml/store/switcher/enhanced.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/store/switcher/enhanced.phtml
rename to app/code/Magento/Backend/view/adminhtml/store/switcher/enhanced.phtml
diff --git a/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml b/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml
index f1137d7749efc053047527077968a2072abade07..cd4902b3da9c95335cb2ba9469e6f0c79295eb1f 100644
--- a/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml
@@ -30,7 +30,7 @@ $upsModel = $this->getShippingModel();
 $orShipArr = $upsModel->getCode('originShipment');
 $defShipArr = $upsModel->getCode('method');
 
-/** @var $this \Magento\Adminhtml\Block\Template */
+/** @var $this \Magento\Backend\Block\Template */
 $sectionCode = $this->getRequest()->getParam('section');
 $websiteCode = $this->getRequest()->getParam('website');
 $storeCode = $this->getRequest()->getParam('store');
diff --git a/app/code/Magento/Adminhtml/Block/Backup.php b/app/code/Magento/Backup/Block/Adminhtml/Backup.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Backup.php
rename to app/code/Magento/Backup/Block/Adminhtml/Backup.php
index 87cec4f4a322ec7bcec94831ea07a4daf6333e3f..3657272cab5bc524a79717c5ec2ca7e79887e1a9 100644
--- a/app/code/Magento/Adminhtml/Block/Backup.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Backup.php
@@ -31,37 +31,37 @@
  * @package    Magento_Adminhtml
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backup\Block\Adminhtml;
 
-class Backup extends \Magento\Adminhtml\Block\Template
+class Backup extends \Magento\Backend\Block\Template
 {
     /**
      * Block's template
      *
      * @var string
      */
-    protected $_template = 'backup/list.phtml';
+    protected $_template = 'Magento_Backup::backup/list.phtml';
 
     protected function _prepareLayout()
     {
         parent::_prepareLayout();
         $this->addChild('createButton', 'Magento\Adminhtml\Block\Widget\Button', array(
             'label' => __('Database Backup'),
-            'onclick' => "return backup.backup('" . \Magento\Backup\Helper\Data::TYPE_DB . "')",
+            'onclick' => "return backup.backup('" . \Magento\Backup\Factory::TYPE_DB . "')",
             'class'  => 'task'
         ));
         $this->addChild('createSnapshotButton', 'Magento\Adminhtml\Block\Widget\Button', array(
             'label' => __('System Backup'),
-            'onclick' => "return backup.backup('" . \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT . "')",
+            'onclick' => "return backup.backup('" . \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT . "')",
             'class'  => ''
         ));
         $this->addChild('createMediaBackupButton', 'Magento\Adminhtml\Block\Widget\Button', array(
             'label' => __('Database and Media Backup'),
-            'onclick' => "return backup.backup('" . \Magento\Backup\Helper\Data::TYPE_MEDIA . "')",
+            'onclick' => "return backup.backup('" . \Magento\Backup\Factory::TYPE_MEDIA . "')",
             'class'  => ''
         ));
 
-        $this->addChild('dialogs', 'Magento\Adminhtml\Block\Backup\Dialogs');
+        $this->addChild('dialogs', 'Magento\Backup\Block\Adminhtml\Dialogs');
     }
 
     public function getCreateButtonHtml()
diff --git a/app/code/Magento/Adminhtml/Block/Backup/Dialogs.php b/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Backup/Dialogs.php
rename to app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
index fc3499afd7885b40e80a3a345d3bb9f697407fde..577ff48d604d8cca8a28eff1235e65b2166089c5 100644
--- a/app/code/Magento/Adminhtml/Block/Backup/Dialogs.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
@@ -31,16 +31,16 @@
  * @package    Magento_Adminhtml
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Backup;
+namespace Magento\Backup\Block\Adminhtml;
 
-class Dialogs extends \Magento\Adminhtml\Block\Template
+class Dialogs extends \Magento\Backend\Block\Template
 {
     /**
      * Block's template
      *
      * @var string
      */
-    protected $_template = 'backup/dialogs.phtml';
+    protected $_template = 'Magento_Backup::backup/dialogs.phtml';
 
     /**
      * Include backup.js file in page before rendering
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
index bbfd4254c29b44196081c012705160e4b8f53614..48045f99d9491e7d1e3d180536960eaa879aabe6 100644
--- a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -47,7 +47,7 @@ class Download
         $url7zip = __('The archive can be uncompressed with <a href="%1">%2</a> on Windows systems.', 'http://www.7-zip.org/',
             '7-Zip');
 
-        return '<a href="' . $this->getUrl('adminhtml/*/download',
+        return '<a href="' . $this->getUrl('*/*/download',
             array('time' => $row->getData('time'), 'type' => $row->getData('type'))) . '">' . $row->getData('extension')
                . '</a> &nbsp; <small>(' . $url7zip . ')</small>';
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Backup.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
similarity index 95%
rename from app/code/Magento/Backend/Controller/Adminhtml/System/Backup.php
rename to app/code/Magento/Backup/Controller/Adminhtml/Index.php
index 0bea7de81560fd51379fd6b36f5410934857ba68..d5bd2bfdce22a621ad35d3bf0e85afdb4b9cc8a0 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Backup.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -31,9 +31,9 @@
  * @package    Magento_Backend
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Backend\Controller\Adminhtml\System;
+namespace Magento\Backup\Controller\Adminhtml;
 
-class Backup extends \Magento\Backend\App\Action
+class Index extends \Magento\Backend\App\Action
 {
     /**
      * Core registry
@@ -108,7 +108,7 @@ class Backup extends \Magento\Backend\App\Action
     public function createAction()
     {
         if (!$this->getRequest()->isAjax()) {
-            return $this->getUrl('adminhtml/*/index');
+            return $this->getUrl('*/*/index');
         }
 
         $response = new \Magento\Object();
@@ -121,10 +121,10 @@ class Backup extends \Magento\Backend\App\Action
         try {
             $type = $this->getRequest()->getParam('type');
 
-            if ($type == \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT
+            if ($type == \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT
                 && $this->getRequest()->getParam('exclude_media')
             ) {
-                $type = \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA;
+                $type = \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA;
             }
 
             $backupManager = $this->_backupFactory->create($type)
@@ -150,7 +150,7 @@ class Backup extends \Magento\Backend\App\Action
                 }
             }
 
-            if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+            if ($type != \Magento\Backup\Factory::TYPE_DB) {
                 $backupManager->setRootDir($this->_objectManager->get('Magento\App\Dir')->getDir())
                     ->addIgnorePaths($helper->getBackupIgnorePaths());
             }
@@ -161,7 +161,7 @@ class Backup extends \Magento\Backend\App\Action
 
             $this->_getSession()->addSuccess($successMessage);
 
-            $response->setRedirectUrl($this->getUrl('adminhtml/*/index'));
+            $response->setRedirectUrl($this->getUrl('*/*/index'));
         } catch (\Magento\Backup\Exception\NotEnoughFreeSpace $e) {
             $errorMessage = __('You need more free space to create a backup.');
         } catch (\Magento\Backup\Exception\NotEnoughPermissions $e) {
@@ -224,7 +224,7 @@ class Backup extends \Magento\Backend\App\Action
         }
 
         if (!$this->getRequest()->isAjax()) {
-            return $this->getUrl('adminhtml/*/index');
+            return $this->getUrl('*/*/index');
         }
 
         $helper = $this->_objectManager->get('Magento\Backup\Helper\Data');
@@ -280,7 +280,7 @@ class Backup extends \Magento\Backend\App\Action
                 }
             }
 
-            if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+            if ($type != \Magento\Backup\Factory::TYPE_DB) {
 
                 $backupManager->setRootDir($this->_objectManager->get('Magento\App\Dir')->getDir())
                     ->addIgnorePaths($helper->getRollbackIgnorePaths());
diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
index 88f8134bf35d33d511dea21b6c361b405cbc98c0..3c66947ae843ca1b6f750883bcaad1b9eccfcc2d 100644
--- a/app/code/Magento/Backup/Helper/Data.php
+++ b/app/code/Magento/Backup/Helper/Data.php
@@ -29,31 +29,6 @@ namespace Magento\Backup\Helper;
 
 class Data extends \Magento\App\Helper\AbstractHelper
 {
-    /**
-     * Backup type constant for database backup
-     */
-    const TYPE_DB = 'db';
-
-    /**
-     * Backup type constant for filesystem backup
-     */
-    const TYPE_FILESYSTEM = 'filesystem';
-
-    /**
-     * Backup type constant for full system backup(database + filesystem)
-     */
-    const TYPE_SYSTEM_SNAPSHOT = 'snapshot';
-
-    /**
-     * Backup type constant for media and database backup
-     */
-    const TYPE_MEDIA = 'media';
-
-    /**
-     * Backup type constant for full system backup excluding media folder
-     */
-    const TYPE_SNAPSHOT_WITHOUT_MEDIA = 'nomedia';
-
     /**
      * @var \Magento\Filesystem
      */
@@ -116,10 +91,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
     public function getBackupTypes()
     {
         return array(
-            self::TYPE_DB                     => __('Database'),
-            self::TYPE_MEDIA                  => __('Database and Media'),
-            self::TYPE_SYSTEM_SNAPSHOT        => __('System'),
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('System (excluding Media)')
+            \Magento\Backup\Factory::TYPE_DB                     => __('Database'),
+            \Magento\Backup\Factory::TYPE_MEDIA                  => __('Database and Media'),
+            \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT        => __('System'),
+            \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('System (excluding Media)')
         );
     }
 
@@ -131,10 +106,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
     public function getBackupTypesList()
     {
         return array(
-            self::TYPE_DB,
-            self::TYPE_SYSTEM_SNAPSHOT,
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA,
-            self::TYPE_MEDIA
+            \Magento\Backup\Factory::TYPE_DB,
+            \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT,
+            \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA,
+            \Magento\Backup\Factory::TYPE_MEDIA
         );
     }
 
@@ -145,7 +120,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
      */
     public function getDefaultBackupType()
     {
-        return self::TYPE_DB;
+        return \Magento\Backup\Factory::TYPE_DB;
     }
 
     /**
@@ -178,10 +153,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
     public function getExtensions()
     {
         return array(
-            self::TYPE_SYSTEM_SNAPSHOT => 'tgz',
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
-            self::TYPE_MEDIA => 'tgz',
-            self::TYPE_DB => 'gz'
+            \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'tgz',
+            \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
+            \Magento\Backup\Factory::TYPE_MEDIA => 'tgz',
+            \Magento\Backup\Factory::TYPE_DB => 'gz'
         );
     }
 
@@ -193,7 +168,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
      */
     public function generateBackupDownloadName(\Magento\Backup\Model\Backup $backup)
     {
-        $additionalExtension = $backup->getType() == self::TYPE_DB ? '.sql' : '';
+        $additionalExtension = $backup->getType() == \Magento\Backup\Factory::TYPE_DB ? '.sql' : '';
         return $backup->getType() . '-' . date('YmdHis', $backup->getTime()) . $additionalExtension . '.'
             . $this->getExtensionByType($backup->getType());
     }
@@ -283,10 +258,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
     public function getCreateSuccessMessageByType($type)
     {
         $messagesMap = array(
-            self::TYPE_SYSTEM_SNAPSHOT => __('The system backup has been created.'),
-            self::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('The system backup (excluding media) has been created.'),
-            self::TYPE_MEDIA => __('The database and media backup has been created.'),
-            self::TYPE_DB => __('The database backup has been created.')
+            \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => __('The system backup has been created.'),
+            \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('The system backup (excluding media) has been created.'),
+            \Magento\Backup\Factory::TYPE_MEDIA => __('The database and media backup has been created.'),
+            \Magento\Backup\Factory::TYPE_DB => __('The database backup has been created.')
         );
 
         if (!isset($messagesMap[$type])) {
diff --git a/app/code/Magento/Backup/Model/Observer.php b/app/code/Magento/Backup/Model/Observer.php
index 7f3fdd2ba17c360119ef63ed77f393a8a00a25c4..d9685dd0b487d1e6932f9bde566f498a6c3aa117 100644
--- a/app/code/Magento/Backup/Model/Observer.php
+++ b/app/code/Magento/Backup/Model/Observer.php
@@ -134,7 +134,7 @@ class Observer
 
             $this->_coreRegistry->register('backup_manager', $backupManager);
 
-            if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+            if ($type != \Magento\Backup\Factory::TYPE_DB) {
                 $backupManager->setRootDir($this->_dir->getDir())
                     ->addIgnorePaths($this->_backupData->getBackupIgnorePaths());
             }
diff --git a/app/code/Magento/Backup/Model/Resource/Db.php b/app/code/Magento/Backup/Model/Resource/Db.php
index c00debc37dd861d7daa87629f968ee6d11ee10df..a2e59e853fd0b76bd2ffd5c9e4623f7464dde100 100644
--- a/app/code/Magento/Backup/Model/Resource/Db.php
+++ b/app/code/Magento/Backup/Model/Resource/Db.php
@@ -158,7 +158,7 @@ class Db
     }
 
     /**
-     * Retrive table partical data SQL insert
+     * Retrieve table partical data SQL insert
      *
      * @param string $tableName
      * @param int $count
diff --git a/app/code/Magento/Backup/etc/adminhtml/menu.xml b/app/code/Magento/Backup/etc/adminhtml/menu.xml
index 17c54d4b17e749c555274fa601eff0f8fb1136ab..55bee83779e3bad1480ead8ef1dbcf1f6eea77b4 100644
--- a/app/code/Magento/Backup/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/menu.xml
@@ -27,6 +27,6 @@
 -->
 <config>
     <menu>
-        <add id="Magento_Backup::system_tools_backup" title="Backups" module="Magento_Backup" sortOrder="30" parent="Magento_Adminhtml::system_tools" action="adminhtml/system_backup" resource="Magento_Backup::backup"/>
+        <add id="Magento_Backup::system_tools_backup" title="Backups" module="Magento_Backup" sortOrder="30" parent="Magento_Adminhtml::system_tools" action="backup/index" resource="Magento_Backup::backup"/>
     </menu>
 </config>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml b/app/code/Magento/Backup/etc/adminhtml/routes.xml
similarity index 82%
rename from app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml
rename to app/code/Magento/Backup/etc/adminhtml/routes.xml
index 7ff60b04ca055b8db85bcfad8ef4bf2dcd3c2c90..54def962da5820967fc7ea2c4b8149553a864b89 100644
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/routes.xml
@@ -23,6 +23,10 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="catalog_product_view_type_simple"/>
-</layout>
+<config>
+    <router id="admin">
+        <route id="backup" frontName="backup">
+            <module name="Magento_Backup_Adminhtml" before="Magento_Adminhtml" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/backup/dialogs.phtml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml
rename to app/code/Magento/Backup/view/adminhtml/backup/dialogs.phtml
index 9a06acd722cc5df563fa426ebe6185dbe8e19296..65fa85447818f965201a185a6fd7a24a43ce1e1c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/backup/dialogs.phtml
@@ -149,17 +149,16 @@
 </div>
 
 <?php
-    $helper = $this->helper('Magento\Backup\Helper\Data');
-    $rollbackUrl = $this->getUrl('adminhtml/*/rollback');
-    $backupUrl = $this->getUrl('adminhtml/*/create');
+    $rollbackUrl = $this->getUrl('*/*/rollback');
+    $backupUrl = $this->getUrl('*/*/create');
 ?>
 
 <script type="text/javascript">
 //<![CDATA[
     document.observe('dom:loaded', function () {
         backup = new AdminBackup();
-        backup.rollbackUrl = '<?php echo $helper->escapeJsQuote($rollbackUrl);?>';
-        backup.backupUrl = '<?php echo $helper->escapeJsQuote($backupUrl);?>';
+        backup.rollbackUrl = '<?php echo $this->escapeJsQuote($rollbackUrl);?>';
+        backup.backupUrl = '<?php echo $this->escapeJsQuote($backupUrl);?>';
     });
 //]]>
 </script>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/backup/left.phtml b/app/code/Magento/Backup/view/adminhtml/backup/left.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/backup/left.phtml
rename to app/code/Magento/Backup/view/adminhtml/backup/left.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/backup/list.phtml b/app/code/Magento/Backup/view/adminhtml/backup/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/backup/list.phtml
rename to app/code/Magento/Backup/view/adminhtml/backup/list.phtml
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_block.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml
similarity index 100%
rename from app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_block.xml
rename to app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml
similarity index 95%
rename from app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml
rename to app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml
index dfa34b7b5a0e118df8109e0a938966f20110a137..c48c7470515d54fa2d4f7752cf5c259ad371fe4b 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml
+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_system_backup_block"/>
+    <update handle="backup_index_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.system.backup.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
 </layout>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml
similarity index 88%
rename from app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml
rename to app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml
index 50bed71f01def9f4e87948c01b602ec271052665..f5bf9fb8bce7646b7aae38c90dd92b362d844ecd 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml
+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml
@@ -25,8 +25,8 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_system_backup_block"/>
+    <update handle="backup_index_block"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Backup" name="adminhtml.system.backup.container"/>
+        <block class="Magento\Backup\Block\Adminhtml\Backup" name="adminhtml.system.backup.container"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index d0637627f1826c79f863c5189270084010d69a05..503a75586ab2f49de142909e405fd245b6eb4a83 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -260,7 +260,7 @@ class Option extends \Magento\Backend\Block\Widget
 
     public function getTypeSelectHtml()
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setData(array(
                 'id' => $this->getFieldId().'_{{index}}_type',
                 'class' => 'select select-product-option-type required-option-select',
@@ -274,7 +274,7 @@ class Option extends \Magento\Backend\Block\Widget
 
     public function getRequireSelectHtml()
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setData(array(
                 'id' => $this->getFieldId().'_{{index}}_required',
                 'class' => 'select'
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index e546a89210085a1c0d08476f233ab6d73d5f6067..f95d01747dddec197c15b6c61ee4960e3a605afa 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -62,24 +62,24 @@ class Selection
      */
     protected $_yesno;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Backend\Model\Config\Source\Yesno $yesno
-     * @param \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType
-     * @param \Magento\Catalog\Helper\Data $catalogData
-     * @param \Magento\Core\Model\Registry $registry
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Backend\Model\Config\Source\Yesno $yesno
+     * @param \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType
+     * @param \Magento\Catalog\Helper\Data $catalogData
+     * @param \Magento\Core\Model\Registry $registry
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Backend\Model\Config\Source\Yesno $yesno,
-        \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType,
-        \Magento\Catalog\Helper\Data $catalogData,
-        \Magento\Core\Model\Registry $registry,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Backend\Model\Config\Source\Yesno $yesno,
+        \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType,
+        \Magento\Catalog\Helper\Data $catalogData,
+        \Magento\Core\Model\Registry $registry,
+        array $data = array()
+    ) {
         $this->_catalogData = $catalogData;
         $this->_coreRegistry = $registry;
         $this->_priceType = $priceType;
@@ -149,7 +149,7 @@ class Selection
      */
     public function getPriceTypeSelectHtml()
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setData(array(
                 'id'    => $this->getFieldId() . '_{{index}}_price_type',
                 'class' => 'select select-product-option-type required-option-select'
@@ -169,7 +169,7 @@ class Selection
      */
     public function getQtyTypeSelectHtml()
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setData(array(
                 'id' => $this->getFieldId().'_{{index}}_can_change_qty',
                 'class' => 'select'
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index f5a80005dd3ff69c525b2eb486a1cf3fcec78167..be86fd7c461b0f5a7a22aaf36126fca3fca7aded 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -496,7 +496,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
     }
 
     /**
-     * Retrive bundle selections collection based on used options
+     * Retrieve bundle selections collection based on used options
      *
      * @param array $optionIds
      * @param \Magento\Catalog\Model\Product $product
diff --git a/app/code/Magento/Bundle/Model/Resource/Option/Collection.php b/app/code/Magento/Bundle/Model/Resource/Option/Collection.php
index e1d22af2e5bb0f9b2a8958609a207d82fc61beee..25c689fe2efe5ee5f27006702b3e793418270dc0 100644
--- a/app/code/Magento/Bundle/Model/Resource/Option/Collection.php
+++ b/app/code/Magento/Bundle/Model/Resource/Option/Collection.php
@@ -193,7 +193,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
     }
 
     /**
-     * Retrive all ids for collection
+     * Retrieve all ids for collection
      *
      * @return array
      */
diff --git a/app/code/Magento/Bundle/view/frontend/bundle.js b/app/code/Magento/Bundle/view/frontend/bundle.js
index fecf8b2293c2a84105bcd06213c216b728a1c481..8329814c947de6d6f98e987e48a02eb28461e7c9 100644
--- a/app/code/Magento/Bundle/view/frontend/bundle.js
+++ b/app/code/Magento/Bundle/view/frontend/bundle.js
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,7 +26,7 @@
     "use strict";
     $.widget('mage.bundleOption', {
         options: {
-            productBundleSelector: '.product-bundle-option',
+            productBundleSelector: '.product.bundle.option',
             mapPopupPrice: '#map-popup-price',
             prices: {},
             priceTemplate: '<span class="price">${formattedPrice}</span>'
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml
index 23c50f81e5d643d7d4839d7e6d53205a22402a3d..69ede2e267aa5ae8bfc3f5e4e47686240c199a7f 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -55,33 +53,83 @@ if ($_product->getPriceType() == 1) {
 ?>
 
 <div class="price-box">
-        <?php if ($_product->getPriceView()): ?>
-            <p class="minimal-price">
-                <span class="price-label"><?php echo __('As low as') ?>:</span>
-                <?php if ($this->displayBothPrices()): ?>
-                    <span class="price-excluding-tax">
-                        <span class="label"><?php echo __('Excl. Tax:') ?></span>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
-                    </span>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
-                        <span class="weee">(<small>
-                            <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
-                                    <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
-                                <?php else: ?>
-                                    <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
-                                <?php endif; ?>
+    <?php if ($_product->getPriceView()): ?>
+        <p class="minimal-price">
+            <span class="price-label"><?php echo __('As low as') ?>:</span>
+            <?php if ($this->displayBothPrices()): ?>
+                <span class="price-excluding-tax">
+                    <span class="label"><?php echo __('Excl. Tax:') ?></span>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+                </span>
+                <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <span class="weee">(<small>
+                        <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+                            <?php else: ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+                            <?php endif; ?>
 
-                                <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
-                                <?php $_weeeSeparator = ' + '; ?>
-                            <?php endforeach; ?>
-                        </small>)</span>
-                    <?php endif; ?>
-                    <span class="price-including-tax">
-                        <span class="label"><?php echo __('Incl. Tax:') ?></span>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
-                    </span>
+                            <?php echo $_weeeSeparator; ?>
+                            <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+                            <?php $_weeeSeparator = ' + '; ?>
+                        <?php endforeach; ?>
+                    </small>)</span>
+                <?php endif; ?>
+                <span class="price-including-tax">
+                    <span class="label"><?php echo __('Incl. Tax:') ?></span>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+                </span>
+        <?php else: ?>
+            <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+            <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                <span class="weee">(<small>
+                    <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+                            <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+                        <?php else: ?>
+                            <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+                        <?php endif; ?>
+
+                        <?php echo $_weeeSeparator; ?>
+                        <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+                        <?php $_weeeSeparator = ' + '; ?>
+                    <?php endforeach; ?>
+                </small>)</span>
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+                <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+            <?php endif; ?>
+        <?php endif; ?>
+        </p>
+    <?php else: ?>
+        <?php if ($_minimalPriceTax <> $_maximalPriceTax): ?>
+        <p class="price-from">
+            <span class="price-label"><?php echo __('From') ?>:</span>
+            <?php if ($this->displayBothPrices()): ?>
+                <span class="price-excluding-tax">
+                    <span class="label"><?php echo __('Excl. Tax:') ?></span>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+                </span>
+                <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <span class="weee">(<small>
+                        <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+                            <?php else: ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+                            <?php endif; ?>
+
+                            <?php echo $_weeeSeparator; ?>
+                            <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+                            <?php $_weeeSeparator = ' + '; ?>
+                        <?php endforeach; ?>
+                    </small>)</span>
+                <?php endif; ?>
+                <span class="price-including-tax">
+                    <span class="label"><?php echo __('Incl. Tax:') ?></span>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+                </span>
             <?php else: ?>
                 <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
                 <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
@@ -103,15 +151,24 @@ if ($_product->getPriceType() == 1) {
                     <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
                 <?php endif; ?>
             <?php endif; ?>
-            </p>
-        <?php else: ?>
-            <?php if ($_minimalPriceTax <> $_maximalPriceTax): ?>
-            <p class="price-from">
-                <span class="price-label"><?php echo __('From') ?>:</span>
+        </p>
+            <?php
+                if ($_product->getPriceType() == 1) {
+                    if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(0, 1, 4))) {
+                        $_maximalPriceTax += $_weeeTaxAmount;
+                        $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
+                    }
+                    if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)) {
+                        $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
+                    }
+                }
+            ?>
+            <p class="price-to">
+                <span class="price-label"><?php echo __('To') ?>:</span>
                 <?php if ($this->displayBothPrices()): ?>
                     <span class="price-excluding-tax">
                         <span class="label"><?php echo __('Excl. Tax:') ?></span>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
                     </span>
                     <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
                         <span class="weee">(<small>
@@ -129,11 +186,11 @@ if ($_product->getPriceType() == 1) {
                         </small>)</span>
                     <?php endif; ?>
                     <span class="price-including-tax">
-                        <span class="label"><?php echo __('Incl. Tax:') ?></span>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+                        <span class="label"><?php echo __('Incl. Tax') ?></span>
+                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
                     </span>
                 <?php else: ?>
-                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
                     <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
                         <span class="weee">(<small>
                             <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -150,115 +207,56 @@ if ($_product->getPriceType() == 1) {
                         </small>)</span>
                     <?php endif; ?>
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
                     <?php endif; ?>
                 <?php endif; ?>
             </p>
-                <?php
-                    if ($_product->getPriceType() == 1) {
-                        if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(0, 1, 4))) {
-                            $_maximalPriceTax += $_weeeTaxAmount;
-                            $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
-                        }
-                        if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)) {
-                            $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
-                        }
-                    }
-                ?>
-                <p class="price-to">
-                    <span class="price-label"><?php echo __('To') ?>:</span>
-                    <?php if ($this->displayBothPrices()): ?>
-                        <span class="price-excluding-tax">
-                            <span class="label"><?php echo __('Excl. Tax:') ?></span>
-                            <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
-                        </span>
-                        <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
-                            <span class="weee">(<small>
-                                <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
-                                        <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
-                                    <?php else: ?>
-                                        <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
-                                    <?php endif; ?>
-
-                                    <?php echo $_weeeSeparator; ?>
-                                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
-                                    <?php $_weeeSeparator = ' + '; ?>
-                                <?php endforeach; ?>
-                            </small>)</span>
-                        <?php endif; ?>
-                        <span class="price-including-tax">
-                            <span class="label"><?php echo __('Incl. Tax') ?></span>
-                            <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
-                        </span>
-                    <?php else: ?>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
-                        <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
-                            <span class="weee">(<small>
-                                <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
-                                        <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
-                                    <?php else: ?>
-                                        <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
-                                    <?php endif; ?>
+        <?php else: ?>
+            <?php if ($this->displayBothPrices()): ?>
+                <span class="price-excluding-tax">
+                    <span class="label"><?php echo __('Excl. Tax:') ?></span>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+                </span>
+                <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <span class="weee">(<small>
+                        <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+                            <?php else: ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+                            <?php endif; ?>
 
-                                    <?php echo $_weeeSeparator; ?>
-                                    <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
-                                    <?php $_weeeSeparator = ' + '; ?>
-                                <?php endforeach; ?>
-                            </small>)</span>
-                        <?php endif; ?>
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                            <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
-                        <?php endif; ?>
-                    <?php endif; ?>
-                </p>
+                            <?php echo $_weeeSeparator; ?>
+                            <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+                            <?php $_weeeSeparator = ' + '; ?>
+                        <?php endforeach; ?>
+                    </small>)</span>
+                <?php endif; ?>
+                <span class="price-including-tax">
+                    <span class="label"><?php echo __('Incl. Tax:') ?></span>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+                </span>
             <?php else: ?>
-                <?php if ($this->displayBothPrices()): ?>
-                    <span class="price-excluding-tax">
-                        <span class="label"><?php echo __('Excl. Tax:') ?></span>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
-                    </span>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
-                        <span class="weee">(<small>
-                            <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
-                                    <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
-                                <?php else: ?>
-                                    <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
-                                <?php endif; ?>
-
-                                <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
-                                <?php $_weeeSeparator = ' + '; ?>
-                            <?php endforeach; ?>
-                        </small>)</span>
-                    <?php endif; ?>
-                    <span class="price-including-tax">
-                        <span class="label"><?php echo __('Incl. Tax:') ?></span>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
-                    </span>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
-                    <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
-                        <span class="weee">(<small>
-                            <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
-                                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
-                                    <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
-                                <?php else: ?>
-                                    <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
-                                <?php endif; ?>
+                <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+                <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+                    <span class="weee">(<small>
+                        <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+                            <?php else: ?>
+                                <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+                            <?php endif; ?>
 
-                                <?php echo $_weeeSeparator; ?>
-                                <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
-                                <?php $_weeeSeparator = ' + '; ?>
-                            <?php endforeach; ?>
-                        </small>)</span>
-                    <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
-                        <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
-                    <?php endif; ?>
+                            <?php echo $_weeeSeparator; ?>
+                            <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+                            <?php $_weeeSeparator = ' + '; ?>
+                        <?php endforeach; ?>
+                    </small>)</span>
+                <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+                    <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
                 <?php endif; ?>
             <?php endif; ?>
         <?php endif; ?>
+    <?php endif; ?>
 </div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/backbutton.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/backbutton.phtml
similarity index 86%
rename from app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/backbutton.phtml
rename to app/code/Magento/Bundle/view/frontend/catalog/product/view/backbutton.phtml
index cb76e318b8ce8efca2daf396ced8c3a0bd3a7461..d3029b7b922f80c2534c5d9764e8e16e45a5cd87 100644
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/backbutton.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/backbutton.phtml
@@ -18,9 +18,11 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<button type="button" class="action back customization"><span><?php echo __('Go back to product details') ?></span></button>
+<button type="button"
+        class="action back customization">
+    <span><?php echo __('Go back to product details') ?></span>
+</button>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/customize.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/customize.phtml
similarity index 84%
rename from app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/customize.phtml
rename to app/code/Magento/Bundle/view/frontend/catalog/product/view/customize.phtml
index 4b08a51a035a0e444bd71019e80c48a1369d97d6..adbe1fe430893c1b06bac0011e0bc18e59f41232 100644
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/customize.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/customize.phtml
@@ -18,7 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,6 +26,10 @@
 <?php $_product = $this->getProduct() ?>
 <?php if ($_product->isSaleable() && $this->hasOptions()):?>
     <div class="actions bundle">
-        <button id="bundle-slide" class="action primary customize" type="button"><span><?php echo __('Customize and Add to Cart'); ?></span></button>
+        <button id="bundle-slide"
+                class="action primary customize"
+                type="button">
+            <span><?php echo __('Customize and Add to Cart'); ?></span>
+        </button>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml
index dcccb1c86682d67ef7e50b10e5f559779aaf79ef..ee2633f4f9eb74ca8ed6f18de1196af71a828749 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/price.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/price.phtml
index dc0360b3534e43eaa85d95e57f8d80b2998d166b..6dda6945e424b64fbd43fc933b48c48d77139bfa 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/price.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/price.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/summary.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/summary.phtml
similarity index 83%
rename from app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/summary.phtml
rename to app/code/Magento/Bundle/view/frontend/catalog/product/view/summary.phtml
index e2c3b5c3ad7bd311ba55e693a35d4650c3672dfc..5be24e3afcf3eb1ea7a48c21e6da1f1db275dc00 100644
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/summary.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/summary.phtml
@@ -18,7 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -38,9 +37,13 @@
             <div class="product details">
                 <strong class="product name"><?php echo $this->escapeHtml($_product->getName()) ?></strong>
                 <?php if($_product->getIsSalable()): ?>
-                    <p class="available stock" title="<?php echo __('Availability') ?>"><span><?php echo __('In stock') ?></span></p>
+                    <p class="available stock" title="<?php echo __('Availability') ?>">
+                        <span><?php echo __('In stock') ?></span>
+                    </p>
                 <?php else: ?>
-                    <p class="unavailable stock" title="<?php echo __('Availability') ?>"><span><?php echo __('Out of stock') ?></span></p>
+                    <p class="unavailable stock" title="<?php echo __('Availability') ?>">
+                        <span><?php echo __('Out of stock') ?></span>
+                    </p>
                 <?php endif; ?>
                 <?php echo $this->getChildHtml('', true);?>
             </div>
@@ -63,29 +66,28 @@
     </div>
 </div>
 <script>
+    //<![CDATA[
     (function ($) {
         head.js("<?php echo $this->getViewFileUrl('js/sticky.js') ?>",function() {
             $('#bundleSummary').sticky({
                 container: '.product.add.form'
             });
         });
-    })(jQuery);
-</script>
-<script type="text/javascript">
-    (function($) {
+
         head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::js/slide.js')?>", function() {
             $('.product.add.form').slide({
-                slideSpeed: 1500,
-                slideSelector: '#bundle-slide',
-                slideBackSelector: '.action.customization.back',
-                bundleProductSelector: '#bundleProduct',
-                bundleOptionsContainer: '.product.add.form',
-                <?php if ($this->isStartCustomization()): ?>
+                    slideSpeed: 1500,
+                    slideSelector: '#bundle-slide',
+                    slideBackSelector: '.action.customization.back',
+                    bundleProductSelector: '#bundleProduct',
+                    bundleOptionsContainer: '.product.add.form',
+                    <?php if ($this->isStartCustomization()): ?>
                     autostart: true
-                <?php endif;?>
+                    <?php endif;?>
                 }
             );
         });
     })(jQuery);
+    //]]>
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml
index 8e91973b3c3f1d6288aeb3275bd4542ee22d728b..67c980555b17345578f3236bed72c7d6602e7e0c 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -33,9 +31,9 @@ $_product = $this->getProduct();
 $_tierPrices = $this->getTierPrices();
 ?>
 <?php if (count($_tierPrices) > 0): ?>
-    <ul class="tier-prices product-pricing">
+    <ul class="prices tier items">
     <?php foreach($_tierPrices as $_price): ?>
-        <li><?php echo __('Buy %1 with %2 discount each', $_price['price_qty'], '<strong class="benefit">'.($_price['price']*1).'%</strong>') ?></li>
+        <li class="item"><?php echo __('Buy %1 with %2 discount each', $_price['price_qty'], '<strong class="benefit">'.($_price['price']*1).'%</strong>') ?></li>
     <?php endforeach ?>
     </ul>
 <?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml
index cf1f401ee33c69e9e48385c83c9aaf4974b6a761..f354810ab94a6d4c11fcd46edd6760472b2ee053 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml
@@ -18,42 +18,43 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
+/* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */
 ?>
 <?php $_product = $this->getProduct() ?>
-
 <?php if($_product->isSaleable()): ?>
-<script type="text/javascript">
-    (function ($) {
-        head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function() {
-            $('#product_addtocart_form').bundleOption({
-                bundleConfig: <?php echo $this->getJsonConfig() ?>,
-                bundleOptionQtyPrefix: "#bundle-option-",
-                bundleOptionQtySuffix: "-qty-input",
-                priceSelectors: {
-                    "product-price": "#product-price-<?php echo $_product->getId()?>",
-                    "bundle-price": "#bundle-price-<?php echo $_product->getId()?>",
-                    "price-including-tax": "#price-including-tax-<?php echo $_product->getId()?>",
-                    "price-excluding-tax": "#price-excluding-tax-<?php echo $_product->getId()?>"
-                }
+    <script type="text/javascript">
+        //<![CDATA[
+        (function ($) {
+            head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::/bundle.js') ?>", function() {
+                $('#product_addtocart_form').bundleOption({
+                    bundleConfig: <?php echo $this->getJsonConfig() ?>,
+                    bundleOptionQtyPrefix: "#bundle-option-",
+                    bundleOptionQtySuffix: "-qty-input",
+                    priceSelectors: {
+                        "product-price": "#product-price-<?php echo $_product->getId()?>",
+                        "bundle-price": "#bundle-price-<?php echo $_product->getId()?>",
+                        "price-including-tax": "#price-including-tax-<?php echo $_product->getId()?>",
+                        "price-excluding-tax": "#price-excluding-tax-<?php echo $_product->getId()?>"
+                    }
+                });
             });
-        });
-    })(jQuery);
-</script>
+        })(jQuery);
+        //]]>
+    </script>
 <?php endif; ?>
 <?php if ($this->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable()): ?>
-        <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+        <p class="stock available" title="<?php echo __('Availability:') ?>">
+            <span><?php echo __('In stock') ?></span>
+        </p>
     <?php else: ?>
-        <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+        <p class="stock unavailable" title="<?php echo __('Availability:') ?>">
+            <span><?php echo __('Out of stock') ?></span>
+        </p>
     <?php endif; ?>
 <?php endif; ?>
-<div class="price-box-bundle">
-    <?php echo $this->getPriceHtml($_product) ?>
-</div>
 <?php echo $this->getChildHtml('bundle_prices') ?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml
index 2761f8f27cdf76f1271bcff5a840316e34536fe6..cd785c87d33596dac6d7672fabb9890f74422871 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -18,32 +18,44 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-
 ?>
 
 <?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
 <?php $_option = $this->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
-    <div class="input-box">
-    <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-        <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
-        <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
-    <?php else:?>
-        <ul class="options-list">
-        <?php foreach($_selections as $_selection): ?>
-            <li><input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" <?php if ($_option->getRequired()) echo 'data-validate = {"validate-one-required-by-name":true}'?> name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>"/>
-                <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></label></span>
-            </li>
-        <?php endforeach; ?>
-        </ul>
-        <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
-    <?php endif; ?>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+    <label class="label">
+        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+    </label>
+    <div class="control">
+        <div class="nested options-list">
+            <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
+                <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <input type="hidden"
+                       name="bundle_option[<?php echo $_option->getId() ?>]"
+                       value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+            <?php else:?>
+                <?php foreach($_selections as $_selection): ?>
+                    <div class="field choice">
+                        <input class="bundle-option-<?php echo $_option->getId() ?> checkbox product bundle option change-container-classname"
+                               id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+                               type="checkbox"
+                               <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
+                               name="bundle_option[<?php echo $_option->getId() ?>][]"
+                               <?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?>
+                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+                               value="<?php echo $_selection->getSelectionId() ?>"/>
+                        <label class="label"
+                               for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
+                            <span><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></span>
+                        </label>
+                    </div>
+                <?php endforeach; ?>
+                <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+            <?php endif; ?>
+        </div>
     </div>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml
index 405be460f2e0fbe67303af962198bcab3a072457..a24c0efedb6a1a9a43fe22af8e41e30646e89529 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml
@@ -18,32 +18,42 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
 ?>
-
 <?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
 <?php $_option = $this->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
-    <div class="input-box">
-    <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-        <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
-        <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
-    <?php else: ?>
-        <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>][]" class="bundle-option-<?php echo $_option->getId() ?> multiselect change-container-classname product-bundle-option" <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
-        <?php if(!$_option->getRequired()): ?>
-            <option value=""><?php echo __('None') ?></option>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+    <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
+        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+    </label>
+    <div class="control">
+        <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
+            <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
+            <input type="hidden"
+                   name="bundle_option[<?php echo $_option->getId() ?>]"
+                   value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+        <?php else: ?>
+            <select multiple="multiple"
+                    size="5"
+                    id="bundle-option-<?php echo $_option->getId() ?>"
+                    name="bundle_option[<?php echo $_option->getId() ?>][]"
+                    class="bundle-option-<?php echo $_option->getId() ?> multiselect product bundle option change-container-classname"
+                    <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
+                <?php if(!$_option->getRequired()): ?>
+                    <option value=""><?php echo __('None') ?></option>
+                <?php endif; ?>
+                <?php foreach ($_selections as $_selection): ?>
+                    <option value="<?php echo $_selection->getSelectionId() ?>"
+                            <?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?>
+                            <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
+                        <?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
         <?php endif; ?>
-        <?php foreach ($_selections as $_selection): ?>
-            <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
-        <?php endforeach; ?>
-        </select>
-    <?php endif; ?>
     </div>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml
index 89aa9c26f1778945cb1c4f1f7f6e9dd79297e795..c808e6c31c41b2ce3cb6b801a9d197caba8102ae 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml
@@ -18,45 +18,73 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
 ?>
-
 <?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
 <?php $_option = $this->getOption(); ?>
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
 
-<dt>
-    <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
-</dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
-    <div class="input-box">
-    <?php if ($this->showSingle()): ?>
-        <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
-        <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" />
-    <?php else:?>
-        <ul class="options-list">
-        <?php if (!$_option->getRequired()): ?>
-            <li><input type="radio" class="radio product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?> value=""/>
-            <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>"><?php echo __('None') ?></label></span>
-            </li>
-        <?php endif; ?>
-        <?php foreach ($_selections as $_selection): ?>
-            <li><input type="radio" class="radio change-container-classname product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" <?php if ($_option->getRequired()) echo 'data-validate = {"validate-one-required-by-name":true}'?>  name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>"/>
-            <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
-            </li>
-        <?php endforeach; ?>
-        </ul>
-        <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
-    <?php endif; ?>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+    <label class="label">
+        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+    </label>
+    <div class="control">
+        <div class="nested options-list">
+            <?php if ($this->showSingle()): ?>
+                <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
+                <input type="hidden"
+                       name="bundle_option[<?php echo $_option->getId() ?>]"
+                       value="<?php echo $_selections[0]->getSelectionId() ?>" />
+            <?php else:?>
+                <?php if (!$_option->getRequired()): ?>
+                    <div class="field choice">
+                        <input type="radio"
+                               class="radio product bundle option"
+                               id="bundle-option-<?php echo $_option->getId() ?>"
+                               name="bundle_option[<?php echo $_option->getId() ?>]"
+                               <?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
+                               value=""/>
+                        <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
+                            <span><?php echo __('None') ?></span>
+                        </label>
+                    </div>
+                <?php endif; ?>
+                <?php foreach ($_selections as $_selection): ?>
+                    <div class="field choice">
+                        <input type="radio"
+                               class="radio product bundle option change-container-classname"
+                               id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+                               <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
+                               name="bundle_option[<?php echo $_option->getId() ?>]"
+                               <?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?>
+                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+                               value="<?php echo $_selection->getSelectionId() ?>"/>
+                        <label class="label"
+                               for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
+                            <span><?php echo $this->getSelectionTitlePrice($_selection) ?></span>
+                        </label>
+                    </div>
+                <?php endforeach; ?>
+                <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+            <?php endif; ?>
+            <div class="field qty qty-holder">
+                <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
+                    <span><?php echo __('Qty') ?></span>
+                </label>
+                <div class="control">
+                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+                           id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                           type="text"
+                           name="bundle_option_qty[<?php echo $_option->getId() ?>]"
+                           value="<?php echo $_defaultQty ?>"/>
+                </div>
+            </div>
+        </div>
     </div>
-    <span class="qty-holder">
-        <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo __('Qty:') ?>&nbsp;</label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
-    </span>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml
index b6fa2ac5edc11e158902cd5e10cce9de2d76cc34..52801328c7f053b9164c44e541ce8e07c0ef5a54 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml
@@ -18,12 +18,9 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-
 ?>
 
 <?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select */ ?>
@@ -31,25 +28,45 @@
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
-
-<dt>
-    <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
-</dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
-    <div class="input-box">
-    <?php if ($this->showSingle()): ?>
-        <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
-        <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
-    <?php else:?>
-        <select id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?> bundle-option-select product-bundle-option change-container-classname" <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
-            <option value=""><?php echo __('Choose a selection...') ?></option>
-        <?php foreach ($_selections as $_selection): ?>
-            <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
-        <?php endforeach; ?>
-        </select>
-    <?php endif; ?>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+    <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
+        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+    </label>
+    <div class="control">
+        <?php if ($this->showSingle()): ?>
+            <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
+            <input type="hidden"
+                   name="bundle_option[<?php echo $_option->getId() ?>]"
+                   value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+        <?php else:?>
+            <select id="bundle-option-<?php echo $_option->getId() ?>"
+                    name="bundle_option[<?php echo $_option->getId() ?>]"
+                    class="bundle-option-<?php echo $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
+                <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
+                <option value=""><?php echo __('Choose a selection...') ?></option>
+                <?php foreach ($_selections as $_selection): ?>
+                    <option value="<?php echo $_selection->getSelectionId() ?>"
+                        <?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?>
+                        <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
+                        <?php echo $this->getSelectionTitlePrice($_selection, false) ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        <?php endif; ?>
+        <div class="nested">
+            <div class="field qty qty-holder">
+                <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
+                    <span><?php echo __('Qty') ?></span>
+                </label>
+                <div class="control">
+                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+                           id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                           type="text"
+                           name="bundle_option_qty[<?php echo $_option->getId() ?>]"
+                           value="<?php echo $_defaultQty ?>"/>
+                </div>
+            </div>
+        </div>
     </div>
-    <span class="qty-holder">
-        <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo __('Qty:') ?>&nbsp;</label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
-    </span>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml
index 9fea3750b23a97f0b4490e19bbf04815690f3d03..59b828af0171cee03cb82e692c69c10e3ff92c1a 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml
@@ -18,33 +18,41 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php /** @var $this Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */ ?>
-<?php $_product = $this->getProduct(); ?>
+<?php
+$_product = $this->getProduct();
+$_helper = $this->helper('Magento\Catalog\Helper\Output');
+?>
 <?php $_options = $this->decorateArray($this->getOptions()); ?>
 <?php if ($_product->isSaleable()):?>
     <?php if (count($_options)): ?>
-    <script type="text/javascript">
-        (function ($) {
-            head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function () {
-                $('#product_addtocart_form').bundleOption({'optionConfig':<?php echo $this->getJsonConfig()?>}).trigger('changeSelection');
-            });
-        })(jQuery);
-    </script>
-        <dl>
-        <?php foreach ($_options as $_option): ?>
-            <?php if (!$_option->getSelections()): ?>
-                <?php continue; ?>
-            <?php endif; ?>
-            <?php echo $this->getOptionHtml($_option) ?>
-        <?php endforeach; ?>
-        </dl>
+        <script type="text/javascript">
+            //<![CDATA[
+            (function ($) {
+                head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function () {
+                    $('#product_addtocart_form')
+                        .bundleOption({'optionConfig':<?php echo $this->getJsonConfig()?>})
+                        .trigger('changeSelection');
+                });
+            })(jQuery);
+            //]]>
+        </script>
+        <fieldset class="fieldset bundle options">
+            <legend id="customizeTitle" class="legend">
+                <span><?php echo __('Customize %1', $_helper->productAttribute($_product, $_product->getName(), 'name')) ?></span>
+            </legend><br />
+            <?php foreach ($_options as $_option): ?>
+                <?php if (!$_option->getSelections()): ?>
+                    <?php continue; ?>
+                <?php endif; ?>
+                <?php echo $this->getOptionHtml($_option) ?>
+            <?php endforeach; ?>
+        </fieldset>
     <?php else: ?>
-        <p><?php echo __('No options of this product are available.') ?></p>
+        <p class="empty"><?php echo __('No options of this product are available.') ?></p>
     <?php endif; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/js/float.js b/app/code/Magento/Bundle/view/frontend/js/float.js
index 3e3d7c7888f2e0e16a3fb1f3c9bc66c0626fe32a..8abb7bc455861239a602e554a645ba0e6fcf4f98 100644
--- a/app/code/Magento/Bundle/view/frontend/js/float.js
+++ b/app/code/Magento/Bundle/view/frontend/js/float.js
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    frontend bundle product float
- * @package     mage
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Bundle/view/frontend/js/product-summary.js b/app/code/Magento/Bundle/view/frontend/js/product-summary.js
index a204c51b2c7c1aeb63942ceb70c7f73e7ee5b0cc..2218a61433c0d4fc00e8913ebe40c1eeb83b03b1 100644
--- a/app/code/Magento/Bundle/view/frontend/js/product-summary.js
+++ b/app/code/Magento/Bundle/view/frontend/js/product-summary.js
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    frontend bundle product summary
- * @package     mage
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Bundle/view/frontend/js/slide.js b/app/code/Magento/Bundle/view/frontend/js/slide.js
index b451fce49cb2860ab1e7eb93cb32c6301543c7a6..d077384793866abafe3fc07b4afec266e92fcd1d 100644
--- a/app/code/Magento/Bundle/view/frontend/js/slide.js
+++ b/app/code/Magento/Bundle/view/frontend/js/slide.js
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    frontend bundle product slide
- * @package     mage
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -31,14 +29,21 @@
             slideBackSelector: '.bundle-slide-back',
             bundleProductSelector: '#bundleProduct',
             bundleOptionsContainer: '#options-container',
-            productViewContainer: '#productView'
+            productViewContainer: '#productView',
+            slidedown: true
 
         },
 
         _create: function() {
-            $(this.options.slideSelector).on('click', $.proxy(this._slide, this));
-            $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this));
-            this.options.autostart && this._slide();
+            if(this.options.slidedown === true) {
+                $(this.options.slideSelector).on('click', $.proxy(this._show, this));
+                $(this.options.slideBackSelector).on('click', $.proxy(this._hide, this));
+                this.options.autostart && this._show();
+            } else {
+                $(this.options.slideSelector).on('click', $.proxy(this._slide, this));
+                $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this));
+                this.options.autostart && this._slide();
+            }
         },
 
         /**
@@ -75,6 +80,18 @@
                     this.element.css('height','auto');
                 }, this)
             );
+        },
+        _show: function() {
+            $(this.options.bundleOptionsContainer).slideDown(800);
+            $('html, body').animate({
+                scrollTop: $(this.options.bundleOptionsContainer).offset().top
+            }, 600);
+        },
+        _hide: function() {
+            $('html, body').animate({
+                scrollTop: 0
+            }, 600);
+            $(this.options.bundleOptionsContainer).slideUp(800);
         }
     });
 }(jQuery));
\ No newline at end of file
diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
index 83752c4c834c591ed98e8e26c2c08ce9ca35ba3e..3e1666e39a95774fe8b6a5c4e4fc16545ec16e62 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
@@ -36,21 +36,24 @@
             </arguments>
         </block>
     </referenceBlock>
+    <referenceBlock name="root">
+        <action method="addBodyClass">
+            <argument name="value" xsi:type="string">type-bundle</argument>
+        </action>
+    </referenceBlock>
     <referenceBlock name="product.info">
-        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
-            <action method="addPriceBlockType">
-                <argument name="type" xsi:type="string">bundle</argument>
-                <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-                <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
-            </action>
+        <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.summary" as="form_top" template="catalog/product/view/summary.phtml">
             <block class="Magento\Bundle\Block\Catalog\Product\Price" name="bundle.prices" as="bundle_prices" template="catalog/product/view/price.phtml">
                 <action method="setMAPTemplate">
                     <argument name="tmpl" xsi:type="string">Magento_Catalog::product/price_msrp_item.phtml</argument>
                 </action>
             </block>
+            <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.bundle" as="addtocart" template="product/view/addtocart.phtml"/>
+            <block class="Magento\Catalog\Block\Product\View" name="product.info.addto.bundle" as="addto" template="product/view/addto.phtml"/>
         </block>
     </referenceBlock>
     <referenceBlock name="product.info.options.wrapper">
+        <block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/>
         <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
             <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
             <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
@@ -62,7 +65,32 @@
         <remove name="product.tierprices"/>
         <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.tierprices" as="tierprices" before="-" template="Magento_Bundle::catalog/product/view/tierprices.phtml"/>
         <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/>
+        <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.back.button" as="backButton" after="-" template="catalog/product/view/backbutton.phtml"/>
+        <action method="unsetChild">
+            <argument name="block" xsi:type="string">product.info.addtocart</argument>
+        </action>
+        <action method="setHideRequiredNotice">
+            <argument name="flag" xsi:type="string">1</argument>
+        </action>
+        <action method="unsetChild">
+            <argument name="block" xsi:type="string">product.info.addto</argument>
+        </action>
     </referenceBlock>
+    <referenceContainer name="content">
+        <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle options container" after="product.info.media"/>
+        <move element="product.info" destination="bundle.options.container" before="-"/>
+    </referenceContainer>
+    <referenceContainer name="product.info.type">
+        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
+            <action method="addPriceBlockType">
+                <argument name="type" xsi:type="string">bundle</argument>
+                <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
+                <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
+            </action>
+        </block>
+        <container name="product.info.bundle.extra" after="product.info.bundle" as="product_type_data_extra" label="Product Extra Info"/>
+        <block class="Magento\Bundle\Block\Catalog\Product\View" name="customize.button" as="customize_button" template="catalog/product/view/customize.phtml"/>
+    </referenceContainer>
     <referenceBlock name="product.clone_prices">
         <action method="addPriceBlockType">
             <argument name="type" xsi:type="string">bundle</argument>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml
index 547ba39c0ee1105f686f6381214f8f475c29c3cf..f56f9a2b65b5b449cf0c2ce2281116761fe5abcb 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="checkout.cart">
+    <referenceBlock name="checkout.cart.form">
         <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml"/>
     </referenceBlock>
     <referenceBlock name="checkout.cart.crosssell">
diff --git a/app/code/Magento/Bundle/view/frontend/layout/default.xml b/app/code/Magento/Bundle/view/frontend/layout/default.xml
index c21ff6f807e4b394da181891990170337fc20cf1..30de3dbeb470c1527c2183e718d662dcde3ca0d4 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/default.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/default.xml
@@ -24,8 +24,12 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="cart_sidebar">
-        <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
+    <referenceBlock name="wishlist_sidebar">
+        <action method="addPriceBlockType">
+            <argument name="type" xsi:type="string">bundle</argument>
+            <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
+            <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
+        </action>
     </referenceBlock>
     <referenceBlock name="catalog_product_price_template">
         <action method="addPriceBlockType">
@@ -34,4 +38,7 @@
             <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
         </action>
     </referenceBlock>
+    <referenceBlock name="minicart">
+        <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
+    </referenceBlock>
 </layout>
diff --git a/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml b/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml
index a847fff4d91de884a8cc6c385bb9b2ff2e3f48e0..e8ab7745d80e182d2a1da1423df51f3e1e6b5e5a 100644
--- a/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml
+++ b/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -29,7 +27,7 @@
 /**
  * Template for displaying bundle product price in RSS feeds
  *
- * @see \Magento\Bundle\Block\Catalog\Product\Price
+ * @var $this \Magento\Bundle\Block\Catalog\Product\Price
  */
 ?>
 
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml
index 81e3d4dd828e6fccdb5c09ef84990119fe8d83b8..8058ab26283d5a69c2e6dd3eaa9889c1fea57c20 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -35,228 +33,223 @@
 
 <?php foreach ($items as $_item): ?>
 
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
+    <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+        <?php $_showlastRow = true ?>
+    <?php else: ?>
+        <?php $_showlastRow = false ?>
+    <?php endif; ?>
 
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr>
-        <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
+    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+        <?php $attributes = $this->getSelectionAttributes($_item) ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+            <tr>
+                <td class="col label" colspan="7"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+            </tr>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
+        <?php endif; ?>
     <?php endif; ?>
-<?php endif; ?>
 <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
-    </td>
+        <td class="col name">
+            <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+        </td>
     <?php else: ?>
-    <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
+        <td class="col option"><?php echo $this->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
-    <td class="a-right">
+    <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
+    <td class="col price">
         <?php if ($this->canShowPriceInfo($_item)): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+                <span class="price excl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
+                <span class="cart price">
+            <?php endif; ?>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
+                <?php endif; ?>
 
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
                         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                   <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
                             <?php endforeach; ?>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php endif; ?>
                     </span>
 
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
+                </span>
+                <br />
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+                <span class="price incl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
+                <span class="cart price">
+            <?php endif; ?>
 
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
+                <?php endif; ?>
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
                         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
                             <?php endforeach; ?>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php endif; ?>
                     </span>
 
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total Incl. Tax'); ?>:<br/> <?php echo $this->getOrder()->formatPrice($_incl + $this->getItem()->getWeeeTaxAppliedAmount()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-            </span>
-        <?php endif; ?>
+                </span>
+            <?php endif; ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="a-center">
+    <td class="col qty">
         <?php if ($this->canShowPriceInfo($_item)): ?>
             <?php echo $_item->getQty()*1 ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="a-right">
+    <td class="col subtotal">
         <?php if ($this->canShowPriceInfo($_item)): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-                <span class="price-excl-tax">
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                        <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <span class="cart-price">
-                        <?php endif; ?>
-                            <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                        <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            </span>
-                        <?php endif; ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+        <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
+                <?php endif; ?>
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
+                <?php endif; ?>
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+                <span class="cart price">
                     <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
                     <?php else: ?>
-                        <span class="cart-price">
+                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
                     <?php endif; ?>
+                </span>
 
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                        <?php else: ?>
-                            <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                        <?php endif; ?>
-
-                    </span>
-
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
 
-                        <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                                <small>
-                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                                <?php endforeach; ?>
-                                </small>
-                            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                            <small>
                                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                    <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
                                 <?php endforeach; ?>
-                            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                            </small>
+                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
                                 <small>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+                                </small>
+                            <?php endforeach; ?>
+                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                            <small>
                                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
                                 <?php endforeach; ?>
-                                </small>
-                            <?php endif; ?>
-                        </span>
-
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                                <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                            </span>
+                            </small>
                         <?php endif; ?>
+                    </span>
+
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total'); ?>:<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
+                        </span>
                     <?php endif; ?>
+                <?php endif; ?>
                 </span>
                 <br />
             <?php endif; ?>
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-                <span class="price-incl-tax">
+                <span class="price incl tax">
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                       <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <span class="cart-price">
+                        <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                            <span class="cart price">
                         <?php endif; ?>
-                            <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
                         <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             </span>
                         <?php endif; ?>
@@ -270,14 +263,14 @@
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="a-right">
+    <td class="col discount">
         <?php if ($this->canShowPriceInfo($_item)): ?>
             <?php echo $this->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
-   </td>
-    <td class="last a-right">
+    </td>
+    <td class="col rowtotal">
         <?php if ($this->canShowPriceInfo($_item)): ?>
             <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
         <?php else: ?>
@@ -288,41 +281,41 @@
 <?php endforeach; ?>
 
 <?php if ($_showlastRow): ?>
-<tr class="border">
-    <td>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+    <tr>
+        <td class="col options" colspan="7">
+            <?php if($_options = $this->getItemOptions()): ?>
+                <dl class="item options">
+                    <?php foreach ($_options as $_option) : ?>
+                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                        <?php if (!$this->getPrintStatus()): ?>
+                            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
+                                <?php echo $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                    <div class="truncated_full_value">
+                                        <dl class="item options">
+                                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                        </dl>
+                                    </div>
+                                <?php endif; ?>
+                            </dd>
+                        <?php else: ?>
+                            <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+                </dl>
             <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-</tr>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
+            <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+                <a href="#"
+                   id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+                   class="action show"
+                   aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+                   data-item-id="<?php echo $parentItem->getId() ?>">
+                    <?php echo __('Gift Message') ?>
+                </a>
+            <?php endif; ?>
+        </td>
+    </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml
index dfdadda5c646f78254457cd66ff16da306ec5aa4..32f782df72e90d58fe205c487672c4558687f777 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -32,321 +30,312 @@
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
-
 <?php foreach ($items as $_item): ?>
 
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
+    <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+        <?php $_showlastRow = true ?>
+    <?php else: ?>
+        <?php $_showlastRow = false ?>
+    <?php endif; ?>
 
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr>
-        <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
+    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+        <?php $attributes = $this->getSelectionAttributes($_item) ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+            <tr>
+                <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+            </tr>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
+        <?php endif; ?>
     <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
+    <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
+        <td class="col name">
+            <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+        </td>
     <?php else: ?>
-    <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
+        <td class="col value"><?php echo $this->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
-    <td class="a-right">
+    <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
+    <td class="col price">
         <?php if ($this->canShowPriceInfo($_item)): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+                <span class="price excl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                <?php else: ?>
+                <span class="cart price">
+            <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
                 <?php else: ?>
-                    <span class="cart-price">
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
                 <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                          style="display:none;">
                         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
                             <?php endforeach; ?>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php endif; ?>
                     </span>
 
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
+                </span>
+                <br />
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+                <span class="price incl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
+                <span class="cart price">
+            <?php endif; ?>
 
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
+                <?php endif; ?>
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
                         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
                             <?php endforeach; ?>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php endif; ?>
                     </span>
 
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-            </span>
-        <?php endif; ?>
+                </span>
+            <?php endif; ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="a-center">
+    <td class="col qty">
         <?php if ($this->canShowPriceInfo($_item)): ?>
             <?php echo $_item->getQty()*1 ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="a-right">
+    <td class="col subtotal">
         <?php if ($this->canShowPriceInfo($_item)): ?>
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
+        <span class="price excl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
+                <span class="cart price">
+                <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
                 <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
                         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
                             <?php endforeach; ?>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php endif; ?>
                     </span>
 
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
             </span>
             <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+            <span class="price incl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
+                    <span class="cart price">
+                <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
                 <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
+                        </small>
+                    <?php endif; ?>
+                </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                    </span>
                     <?php endif; ?>
                 <?php endif; ?>
-
-
-
             </span>
-        <?php endif; ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-</tr>
+            <?php endif; ?>
+            <?php else: ?>
+                &nbsp;
+            <?php endif; ?>
+        </td>
+    </tr>
 <?php endforeach; ?>
 
 <?php if ($_showlastRow): ?>
-<tr class="border">
-    <td>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+    <tr>
+        <td class="col options" colspan="5">
+            <?php if($_options = $this->getItemOptions()): ?>
+                <dl class="item options">
+                    <?php foreach ($_options as $_option) : ?>
+                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                        <?php if (!$this->getPrintStatus()): ?>
+                            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
+                                <?php echo $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                    <div class="truncated_full_value">
+                                        <dl class="item options">
+                                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                        </dl>
+                                    </div>
+                                <?php endif; ?>
+                            </dd>
+                        <?php else: ?>
+                            <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+                </dl>
             <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-</tr>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
+            <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+                <a href="#"
+                   id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+                   class="action show"
+                   aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+                   data-item-id="<?php echo $parentItem->getId() ?>">
+                    <?php echo __('Gift Message') ?>
+                </a>
+            <?php endif; ?>
+        </td>
+    </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml
index f474b7a616d17f33a3dc17eaf2d1df0e6e9350e1..5b1e56d2135fff60c1826d47b97e723d9d28fb4b 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -35,343 +33,330 @@
 
 <?php foreach ($items as $_item): ?>
 
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
+    <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+        <?php $_showlastRow = true ?>
+    <?php else: ?>
+        <?php $_showlastRow = false ?>
+    <?php endif; ?>
 
-<?php if ($_item->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
-        <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
+    <?php if ($_item->getParentItem()): ?>
+        <?php $attributes = $this->getSelectionAttributes($_item) ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+            <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
+                <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+            </tr>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
+        <?php endif; ?>
     <?php endif; ?>
-<?php endif; ?>
 <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
-
     <?php if (!$_item->getParentItem()): ?>
-    <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3></td>
+        <td class="col name">
+            <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+        </td>
     <?php else: ?>
-    <td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
+        <td class="col value"><?php echo $this->getValueHtml($_item)?></td>
     <?php endif; ?>
-    <td><?php echo $this->prepareSku($_item->getSku()) ?></td>
-    <td class="a-right">
+    <td class="col sku"><?php echo $this->prepareSku($_item->getSku()) ?></td>
+    <td class="col price">
         <?php if (!$_item->getParentItem()): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+                <span class="price excl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
+                <span class="cart price">
+            <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
                 <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                          style="display:none;">
                         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
                             <?php endforeach; ?>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php endif; ?>
                     </span>
-
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
+                </span>
+                <br />
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+                <span class="price incl tax">
                 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
+                    </span>
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                <?php else: ?>
+                <span class="cart price">
+            <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
                 <?php else: ?>
-                    <span class="cart-price">
+                    <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
                 <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+                    <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                          style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
+                        </small>
+                    <?php endif; ?>
                     </span>
-
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-            </span>
-        <?php endif; ?>
+                </span>
+            <?php endif; ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="a-right">
+    <td class="col qty">
         <?php if (($_item->getParentItem() && $this->isChildCalculated()) ||
-                (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
-            <span class="nobr">
+            (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
             <?php if ($_item->getQtyOrdered() > 0): ?>
                 <?php echo __('Ordered'); ?>: <strong><?php echo $_item->getQtyOrdered()*1 ?></strong><br />
             <?php endif; ?>
-            <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
-                <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong><br />
-            <?php endif; ?>
-            <?php if ($_item->getQtyCanceled() > 0): ?>
-                <?php echo __('Canceled'); ?>: <strong><?php echo $_item->getQtyCanceled()*1 ?></strong><br />
-            <?php endif; ?>
-            <?php if ($_item->getQtyRefunded() > 0): ?>
-                <?php echo __('Refunded'); ?>: <strong><?php echo $_item->getQtyRefunded()*1 ?></strong>
-            <?php endif; ?>
-            </span>
+                <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
+                    <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong><br />
+                <?php endif; ?>
+                <?php if ($_item->getQtyCanceled() > 0): ?>
+                    <?php echo __('Canceled'); ?>: <strong><?php echo $_item->getQtyCanceled()*1 ?></strong><br />
+                <?php endif; ?>
+                <?php if ($_item->getQtyRefunded() > 0): ?>
+                    <?php echo __('Refunded'); ?>: <strong><?php echo $_item->getQtyRefunded()*1 ?></strong>
+                <?php endif; ?>
         <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $this->isShipmentSeparately()): ?>
-            <span class="nobr"><?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong></span>
+            <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="a-right">
+    <td class="col subtotal">
         <?php if (!$_item->getParentItem()): ?>
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+        <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                     </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
+                <?php endif; ?>
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+            <span class="cart price">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+            <?php else: ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
+            <?php endif; ?>
+        </span>
+
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+            <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                  style="display:none;">
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                    <?php endforeach; ?>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+                        <?php endforeach; ?>
+                    </small>
                 <?php endif; ?>
             </span>
-            <br />
+
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                    <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+                </span>
+            <?php endif; ?>
+        <?php endif; ?>
+        </span>
+        <br />
         <?php endif; ?>
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+        <span class="price incl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
+                <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                     </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
                 <?php endif; ?>
+            <?php endif; ?>
+            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+            <span class="cart price">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+            <?php else: ?>
+                <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
+            <?php endif; ?>
+            </span>
 
-
-
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info"
+                      id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                      style="display:none;">
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                    <?php endforeach; ?>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php endif; ?>
             </span>
+
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                    <?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                </span>
+                <?php endif; ?>
+            <?php endif; ?>
+        </span>
         <?php endif; ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <!--
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+    <?php /* if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
     <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
     <?php endif; ?>
     <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
     <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
-    <?php endif; ?>
-    -->
+    <?php endif; */ ?>
 </tr>
 <?php endforeach; ?>
-
 <?php if ($_showlastRow): ?>
-<tr class="border">
-    <td>
+<tr>
+    <td class="col options" colspan="5">
         <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
+            <dl class="item options">
+                <?php foreach ($_options as $_option) : ?>
+                    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                    <?php if (!$this->getPrintStatus()): ?>
+                        <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
+                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                <div class="truncated_full_value">
+                                    <dl class="item options">
+                                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                    </dl>
+                                </div>
+                            <?php endif; ?>
+                        </dd>
+                    <?php else: ?>
+                        <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
                     <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+                <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId()?>"><?php echo __('Gift Message') ?></a>
+            <a href="#"
+               id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+               class="action show"
+               aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+               data-item-id="<?php echo $parentItem->getId()?>">
+                <?php echo __('Gift Message') ?>
+            </a>
         <?php endif; ?>
     </td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml
index 11d3d9abee340e20f5ef93774d01eb451e8ef2e7..0abef02f0604755c8c1e7bf48fb690d48e19cbf1 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -34,78 +32,82 @@
 
 <?php foreach ($items as $_item): ?>
 
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr>
-        <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
-    <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
-    <?php if (!$_item->getParentItem()): ?>
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
+    <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+        <?php $_showlastRow = true ?>
     <?php else: ?>
-    <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
+        <?php $_showlastRow = false ?>
     <?php endif; ?>
-    <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
-    <td class="a-center">
-        <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
-            <?php if (isset($shipItems[$_item->getId()])): ?>
-                <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
-            <?php elseif ($_item->getIsVirtual()): ?>
-                <?php echo __('N/A') ?>
-            <?php else: ?>
-                0
-            <?php endif; ?>
+
+    <?php if ($_item->getParentItem()): ?>
+        <?php $attributes = $this->getSelectionAttributes($_item) ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+            <tr>
+                <td colspan="3" class="col label"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+            </tr>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
+        <?php endif; ?>
+    <?php endif; ?>
+    <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
+        <?php if (!$_item->getParentItem()): ?>
+            <td class="col name">
+                <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+            </td>
         <?php else: ?>
-        &nbsp;
+            <td class="col value"><?php echo $this->getValueHtml($_item) ?></td>
         <?php endif; ?>
-    </td>
-</tr>
+        <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
+        <td class="col price">
+            <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
+                <?php if (isset($shipItems[$_item->getId()])): ?>
+                    <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
+                <?php elseif ($_item->getIsVirtual()): ?>
+                    <?php echo __('N/A') ?>
+                <?php else: ?>
+                    0
+                <?php endif; ?>
+            <?php else: ?>
+                &nbsp;
+            <?php endif; ?>
+        </td>
+    </tr>
 <?php endforeach; ?>
 
 <?php if ($_showlastRow): ?>
-<tr class="border">
-    <td>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+    <tr>
+        <td class="col options" colspan="3">
+            <?php if($_options = $this->getItemOptions()): ?>
+                <dl class="item options">
+                    <?php foreach ($_options as $_option) : ?>
+                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                        <?php if (!$this->getPrintStatus()): ?>
+                            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
+                                <?php echo $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                    <div class="truncated_full_value">
+                                        <dl class="item options">
+                                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                        </dl>
+                                    </div>
+                                <?php endif; ?>
+                            </dd>
+                        <?php else: ?>
+                            <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+                </dl>
             <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-</tr>
+            <?php echo $this->escapeHtml($_item->getDescription()) ?>
+            <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+                <a href="#"
+                   id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+                   class="action show"
+                   aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+                   data-item-id="<?php echo $parentItem->getId() ?>">
+                    <?php echo __('Gift Message') ?>
+                </a>
+            <?php endif; ?>
+        </td>
+    </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
new file mode 100644
index 0000000000000000000000000000000000000000..74b0d87dc935f4d67e9b4b1583efe6450651ff75
--- /dev/null
+++ b/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Captcha
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Captcha block for adminhtml area
+ *
+ * @category   Core
+ * @package    Magento_Captcha
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+namespace Magento\Captcha\Block\Adminhtml\Captcha;
+
+class DefaultCaptcha extends \Magento\Captcha\Block\Captcha\DefaultCaptcha
+{
+    /**
+     * @var \Magento\Backend\Model\Url
+     */
+    protected $_url;
+
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_config;
+
+    /**
+     * @param \Magento\View\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Captcha\Helper\Data $captchaData
+     * @param \Magento\Backend\Model\Url $url
+     * @param \Magento\Backend\App\ConfigInterface $config
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\View\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Captcha\Helper\Data $captchaData,
+        \Magento\Backend\Model\Url $url,
+        \Magento\Backend\App\ConfigInterface $config,
+        array $data = array()
+    ) {
+        parent::__construct($context, $coreData, $captchaData, $data);
+        $this->_url = $url;
+        $this->_config = $config;
+    }
+
+
+    /**
+     * Returns URL to controller action which returns new captcha image
+     *
+     * @return string
+     */
+    public function getRefreshUrl()
+    {
+        return $this->_url->getUrl('adminhtml/refresh/refresh', array(
+            '_secure' => $this->_config->getFlag('web/secure/use_in_adminhtml'),
+            '_nosecret' => true
+        ));
+    }
+}
diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
index d351063c5d9386c02ba865200376aded8b07076e..824eded230ea714eace71a2f495b0a9d9ec4bd42 100644
--- a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
+++ b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
@@ -80,15 +80,8 @@ class DefaultCaptcha extends \Magento\View\Block\Template
      */
     public function getRefreshUrl()
     {
-        $urlPath = 'captcha/refresh';
-        $params = array('_secure' => $this->_storeManager->getStore()->isCurrentlySecure());
-
-        if ($this->_storeManager->getStore()->isAdmin()) {
-            $urlPath = 'adminhtml/refresh/refresh';
-            $params = array_merge($params, array('_nosecret' => true));
-        }
-
-        return $this->_storeManager->getStore()->getUrl($urlPath, $params);
+        $store = $this->_storeManager->getStore();
+        return $store->getUrl('captcha/refresh', array('_secure' => $store->isCurrentlySecure()));
     }
 
     /**
diff --git a/app/code/Magento/Captcha/Helper/Adminhtml/Data.php b/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa81278fd7c735df3fa50f47437fba894d505fa2
--- /dev/null
+++ b/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Captcha
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Captcha helper for adminhtml area
+ *
+ * @category   Magento
+ * @package    Magento_Captcha
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+namespace Magento\Captcha\Helper\Adminhtml;
+
+class Data extends \Magento\Captcha\Helper\Data
+{
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
+
+    /**
+     * @param \Magento\App\Helper\Context $context
+     * @param \Magento\App\Dir $dirs
+     * @param \Magento\Core\Model\StoreManager $storeManager
+     * @param \Magento\Core\Model\Config $config
+     * @param \Magento\Filesystem $filesystem
+     * @param \Magento\Captcha\Model\CaptchaFactory $factory
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
+     */
+    public function __construct(
+        \Magento\App\Helper\Context $context,
+        \Magento\App\Dir $dirs,
+        \Magento\Core\Model\StoreManager $storeManager,
+        \Magento\Core\Model\Config $config,
+        \Magento\Filesystem $filesystem,
+        \Magento\Captcha\Model\CaptchaFactory $factory,
+        \Magento\Backend\App\ConfigInterface $backendConfig
+    ) {
+        $this->_backendConfig = $backendConfig;
+        parent::__construct($context, $dirs, $storeManager, $config, $filesystem, $factory);
+    }
+
+
+    /**
+     * Returns config value for admin captcha
+     *
+     * @param string $key The last part of XML_PATH_$area_CAPTCHA_ constant (case insensitive)
+     * @param \Magento\Core\Model\Store $store
+     * @return \Magento\Core\Model\Config\Element
+     */
+    public function getConfig($key, $store = null)
+    {
+        return $this->_backendConfig->getValue('admin/captcha/' . $key);
+    }
+
+    /**
+     * Get website code
+     *
+     * @param mixed $website
+     * @return string
+     */
+    protected function _getWebsiteCode($website = null)
+    {
+        return 'admin';
+    }
+}
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index 5c0e6ddaa007543d64dbb242f7b0a31731b412ff..21d0ccb1d70e57cfb1966c9783e0e1ddcee1ee16 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -24,15 +24,11 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Captcha\Helper;
+
 /**
  * Captcha image model
- *
- * @category   Magento
- * @package    Magento_Captcha
- * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Captcha\Helper;
-
 class Data extends \Magento\App\Helper\AbstractHelper
 {
     /**
@@ -146,9 +142,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
      */
     public function getConfig($key, $store = null)
     {
-        $store = $this->_storeManager->getStore($store);
-        $areaCode = $store->isAdmin() ? 'admin' : 'customer';
-        return $store->getConfig($areaCode . '/captcha/' . $key);
+        return $this->_storeManager->getStore($store)->getConfig('customer/captcha/' . $key);
     }
 
     /**
@@ -184,13 +178,24 @@ class Data extends \Magento\App\Helper\AbstractHelper
     public function getImgDir($website = null)
     {
         $mediaDir =  $this->_dirs->getDir(\Magento\App\Dir::MEDIA);
-        $captchaDir = $mediaDir . '/captcha/' . $this->_storeManager->getWebsite($website)->getCode();
+        $captchaDir = $mediaDir . '/captcha/' . $this->_getWebsiteCode($website);
         $this->_filesystem->setWorkingDirectory($mediaDir);
         $this->_filesystem->setIsAllowCreateDirectories(true);
         $this->_filesystem->ensureDirectoryExists($captchaDir, 0775);
         return $captchaDir . '/';
     }
 
+    /**
+     * Get website code
+     *
+     * @param mixed $website
+     * @return string
+     */
+    protected function _getWebsiteCode($website = null)
+    {
+        return $this->_storeManager->getWebsite($website)->getCode();
+    }
+
     /**
      * Get captcha image base URL
      *
diff --git a/app/code/Magento/Captcha/Model/Cron.php b/app/code/Magento/Captcha/Model/Cron.php
new file mode 100644
index 0000000000000000000000000000000000000000..5efbe7caa5c1a7444c5577c22fe3acc4e000595c
--- /dev/null
+++ b/app/code/Magento/Captcha/Model/Cron.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Captcha
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Captcha\Model;
+
+/**
+ * Captcha cron actions
+ */
+class Cron
+{
+    /**
+     * CAPTCHA helper
+     *
+     * @var \Magento\Captcha\Helper\Data
+     */
+    protected $_helper;
+
+    /**
+     * CAPTCHA helper
+     *
+     * @var \Magento\Captcha\Helper\Adminhtml\Data
+     */
+    protected $_adminHelper;
+
+    /**
+     * @var \Magento\Filesystem
+     */
+    protected $_filesystem;
+
+    /**
+     * @var \Magento\Core\Model\StoreManager
+     */
+    protected $_storeManager;
+
+    /**
+     * @var \Magento\Captcha\Model\Resource\LogFactory
+     */
+    protected $_resLogFactory;
+
+    /**
+     * @param Resource\LogFactory $resLogFactory
+     * @param \Magento\Captcha\Helper\Data $helper
+     * @param \Magento\Captcha\Helper\Adminhtml\Data $adminHelper
+     * @param \Magento\Filesystem $filesystem
+     * @param \Magento\Core\Model\StoreManager $storeManager
+     */
+    public function __construct(
+        \Magento\Captcha\Model\Resource\LogFactory $resLogFactory,
+        \Magento\Captcha\Helper\Data $helper,
+        \Magento\Captcha\Helper\Adminhtml\Data $adminHelper,
+        \Magento\Filesystem $filesystem,
+        \Magento\Core\Model\StoreManager $storeManager
+    ) {
+        $this->_resLogFactory = $resLogFactory;
+        $this->_helper = $helper;
+        $this->_adminHelper = $adminHelper;
+        $this->_filesystem = $filesystem;
+        $this->_storeManager = $storeManager;
+    }
+
+    /**
+     * Delete Unnecessary logged attempts
+     *
+     * @return \Magento\Captcha\Model\Observer
+     */
+    public function deleteOldAttempts()
+    {
+        $this->_getResourceModel()->deleteOldAttempts();
+        return $this;
+    }
+
+    /**
+     * Delete Expired Captcha Images
+     *
+     * @return \Magento\Captcha\Model\Observer
+     */
+    public function deleteExpiredImages()
+    {
+        foreach ($this->_storeManager->getWebsites() as $website) {
+            $this->_deleteExpiredImagesForWebsite($this->_helper, $website, $website->getDefaultStore());
+        }
+        $this->_deleteExpiredImagesForWebsite($this->_adminHelper);
+        return $this;
+    }
+
+    /**
+     * Delete Expired Captcha Images for specific website
+     *
+     * @param \Magento\Captcha\Helper\Data $helper
+     * @param \Magento\Core\Model\Website|null $website
+     * @param \Magento\Core\Model\Store|null $store
+     * @return \Magento\Captcha\Model\Observer
+     */
+    protected function _deleteExpiredImagesForWebsite(
+        \Magento\Captcha\Helper\Data $helper,
+        \Magento\Core\Model\Website $website = null,
+        \Magento\Core\Model\Store $store = null
+    ) {
+        $expire = time() - $helper->getConfig('timeout', $store) * 60;
+        $imageDirectory = $helper->getImgDir($website);
+        foreach ($this->_filesystem->getNestedKeys($imageDirectory) as $filePath) {
+            if ($this->_filesystem->isFile($filePath)
+                && pathinfo($filePath, PATHINFO_EXTENSION) == 'png'
+                && $this->_filesystem->getMTime($filePath) < $expire) {
+                $this->_filesystem->delete($filePath);
+            }
+        }
+    }
+
+    /**
+     * Get resource model
+     *
+     * @return \Magento\Captcha\Model\Resource\Log
+     */
+    protected function _getResourceModel()
+    {
+        return $this->_resLogFactory->create();
+    }
+
+}
+
diff --git a/app/code/Magento/Captcha/Model/Observer.php b/app/code/Magento/Captcha/Model/Observer.php
index 28c0ece35a832fb38045f4b106162264d38dddec..d08a7782c92c64695c917ff2cc27f5ecab756c19 100644
--- a/app/code/Magento/Captcha/Model/Observer.php
+++ b/app/code/Magento/Captcha/Model/Observer.php
@@ -49,11 +49,6 @@ class Observer
      */
     protected $_urlManager;
 
-    /**
-     * @var \Magento\Filesystem
-     */
-    protected $_filesystem;
-
     /**
      * Customer data
      *
@@ -73,11 +68,6 @@ class Observer
      */
     protected $_request;
 
-    /**
-     * @var \Magento\Core\Model\StoreManagerInterface
-     */
-    protected $_storeManager;
-
     /**
      * @var \Magento\Checkout\Model\Type\Onepage
      */
@@ -106,9 +96,7 @@ class Observer
      * @param \Magento\Customer\Helper\Data $customerData
      * @param \Magento\Captcha\Helper\Data $helper
      * @param \Magento\Core\Model\Url $urlManager
-     * @param \Magento\Filesystem $filesystem
      * @param \Magento\App\RequestInterface $request
-     * @param \Magento\Core\Model\StoreManagerInterface $storeManager
      * @param \Magento\App\ActionFlag $actionFlag
      */
     public function __construct(
@@ -119,9 +107,7 @@ class Observer
         \Magento\Customer\Helper\Data $customerData,
         \Magento\Captcha\Helper\Data $helper,
         \Magento\Core\Model\Url $urlManager,
-        \Magento\Filesystem $filesystem,
         \Magento\App\RequestInterface $request,
-        \Magento\Core\Model\StoreManagerInterface $storeManager,
         \Magento\App\ActionFlag $actionFlag
     ) {
         $this->_resLogFactory = $resLogFactory;
@@ -131,9 +117,7 @@ class Observer
         $this->_customerData = $customerData;
         $this->_helper = $helper;
         $this->_urlManager = $urlManager;
-        $this->_filesystem = $filesystem;
         $this->_request = $request;
-        $this->_storeManager = $storeManager;
         $this->_actionFlag = $actionFlag;
     }
 
@@ -354,38 +338,6 @@ class Observer
         );
     }
 
-    /**
-     * Delete Unnecessary logged attempts
-     *
-     * @return \Magento\Captcha\Model\Observer
-     */
-    public function deleteOldAttempts()
-    {
-        $this->_getResourceModel()->deleteOldAttempts();
-        return $this;
-    }
-
-    /**
-     * Delete Expired Captcha Images
-     *
-     * @return \Magento\Captcha\Model\Observer
-     */
-    public function deleteExpiredImages()
-    {
-        foreach ($this->_storeManager->getWebsites(true) as $website) {
-            $expire = time() - $this->_helper->getConfig('timeout', $website->getDefaultStore()) * 60;
-            $imageDirectory = $this->_helper->getImgDir($website);
-            foreach ($this->_filesystem->getNestedKeys($imageDirectory) as $filePath) {
-                if ($this->_filesystem->isFile($filePath)
-                    && pathinfo($filePath, PATHINFO_EXTENSION) == 'png'
-                    && $this->_filesystem->getMTime($filePath) < $expire) {
-                    $this->_filesystem->delete($filePath);
-                }
-            }
-        }
-        return $this;
-    }
-
     /**
      * Get Captcha String
      *
diff --git a/app/code/Magento/Captcha/etc/adminhtml/di.xml b/app/code/Magento/Captcha/etc/adminhtml/di.xml
index 4194bf6a1071fb653fe3dda67df0c9b5ed81ddff..cccf21421cdfdea39c5697a4118e8feb223ac998 100644
--- a/app/code/Magento/Captcha/etc/adminhtml/di.xml
+++ b/app/code/Magento/Captcha/etc/adminhtml/di.xml
@@ -24,10 +24,14 @@
  */
 -->
 <config>
+    <preference for="Magento\Captcha\Block\Captcha\DefaultCaptcha" type="Magento\Captcha\Block\Adminhtml\Captcha\DefaultCaptcha" />
     <type name="Magento\Captcha\Model\DefaultModel">
         <param name="session">
             <instance type="Magento\Backend\Model\Auth\Session" />
         </param>
+        <param name="captchaData">
+            <instance type="Magento\Captcha\Helper\Adminhtml\Data" />
+        </param>
     </type>
     <type name="Magento\Captcha\Model\Observer">
         <param name="session">
diff --git a/app/code/Magento/Captcha/etc/crontab.xml b/app/code/Magento/Captcha/etc/crontab.xml
index c12fd479f862bf5eb4879cd70909fe0bfe87803b..7f8ec305440131a5ce0089d4c59384c840b827b6 100644
--- a/app/code/Magento/Captcha/etc/crontab.xml
+++ b/app/code/Magento/Captcha/etc/crontab.xml
@@ -24,10 +24,10 @@
  */
 -->
 <config>
-    <job name="captcha_delete_old_attempts" instance="Magento\Captcha\Model\Observer" method="deleteOldAttempts">
+    <job name="captcha_delete_old_attempts" instance="Magento\Captcha\Model\Cron" method="deleteOldAttempts">
         <schedule>*/30 * * * *</schedule>
     </job>
-    <job name="captcha_delete_expired_images" instance="Magento\Captcha\Model\Observer" method="deleteExpiredImages">
+    <job name="captcha_delete_expired_images" instance="Magento\Captcha\Model\Cron" method="deleteExpiredImages">
         <schedule>*/10 * * * *</schedule>
     </job>
 </config>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/tag_product_list.xml b/app/code/Magento/Captcha/etc/crontab/di.xml
similarity index 89%
rename from app/code/Magento/Catalog/view/frontend/layout/tag_product_list.xml
rename to app/code/Magento/Captcha/etc/crontab/di.xml
index 2c2e829daa8ec0998d3eeb68050fccc9897db2b8..c538e5dbf4ae5d69a4d9ef93e074c593bf6813be 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/tag_product_list.xml
+++ b/app/code/Magento/Captcha/etc/crontab/di.xml
@@ -23,6 +23,6 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="MAP_popup"/>
-</layout>
+<config>
+    <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
+</config>
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 8d50e246bb59bdcfb366d5da216bda61c9410d80..28883bd87f7afc3a8ec3c5ddda20a69251362061 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -116,14 +116,14 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
         $this->setChild('store_switcher',
             $this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
                 ->setSwitchUrl($this->getUrl('catalog/*/*', array('_current'=>true, '_query'=>false, 'store'=>null)))
-                ->setTemplate('Magento_Adminhtml::store/switcher/enhanced.phtml')
+                ->setTemplate('Magento_Backend::store/switcher/enhanced.phtml')
         );
         return parent::_prepareLayout();
     }
 
     protected function _getDefaultStoreId()
     {
-        return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+        return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
     }
 
     public function getCategoryCollection()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
index 00c110727480c0f344dd68defde264c6f359185e..95d8fb7364d2e710c14b866b6f804224fba79797 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -183,6 +183,6 @@ class Element
      */
     protected function _getDefaultStoreId()
     {
-        return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+        return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
index dc181e2577447f179ab1c17197ecd4f2ab44f8f5..d4c7b7c8b72b746d6dd46017f177008c3e88c570 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -34,8 +34,7 @@
 
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
-class Front
-    extends \Magento\Backend\Block\Widget\Form\Generic
+class Front extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
      * @var \Magento\Backend\Model\Config\Source\Yesno
@@ -152,7 +151,7 @@ class Front
             'values' => $yesnoSource,
         ));
 
-        $htmlAllowed = $fieldset->addField('is_html_allowed_on_front', 'select', array(
+        $fieldset->addField('is_html_allowed_on_front', 'select', array(
             'name' => 'is_html_allowed_on_front',
             'label' => __('Allow HTML Tags on Frontend'),
             'title' => __('Allow HTML Tags on Frontend'),
@@ -185,6 +184,11 @@ class Front
             'values'    => $yesnoSource,
         ));
 
+        $this->_eventManager->dispatch('adminhtml_catalog_product_attribute_edit_frontend_prepare_form', array(
+            'form'      => $form,
+            'attribute' => $attributeObject
+        ));
+
         // define field dependencies
         $this->setChild(
             'form_after',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
index 8c3de01c977584a1f5d5181a6b65b41150eb9ccd..15c121b74050edabc9b624fad5575c5fbaa549e6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -102,12 +102,6 @@ class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
         $frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);
         $frontendInputElm->setValues($frontendInputValues);
 
-
-        $this->_eventManager->dispatch('adminhtml_catalog_product_attribute_edit_prepare_form', array(
-            'form'      => $form,
-            'attribute' => $attributeObject
-        ));
-
         return $this;
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
index 9ecdea2660273705c1b3f1e98feb97f50db868a4..29cf7ab00132a663d41b273d0bff68bfcbe6cdbc 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
@@ -32,7 +32,7 @@
 
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree;
 
-class Attribute extends \Magento\Adminhtml\Block\Template
+class Attribute extends \Magento\Backend\Block\Template
 {
     protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
index 44e900b8a8a0b4598531a8b2808a588c6b8983bf..13dc46ea63c85c1960a43aa3a01024264682710f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
@@ -32,7 +32,7 @@
 
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree;
 
-class Group extends \Magento\Adminhtml\Block\Template
+class Group extends \Magento\Backend\Block\Template
 {
     protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index 26b253143b700a8d11b5710f0ac3401125e68339..9fb3987400dad567e99a9cc4cbdca9063c9d1026 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar;
 
-class Add extends \Magento\Adminhtml\Block\Template
+class Add extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
index 763b599c103f42d2088ee509b13f8c3b6b68d452..e51457eb6bd49678503ab2574306b658b66503e9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -63,7 +63,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\Type\Configurable
     }
 
     /**
-     * Returns additional values for js config, con be overriden by descedants
+     * Returns additional values for js config, con be overridden by descendants
      *
      * @return array
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index bbf5f15c66d969736cb6b29b360e0bb1c8fed466..3de2bf5166f599fef70b038237ab4727fa64ace8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -43,22 +43,22 @@ class Attributes
      */
     protected $_productFactory;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Core\Model\Registry $registry
-     * @param \Magento\Data\FormFactory $formFactory
-     * @param \Magento\Catalog\Model\ProductFactory $productFactory
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Core\Model\Registry $registry
+     * @param \Magento\Data\FormFactory $formFactory
+     * @param \Magento\Catalog\Model\ProductFactory $productFactory
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Core\Model\Registry $registry,
-        \Magento\Data\FormFactory $formFactory,
-        \Magento\Catalog\Model\ProductFactory $productFactory,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Core\Model\Registry $registry,
+        \Magento\Data\FormFactory $formFactory,
+        \Magento\Catalog\Model\ProductFactory $productFactory,
+        array $data = array()
+    ) {
         $this->_productFactory = $productFactory;
         parent::__construct($context, $coreData, $registry, $formFactory, $data);
     }
@@ -102,7 +102,7 @@ class Attributes
     }
 
     /**
-     * Retrive attributes for product massupdate
+     * Retrieve attributes for product mass update
      *
      * @return array
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
index f18d195891e5b56add094c4a3d985dc0112ae27a..f3d3f7663dedb12cd77be02b5266ffb2ca591e91 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
@@ -26,7 +26,7 @@
 
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
 
-class Js extends \Magento\Adminhtml\Block\Template
+class Js extends \Magento\Backend\Block\Template
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 2e51f42b828cc35cf9d7651f470f40abd78aa678..56c85c439834caeabeeb6bc2191bbb32e912459e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -35,7 +35,7 @@
 
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
 
-class Alerts extends \Magento\Adminhtml\Block\Template
+class Alerts extends \Magento\Backend\Block\Template
 {
     protected $_template = 'catalog/product/tab/alert.phtml';
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
index 53e6149c75eab3b06fe0a8bc565f97aee8bac5bf..0a0dc3976f941c249a7dba2bac7cd05fbbfefe85 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
@@ -43,7 +43,7 @@ class Create extends \Magento\Backend\Block\Widget\Button
     protected $_config = null;
 
     /**
-     * Retrive config of new attribute creation
+     * Retrieve config of new attribute creation
      *
      * @return \Magento\Object
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 288e9b821639713ac8d6b66b235e06061d170be2..a5cdc6b1e0eded8c76024967e7f2504742a65a81 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -66,26 +66,26 @@ class Option extends \Magento\Adminhtml\Block\Widget
      */
     protected $_optionType;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Backend\Model\Config\Source\Yesno $configYesNo
-     * @param \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType
-     * @param \Magento\Catalog\Model\Product $product
-     * @param \Magento\Core\Model\Registry $registry
-     * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Backend\Model\Config\Source\Yesno $configYesNo
+     * @param \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType
+     * @param \Magento\Catalog\Model\Product $product
+     * @param \Magento\Core\Model\Registry $registry
+     * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Backend\Model\Config\Source\Yesno $configYesNo,
-        \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType,
-        \Magento\Catalog\Model\Product $product,
-        \Magento\Core\Model\Registry $registry,
-        \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Backend\Model\Config\Source\Yesno $configYesNo,
+        \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType,
+        \Magento\Catalog\Model\Product $product,
+        \Magento\Core\Model\Registry $registry,
+        \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
+        array $data = array()
+    ) {
         $this->_optionType = $optionType;
         $this->_configYesNo = $configYesNo;
         $this->_product = $product;
@@ -190,7 +190,7 @@ class Option extends \Magento\Adminhtml\Block\Widget
 
     public function getTypeSelectHtml()
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setData(array(
                 'id'    => $this->getFieldId() . '_${id}_type',
                 'class' => 'select select-product-option-type required-option-select',
@@ -203,7 +203,7 @@ class Option extends \Magento\Adminhtml\Block\Widget
 
     public function getRequireSelectHtml()
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setData(array(
                 'id'    => $this->getFieldId() . '_${id}_is_require',
                 'class' => 'select'
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
index 7d0065a0ac285a993ac5b2d93165a0ae78b1b385..2b8f3ffacfa92797185b9ea460f830942caefb34 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
@@ -43,18 +43,18 @@ class AbstractType extends \Magento\Adminhtml\Block\Widget
      */
     protected $_optionPrice;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice,
+        array $data = array()
+    ) {
         $this->_optionPrice = $optionPrice;
         parent::__construct($context, $coreData, $data);
     }
@@ -63,7 +63,7 @@ class AbstractType extends \Magento\Adminhtml\Block\Widget
     {
         $this->setChild('option_price_type',
             $this->getLayout()
-                ->addBlock('Magento\Adminhtml\Block\Html\Select',
+                ->addBlock('Magento\View\Block\Html\Select',
                     $this->getNameInLayout() . '.option_price_type',
                     $this->getNameInLayout())
                 ->setData(array(
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
index e2e16feddf42001d3675256a30bb107b1d2c58c8..07148b2b7a8173226c6be72599adf1527b214d81 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
 
-class Reviews extends \Magento\Adminhtml\Block\Review\Grid
+class Reviews extends \Magento\Review\Block\Adminhtml\Grid
 {
     /**
      * Hide grid mass action elements
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
index 306e7bff497931b9b80ac4f0e7ea1b9fd0c38447..9b1a54e2c4aa782f49f4afecffb0a45fda3919b1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
@@ -145,7 +145,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
         }
         if ($store->getId()) {
             //$collection->setStoreId($store->getId());
-            $adminStore = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
             $collection->addStoreFilter($store);
             $collection->joinAttribute(
                 'name',
@@ -153,7 +152,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
                 'entity_id',
                 null,
                 'inner',
-                $adminStore
+                \Magento\Core\Model\Store::DEFAULT_STORE_ID
             );
             $collection->joinAttribute(
                 'custom_name',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index 98e85e6076ef8ec78855118511914c49174ce1a3..fba2da65e8a24bcd53d4d14b4c6044da53696948 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -214,6 +214,6 @@ class Gallery extends \Magento\Data\Form\Element\AbstractElement
      */
     protected function _getDefaultStoreId()
     {
-        return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+        return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 51c2f9046c1e06e6e0dd29d4e79247c288d0e0ca..22a576cc5aba082dab2635fc3b5d0f6714623eaf 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -45,25 +45,25 @@ class Content extends \Magento\Backend\Block\Widget
      */
     protected $_mediaConfig;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
+        array $data = array()
+    ) {
         $this->_mediaConfig = $mediaConfig;
         parent::__construct($context, $coreData, $data);
     }
 
     protected function _prepareLayout()
     {
-        $this->addChild('uploader', 'Magento\Adminhtml\Block\Media\Uploader');
+        $this->addChild('uploader', 'Magento\Backend\Block\Media\Uploader');
 
         $this->getUploader()->getConfig()
             ->setUrl(
@@ -85,9 +85,9 @@ class Content extends \Magento\Backend\Block\Widget
 
 
     /**
-     * Retrive uploader block
+     * Retrieve uploader block
      *
-     * @return \Magento\Adminhtml\Block\Media\Uploader
+     * @return \Magento\Backend\Block\Media\Uploader
      */
     public function getUploader()
     {
@@ -95,7 +95,7 @@ class Content extends \Magento\Backend\Block\Widget
     }
 
     /**
-     * Retrive uploader block html
+     * Retrieve uploader block html
      *
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
index 100c31670a979183948630eba77d798d34b058fa..3fad613ceb7797186b0f4a0705c159db9dfd5a5e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser;
 
-class Container extends \Magento\Adminhtml\Block\Template
+class Container extends \Magento\Backend\Block\Template
 {
     protected $_template = 'catalog/product/widget/chooser/container.phtml';
 }
diff --git a/app/code/Magento/Catalog/Block/Navigation.php b/app/code/Magento/Catalog/Block/Navigation.php
index 1554da667a327284cba3031f5867509b213f38e7..498610ecbee77d7df7250cd1d731d562cbfa56c8 100644
--- a/app/code/Magento/Catalog/Block/Navigation.php
+++ b/app/code/Magento/Catalog/Block/Navigation.php
@@ -299,8 +299,7 @@ class Navigation extends \Magento\View\Block\Template
         $html = array();
 
         // get all children
-        // If Flat Data enabled then use it but only on frontend
-        if ($this->_catalogCategoryFlat->isAvailable() && !$this->_storeManager->getStore()->isAdmin()) {
+        if ($this->_catalogCategoryFlat->isAvailable()) {
             $children = (array)$category->getChildrenNodes();
             $childrenCount = count($children);
         } else {
diff --git a/app/code/Magento/Catalog/Block/Product/Gallery.php b/app/code/Magento/Catalog/Block/Product/Gallery.php
index 077d15f1f874bc917c52032168852e5ef8f215ce..9fe9ff3dfdb85e64df864a06deb2d54b5ee37884 100644
--- a/app/code/Magento/Catalog/Block/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/Gallery.php
@@ -123,20 +123,20 @@ class Gallery extends \Magento\View\Block\Template
         return false;
     }
 
-    public function getPreviusImage()
+    public function getPreviousImage()
     {
         $current = $this->getCurrentImage();
         if (!$current) {
             return false;
         }
-        $previus = false;
+        $previous = false;
         foreach ($this->getGalleryCollection() as $image) {
             if ($image->getValueId() == $current->getValueId()) {
-                return $previus;
+                return $previous;
             }
-            $previus = $image;
+            $previous = $image;
         }
-        return $previus;
+        return $previous;
     }
 
     public function getNextImage()
@@ -159,9 +159,9 @@ class Gallery extends \Magento\View\Block\Template
         return $next;
     }
 
-    public function getPreviusImageUrl()
+    public function getPreviousImageUrl()
     {
-        $image = $this->getPreviusImage();
+        $image = $this->getPreviousImage();
         if ($image) {
             return $this->getUrl('*/*/*', array('_current' => true, 'image' => $image->getValueId()));
         }
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index b5c72df453abea0754f50307a7f5077780269c05..fc4d9afec88dc4f0ae7e8084b2b71bef981fddb3 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -597,7 +597,7 @@ class Toolbar extends \Magento\View\Block\Template
     }
 
     /**
-     * Retrive URL for view mode
+     * Retrieve URL for view mode
      *
      * @param string $mode
      * @return string
diff --git a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
index 0d684a721a8a36536da85c74c60b14592bbf4593..7488844c9e00fa6cb3437581d147d26e6e39e784 100644
--- a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
+++ b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
@@ -68,7 +68,7 @@ abstract class AbstractView extends \Magento\Catalog\Block\Product\AbstractProdu
 
 
     /**
-     * Retrive product
+     * Retrieve product
      *
      * @return \Magento\Catalog\Model\Product
      */
diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php b/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php
index eaab4c369e2f1072bd0b872981043372a4c0643b..592f722cd2a0d4abea94c8b30974ed74887863dc 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php
@@ -160,7 +160,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
     }
 
     /**
-     * Returns additional values for js config, con be overriden by descedants
+     * Returns additional values for js config, con be overridden by descendants
      *
      * @return array
      */
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
index 4ac2ac629160541367baf4b40bc1fdd9a0206f48..510b8883b4f3e2f5f1b14771ce3acc296c9b4f41 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
@@ -193,7 +193,7 @@ class Product extends \Magento\Backend\App\Action
     protected function _outputBlocks()
     {
         $blocks = func_get_args();
-        $output = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Text\ListText');
+        $output = $this->_view->getLayout()->createBlock('Magento\Backend\Block\Text\ListText');
         foreach ($blocks as $block) {
             $output->insert($block, '', true);
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index eb937b0f854865b929f86c337a2cc479be068142..d33d51f6798bd2fe4716ae8ade4550e78165c24a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -195,7 +195,7 @@ class Attribute extends \Magento\Backend\App\Action
     }
 
     /**
-     * Validate selection of products for massupdate
+     * Validate selection of products for mass update
      *
      * @return boolean
      */
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
index 3118f6faf97162353193e67ba0789e6bf47eaf98..fa36b4dc8e69a540c2da31a7d5bd95fe306fca5b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
@@ -247,7 +247,7 @@ class Attribute extends \Magento\Backend\App\Action
             if (!empty($data['new_attribute_set_name'])) {
                 /** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
                 $attributeSet = $this->_objectManager->create('Magento\Eav\Model\Entity\Attribute\Set');
-                $name = $this->_objectManager->get('Magento\Adminhtml\Helper\Data')
+                $name = $this->_objectManager->get('Magento\Backend\Helper\Data')
                     ->stripTags($data['new_attribute_set_name']);
                 $name = trim($name);
                 $attributeSet->setEntityTypeId($this->_entityTypeId)
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
index 805a9fc234016221bc392cb9df69b4ba6b943072..f48ec1dbdf4db8e219bbf05aca042c272c4da670 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
@@ -70,7 +70,7 @@ class Review extends \Magento\Backend\App\Action
         $this->_view->loadLayout();
         $this->_setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
 
-        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Main'));
+        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Main'));
 
         $this->_view->renderLayout();
     }
@@ -89,7 +89,7 @@ class Review extends \Magento\Backend\App\Action
         $this->_view->loadLayout();
 
         $this->_coreRegistry->register('usePendingFilter', true);
-        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Main'));
+        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Main'));
 
         $this->_view->renderLayout();
     }
@@ -103,7 +103,7 @@ class Review extends \Magento\Backend\App\Action
         $this->_view->loadLayout();
         $this->_setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
 
-        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Edit'));
+        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Edit'));
 
         $this->_view->renderLayout();
     }
@@ -119,8 +119,8 @@ class Review extends \Magento\Backend\App\Action
 
         $this->_view->getLayout()->getBlock('head')->setCanLoadExtJs(true);
 
-        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Add'));
-        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Product\Grid'));
+        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Add'));
+        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Product\Grid'));
 
         $this->_view->renderLayout();
     }
@@ -292,14 +292,14 @@ class Review extends \Magento\Backend\App\Action
     public function productGridAction()
     {
         $this->getResponse()->setBody(
-            $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Product\Grid')->toHtml()
+            $this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Product\Grid')->toHtml()
         );
     }
 
     public function reviewGridAction()
     {
         $this->getResponse()->setBody(
-            $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Grid')->toHtml()
+            $this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Grid')->toHtml()
         );
     }
 
@@ -380,7 +380,7 @@ class Review extends \Magento\Backend\App\Action
     {
         $this->getResponse()->setBody(
             $this->_view->getLayout()
-                ->createBlock('Magento\Adminhtml\Block\Review\Rating\Detailed')
+                ->createBlock('Magento\Review\Block\Adminhtml\Rating\Detailed')
                 ->setIndependentMode()
                 ->toHtml()
         );
diff --git a/app/code/Magento/Catalog/Helper/Category/Flat.php b/app/code/Magento/Catalog/Helper/Category/Flat.php
index d73c9ec0d2095dc58e0fd465a6ca40aa647dca2f..e9bf476282974ae85c9fa5eec5d45e8e6363d15f 100644
--- a/app/code/Magento/Catalog/Helper/Category/Flat.php
+++ b/app/code/Magento/Catalog/Helper/Category/Flat.php
@@ -76,20 +76,22 @@ class Flat extends \Magento\Catalog\Helper\Flat\AbstractFlat
     /**
      * Construct
      *
+     * @param \Magento\App\Helper\Context $context
      * @param \Magento\Index\Model\ProcessFactory $processFactory
      * @param \Magento\Catalog\Model\Resource\Category\Flat $catalogCategoryFlat
-     * @param \Magento\App\Helper\Context $context
      * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+     * @param bool $isAvailable
      */
     public function __construct(
+        \Magento\App\Helper\Context $context,
         \Magento\Index\Model\ProcessFactory $processFactory,
         \Magento\Catalog\Model\Resource\Category\Flat $catalogCategoryFlat,
-        \Magento\App\Helper\Context $context,
-        \Magento\Core\Model\Store\Config $coreStoreConfig
+        \Magento\Core\Model\Store\Config $coreStoreConfig,
+        $isAvailable = true
     ) {
         $this->_catalogCategoryFlat = $catalogCategoryFlat;
         $this->_coreStoreConfig = $coreStoreConfig;
-        parent::__construct($processFactory, $context);
+        parent::__construct($context, $processFactory, $isAvailable);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php b/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php
index a1256ab513cd4979bc998d329e80d4121030b070..336128512cc1bc73522ff5fc70f7d320a39ff557 100644
--- a/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php
+++ b/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php
@@ -72,17 +72,25 @@ abstract class AbstractFlat extends \Magento\App\Helper\AbstractHelper
      */
     protected $_processFactory;
 
+    /**
+     * @var bool
+     */
+    protected $_isAvailable;
+
     /**
      * Construct
      *
-     * @param \Magento\Index\Model\ProcessFactory $processFactory
      * @param \Magento\App\Helper\Context $context
+     * @param \Magento\Index\Model\ProcessFactory $processFactory
+     * @param bool $isAvailable
      */
     public function __construct(
+        \Magento\App\Helper\Context $context,
         \Magento\Index\Model\ProcessFactory $processFactory,
-        \Magento\App\Helper\Context $context
+        $isAvailable = true
     ) {
         $this->_processFactory = $processFactory;
+        $this->_isAvailable = $isAvailable;
         parent::__construct($context);
     }
 
@@ -93,7 +101,9 @@ abstract class AbstractFlat extends \Magento\App\Helper\AbstractHelper
      */
     public function isAvailable()
     {
-        return $this->isEnabled() && !$this->getProcess()->isLocked()
+        return $this->_isAvailable
+            && $this->isEnabled()
+            && !$this->getProcess()->isLocked()
             && $this->getProcess()->getStatus() != \Magento\Index\Model\Process::STATUS_RUNNING;
     }
 
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index a11835d619bd0d29e2301bbadc3ec20a78c707c8..701e437e155ee1183fa9b17e5364e81cbc8dd7b3 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -170,7 +170,7 @@ class Compare extends \Magento\Core\Helper\Url
     }
 
     /**
-     * Retrive add to wishlist url
+     * Retrieve add to wishlist url
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
@@ -188,7 +188,7 @@ class Compare extends \Magento\Core\Helper\Url
     }
 
     /**
-     * Retrive add to cart url
+     * Retrieve add to cart url
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return string
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index c7f2c748d53c01bd8e0fbd023b1ea33f01fc6c7b..7d4be6f61a58561ede3acaf70a011b5e5c90c3e1 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -141,7 +141,7 @@ class Attribute extends \Magento\Backend\Helper\Data
      */
     public function getSelectedStoreId()
     {
-        return (int)$this->_getRequest()->getParam('store', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+        return (int)$this->_getRequest()->getParam('store', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat.php b/app/code/Magento/Catalog/Helper/Product/Flat.php
index 41317bc6a3267c51e0072b92731e91363945c2c4..8b0b89fd28d45caeaa9fea0d9a0b6c30fafbd72b 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat.php
@@ -95,23 +95,25 @@ class Flat extends \Magento\Catalog\Helper\Flat\AbstractFlat
     /**
      * Construct
      *
-     * @param \Magento\Index\Model\ProcessFactory $processFactory
      * @param \Magento\App\Helper\Context $context
+     * @param \Magento\Index\Model\ProcessFactory $processFactory
      * @param \Magento\Core\Model\Store\Config $coreStoreConfig
      * @param \Magento\Catalog\Model\Product\Flat\Flag $flatFlag
      * @param $addFilterableAttrs
      * @param $addChildData
+     * @param $isAvailable
      */
     public function __construct(
-        \Magento\Index\Model\ProcessFactory $processFactory,
         \Magento\App\Helper\Context $context,
+        \Magento\Index\Model\ProcessFactory $processFactory,
         \Magento\Core\Model\Store\Config $coreStoreConfig,
         \Magento\Catalog\Model\Product\Flat\Flag $flatFlag,
         $addFilterableAttrs,
-        $addChildData
+        $addChildData,
+        $isAvailable = true
     ) {
         $this->_coreStoreConfig = $coreStoreConfig;
-        parent::__construct($processFactory, $context);
+        parent::__construct($context, $processFactory, $isAvailable);
         $this->_flagObject = $flatFlag->loadSelf();
         $this->_addFilterableAttrs = intval($addFilterableAttrs);
         $this->_addChildData = intval($addChildData);
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index d44f04ff2c8c9f8e50fd93a09981a17f1b331d00..83ad9af6702367b01ba8a37ba6932317b175018c 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -35,12 +35,6 @@ namespace Magento\Catalog\Model;
 
 abstract class AbstractModel extends \Magento\Core\Model\AbstractModel
 {
-    /**
-     * Identifier of default store
-     * used for loading default data for entity
-     */
-    const DEFAULT_STORE_ID = 0;
-
     /**
      * Attribute default values
      *
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index d7c7a6c3111fa633ec9068c153fc642ec9d3f3cf..23a5997ac928b704f9030f4c85e3b4137e866489 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -44,18 +44,18 @@ class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Abs
     /**
      * Layoutupdate validator factory
      *
-     * @var \Magento\Adminhtml\Model\LayoutUpdate\ValidatorFactory
+     * @var \Magento\Core\Model\Layout\Update\ValidatorFactory
      */
     protected $_layoutUpdateValidatorFactory;
 
     /**
      * Construct
      *
-     * @param \Magento\Adminhtml\Model\LayoutUpdate\ValidatorFactory $layoutUpdateValidatorFactory
+     * @param \Magento\Core\Model\Layout\Update\ValidatorFactory $layoutUpdateValidatorFactory
      * @param \Magento\Logger $logger
      */
     public function __construct(
-        \Magento\Adminhtml\Model\LayoutUpdate\ValidatorFactory $layoutUpdateValidatorFactory,
+        \Magento\Core\Model\Layout\Update\ValidatorFactory $layoutUpdateValidatorFactory,
         \Magento\Logger $logger
     ) {
         $this->_layoutUpdateValidatorFactory = $layoutUpdateValidatorFactory;
@@ -71,7 +71,7 @@ class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Abs
             return true;
         }
 
-        /** @var $validator \Magento\Adminhtml\Model\LayoutUpdate\Validator */
+        /** @var $validator \Magento\Core\Model\Layout\Update\Validator */
         $validator = $this->_layoutUpdateValidatorFactory->create();
         if (!$validator->isValid($xml)) {
             $messages = $validator->getMessages();
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index ee6c2ed06743d85d33cfa7f26f749f84343ba01a..e32cf4c07efd44718b9fb100177fa8b69bf5a8b0 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -240,7 +240,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel
     protected function _construct()
     {
         // If Flat Data enabled then use it but only on frontend
-        if ($this->_catalogCategoryFlat->isAvailable() && !$this->_storeManager->getStore()->isAdmin()) {
+        if ($this->_catalogCategoryFlat->isAvailable()) {
             $this->_init('Magento\Catalog\Model\Resource\Category\Flat');
             $this->_useFlatResource = true;
         } else {
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index de01c1491b720ebaf712e5a7936e219649630c14..3627f6cb0562c34fef151311fa57b067d7766cf1 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -205,6 +205,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel
      */
     protected $_itemOptionFactory;
 
+    /**
+     * @var \Magento\App\State
+     */
+    protected $_appState;
+
     /**
      * Construct
      *
@@ -273,6 +278,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel
         $this->_collectionFactory = $collectionFactory;
         $this->_urlModel = $url;
         $this->_linkInstance = $productLink;
+        $this->_appState = $context->getAppState();
         parent::__construct($storeManager, $context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -1911,7 +1917,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel
      */
     public function setOrigData($key=null, $data=null)
     {
-        if ($this->_storeManager->getStore()->isAdmin()) {
+        if ($this->_appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
             return parent::setOrigData($key, $data);
         }
 
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
index cda164b93eef383c6a0a524af5fb0998d1761649..2a3f327cfd734702d6326d8fcfff3bab6386cc76 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -301,7 +301,7 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
         $storeId = $object->getStoreId();
 
         $storeIds = $object->getStoreIds();
-        $storeIds[] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+        $storeIds[] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
 
         // remove current storeId
         $storeIds = array_flip($storeIds);
@@ -541,7 +541,7 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
     }
 
     /**
-     * Retrive image from gallery
+     * Retrieve image from gallery
      *
      * @param \Magento\Catalog\Model\Product $product
      * @param string $file
diff --git a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
index d75edbb641406d90f2d8ade1250139fc11629ad1..3f4582619e47861fec5d57151f478d4f88025bac 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
@@ -30,21 +30,21 @@ namespace Magento\Catalog\Model\Product\Media;
 interface ConfigInterface
 {
     /**
-     * Retrive base url for media files
+     * Retrieve base url for media files
      *
      * @return string
      */
     function getBaseMediaUrl();
 
     /**
-     * Retrive base path for media files
+     * Retrieve base path for media files
      *
      * @return string
      */
     function getBaseMediaPath();
 
     /**
-     * Retrive url for media file
+     * Retrieve url for media file
      *
      * @param string $file
      * @return string
@@ -52,7 +52,7 @@ interface ConfigInterface
     function getMediaUrl($file);
 
     /**
-     * Retrive file system path for media file
+     * Retrieve file system path for media file
      *
      * @param string $file
      * @return string
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Configurable.php b/app/code/Magento/Catalog/Model/Product/Type/Configurable.php
index fc53f62519a6277eae89011d7677c4989ff8ac13..e680ecaac99b59d6d45692316a898ae62a11d24a 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Configurable.php
@@ -1105,7 +1105,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
         \Magento\Catalog\Model\Product $parentProduct,
         $postData
     ) {
-        $product->setStoreId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+        $product->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
             ->setTypeId($postData['weight']
                 ? \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
                 : \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Grouped.php b/app/code/Magento/Catalog/Model/Product/Type/Grouped.php
index 6fc9353d9baca52078e39d128f643189468a4419..2e1060925c1793f79504f4bb48ce662ef0766ef6 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Grouped.php
@@ -93,6 +93,11 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      */
     protected $_catalogProductLink;
 
+    /**
+     * @var \Magento\App\State
+     */
+    protected $_appState;
+
     /**
      * Construct
      *
@@ -109,6 +114,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Filesystem $filesystem
      * @param \Magento\Core\Model\Registry $coreRegistry
      * @param \Magento\Logger $logger
+     * @param \Magento\App\State $appState
      * @param array $data
      */
     public function __construct(
@@ -125,11 +131,13 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
         \Magento\Filesystem $filesystem,
         \Magento\Core\Model\Registry $coreRegistry,
         \Magento\Logger $logger,
+        \Magento\App\State $appState,
         array $data = array()
     ) {
         $this->_catalogProductLink = $catalogProductLink;
         $this->_storeManager = $storeManager;
         $this->_catalogProductStatus = $catalogProductStatus;
+        $this->_appState = $appState;
         parent::__construct($productFactory, $catalogProductOption, $eavConfig, $catalogProductType,
             $eventManager, $coreData, $fileStorageDb, $filesystem, $coreRegistry, $logger, $data);
     }
@@ -190,9 +198,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
         if (!$product->hasData($this->_keyAssociatedProducts)) {
             $associatedProducts = array();
 
-            if (!$this->_storeManager->getStore()->isAdmin()) {
-                $this->setSaleableStatus($product);
-            }
+            $this->setSaleableStatus($product);
 
             $collection = $this->getAssociatedProductCollection($product)
                 ->addAttributeToSelect('*')
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php b/app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b3acf254d68d05488a54754ca0d03019a67abba
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Catalog
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Model\Product\Type\Grouped;
+
+/**
+ * Grouped product type implementation for backend
+ */
+class Backend extends \Magento\Catalog\Model\Product\Type\Grouped
+{
+    /**
+     * No filters required in backend
+     *
+     * @param  \Magento\Catalog\Model\Product $product
+     * @return \Magento\Catalog\Model\Product\Type\Grouped
+     */
+    public function setSaleableStatus($product)
+    {
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
index b663345975399ac9d279ffba610cd16ba4552830..090bc5e35befc2d8c877c50f5e4ad5f5b8ca51c5 100644
--- a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
@@ -103,7 +103,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
      */
     public function getDefaultStoreId()
     {
-        return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+        return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
index d6267b829b2a70c0c041b56eccd0c88aac7055fa..1e71af74584a1e00c6751852773db5333cd7b2f3 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
@@ -175,7 +175,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
     public function getProductStoreId()
     {
         if (is_null($this->_productStoreId)) {
-            $this->_productStoreId = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+            $this->_productStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
         }
         return $this->_productStoreId;
     }
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
index 503094f1168ddee4dade8c676dd34083df8e3bcc..0b9f48aac790167a3db847e5cd738017cd500450 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
@@ -236,7 +236,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
      * @param integer $storeId
      * @return string
      */
-    public function getMainStoreTable($storeId = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
+    public function getMainStoreTable($storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID)
     {
         if (is_string($storeId)) {
             $storeId = intval($storeId);
@@ -277,7 +277,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
     }
 
     /**
-     * Retreive inactive categories ids
+     * Retrieve inactive categories ids
      *
      * @return \Magento\Catalog\Model\Resource\Category\Flat
      */
@@ -289,7 +289,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
     }
 
     /**
-     * Retreive inactive categories ids
+     * Retrieve inactive categories ids
      *
      * @return array
      */
@@ -518,7 +518,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
         if ($this->_isBuilt === null) {
             $defaultStoreView = $this->_storeManager->getDefaultStoreView();
             if ($defaultStoreView === null) {
-                $defaultStoreId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+                $defaultStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
             } else {
                 $defaultStoreId = $defaultStoreView->getId();
             }
@@ -925,7 +925,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
                 ))
             )
             ->where('def.entity_id IN (?)', $entityIds)
-            ->where('def.store_id IN (?)', array(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID, $storeId));
+            ->where('def.store_id IN (?)', array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, $storeId));
         return $this->_getWriteAdapter()->fetchAll($select);
     }
 
@@ -1001,7 +1001,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
         } else if ($category instanceof \Magento\Catalog\Model\Category) {
             $categoryId = $category->getId();
             foreach ($category->getStoreIds() as $storeId) {
-                if ($storeId == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+                if ($storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
                     continue;
                 }
 
@@ -1484,7 +1484,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
                     array('csg' => $this->getTable('core_store_group')),
                     'csg.group_id = cs.group_id',
                     array('root_category_id'))
-                ->where('cs.store_id <> ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                ->where('cs.store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
             $this->_storesRootCategories = $this->_getWriteAdapter()->fetchPairs($select);
         }
 
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php b/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php
index cbf6bc92ffc8c503324419959d33c07a7861648f..f150c0b8853bde85f0d54b8370ac14832f23d186 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php
@@ -299,7 +299,7 @@ class Product extends \Magento\Index\Model\Resource\AbstractResource
         $anchorInfo = $this->_getAnchorAttributeInfo();
         $bind = array(
             'attribute_id' => $anchorInfo['id'],
-            'store_id'     => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+            'store_id'     => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
             'e_value'      => 1
         );
         $select = $this->_getReadAdapter()->select()
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
index 399e73c59f3e2b7c9469699d7a6dc7c999a982ec..de0032f55d4276fc15131f5e03b26b6d4703bf40 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
@@ -632,7 +632,7 @@ class Tree extends \Magento\Data\Tree\Dbp
                         array($tableDefault => $attribute->getBackend()->getTable()),
                         sprintf('%1$s.entity_id=e.entity_id AND %1$s.attribute_id=%2$d'
                             . ' AND %1$s.entity_type_id=e.entity_type_id AND %1$s.store_id=%3$d',
-                            $tableDefault, $attribute->getId(), \Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+                            $tableDefault, $attribute->getId(), \Magento\Core\Model\Store::DEFAULT_STORE_ID),
                         array($attributeCode => 'value'))
                     ->joinLeft(
                         array($tableStore => $attribute->getBackend()->getTable()),
diff --git a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
index 4f6f16c47a79b7911b953f731a5aa8b117347be6..dd44a43cf628ec19bfb8501613c686802d624522 100644
--- a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
@@ -129,7 +129,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
      */
     public function getDefaultStoreId()
     {
-        return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+        return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
index e7acb226ae08fcb056274a85bfd2515e8670ba4a..d5d344155991ea308e4273435257ef0bf9786cae 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
@@ -113,10 +113,10 @@ class Media extends \Magento\Core\Model\Resource\Db\AbstractDb
     }
 
     /**
-     * Insert gallery value to db and retrive last id
+     * Insert gallery value to db and retrieve last id
      *
      * @param array $data
-     * @return interger
+     * @return integer
      */
     public function insertGallery($data)
     {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index e36de785d713c6332672df02ebc1f96a354b2a21..1947eb04a8a076b19e0ae179ecf2f1f210d93978 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -421,10 +421,6 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
      */
     public function isEnabledFlat()
     {
-        // Flat Data can be used only on frontend
-        if ($this->_storeManager->getStore()->isAdmin()) {
-            return false;
-        }
         if (!isset($this->_flatEnabled[$this->getStoreId()])) {
             $this->_flatEnabled[$this->getStoreId()] = $this->getFlatHelper()->isAvailable();
         }
@@ -749,7 +745,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
         }
         $store = $this->_storeManager->getStore($store);
 
-        if (!$store->isAdmin()) {
+        if ($store->getId() != \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
             $this->setStoreId($store);
             $this->_productLimitationFilters['store_id'] = $store->getId();
             $this->_applyProductLimitations();
@@ -801,7 +797,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
             $this->_productLimitationFilters['category_is_anchor'] = 1;
         }
 
-        if ($this->getStoreId() == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+        if ($this->getStoreId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
             $this->_applyZeroStoreProductLimitations();
         } else {
             $this->_applyProductLimitations();
@@ -1046,7 +1042,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
     }
 
     /**
-     * Retrive all ids for collection
+     * Retrieve all ids for collection
      *
      * @param int|string $limit
      * @param int|string $offset
@@ -1063,7 +1059,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
     }
 
     /**
-     * Retreive product count select for categories
+     * Retrieve product count select for categories
      *
      * @return \Magento\DB\Select
      */
@@ -1323,7 +1319,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
     }
 
     /**
-     * Retreive all ids
+     * Retrieve all ids
      *
      * @param boolean $resetCache
      * @return array
@@ -1507,7 +1503,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
      */
     public function addFilterByRequiredOptions()
     {
-        $this->addAttributeToFilter('required_options', array(array('neq' => '1'), array('null' => true)), 'left');
+        $this->addAttributeToFilter('required_options', array(array('neq' => 1), array('null' => true)), 'left');
         return $this;
     }
 
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php
index 29a2dab2aec598208eb3c31a2a922bab4e3067f4..ae3630b2f9ad3a40aa15f106aba5b5521745b40e 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php
@@ -914,7 +914,7 @@ class Indexer extends \Magento\Index\Model\Resource\AbstractResource
                 array())
             ->where('t1.entity_type_id = :entity_type_id')
             ->where('t1.attribute_id = :attribute_id')
-            ->where('t1.store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            ->where('t1.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
             ->where("{$fieldExpr} = ?", \Magento\Catalog\Model\Product\Status::STATUS_ENABLED);
         foreach ($this->getAttributes() as $attributeCode => $attribute) {
             /** @var $attribute \Magento\Eav\Model\Entity\Attribute */
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php
index 405ae3578a0926f31086e8ea801f4dce3b67160b..8bbca9757f6939488631cb24820cef6b9ad4db95 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php
@@ -82,8 +82,8 @@ class Decimal
                 'pds.entity_id = pdd.entity_id AND pds.attribute_id = pdd.attribute_id'
                     . ' AND pds.store_id=cs.store_id',
                 array('value' => $productValueExpression))
-            ->where('pdd.store_id=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
-            ->where('cs.store_id!=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
+            ->where('pdd.store_id=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
+            ->where('cs.store_id!=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
             ->where('pdd.attribute_id IN(?)', $attrIds)
             ->where("{$productValueExpression} IS NOT NULL");
 
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
index 319e342ccf3f2426890e09e948c6e6f0cc7b4a2a..da17fb878b0a336dd5defb308cfa34b7ad5245d9 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
@@ -238,8 +238,8 @@ class Source
                 'pvs.entity_id = pvd.entity_id AND pvs.attribute_id = pvd.attribute_id'
                     . ' AND pvs.store_id=cs.store_id',
                 array('value' => $productValueExpression))
-            ->where('pvd.store_id=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
-            ->where('cs.store_id!=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
+            ->where('pvd.store_id=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
+            ->where('cs.store_id!=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
             ->where('pvd.attribute_id IN(?)', $attrIds);
 
         $statusCond = $adapter->quoteInto('=?', \Magento\Catalog\Model\Product\Status::STATUS_ENABLED);
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option.php b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
index b2aa803203e9ec6e53f96e33ee2386f6bff35770..4aaf0102a63d8e34c6e81ade21539ce41224c062 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
@@ -129,7 +129,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
                 $statement = $readAdapter->select()
                     ->from($priceTable, 'option_id')
                     ->where('option_id = ?', $object->getId())
-                    ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                    ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
                 $optionId = $readAdapter->fetchOne($statement);
 
                 if ($optionId) {
@@ -148,7 +148,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
                             $data,
                             array(
                                 'option_id = ?' => $object->getId(),
-                                'store_id  = ?' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+                                'store_id  = ?' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                             )
                         );
                     }
@@ -157,7 +157,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
                          new \Magento\Object(
                             array(
                                 'option_id'  => $object->getId(),
-                                'store_id'   => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+                                'store_id'   => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                                 'price'      => $object->getPrice(),
                                 'price_type' => $object->getPriceType()
                             )
@@ -261,7 +261,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
             $statement = $readAdapter->select()
                 ->from($titleTable)
                 ->where('option_id = ?', $object->getId())
-                ->where('store_id  = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                ->where('store_id  = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             if ($readAdapter->fetchOne($statement)) {
                 if ($object->getStoreId() == '0') {
@@ -279,7 +279,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
                         $data,
                         array(
                             'option_id = ?' => $object->getId(),
-                            'store_id  = ?' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+                            'store_id  = ?' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
                         )
                     );
                 }
@@ -288,7 +288,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
                     new \Magento\Object(
                         array(
                             'option_id' => $object->getId(),
-                            'store_id'  => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+                            'store_id'  => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                             'title'     => $object->getTitle()
                         )
                     ),
@@ -485,7 +485,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
         $defaultOptionJoin = implode(
             ' AND ',
             array('option_title_default.option_id=product_option.option_id',
-            $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID))
+            $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID))
         );
 
         $storeOptionJoin = implode(
@@ -518,7 +518,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
         $defaultOptionJoin = implode(
             ' AND ', array(
                 'option_title_default.option_type_id=option_type.option_type_id',
-                $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID))
+                $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID))
         );
 
         $storeOptionJoin = implode(
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
index e7a8650a8e2dcbe0d0687c055a0cd0376c066e7d..b4db96dc2037a005521c426d7db0619551c1fbbc 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
@@ -122,7 +122,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
                     'store_title'   => 'title',
                     'title'         => $titleExpr
                 ))
-            ->where('default_option_title.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+            ->where('default_option_title.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
         return $this;
     }
@@ -154,7 +154,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
                 'default_option_price.option_id = main_table.option_id AND '
                     . $adapter->quoteInto(
                         'default_option_price.store_id = ?',
-                        \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+                        \Magento\Core\Model\Store::DEFAULT_STORE_ID
                     ),
                 array(
                     'default_price' => 'price',
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
index 7e2e8605b829388e1cee26d2ad08761403163da1..f5454df218255e2bfd21c357db7a9297efa15feb 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
@@ -118,7 +118,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
             $select = $this->_getReadAdapter()->select()
                 ->from($priceTable, 'option_type_id')
                 ->where('option_type_id = ?', (int)$object->getId())
-                ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
             $optionTypeId = $this->_getReadAdapter()->fetchOne($select);
 
             if ($optionTypeId) {
@@ -129,7 +129,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
                     );
                     $where = array(
                         'option_type_id = ?'    => $optionTypeId,
-                        'store_id = ?'          => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+                        'store_id = ?'          => \Magento\Core\Model\Store::DEFAULT_STORE_ID
                     );
 
                     $this->_getWriteAdapter()->update($priceTable, $bind, $where);
@@ -137,7 +137,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
             } else {
                 $bind  = array(
                     'option_type_id'    => (int)$object->getId(),
-                    'store_id'          => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+                    'store_id'          => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                     'price'             => $price,
                     'price_type'        => $priceType
                 );
@@ -224,14 +224,14 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
             $select = $this->_getReadAdapter()->select()
                 ->from($titleTable, array('option_type_id'))
                 ->where('option_type_id = ?', (int)$object->getId())
-                ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
             $optionTypeId = $this->_getReadAdapter()->fetchOne($select);
 
             if ($optionTypeId) {
                 if ($object->getStoreId() == '0') {
                     $where = array(
                         'option_type_id = ?'    => (int)$optionTypeId,
-                        'store_id = ?'          => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+                        'store_id = ?'          => \Magento\Core\Model\Store::DEFAULT_STORE_ID
                     );
                     $bind  = array(
                         'title' => $object->getTitle()
@@ -241,7 +241,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
             } else {
                 $bind  = array(
                     'option_type_id'    => (int)$object->getId(),
-                    'store_id'          => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+                    'store_id'          => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                     'title'             => $object->getTitle()
                 );
                 $this->_getWriteAdapter()->insert($titleTable, $bind);
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
index 997bc3ec27a3ff0de1d1ab8beb0eb2b9e27c71eb..34e992aea4fdf9fcdb11d91cac6e1d01e6c7a8ca 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
@@ -86,7 +86,7 @@ class Collection
             'store_value_title.title'
         );
         $joinExprDefaultPrice = 'default_value_price.option_type_id = main_table.option_type_id AND '
-                  . $adapter->quoteInto('default_value_price.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                  . $adapter->quoteInto('default_value_price.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
         $joinExprStorePrice = 'store_value_price.option_type_id = main_table.option_type_id AND '
                        . $adapter->quoteInto('store_value_price.store_id = ?', $storeId);
@@ -122,7 +122,7 @@ class Collection
                     'store_title' => 'title',
                     'title'       => $titleExpr)
             )
-            ->where('default_value_title.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+            ->where('default_value_title.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
         return $this;
     }
@@ -155,7 +155,7 @@ class Collection
                     'title'         => $titleExpr
                 )
             )
-            ->where('default_value_title.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+            ->where('default_value_title.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
         return $this;
     }
@@ -179,7 +179,7 @@ class Collection
             );
 
         $joinExprDefault = 'default_value_price.option_type_id = main_table.option_type_id AND '
-                        . $this->getConnection()->quoteInto('default_value_price.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                        . $this->getConnection()->quoteInto('default_value_price.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
         $joinExprStore = 'store_value_price.option_type_id = main_table.option_type_id AND '
                        . $this->getConnection()->quoteInto('store_value_price.store_id = ?', $storeId);
         $this->getSelect()
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Status.php b/app/code/Magento/Catalog/Model/Resource/Product/Status.php
index a99e7f75747eb4999ec84a0cf7c7796732ebbf9d..638fe33172985e0fbd0b05b479df66a255d1e2f1 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Status.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Status.php
@@ -127,7 +127,7 @@ class Status extends \Magento\Core\Model\Resource\Db\AbstractDb
      */
     public function refreshEnabledIndex($productId, $storeId)
     {
-        if ($storeId == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+        if ($storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
             foreach ($this->_storeManager->getStores() as $store) {
                 $this->refreshEnabledIndex($productId, $store->getId());
             }
@@ -212,12 +212,12 @@ class Status extends \Magento\Core\Model\Resource\Db\AbstractDb
             $productIds = array($productIds);
         }
 
-        if ($storeId === null || $storeId == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+        if ($storeId === null || $storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
             $select = $adapter->select()
                 ->from($attributeTable, array('entity_id', 'value'))
                 ->where('entity_id IN (?)', $productIds)
                 ->where('attribute_id = ?', $attribute->getAttributeId())
-                ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+                ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             $rows = $adapter->fetchPairs($select);
         } else {
@@ -233,7 +233,7 @@ class Status extends \Magento\Core\Model\Resource\Db\AbstractDb
                         . (int)$storeId,
                     array('t1.entity_id')
                 )
-                ->where('t1.store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+                ->where('t1.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
                 ->where('t1.attribute_id = ?', $attribute->getAttributeId())
                 ->where('t1.entity_id IN(?)', $productIds);
             $rows = $adapter->fetchPairs($select);
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php b/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php
index 7ad006c29ac99f594e43d87bb9f39de4604dfba4..889bc5c6f491456f7f348da45a5c242682836637 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php
@@ -227,7 +227,7 @@ class Configurable extends \Magento\Core\Model\Resource\Db\AbstractDb
                     ),
                     implode(' AND ', array(
                         'option_value.option_id = entity_value.value',
-                        'option_value.store_id = ' . \Magento\Core\Model\AppInterface::ADMIN_STORE_ID,
+                        'option_value.store_id = ' . \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                     )),
                     array()
                 )->joinLeft(
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 9b2d2e4c1c2a38b2f5b5f6e43900dc0b27c82f79..7b2e542f5ab818237f0bd2aaf6c4592a305a08b8 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -24,6 +24,7 @@
  */
 -->
 <config>
+    <preference for="Magento\Catalog\Model\Product\Type\Grouped" type="Magento\Catalog\Model\Product\Type\Grouped\Backend" />
     <type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute">
         <param name="attributeLabelCache">
             <instance type="Magento\App\Cache\Type\Translate" />
@@ -56,4 +57,9 @@
             </value>
         </param>
     </type>
+    <type name="Magento\Catalog\Helper\Flat\AbstractFlat">
+        <param name="isAvailable">
+            <value type="bool">false</value>
+        </param>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
index e05b83a4b709c3481b6e6e4d4057b43f7052b649..77c1023fed0ccca1e5fd5853ed1a05c79ade2652 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
@@ -33,5 +33,7 @@
         <add id="Magento_Catalog::catalog_attributes_attributes" title="Product" module="Magento_Catalog" sortOrder="30" parent="Magento_Adminhtml::stores_attributes" action="catalog/product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
         <add id="Magento_Catalog::catalog_attributes_sets" title="Product Template" module="Magento_Catalog" sortOrder="40" parent="Magento_Adminhtml::stores_attributes" action="catalog/product_set/" resource="Magento_Catalog::sets"/>
         <add id="Magento_Catalog::catalog_urlrewrite" title="URL Redirects" module="Magento_Catalog" sortOrder="20" parent="Magento_Adminhtml::marketing_seo" action="adminhtml/urlrewrite/index" resource="Magento_Catalog::urlrewrite"/>
+
+        <add id="Magento_Catalog::inventory" title="Inventory" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::catalog" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
index 6fe277a3ce557d6f490aa20781a2b44fd81ed0e1..b878ba6dba87dd549d37bbe0e656f438e92b1301 100644
--- a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
@@ -47,7 +47,7 @@
                     <?php $_labels = $this->getLabelValues() ?>
                     <?php foreach ($this->getStores() as $_store): ?>
                         <td class="col-store-view">
-                            <input class="input-text<?php if ($_store->getId() == \Magento\Core\Model\App::ADMIN_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+                            <input class="input-text<?php if ($_store->getId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
                         </td>
                     <?php endforeach; ?>
                 </tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
index 83fb7b2392fbae0ccdc92dae7a599769636aee03..95427458050698f3c91ec9afd7c4429433b506ee 100644
--- a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
@@ -70,7 +70,7 @@
                 <input class="input-radio" type="{{intype}}" name="default[]" value="{{id}}" {{checked}}<?php if ($this->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
             </td>
             <?php foreach ($this->getStores() as $_store): ?>
-            <td class="col-{{id}}"><input name="option[value][{{id}}][<?php echo $_store->getId() ?>]" value="{{store<?php echo $_store->getId() ?>}}" class="input-text<?php if ($_store->getId() == \Magento\Core\Model\App::ADMIN_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($this->getReadOnly() || $this->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
+            <td class="col-{{id}}"><input name="option[value][{{id}}][<?php echo $_store->getId() ?>]" value="{{store<?php echo $_store->getId() ?>}}" class="input-text<?php if ($_store->getId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($this->getReadOnly() || $this->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
             <?php endforeach; ?>
             <td id="delete_button_container_{{id}}" class="col-delete">
                 <input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
index c727fe8839bf78357d06cc8477732ddf097a23fa..ce0d24b444c7fe7a02a8941ad65a477394ead7dc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
@@ -39,6 +39,6 @@
         <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit" name="attribute_edit_content"/>
     </referenceContainer>
     <referenceContainer name="js">
-        <block class="Magento\Adminhtml\Block\Template" name="attribute_edit_js" template="Magento_Catalog::catalog/product/attribute/js.phtml"/>
+        <block class="Magento\Backend\Block\Template" name="attribute_edit_js" template="Magento_Catalog::catalog/product/attribute/js.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Catalog/view/adminhtml/product/product.css b/app/code/Magento/Catalog/view/adminhtml/product/product.css
index f0c9fcaa03d27e055b1b4ce6408886332d5c5920..7b8fa7ac9037d838dc2c64ec87b87fdd509c00ee 100644
--- a/app/code/Magento/Catalog/view/adminhtml/product/product.css
+++ b/app/code/Magento/Catalog/view/adminhtml/product/product.css
@@ -27,9 +27,9 @@
 [class^=" catalog-product-"] .page-actions .action-back,
 [class^=" catalog-product-"] .page-actions .action-back:hover,
 [class^=" catalog-product-"] .page-actions .action-back:active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:active {
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active {
     overflow: hidden;
     padding: 5px 6px 3px;
     margin-left: 12px;
@@ -37,17 +37,17 @@
 }
 
 [class^=" catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover {
+[class^=" newsletter-"] .page-actions .action-back:hover {
     color: #000;
 }
 
 [class^=" catalog-product-"] .page-actions .action-back.mage-error,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
+[class^=" newsletter-"] .page-actions .action-back.mage-error {
     color: #b57c72;
 }
 
 [class^=" catalog-product-"] .page-actions .action-back:before,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:before {
+[class^=" newsletter-"] .page-actions .action-back:before {
     display: inline-block;
     font-family: 'MUI-Icons';
     font-style: normal;
@@ -59,7 +59,7 @@
 }
 
 [class^=" catalog-product-"] .page-actions .action-back span,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back span {
+[class^=" newsletter-"] .page-actions .action-back span {
     display: inline-block;
     overflow: hidden;
     text-indent: -999em;
diff --git a/app/code/Magento/Catalog/view/frontend/category/view.phtml b/app/code/Magento/Catalog/view/frontend/category/view.phtml
index d576070d0a42deca66a3b328159fc0e67530d8e5..4a3d1afe7aae00b97f9d1baf8d6dc3761887dcf7 100644
--- a/app/code/Magento/Catalog/view/frontend/category/view.phtml
+++ b/app/code/Magento/Catalog/view/frontend/category/view.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,7 +26,7 @@
 /**
  * Category view template
  *
- * @see \Magento\Catalog\Block\Category\View
+ * @var $this \Magento\Catalog\Block\Category\View
  */
 ?>
 <?php
@@ -36,33 +34,29 @@
     $_category  = $this->getCurrentCategory();
     $_imgHtml   = '';
     if ($_imgUrl = $_category->getImageUrl()) {
-        $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->escapeHtml($_category->getName()).'" title="'.$this->escapeHtml($_category->getName()).'" /></p>';
+        $_imgHtml = '<div class="category image"><img src="' . $_imgUrl . '" alt="' . $this->escapeHtml($_category->getName()) . '" title="' . $this->escapeHtml($_category->getName()) . '" /></div>';
         $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
     }
 ?>
-<div class="page-title category-title">
-    <h1><?php echo $_helper->categoryAttribute($_category, $_category->getName(), 'name') ?></h1>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<?php if($_imgUrl): ?>
-    <?php echo $_imgHtml ?>
-<?php endif; ?>
+<div class="category view">
+    <?php if($_imgUrl): ?>
+        <?php echo $_imgHtml ?>
+    <?php endif; ?>
 
-<?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
-    <div class="category-description std">
-        <?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?>
-    </div>
+    <?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
+        <div class="category description">
+            <?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?>
+        </div>
     <?php endif; ?>
 
-<?php if($this->isContentMode()): ?>
-    <?php echo $this->getCmsBlockHtml() ?>
+    <?php if($this->isContentMode()): ?>
+        <?php echo $this->getCmsBlockHtml() ?>
 
-<?php elseif($this->isMixedMode()): ?>
-    <?php echo $this->getCmsBlockHtml() ?>
-    <?php echo $this->getProductListHtml() ?>
+    <?php elseif($this->isMixedMode()): ?>
+        <?php echo $this->getCmsBlockHtml() ?>
+        <?php echo $this->getProductListHtml() ?>
 
-<?php else: ?>
-    <?php echo $this->getProductListHtml() ?>
-<?php endif; ?>
+    <?php else: ?>
+        <?php echo $this->getProductListHtml() ?>
+    <?php endif; ?>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml
index b41858ab8b394d77d12d94c3a76a978a71c17713..1f250d2453ebeb58c9efe1bad8653276235267ab 100644
--- a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml
@@ -18,10 +18,8 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-category-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<div class="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></div>
diff --git a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml
index 8c9808693b5b343c3320253312e378cb8ee3d1c8..cec450787e08247d57f788e8ff2e83fae1468c8c 100644
--- a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml
@@ -18,10 +18,8 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-category-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<span class="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif b/app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif
deleted file mode 100644
index 3ff818b1b442dd7d99578316d7f0eb090c8e58b5..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif and /dev/null differ
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif b/app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif
deleted file mode 100644
index 3ac3de1ce5e01f145942aaae282835201e3e39ae..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif and /dev/null differ
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_widget-link.gif b/app/code/Magento/Catalog/view/frontend/images/i_widget-link.gif
deleted file mode 100644
index 16fc968deb5ea628fc160d01fd872fa44d36481b..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Catalog/view/frontend/images/i_widget-link.gif and /dev/null differ
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_widget-new.gif b/app/code/Magento/Catalog/view/frontend/images/i_widget-new.gif
deleted file mode 100644
index fe0b27df8dce65a5e52da0b4e4271affcbdd17d7..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Catalog/view/frontend/images/i_widget-new.gif and /dev/null differ
diff --git a/app/code/Magento/Catalog/view/frontend/images/media/col_left_callout.jpg b/app/code/Magento/Catalog/view/frontend/images/media/col_left_callout.jpg
deleted file mode 100644
index d6a26486bc9758e18f47719cb6dbf4b528bccc2b..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Catalog/view/frontend/images/media/col_left_callout.jpg and /dev/null differ
diff --git a/app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg b/app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg
deleted file mode 100644
index 57dc1534051781fc02def8585a5a8ee586c3d118..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg and /dev/null differ
diff --git a/app/code/Magento/Catalog/view/frontend/js/configurable.js b/app/code/Magento/Catalog/view/frontend/js/configurable.js
index 9333c64b8d44fdc27c1babed6dc8895ce2110f9a..a4bf7504f63328fe81fd8cddd0f8b7bd74b3b854 100644
--- a/app/code/Magento/Catalog/view/frontend/js/configurable.js
+++ b/app/code/Magento/Catalog/view/frontend/js/configurable.js
@@ -61,7 +61,7 @@
                 $(this.options.spConfig.containerId).find(this.options.superSelector) :
                 $(this.options.superSelector);
             this.options.values = this.options.spConfig.defaultValues || {};
-            this.options.parentImage = $('[data-role=base-image]').attr('src');
+            this.options.parentImage = $('[data-role=base-image-container] img').attr('src');
         },
 
         /**
@@ -233,7 +233,7 @@
             $.each(imagesArray || {}, function (k, v) {
                 result.push(v);
             });
-            var baseImage = this.element.find('[data-role=base-image]');
+            var baseImage = $('[data-role=base-image-container] img');
             if (result.length === 1) {
                 baseImage.attr('src', result[0]).trigger('imageChanged', result[0]);
             } else {
@@ -247,7 +247,7 @@
          * @private
          */
         _fitImageToContainer: function () {
-            var image = this.element.find('[data-role=base-image]'),
+            var image = $('[data-role=base-image-container] img'),
                 imageContainer = image.closest('[data-role=base-image-container]'),
                 width = image.width(),
                 height = image.height(),
diff --git a/app/code/Magento/Catalog/view/frontend/js/list.js b/app/code/Magento/Catalog/view/frontend/js/list.js
index 6e7b80dd8b0a282eb3a0f1a1fd36615ef43bfddb..1ed2bc052077107496523c986854f1a83d72ef0d 100644
--- a/app/code/Magento/Catalog/view/frontend/js/list.js
+++ b/app/code/Magento/Catalog/view/frontend/js/list.js
@@ -26,40 +26,49 @@
 (function ($, window) {
     $.widget('mage.compareList', {
         _create: function() {
-            this.element.decorate('table');
 
-            $(this.options.windowCloseSelector).on('click', function() {
-                window.close();
-            });
+            var elem = this.element,
+                products = $('thead td', elem);
+
+            if (products.length > this.options.productsInRow) {
+                var headings = $('<table/>')
+                    .addClass('comparison headings data table')
+                    .insertBefore(elem.closest('.container'));
+                elem.addClass('scroll');
+
+                $('th', elem).each(function(){
+                    var th = $(this),
+                        thCopy = th.clone();
+
+                    th.animate({
+                        top: '+=0'
+                    }, 50, function(){
+                        var height;
+                        if ($.browser.mozilla && $.browser.version <= '11.0') {
+                            height = th.outerHeight();
+                        }
+                        else {
+                            height = th.height();
+                        }
+                        thCopy.css('height', height)
+                            .appendTo(headings)
+                            .wrap('<tr />');
+                    });
+                });
+            }
 
             $(this.options.windowPrintSelector).on('click', function(e) {
                 e.preventDefault();
                 window.print();
             });
 
-            var ajaxSpinner = $(this.options.ajaxSpinner);
-            $(this.options.productRemoveSelector).on('click', function(e) {
-                e.preventDefault();
-                $.ajax({
-                    url: $(e.target).data('url'),
-                    type: 'POST',
-                    beforeSend: function() {
-                        ajaxSpinner.show();
-                    }
-                }).done(function() {
-                    ajaxSpinner.hide();
-                    window.location.reload();
-                    window.opener.location.reload();
-                });
-            });
-
             $.each(this.options.selectors, function(i, selector) {
                 $(selector).on('click', function(e) {
                     e.preventDefault();
-                    window.opener.focus();
-                    window.opener.location.href = $(this).data('url');
+                    window.location.href = $(this).data('url');
                 });
             });
+
         }
     });
-})(jQuery, window);
+})(jQuery, window);
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/view/frontend/layer/filter.phtml b/app/code/Magento/Catalog/view/frontend/layer/filter.phtml
index 60e8454a97c6e5baba65922aae91e34bfcf0582a..c94aceb9799ae9635035ee206964f09d4a67fd99 100644
--- a/app/code/Magento/Catalog/view/frontend/layer/filter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/layer/filter.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,20 +26,20 @@
 /**
  * Template for filter items block
  *
- * @see \Magento\Catalog\Block\Layer\Filter
+ * @var $this \Magento\Catalog\Block\Layer\Filter
  */
 ?>
 
-<ol>
-<?php foreach ($this->getItems() as $_item): ?>
-    <li>
-        <?php if ($_item->getCount() > 0): ?>
-        <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
-        <?php else: echo $_item->getLabel() ?>
-        <?php endif; ?>
-        <?php if ($this->shouldDisplayProductCount()): ?>
-        (<?php echo $_item->getCount() ?>)
-        <?php endif; ?>
-    </li>
-<?php endforeach ?>
+<ol class="items">
+    <?php foreach ($this->getItems() as $_item): ?>
+        <li class="item">
+            <?php if ($_item->getCount() > 0): ?>
+                <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
+            <?php else: echo $_item->getLabel() ?>
+            <?php endif; ?>
+            <?php if ($this->shouldDisplayProductCount()): ?>
+                <span class="count"><?php echo $_item->getCount() ?></span>
+            <?php endif; ?>
+        </li>
+    <?php endforeach ?>
 </ol>
diff --git a/app/code/Magento/Catalog/view/frontend/layer/state.phtml b/app/code/Magento/Catalog/view/frontend/layer/state.phtml
index fa2c878309377e9312e20c7d876f167461959a40..17a44eeef0123e173d85601f293ae06cf95e5509 100644
--- a/app/code/Magento/Catalog/view/frontend/layer/state.phtml
+++ b/app/code/Magento/Catalog/view/frontend/layer/state.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -33,23 +31,34 @@
 ?>
 <?php $_filters = $this->getActiveFilters() ?>
 <?php if(!empty($_filters)): ?>
-<div class="currently">
-    <p class="block-subtitle"><?php echo __('Currently Shopping by:') ?></p>
-    <ol>
-    <?php foreach ($_filters as $_filter): ?>
-        <li>
-            <span class="label"><?php echo __($_filter->getName()) ?>:</span> <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
-            <?php
+<div class="filtered">
+    <strong class="subtitle"><?php echo __('Currently Shopping by:') ?></strong>
+    <ol class="items">
+        <?php foreach ($_filters as $_filter): ?>
+            <li class="item">
+                <span class="label"><?php echo __($_filter->getName()) ?>:</span>
+                <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
+                <?php
                 $clearLinkUrl = $_filter->getClearLinkUrl();
                 if ($clearLinkUrl):
-            ?>
-                <a  class="btn-previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Previous') ?>"><?php echo __('Previous') ?></a>
-                <a  class="btn-remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>"><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></a>
-            <?php else: ?>
-                <a  class="btn-remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Remove This Item') ?>"><?php echo __('Remove This Item') ?></a>
-            <?php endif; ?>
-        </li>
-    <?php endforeach; ?>
+                    ?>
+                    <a class="action previous" href="<?php echo $_filter->getRemoveUrl() ?>"
+                       title="<?php echo __('Previous') ?>">
+                        <span><?php echo __('Previous') ?></span>
+                    </a>
+                    <a class="action remove"
+                       title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
+                       href="<?php echo $clearLinkUrl ?>">
+                        <span><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
+                    </a>
+                <?php else: ?>
+                    <a class="action remove" href="<?php echo $_filter->getRemoveUrl() ?>"
+                       title="<?php echo __('Remove This Item') ?>">
+                        <span><?php echo __('Remove This Item') ?></span>
+                    </a>
+                <?php endif; ?>
+            </li>
+        <?php endforeach; ?>
     </ol>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/layer/view.phtml b/app/code/Magento/Catalog/view/frontend/layer/view.phtml
index 411c4564f40702cc1149e657f7d1cdbdc6a87dae..838bf752f3f34bf89baf913662c578e46ab4cce8 100644
--- a/app/code/Magento/Catalog/view/frontend/layer/view.phtml
+++ b/app/code/Magento/Catalog/view/frontend/layer/view.phtml
@@ -18,42 +18,40 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
 /**
  * Category layered navigation
  *
- * @see \Magento\Catalog\Block\Layer\View
+ * @var $this \Magento\Catalog\Block\Layer\View
  */
 ?>
+
 <?php if($this->canShowBlock()): ?>
-<div class="block block-layered-nav">
-    <div class="block-title">
-        <strong><span><?php echo __('Shop By') ?></span></strong>
+<div class="block filter">
+    <div class="title">
+        <strong><?php echo __('Shop By') ?></strong>
     </div>
-    <div class="block-content">
+    <div class="content">
         <?php echo $this->getStateHtml() ?>
         <?php if ($this->getLayer()->getState()->getFilters()): ?>
-            <div class="actions"><a href="<?php echo $this->getClearUrl() ?>"><?php echo __('Clear All') ?></a></div>
+            <div class="actions">
+                <a href="<?php echo $this->getClearUrl() ?>" class="action reset"><?php echo __('Clear All') ?></a>
+            </div>
         <?php endif; ?>
-        <?php if($this->canShowOptions()): ?>
-            <p class="block-subtitle"><?php echo __('Shopping Options') ?></p>
-            <dl id="narrow-by-list">
-                <?php $_filters = $this->getFilters() ?>
-                <?php foreach ($_filters as $_filter): ?>
+        <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
+        <dl class="options" id="narrow-by-list">
+            <?php $_filters = $this->getFilters() ?>
+            <?php foreach ($_filters as $_filter): ?>
                 <?php if($_filter->getItemsCount()): ?>
                     <dt><?php echo __($_filter->getName()) ?></dt>
                     <dd><?php echo $_filter->getHtml() ?></dd>
                 <?php endif; ?>
-                <?php endforeach; ?>
-            </dl>
-            <script type="text/javascript">(function($) {$('#narrow-by-list').decorate('dataList')})(jQuery)</script>
-        <?php endif; ?>
+            <?php endforeach; ?>
+        </dl>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
index 0c0ab92140c3dab9af74ebf84b4facd839f4f4cd..57788350edba658d9dd313358e4aa9b4db912990 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
@@ -24,32 +24,60 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="page_two_columns_left"/>
     <referenceContainer name="content">
         <block class="Magento\Catalog\Block\Category\View" name="category.products" template="category/view.phtml">
             <block class="Magento\Catalog\Block\Product\ListProduct" name="product_list" template="product/list.phtml">
                 <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
                     <block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
+                    <!-- The following code shows how to set your own pager increments -->
+                    <!--
+                        <action method="setDefaultListPerPage">
+                        <argument name="limit" xsi:type="string">4</argument>
+                    </action>
+                    <action method="setDefaultGridPerPage">
+                        <argument name="limit" xsi:type="string">3</argument>
+                    </action>
+                    <action method="addPagerLimit">
+                        <argument name="mode" xsi:type="string">list</argument>
+                        <argument name="limit" xsi:type="string">2</argument>
+                    </action>
+                    <action method="addPagerLimit">
+                        <argument name="mode" xsi:type="string">list</argument>
+                        <argument name="limit" xsi:type="string">4</argument>
+                    </action>
+                    <action method="addPagerLimit">
+                        <argument name="mode" xsi:type="string">list</argument>
+                        <argument name="limit" xsi:type="string">6</argument>
+                    </action>
+                    <action method="addPagerLimit">
+                        <argument name="mode" xsi:type="string">list</argument>
+                        <argument name="limit" xsi:type="string">8</argument>
+                    </action>
+                    <action method="addPagerLimit" translate="label">
+                        <argument name="mode" xsi:type="string">list</argument>
+                        <argument name="limit" xsi:type="string">all</argument>
+                        <argument name="label" xsi:type="string">All</argument>
+                    </action>
+                    <action method="addPagerLimit">
+                        <argument name="mode" xsi:type="string">grid</argument>
+                        <argument name="limit" xsi:type="string">3</argument>
+                    </action>
+                    <action method="addPagerLimit">
+                        <argument name="mode" xsi:type="string">grid</argument>
+                        <argument name="limit" xsi:type="string">6</argument>
+                    </action>
+                    <action method="addPagerLimit">
+                        <argument name="mode" xsi:type="string">grid</argument>
+                        <argument name="limit" xsi:type="string">9</argument>
+                    </action>
+                    <action method="addPagerLimit" translate="label">
+                        <argument name="mode" xsi:type="string">grid</argument>
+                        <argument name="limit" xsi:type="string">all</argument>
+                        <argument name="label" xsi:type="string">All</argument>
+                    </action>
+                    -->
                 </block>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">empty</argument>
-                    <argument name="count" xsi:type="string">6</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">one_column</argument>
-                    <argument name="count" xsi:type="string">5</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">two_columns_left</argument>
-                    <argument name="count" xsi:type="string">4</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">two_columns_right</argument>
-                    <argument name="count" xsi:type="string">4</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">three_columns</argument>
-                    <argument name="count" xsi:type="string">3</argument>
-                </action>
                 <action method="setToolbarBlockName">
                     <argument name="name" xsi:type="string">product_list_toolbar</argument>
                 </action>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
index b155ed90be56da3f2418b6bfb63da2bcdf7a682f..dabf708b5197530a931ff98058c199254e7b04ac 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceContainer name="left">
-        <block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" after="currency" template="navigation/left.phtml"/>
+        <block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" before="-" template="navigation/left.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml
index c33e2e17ba9d11a484d6cff6a4efd4ebc0024d30..5d2abe78c9cd96130fb772d5b48c3e203daea27b 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceContainer name="left">
-        <block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" after="currency" template="layer/view.phtml"/>
+        <block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" before="-" template="layer/view.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml
index 6bc838546534494beebaeae317df39e5655abe97..e00562d5d779dd54c1d4f427c49ceb0fec4d8684 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml
@@ -24,18 +24,12 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">popup.phtml</argument>
+    <update handle="page_one_column"/>
+    <referenceBlock name="page.main.title">
+        <action method="setPageTitle">
+            <argument translate="true" name="page_title" xsi:type="string">Compare Products</argument>
         </action>
     </referenceBlock>
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-scriptaculous-js">
-            <arguments>
-                <argument name="file" xsi:type="string">scriptaculous/scriptaculous.js</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
     <referenceContainer name="content">
         <block class="Magento\Catalog\Block\Product\Compare\ListCompare" name="catalog.compare.list" template="product/compare/list.phtml"/>
     </referenceContainer>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index c625607f9b2e7c13d37959803c9028d1b90b5d33..59a46c1af004ced809162cb5f062ada833610a64 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -24,69 +24,119 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="page_one_column"/>
+    <referenceBlock name="page.main.title">
+        <arguments>
+            <argument name="css_class" xsi:type="string">product</argument>
+            <argument name="add_base_attribute" xsi:type="string">itemprop="name"</argument>
+        </arguments>
+    </referenceBlock>
     <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-right.phtml</argument>
-        </action>
+        <arguments>
+            <argument name="add_attribute" xsi:type="string">itemscope itemtype="http://schema.org/Product"</argument>
+        </arguments>
     </referenceBlock>
     <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-catalog-zoom-css">
+        <block class="Magento\Page\Block\Html\Head\Script" name="mage-zoom-js">
+            <arguments>
+                <argument name="file" xsi:type="string">mage/zoom.js</argument>
+            </arguments>
+        </block>
+        <block class="Magento\Page\Block\Html\Head\Css" name="mage-gallery-css">
             <arguments>
-                <argument name="file" xsi:type="string">Magento_Catalog::zoom.css</argument>
+                <argument name="file" xsi:type="string">mage/gallery.css</argument>
             </arguments>
         </block>
     </referenceBlock>
     <update handle="page_calendar"/>
+    <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view/form.phtml">
+        <container name="product.info.form.content" label="invisible" as="product_info_form_content">
+            <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
+        </container>
+        <block class="Magento\View\Block\Template" name="product.info.form.options" as="options_container">
+            <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
+                <block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
+                    <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
+                    <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
+                    <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
+                    <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
+                    <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
+                </block>
+                <block class="Magento\View\Block\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Page::js/calendar.phtml"/>
+            </block>
+            <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
+                <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="product/view/addtocart.phtml"/>
+                <block class="Magento\Catalog\Block\Product\View" name="product.clone_prices" as="prices" template="product/view/price_clone.phtml"/>
+            </block>
+        </block>
+    </block>
     <referenceContainer name="content">
-        <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view.phtml">
-            <block class="Magento\Catalog\Block\Product\View\BaseImage" name="product-info-base-image" as="base-image" template="product/view/base-image.phtml"/>
-            <block class="Magento\Catalog\Block\Product\View\Gallery" name="product-info-gallery" as="gallery" template="product/view/gallery.phtml"/>
+        <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product info main" before="-">
+            <block class="Magento\Catalog\Block\Product\View" name="product.price" template="product/view/price.phtml"/>
+            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml">
+                <arguments>
+                    <argument name="at_call" xsi:type="string">getSku</argument>
+                    <argument name="at_code" xsi:type="string">sku</argument>
+                    <argument name="css_class" xsi:type="string">sku</argument>
+                    <argument name="at_label" xsi:type="string">default</argument>
+                    <argument name="add_attribute" xsi:type="string">itemprop="sku"</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Catalog\Block\Product\View" name="product.info.rating" template="product/view/rating.phtml"/>
+            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="product/view/attribute.phtml" group="detailed_info">
+                <arguments>
+                    <argument name="at_call" xsi:type="string">getShortDescription</argument>
+                    <argument name="at_code" xsi:type="string">short_description</argument>
+                    <argument name="css_class" xsi:type="string">overview</argument>
+                    <argument name="at_label" translate="true" xsi:type="string">none</argument>
+                    <argument name="title" translate="true" xsi:type="string">Overview</argument>
+                    <argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
+                </arguments>
+            </block>
             <container name="alert.urls" as="alert_urls" label="Alert Urls"/>
-            <block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" as="upsell_products" template="product/list/upsell.phtml">
-                <action method="setColumnCount">
-                    <argument name="columns" xsi:type="string">4</argument>
-                </action>
-                <action method="setItemLimit">
-                    <argument name="type" xsi:type="string">upsell</argument>
-                    <argument name="limit" xsi:type="string">4</argument>
-                </action>
+            <container name="product.info.type" label="invisible"/>
+            <block class="Magento\Catalog\Block\Product\View" name="product.tierprices" as="tierprices" template="product/view/tierprices.phtml"/>
+            <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
+            <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/>
+            <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="social links product">
+                <block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/>
+            </container>
+        </container>
+        <container name="product.info.media" label="invisible" htmlTag="div" htmlClass="product media" after="product.info.main">
+            <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="product/view/base-image.phtml">
+                <block class="Magento\Catalog\Block\Product\Image" name="product.image.main"/>
+                <block class="Magento\Catalog\Block\Product\Image" name="product.image.thumbs"/>
             </block>
-            <block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.additional" as="product_additional_data"/>
-            <block class="Magento\Catalog\Block\Product\View\Description" name="product.description" as="description" template="product/view/description.phtml" group="detailed_info">
-                <action method="setTitle">
-                    <argument translate="true" name="value" xsi:type="string">Details</argument>
-                </action>
+        </container>
+        <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="product/view/details.phtml">
+            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="product/view/attribute.phtml" group="detailed_info">
+                <arguments>
+                    <argument name="at_call" xsi:type="string">getDescription</argument>
+                    <argument name="at_code" xsi:type="string">description</argument>
+                    <argument name="css_class" xsi:type="string">description</argument>
+                    <argument name="at_label" xsi:type="string">none</argument>
+                    <argument name="title" translate="true" xsi:type="string">Details</argument>
+                </arguments>
             </block>
             <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="product/view/attributes.phtml" group="detailed_info">
-                <action method="setTitle">
-                    <argument translate="true" name="value" xsi:type="string">Additional Information</argument>
-                </action>
-            </block>
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/>
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
-            <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
-            <block class="Magento\View\Block\Template" name="product.info.container" as="options_container">
-                <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
-                    <block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
-                        <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
-                        <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
-                        <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
-                        <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
-                        <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
-                    </block>
-                    <block class="Magento\View\Block\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Page::js/calendar.phtml"/>
-                </block>
-                <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
-                    <block class="Magento\Catalog\Block\Product\View" name="product.tierprices.additional" as="product.tierprices" template="product/view/tierprices.phtml"/>
-                    <block class="Magento\Catalog\Block\Product\View" name="product.clone_prices" as="prices" template="product/view/price_clone.phtml"/>
-                    <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="addtocart" template="product/view/addtocart.phtml"/>
-                    <block class="Magento\Catalog\Block\Product\View" name="product.info.addto.additional" as="addto" template="product/view/addto.phtml"/>
-                </block>
+                <arguments>
+                    <argument translate="true" name="title" xsi:type="string">Additional Information</argument>
+                </arguments>
             </block>
         </block>
     </referenceContainer>
-    <referenceContainer name="right">
-        <block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" before="-" template="product/list/related.phtml"/>
+    <referenceContainer name="content.aside">
+        <block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" template="Magento_Catalog::product/list/items.phtml">
+            <arguments>
+                <argument name="type" xsi:type="string">related</argument>
+            </arguments>
+        </block>
+        <block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" template="Magento_Catalog::product/list/items.phtml">
+            <arguments>
+                <argument name="type" xsi:type="string">upsell</argument>
+            </arguments>
+        </block>
+        <block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.additional" as="product_additional_data"/>
     </referenceContainer>
     <update handle="MAP_popup"/>
     <update handle="MAP_price_msrp_item"/>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml
index 2bad362d01d06d4c53b90df177e8e4fea3b3e12b..baf5f2d8391c7f9ec80d56ee3fc1253a5ee57811 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml
@@ -24,11 +24,15 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
-        <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.configurable" as="product_type_data" template="product/view/type/default.phtml">
-            <container name="product.info.configurable.extra" as="product_type_data_extra" label="Product Extra Info"/>
-        </block>
+    <referenceBlock name="root">
+        <action method="addBodyClass">
+            <argument name="value" xsi:type="string">type-configurable</argument>
+        </action>
     </referenceBlock>
+    <referenceContainer name="product.info.type">
+        <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.configurable" as="product_type_data" template="product/view/type/default.phtml"/>
+        <container name="product.info.configurable.extra" after="product.info.configurable" as="product_type_data_extra" label="Product Extra Info"/>
+    </referenceContainer>
     <referenceBlock name="product.info.options.wrapper">
         <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="product/view/type/options/configurable.phtml"/>
     </referenceBlock>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml
index af3c5a23e151a19efc0e68973f7d71fbe5a06e03..e86dc99138ff6bf2203603a5a1ec70282997479e 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml
@@ -24,9 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
-        <block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" as="product_type_data" template="product/view/type/grouped.phtml">
-            <container name="product.info.grouped.extra" as="product_type_data_extra" label="Product Extra Info"/>
-        </block>
-    </referenceBlock>
+    <referenceContainer name="product.info.form.content">
+        <block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="product/view/type/grouped.phtml"/>
+        <container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/>
+    </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml
index 27a22feac4f7eae2b6867d571f05d5c89c02a58e..b39d1f7329a16135cf1bc5a0edc0b5f52e88f111 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml
@@ -24,9 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
-        <block class="Magento\Catalog\Block\Product\View\Type\Simple" name="product.info.simple" as="product_type_data" template="product/view/type/default.phtml">
-            <container name="product.info.simple.extra" as="product_type_data_extra" label="Product Extra Info"/>
-        </block>
-    </referenceBlock>
+    <referenceContainer name="product.info.type">
+        <block class="Magento\Catalog\Block\Product\View\Type\Simple" name="product.info.simple" as="product_type_data" template="product/view/type/default.phtml"/>
+        <container name="product.info.simple.extra" after="product.info.simple" as="product_type_data_extra" label="Product Extra Info"/>
+    </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml
index 635b713c307ada10eada7361903d5a4e9505fffa..3f0089174f9d47eef86e7c920efd94dc8c635805 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml
@@ -24,9 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
-        <block class="Magento\Catalog\Block\Product\View\Type\Virtual" name="product.info.virtual" as="product_type_data" template="product/view/type/default.phtml">
-            <container name="product.info.virtual.extra" as="product_type_data_extra" label="Product Extra Info"/>
-        </block>
-    </referenceBlock>
+    <referenceContainer name="product.info.type">
+        <block class="Magento\Catalog\Block\Product\View\Type\Virtual" name="product.info.virtual" as="product_type_data" template="product/view/type/default.phtml"/>
+        <container name="product.info.virtual.extra" after="product.info.virtual" as="product_type_data_extra" label="Product Extra Info"/>
+    </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/default.xml b/app/code/Magento/Catalog/view/frontend/layout/default.xml
index 61dce0450f1e8433c01dfd560cf8bd357763bfb7..c22c8528c0d924b27d81112f3be9daadecc2498d 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/default.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/default.xml
@@ -24,36 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-catalog-widgets-css">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Catalog::widgets.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <referenceContainer name="left">
-        <block class="Magento\View\Block\Template" name="left.permanent.callout" template="Magento_Page::callouts/left_col.phtml">
-            <action method="setImgSrc">
-                <argument name="src" xsi:type="string">Magento_Catalog::images/media/col_left_callout.jpg</argument>
-            </action>
-            <action method="setImgAlt">
-                <argument translate="true" name="alt" xsi:type="string">Our customer service is available 24/7.</argument>
-            </action>
-            <action method="setLinkUrl">
-                <argument name="url" xsi:type="string">checkout/cart</argument>
-            </action>
-        </block>
-    </referenceContainer>
     <referenceContainer name="right">
-        <block class="Magento\Catalog\Block\Product\Compare\Sidebar" before="cart_sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
-        <block class="Magento\View\Block\Template" name="right.permanent.callout" template="Magento_Page::callouts/right_col.phtml">
-            <action method="setImgSrc">
-                <argument name="src" xsi:type="string">Magento_Catalog::images/media/col_right_callout.jpg</argument>
-            </action>
-            <action method="setImgAlt">
-                <argument translate="true" name="alt" xsi:type="string">Look for our special back-to-school items and save bunches!</argument>
-            </action>
-        </block>
+        <block class="Magento\Catalog\Block\Product\Compare\Sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
     </referenceContainer>
     <block class="Magento\Catalog\Block\Product\Price\Template" name="catalog_product_price_template"/>
     <referenceBlock name="catalog_product_price_template">
diff --git a/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml b/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml
index 06b07bc17cffe1034a7b566052ddcf9582be0e15..4b0273ddb94d08720ef31f9eece9266600cda938 100644
--- a/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml
+++ b/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -31,32 +29,33 @@
  */
 ?>
 <?php if ($this->helper('Magento\Catalog\Helper\Data')->isMsrpEnabled()): ?>
-<div id="map-popup" class="map-popup" style="display:none;">
-    <a href="#" class="map-popup-close" id="map-popup-close">x</a>
-
-    <div class="map-popup-arrow"></div>
-    <div class="map-popup-heading"><h2 id="map-popup-heading"></h2></div>
-    <div class="map-popup-content" id="map-popup-content">
-        <div class="map-popup-checkout">
-            <form action="" method="POST" id="product_addtocart_form_from_popup">
-                <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
-
-                <div class="additional-addtocart-box">
-                    <?php echo $this->getChildHtml(); ?>
-                </div>
-                <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"
-                        id="map-popup-button"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-            </form>
+<div id="map-popup" class="map popup">
+    <a href="#" class="action close" id="map-popup-close"><span><?php echo __('Close') ?></span></a>
+    <div class="title" id="map-popup-heading"></div>
+    <div class="content" id="map-popup-content">
+        <form action="" method="POST" id="product_addtocart_form_from_popup" class="form map checkout">
+            <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
+            <div class="additional-addtocart-box">
+                <?php echo $this->getChildHtml(); ?>
+            </div>
+            <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart" id="map-popup-button">
+                <span><?php echo __('Add to Cart') ?></span>
+            </button>
+        </form>
+        <div class="map msrp" id="map-popup-msrp-box">
+            <span class="label"><?php echo __('Price'); ?></span>
+            <div class="old price" id="map-popup-msrp"></div>
         </div>
-        <div class="map-popup-msrp" id="map-popup-msrp-box"><strong><?php echo __('Price'); ?>:</strong> <span
-            style="text-decoration:line-through;" id="map-popup-msrp"></span></div>
-        <div class="map-popup-price" id="map-popup-price-box"><strong><?php echo __('Actual Price'); ?>:</strong>
-            <span id="map-popup-price"></span></div>
-
+        <div class="map price" id="map-popup-price-box">
+            <span class="label"><?php echo __('Actual Price'); ?></span>
+            <div id="map-popup-price" class="actual price"></div>
+        </div>
+    </div>
+    <div class="content" id="map-popup-text">
+        <?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessage(); ?>
+    </div>
+    <div class="content" id="map-popup-text-what-this">
+        <?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessageWhatsThis(); ?>
     </div>
-    <div class="map-popup-text"
-         id="map-popup-text"><?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessage(); ?></div>
-    <div class="map-popup-text"
-         id="map-popup-text-what-this"><?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessageWhatsThis(); ?></div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/navigation/left.phtml b/app/code/Magento/Catalog/view/frontend/navigation/left.phtml
index d91ec6b8d635860a206333d2e014c60943731565..c8fd9446ef22f2ce8318bb5acf58cb2cc4ea3111 100644
--- a/app/code/Magento/Catalog/view/frontend/navigation/left.phtml
+++ b/app/code/Magento/Catalog/view/frontend/navigation/left.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -34,26 +32,27 @@
 <?php $_categories = $this->getCurrentChildCategories() ?>
 <?php $_count = is_array($_categories)?count($_categories):$_categories->count(); ?>
 <?php if($_count): ?>
-<div class="block block-layered-nav">
-    <div class="block-title">
-        <strong><span><?php echo __('Browse By') ?></span></strong>
+    <div class="block filter">
+        <div class="title">
+            <strong><?php echo __('Shop By') ?></strong>
+        </div>
+        <div class="content">
+            <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
+            <dl class="options" id="narrow-by-list2">
+                <dt><?php echo __('Category') ?></dt>
+                <dd>
+                    <ol class="items">
+                        <?php foreach ($_categories as $_category): ?>
+                            <?php if($_category->getIsActive()): ?>
+                                <li class="item">
+                                    <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a>
+                                    <span class="count"><?php echo $_category->getProductCount() ?></span>
+                                </li>
+                            <?php endif; ?>
+                        <?php endforeach ?>
+                    </ol>
+                </dd>
+            </dl>
+        </div>
     </div>
-    <div class="block-content">
-        <dl id="narrow-by-list2">
-            <dt><?php echo __('Category') ?></dt>
-            <dd>
-                <ol>
-                <?php foreach ($_categories as $_category): ?>
-                    <?php if($_category->getIsActive()): ?>
-                    <li>
-                        <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a> (<?php echo $_category->getProductCount() ?>)
-                    </li>
-                    <?php endif; ?>
-                <?php endforeach ?>
-                </ol>
-            </dd>
-        </dl>
-        <script type="text/javascript">(function($) {$('#narrow-by-list2').decorate('dataList')})(jQuery)</script>
-    </div>
-</div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/navigation/top.phtml b/app/code/Magento/Catalog/view/frontend/navigation/top.phtml
index 5c948d34a69f6812719d9ff168c09f9d975e9596..2a5fc51cd744f748f9627464b58c5a8febe5d590 100644
--- a/app/code/Magento/Catalog/view/frontend/navigation/top.phtml
+++ b/app/code/Magento/Catalog/view/frontend/navigation/top.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,7 +26,7 @@
 /**
  * Top menu for store
  *
- * @see \Magento\Catalog\Block\Navigation
+ * @var $this \Magento\Catalog\Block\Navigation
  */
 ?>
 <?php
@@ -41,7 +39,7 @@
 ?>
 <?php $_menu = $this->renderCategoriesMenuHtml(0,'level-top') ?>
 <?php if($_menu): ?>
-<div class="nav-container">
+<div class="nav container">
     <ul id="nav">
         <?php echo $_menu ?>
     </ul>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/product/compare/link.phtml
similarity index 98%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/compare/link.phtml
rename to app/code/Magento/Catalog/view/frontend/product/compare/link.phtml
index 288e5ce1f9abd7d0e619c04c6b5f55924a4ed683..b7c2bed52316ae27d7e396bfc375a8df58e94035 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/link.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/compare/link.phtml
@@ -18,7 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Catalog/view/frontend/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/product/compare/list.phtml
index 89c012dd4b768274839231d765d3b081eec2fca0..206691fd2ba3af8871472ccb6b54eaad3af7c408 100644
--- a/app/code/Magento/Catalog/view/frontend/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/compare/list.phtml
@@ -18,146 +18,135 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 /* @var $this \Magento\Catalog\Block\Product\Compare\ListCompare */
 ?>
-<div class="page-title title-buttons">
-    <h1><?php echo __('Compare Products') ?></h1>
-    <a href="#" class="link-print"><?php echo __('Print This Page') ?></a>
-</div>
 <?php $_total=$this->getItems()->getSize() ?>
 <?php if($_total): ?>
-<table class="data-table compare-table" id="product-comparison">
-    <?php $_i=0 ?>
-    <?php foreach($this->getItems() as $_item): ?>
-    <?php if($_i++%10==0): ?>
-        <col width="1" />
-        <?php endif; ?>
-    <col width="<?php echo floor(100/$_total); ?>%" />
-    <?php endforeach; ?>
-    <?php if ($_total>2): ?>
-    <thead>
-    <tr>
-        <?php $_i=0 ?>
-        <?php foreach($this->getItems() as $_item): ?>
-        <?php if($_i++%10==0): ?>
-            <th>&nbsp;</th>
-            <?php endif; ?>
-        <td class="a-right"><a href="#" data-url='<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getRemoveUrl($_item) ?>' class="btn-remove"  title="<?php echo __('Remove This Item') ?>"><?php echo __('Remove This Item') ?></a></td>
-        <?php endforeach; ?>
-    </tr>
-    </thead>
-    <?php endif ?>
-    <tbody>
-    <tr class="product-shop-row">
-        <?php $_i=0 ?>
-        <?php foreach($this->getItems() as $_item): ?>
-        <?php if($_i++%10==0): ?>
-            <th>&nbsp;</th>
-            <?php endif; ?>
-        <td>
-            <a class="product-image" href="#" data-url="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>"><img src="<?php echo $this->getSmallImageUrl($_item) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_item->getName(), null, true) ?>" /></a>
-            <h2 class="product-name"><a href="#" data-url="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a></h2>
-            <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
-            <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
-            <?php if($_item->isSaleable()): ?>
-            <p><button type="button" data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" ><span><span><?php echo __('Add to Cart') ?></span></span></button></p>
-            <?php else: ?>
-            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-            <ul class="add-to-links" data-role="add-to-links">
-                <li><a href="#" data-url="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" data-action="add-to-wishlist" ><?php echo __('Add to Wishlist') ?></a></li>
-            </ul>
-            <?php endif; ?>
-        </td>
-        <?php endforeach; ?>
-    </tr>
-    </tbody>
-    <tbody>
-        <?php foreach ($this->getAttributes() as $_attribute): ?>
-    <tr>
-        <?php $_i=0 ?>
-        <?php foreach($this->getItems() as $_item): ?>
-        <?php if($_i++%10==0): ?>
-            <th><span class="nobr"><?php echo $_attribute->getStoreLabel() ?></span></th>
-            <?php endif; ?>
-        <td>
-            <?php switch ($_attribute->getAttributeCode()) {
-            case "price": ?>
-                <?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
-                <?php break;
-            case "small_image": ?>
-                <img src="<?php echo $this->getSmallImageUrl($_item); ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" />
-                <?php break;
-            case "date":
-                echo substr($this->getProductAttributeValue($_item, $_attribute),0,10);
-                break;
-            default: ?>
-                <div class="std">
-                    <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
-                </div>
-                <?php break;
-        } ?>
-        </td>
-        <?php endforeach; ?>
-    </tr>
-        <?php endforeach; ?>
-    </tbody>
-    <tbody>
-    <tr class="add-to-row">
-        <?php $_i=0 ?>
-        <?php foreach($this->getItems() as $_item): ?>
-        <?php if($_i++%10==0): ?>
-            <th>&nbsp;</th>
-            <?php endif; ?>
-        <td>
-            <?php echo $this->getPriceHtml($_item, true, '-compare-list-bottom') ?>
-            <?php if($_item->isSaleable()): ?>
-            <p><button type="button" data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" ><span><span><?php echo __('Add to Cart') ?></span></span></button></p>
-            <?php else: ?>
-            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-            <ul class="add-to-links" data-role="add-to-links">
-                <li><a href="#" data-url="<?php echo $this->getAddToWishlistUrl($_item);?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-            </ul>
-            <?php endif; ?>
-        </td>
-        <?php endforeach; ?>
-    </tr>
-    </tbody>
-</table>
-<div class="buttons-set">
-    <button id="window-close" type="button" title="<?php echo __('Close Window') ?>" class="button"><span><span><?php echo __('Close Window') ?></span></span></button>
-        <span class="please-wait" id="compare-list-please-wait" style="display:none;">
-            <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Please wait...') ?>" title="<?php echo __('Please wait...') ?>" class="v-middle" /> <?php echo __('Please wait...') ?>
-        </span>
-</div>
+    <a href="#" class="action print" title="<?php echo __('Print This Page') ?>">
+        <span><?php echo __('Print This Page') ?></span>
+    </a>
+    <?php $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
+    <div class="comparison wrapper">
+        <div class="comparison container">
+            <table class="data-table data table comparison" id="product-comparison">
+                <thead>
+                <tr>
+                    <?php $_i=0 ?>
+                    <?php foreach($this->getItems() as $_item): ?>
+                        <?php if($_i++==0): ?>
+                            <th class="cell label remove">&nbsp;</th>
+                        <?php endif; ?>
+                        <td class="cell remove product">
+                            <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getRemoveUrl($_item) ?>"
+                               class="action delete" title="<?php echo __('Remove Product') ?>">
+                                <span><?php echo __('Remove Product') ?></span>
+                            </a>
+                        </td>
+                    <?php endforeach; ?>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <?php $_i = 0; ?>
+                    <?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
+                    <?php foreach($this->getItems() as $_item): ?>
+                        <?php if($_i++==0): ?>
+                            <th class="cell label product">&nbsp;</th>
+                        <?php endif; ?>
+                        <td class="cell product info">
+                            <a class="product photo" href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
+                                <?php /* product_comparison_list */ ?>
+                                <?php echo $imageBlock->init($_item, 'product_comparison_list')->toHtml() ?>
+                            </a>
+                            <strong class="product name">
+                                <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
+                                    <?php echo $_helper->productAttribute($_item, $_item->getName(), 'name') ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
+                            <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
+                            <div class="product actions">
+                                <div class="primary">
+                                    <?php if($_item->isSaleable()): ?>
+                                        <button type="button" class="action tocart"
+                                                data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>">
+                                            <span><?php echo __('Add to Cart') ?></span>
+                                        </button>
+                                    <?php else: ?>
+                                        <?php if ($_item->getIsSalable()): ?>
+                                            <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                        <?php else: ?>
+                                            <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                        <?php endif; ?>
+                                    <?php endif; ?>
+                                </div>
+                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
+                                    <div class="secondary addto links">
+                                        <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist">
+                                            <span><?php echo __('Add to Wishlist') ?></span>
+                                        </a>
+                                    </div>
+                                <?php endif; ?>
+                            </div>
+                        </td>
+                    <?php endforeach; ?>
+                </tr>
+                </tbody>
+                <tbody>
+                <?php foreach ($this->getAttributes() as $_attribute): ?>
+                    <tr>
+                        <?php $_i = 0 ?>
+                        <?php foreach($this->getItems() as $_item): ?>
+                            <?php if($_i++==0): ?>
+                                <th class="cell label">
+                                    <span class="attribute label">
+                                        <?php echo $_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel()) ?>
+                                    </span>
+                                </th>
+                            <?php endif; ?>
+                            <td class="cell product attribute">
+                                <div class="attibute value">
+                                    <?php switch ($_attribute->getAttributeCode()) {
+                                        case "price": ?>
+                                            <?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
+                                            <?php break;
+                                        case "small_image": ?>
+                                            <img src="<?php echo $this->getSmallImageUrl($_item); ?>"
+                                                 width="<?php echo $this->getSmallImageSize() ?>"
+                                                 height="<?php echo $this->getSmallImageSize() ?>"
+                                                 alt="<?php echo $this->stripTags($_item->getName(), null, true) ?>"/>
+                                            <?php break;
+                                        default: ?>
+                                        <?php echo $_helper->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
+                                        <?php break;
+                                    } ?>
+                                </div>
+                            </td>
+                        <?php endforeach; ?>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
+<?php else: ?>
+    <p class="empty"><?php echo __('You have no items to compare.') ?></p>
 <?php endif; ?>
 <script type="text/javascript">
     (function($, window) {
-    <?php if ($_total): ?>
+        <?php if ($_total): ?>
         head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/list.js')?>", function() {
             $('#product-comparison').compareList({
-                productRemoveSelector: 'a.btn-remove',
-                ajaxSpinner: '#compare-list-please-wait',
-                windowCloseSelector: '#window-close',
-                windowPrintSelector: 'a.link-print',
+                windowPrintSelector: '.action.print',
+                productsInRow: 5,
                 selectors: {
-                    productSelector: 'h2.product-name > a',
-                    productImageSelector: 'a.product-image',
-                    productAddToCartSelector: 'button.btn-cart',
-                    productWishListSelector: 'a.link-wishlist'
+                    productAddToCartSelector: 'button.action.tocart'
                 }
             });
         });
-    <?php else: ?>
-        window.close();
-    <?php endif; ?>
+        <?php endif; ?>
     })(jQuery, window);
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml
index 29bc0cfc3ce532e89e6d7f052d7209b3fe9b01dc..bc3729367539c38fb728356b980b1ad6d78997e2 100644
--- a/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -29,42 +27,54 @@
 $_helper = $this->helper('Magento\Catalog\Helper\Product\Compare');
 $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
 ?>
-<div class="block block-list block-compare">
-    <div class="block-title">
-        <strong><span><?php echo __('Compare Products') ?>
+<div class="block compare">
+    <div class="title">
+        <strong>
+            <span class="text"><?php echo __('Compare Products') ?></span>
             <?php if($_helper->getItemCount() > 0): ?>
-                <small><?php echo __('(%1)', $_helper->getItemCount()) ?></small>
-                <?php endif; ?>
-        </span></strong>
+                <span class="qty"><?php echo __('%1', $_helper->getItemCount()) ?></span>
+            <?php endif; ?>
+        </strong>
     </div>
-    <div class="block-content">
+    <div class="content">
         <?php if($_helper->getItemCount() > 0): ?>
-        <ol id="compare-items">
+        <ol id="compare-items" class="items compare">
             <?php foreach($_items as $_index => $_item): ?>
             <li class="item">
-                <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>" />
-                <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>" class="btn-remove"><?php echo __('Remove This Item') ?></a>
-                <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a></p>
+                <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>"/>
+                <strong class="product name">
+                    <a href="<?php echo $this->getProductUrl($_item) ?>">
+                        <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?>
+                    </a>
+                </strong>
+                <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>"
+                   class="action delete"><span><?php echo __('Remove This Item') ?></span></a>
             </li>
-            <?php endforeach; ?>
-        </ol>
-        <div class="actions">
-            <a id='compare-clear-all' href="<?php echo $_helper->getClearListUrl() ?>" ><?php echo __('Clear All') ?></a>
-            <button type="button" title="<?php echo __('Compare') ?>" class="button" data-mage-init="{popupWindow: {windowURL:'<?php echo $_helper->getListUrl() ?>',windowName:'compare',centerScreen:1,resizable:1,scrollbars:1,width:820,height:600}}"><span><span><?php echo __('Compare') ?></span></span></button>
+        <?php endforeach; ?>
+    </ol>
+    <div class="actions">
+        <div class="primary">
+            <a href="<?php echo $_helper->getListUrl() ?>" class="action compare"><span><?php echo __('Compare') ?></span></a>
         </div>
-        <script type="text/javascript">
-            (function($) {
-                head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/compare.js') ?>", function() {
+        <div class="secondary">
+            <a id="compare-clear-all" href="<?php echo $_helper->getClearListUrl() ?>" class="action clear">
+                <span><?php echo __('Clear All') ?></span>
+            </a>
+        </div>
+    </div>
+    <script type="text/javascript">
+        (function($) {
+            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/compare.js') ?>", function () {
                     $('#compare-items').compareItems({
-                        removeConfirmMessage: '<?php echo __('Are you sure you want to remove this item from the compared products?') ?>',
-                        removeSelector: '#compare-items a.btn-remove',
-                        clearAllConfirmMessage: '<?php echo __('Are you sure you want to remove all products from your comparison?') ?>',
+                        removeConfirmMessage: '<?php echo __('Are you sure you would like to remove this item from the compare products?') ?>',
+                        removeSelector: '#compare-items a.action.delete',
+                        clearAllConfirmMessage: '<?php echo __('Are you sure you would like to remove all products from your comparison?') ?>',
                         clearAllSelector: '#compare-clear-all'
                     });
                 });
             })(jQuery);
         </script>
-        <?php else: ?>
+    <?php else: ?>
         <p class="empty"><?php echo __('You have no items to compare.') ?></p>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/product/gallery.phtml
index 6ca9aae68995c27c2ba9ec9af8b218713e180746..3ed9f34b3703d377861234ed211be7f5173c57c5 100644
--- a/app/code/Magento/Catalog/view/frontend/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/gallery.phtml
@@ -27,9 +27,9 @@
 <?php $_width = $this->getImageWidth(); ?>
 <div class="product-image-popup" style="width:<?php echo $_width; ?>px;">
     <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?php echo __('Close Window') ?></span></a></div>
-    <?php if($this->getPreviusImageUrl() || $this->getNextImageUrl()): ?>
+    <?php if($this->getPreviousImageUrl() || $this->getNextImageUrl()): ?>
         <div class="nav">
-          <?php if($_prevUrl = $this->getPreviusImageUrl()): ?>
+          <?php if($_prevUrl = $this->getPreviousImageUrl()): ?>
               <a href="<?php echo $_prevUrl ?>" class="prev">&laquo; <?php echo __('Prev') ?></a>
           <?php endif; ?>
           <?php if($_nextUrl = $this->getNextImageUrl()): ?>
@@ -42,9 +42,9 @@
     <?php endif; ?>
     <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($this->getProduct(), 'image', $this->getImageFile()); ?>"<?php if($_width): ?> width="<?php echo $_width ?>"<?php endif; ?> alt="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" title="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" />
     <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?php echo __('Close Window') ?></span></a></div>
-    <?php if($this->getPreviusImageUrl() || $this->getNextImageUrl()): ?>
+    <?php if($this->getPreviousImageUrl() || $this->getNextImageUrl()): ?>
         <div class="nav">
-          <?php if($_prevUrl = $this->getPreviusImageUrl()): ?>
+          <?php if($_prevUrl = $this->getPreviousImageUrl()): ?>
               <a href="<?php echo $_prevUrl ?>" class="prev">&laquo; <?php echo __('Prev') ?></a>
           <?php endif; ?>
           <?php if($_nextUrl = $this->getNextImageUrl()): ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/image.phtml b/app/code/Magento/Catalog/view/frontend/product/image.phtml
index e442b1f2a949379ac3bee43000f87dd77e45af6c..1d4af74a1c6001507a051af11e26276c14458511 100644
--- a/app/code/Magento/Catalog/view/frontend/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/image.phtml
@@ -18,15 +18,15 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php /** @var $this \Magento\Catalog\Block\Product\Image */ ?>
 
-<img style=" width:<?php echo $this->getProductImageView()->getWidth()?>px;
+<img class="photo image"
+     style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
      height:<?php echo $this->getProductImageView()->getHeight()?>px;"
+     <?php echo $this->getAddAttribute(); ?>
      src="<?php echo $this->getProductImageView()->getUrl() ?>"
-     alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/>
+     alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml
index 16c66e508c064d5dfeffde8e3d2f729350115e59..b481c0f3f5c988db2b330c534bd86249b50e4aed 100644
--- a/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml
@@ -19,15 +19,25 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php /** @var $this \Magento\Catalog\Block\Product\Image */ ?>
 
-<span style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
-    height:<?php echo $this->getProductImageView()->getHeight()?>px; display: block; position: relative;
-    overflow: hidden"><img style="display: block; position: absolute; top: 0; bottom: 0; left: 0; right: 0;
-    margin: auto;" src="<?php echo $this->getProductImageView()->getUrl() ?>"
-    alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/></span>
+<span class="img photo container"
+      style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
+             height:<?php echo $this->getProductImageView()->getHeight()?>px;
+             display: block; position: relative;
+             overflow: hidden"><img class="photo image"
+                                    style="display: block;
+                                           position: absolute;
+                                           top: 0;
+                                           bottom: 0;
+                                           left: 0;
+                                           right: 0;
+                                           margin: auto;"
+                                           <?php echo $this->getAddAttribute(); ?>
+                                           src="<?php echo $this->getProductImageView()->getUrl() ?>"
+                                           alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/>
+</span>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list.phtml b/app/code/Magento/Catalog/view/frontend/product/list.phtml
index 5ed1776acd276aeff4237a6dc7e0f9c98a09123c..96baf368d9a7cb3dd6e4d8179fbe99e9e029f5db 100644
--- a/app/code/Magento/Catalog/view/frontend/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/list.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,136 +26,100 @@
 /**
  * Product list template
  *
- * @see \Magento\Catalog\Block\Product\ProductList
+ * @var $this \Magento\Catalog\Block\Product\ListProduct
  */
 ?>
 <?php
 $_productCollection = $this->getLoadedProductCollection();
 $_helper = $this->helper('Magento\Catalog\Helper\Output');
+$imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
 ?>
 <?php if (!$_productCollection->count()): ?>
-<p class="note-msg"><?php echo __('There are no products matching the selection.') ?></p>
+    <div class="message notice"><span><?php echo __('There are no products matching the selection.') ?></span></div>
 <?php else: ?>
-<div class="category-products">
     <?php echo $this->getToolbarHtml() ?>
     <?php echo $this->getAdditionalHtml() ?>
-    <?php // List mode ?>
-    <?php if ($this->getMode() != 'grid'): ?>
-    <?php $_iterator = 0; ?>
-    <ol class="products-list" id="products-list">
-        <?php foreach ($_productCollection as $_product): ?>
-        <li class="item<?php if (++$_iterator == sizeof($_productCollection)): ?> last<?php endif; ?>">
-            <?php // Product Image
-            $_label = $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true);
-            $_size = $this->getSmallImageSize();
-            ?>
-            <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_label ?>" class="product-image"><img
-                src="<?php echo $this->getSmallImageUrl($_product); ?>" width="<?php echo $_size?>"
-                height="<?php echo $_size?>" alt="<?php echo $_label ?>"/></a>
-            <?php // Product description ?>
-            <div class="product-shop">
-                <div class="f-fix">
-                    <?php $_productNameStripped = $this->stripTags($_product->getName(), null, true); ?>
-                    <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"
-                                                title="<?php echo $_productNameStripped; ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?></a>
-                    </h2>
-                    <?php if ($_product->getRatingSummary()): ?>
-                    <?php echo $this->getReviewsSummaryHtml($_product) ?>
-                    <?php endif; ?>
-                    <?php echo $this->getPriceHtml($_product, true) ?>
-
-                    <?php if ($_product->isSaleable()): ?>
-                    <p>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"
-                                data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
-                            <span><span><?php echo __('Add to Cart') ?></span></span></button>
-                    </p>
-                    <?php else: ?>
-                    <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                    <?php endif; ?>
-                    <div class="desc std">
-                        <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-                        <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
-                           class="link-learn"><?php echo __('Learn More') ?></a>
-                    </div>
-                    <ul class="add-to-links" data-role="add-to-links">
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                        <li><a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
-                               class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
+    <?php if ($this->getMode() == 'grid') {
+        $viewMode ='grid';
+        $image = 'category_page_grid';
+        $showDescription = false;
+        $rating = 'short';
+    } else {
+        $viewMode ='list';
+        $image = 'category_page_list';
+        $showDescription = true;
+        $rating = 'full';
+    }
+    /**
+     * Position for actions regarding image size changing in vde if needed
+     */
+    $pos = $this->getPositioned();
+    $position = '';
+    if ($pos != null) {
+        $position = ' style="left:' . $this->getVar("{$image}:width") . 'px;'
+            .'top:' . $this->getVar("{$image}:height") . 'px;"';
+    }
+    ?>
+    <div class="products wrapper <?php echo $viewMode; ?>">
+        <?php $iterator = 1; ?>
+        <ol class="products list items">
+            <?php foreach ($_productCollection as $_product): ?>
+                <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                <div class="product">
+                    <?php // Product Image ?>
+                    <a href="<?php echo $_product->getProductUrl() ?>" class="product photo">
+                        <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+                    </a>
+                    <div class="product details">
+                        <?php $_productNameStripped = $this->stripTags($_product->getName(), null, true); ?>
+                        <strong class="product name">
+                            <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped; ?>">
+                                <?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
+                            </a>
+                        </strong>
+                        <?php echo $this->getPriceHtml($_product, true) ?>
+                        <?php if ($_product->getRatingSummary()): ?>
+                            <?php echo $this->getReviewsSummaryHtml($_product,$rating) ?>
                         <?php endif; ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                        <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>"
-                                                                class="link-compare"><?php echo __('Add to Compare') ?></a>
-                        </li>
+                        <?php if ($showDescription):?>
+                            <div class="product description">
+                                <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
+                                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
+                                   class="action more"><?php echo __('Learn More') ?></a>
+                            </div>
                         <?php endif; ?>
-                    </ul>
+                        <div class="product actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
+                            <div class="primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position: ''; ?>>
+                                <?php if ($_product->isSaleable()): ?>
+                                    <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart"
+                                            data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
+                                        <span><?php echo __('Add to Cart') ?></span>
+                                    </button>
+                                <?php else: ?>
+                                    <?php if ($_product->getIsSalable()): ?>
+                                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                    <?php else: ?>
+                                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                    <?php endif; ?>
+                                <?php endif; ?>
+                            </div>
+                            <div class="secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
+                                <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
+                                   class="action towishlist" data-action="add-to-wishlist">
+                                    <span><?php echo __('Add to Wishlist') ?></span>
+                                </a>
+                                <a href="<?php echo $this->getAddToCompareUrl($_product) ?>" class="action tocompare">
+                                    <span><?php echo __('Add to Compare') ?></span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </li>
-        <?php endforeach; ?>
-    </ol>
-    <script type="text/javascript">
-        jQuery('#products-list').decorate('list');
-    </script>
-    <?php else: ?>
-
-    <?php // Grid Mode ?>
-
-    <?php $_collectionSize = $_productCollection->count() ?>
-    <?php $_columnCount = $this->getColumnCount(); ?>
-    <?php $i = 0;
-    foreach ($_productCollection as $_product): ?>
-        <?php if ($i++ % $_columnCount == 0): ?>
-        <ul class="products-grid">
-        <?php endif ?>
-        <li class="item<?php if (($i - 1) % $_columnCount == 0): ?> first<?php elseif ($i % $_columnCount == 0): ?> last<?php endif; ?>">
-            <?php // Product Image
-            $_label = $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true);
-            $_size = $this->getSmallImageSize();
-            ?>
-            <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_label ?>" class="product-image"><img
-                src="<?php echo $this->getSmallImageUrl($_product); ?>" width="<?php echo $_size?>"
-                height="<?php echo $_size?>" alt="<?php echo $_label ?>"/></a>
-
-            <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"
-                                        title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name') ?></a>
-            </h2>
-            <?php if ($_product->getRatingSummary()): ?>
-            <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-            <?php endif; ?>
-            <?php echo $this->getPriceHtml($_product, true) ?>
-            <div class="actions">
-                <?php if ($_product->isSaleable()): ?>
-                <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"
-                        data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
-                    <span><span><?php echo __('Add to Cart') ?></span></span></button>
-                <?php else: ?>
-                <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                <?php endif; ?>
-                <ul class="add-to-links" data-role="add-to-links">
-                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                    <li><a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
-                           class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-                    <?php endif; ?>
-                    <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                    <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>"
-                                                            class="link-compare"><?php echo __('Add to Compare') ?></a>
-                    </li>
-                    <?php endif; ?>
-                </ul>
-            </div>
-        </li>
-        <?php if ($i % $_columnCount == 0 || $i == $_collectionSize): ?>
-        </ul>
-        <?php endif ?>
-        <?php endforeach ?>
-    <script type="text/javascript">
-        jQuery('ul.products-grid > li').decorate('generic', ['odd', 'even', 'first', 'last']);
-    </script>
-    <?php endif; ?>
-
-    <div class="toolbar-bottom">
+                <?php echo ($iterator==count($_productCollection)+1) ? '</li>' : '' ?>
+            <?php endforeach; ?>
+        </ol>
+    </div>
+    <div class="toolbar bottom">
         <?php echo $this->getToolbarHtml() ?>
     </div>
-</div>
 <?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/product/list/items.phtml
similarity index 93%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/list/items.phtml
rename to app/code/Magento/Catalog/view/frontend/product/list/items.phtml
index 5ff16b20042bac1ace91f3cb3cf7920021424788..07459d1598ed633fce33bb63e0fe646df0206f25 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/list/items.phtml
@@ -18,7 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -158,6 +157,27 @@ switch($type=$this->getType()) {
     }
     break;
 
+    case 'new':
+    if ($exist = $this->getProductCollection()) {
+        $type = 'new';
+        $mode = 'grid';
+        $type = $type . ' ' . $mode;
+
+        $class = 'widget' . ' ' . $type;
+
+        $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+        $image = 'new_products_content_widget_grid';
+        $title = __('New Products');
+        $items = $exist;
+
+        $showWishlist = true;
+        $showCompare = true;
+        $showCart = true;
+        $rating = 'short';
+        $description = ($mode == 'list') ? true : false;
+    }
+    break;
+
     case 'other':
     break;
 }
@@ -166,35 +186,26 @@ switch($type=$this->getType()) {
 <?php if ($exist):?>
 
 <div class="block <?php echo $class; ?>">
-
     <div class="title">
         <strong><?php echo $title; ?></strong>
     </div>
-
     <div class="content">
-
         <?php if($type == 'related'): ?>
         <div class="actions">
             <?php echo __('Check items to add to the cart or') ?>
             <button type="button" class="action select" role="select-all"><span><?php echo __('select all') ?></span></button>
         </div>
         <?php endif; ?>
-
-
         <ol class="products list items <?php echo $type; ?>">
         <?php $iterator = 1; ?>
         <?php foreach($items as $_item): ?>
             <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-
                 <div class="product">
-
                     <?php echo '<!-- ' . $image . '-->' ?>
                     <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
                         <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
                     </a>
-
                     <div class="product details">
-
                         <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
                             <?php echo $this->escapeHtml($_item->getName()) ?></a>
                         </strong>
@@ -216,11 +227,10 @@ switch($type=$this->getType()) {
 
                         <?php if($showWishlist || $showCompare || $showCart): ?>
                         <div class="product actions">
-
                             <?php if($showCart): ?>
                             <div class="primary">
                                 <?php if($_item->isSaleable()): ?>
-                                <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
+                                <button class="action tocart" data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}" type="button" title="<?php echo __('Add to Cart') ?>">
                                     <span><?php echo __('Add to Cart') ?></span>
                                 </button>
                                 <?php else: ?>
@@ -249,7 +259,6 @@ switch($type=$this->getType()) {
                             <?php endif; ?>
                         </div>
                         <?php endif; ?>
-
                     </div>
                 </div>
             <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
@@ -265,8 +274,5 @@ switch($type=$this->getType()) {
         });
     </script>
     <?php endif; ?>
-    <script type="text/javascript">
-        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-    </script>
 </div>
 <?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list/related.phtml b/app/code/Magento/Catalog/view/frontend/product/list/related.phtml
deleted file mode 100644
index 217820ac1bcd04f512b53eee814cd7c9f69faf13..0000000000000000000000000000000000000000
--- a/app/code/Magento/Catalog/view/frontend/product/list/related.phtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if($this->getItems()->getSize()): ?>
-<div class="block block-related">
-    <div class="block-title">
-        <strong><span><?php echo __('Related Products') ?></span></strong>
-    </div>
-    <div class="block-content">
-        <p class="block-subtitle"><?php echo __('Check items to add to the cart or') ?>&nbsp;<a href="#" role="select-all"><?php echo __('select all') ?></a></p>
-        <ol class="mini-products-list" id="block-related">
-        <?php foreach($this->getItems() as $_item): ?>
-            <li class="item">
-                <?php if(!$_item->isComposite() && $_item->isSaleable()): ?>
-                    <?php if (!$_item->getRequiredOptions()): ?>
-                        <input type="checkbox" class="checkbox related-checkbox" id="related-checkbox<?php echo $_item->getId() ?>" name="related_products[]" value="<?php echo $_item->getId() ?>" />
-                    <?php endif; ?>
-                <?php endif; ?>
-                <div class="product">
-                    <a href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" class="product-image"><img src="<?php echo $this->getThumbnailSidebarUrl($_item) ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
-                    <div class="product-details">
-                        <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
-                        <?php echo $this->getPriceHtml($_item, true, '-related') ?>
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                            <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a>
-                        <?php endif; ?>
-                    </div>
-                </div>
-            </li>
-        <?php endforeach ?>
-        </ol>
-        <script type="text/javascript">jQuery('#block-related').decorate('list', false);</script>
-    </div>
-    <script type="text/javascript">
-        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/related-products.js');?>", function() {
-            jQuery(".block-related a[role='select-all']").relatedProducts();
-        });
-    </script>
-</div>
-<?php endif ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml
index 0837c62388dd23edfd8bd43a29c04fd4e61eb09f..c3c6daedd595abccad454fe794b33b391e0e9d8d 100644
--- a/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -33,75 +31,74 @@
 ?>
 <?php if ($this->getCollection()->getSize()): ?>
 <div class="toolbar">
-    <div class="pager">
-        <p class="amount">
-            <?php if ($this->getLastPageNum() > 1): ?>
-            <?php echo __('Items %1 to %2 of %3 total', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
-            <?php else: ?>
-            <strong><?php echo __('%1 Item(s)', $this->getTotalNum()) ?></strong>
-            <?php endif; ?>
-        </p>
-
-        <div class="limiter">
-            <label><?php echo __('Show') ?></label>
-            <select data-mage-init="{redirectUrl: {event:'change'}}">
-                <?php foreach ($this->getAvailableLimit() as $_key => $_limit): ?>
-                <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if ($this->isLimitCurrent($_key)): ?>
-                        selected="selected"<?php endif ?>>
-                    <?php echo $_limit ?>
-                </option>
-                <?php endforeach; ?>
-            </select> <?php echo __('per page') ?>
-        </div>
-
-        <?php echo $this->getPagerHtml() ?>
-
-    </div>
-
     <?php if ($this->isExpanded()): ?>
-    <div class="sorter">
+    <div class="settings">
         <?php if ($this->isEnabledViewSwitcher()): ?>
-        <p class="view-mode">
+        <div class="modes">
             <?php $_modes = $this->getModes(); ?>
             <?php if ($_modes && count($_modes) > 1): ?>
-            <label><?php echo __('View as') ?>:</label>
+            <strong class="label"><?php echo __('View as') ?></strong>
             <?php foreach ($this->getModes() as $_code => $_label): ?>
                 <?php if ($this->isModeActive($_code)): ?>
                     <strong title="<?php echo $_label ?>"
-                            class="<?php echo strtolower($_code); ?>"><?php echo $_label ?></strong>&nbsp;
-                    <?php else: ?>
-                    <a href="<?php echo $this->getModeUrl($_code) ?>" title="<?php echo $_label ?>"
-                       class="<?php echo strtolower($_code); ?>"><?php echo $_label ?></a>&nbsp;
+                        class="mode active <?php echo strtolower($_code); ?>"><span><?php echo $_label ?></span></strong>
+                <?php else: ?>
+                    <a class="mode <?php echo strtolower($_code); ?>" title="<?php echo $_label ?>"
+                       href="<?php echo $this->getModeUrl($_code) ?>">
+                        <span><?php echo $_label ?></span>
+                    </a>
                     <?php endif; ?>
                 <?php endforeach; ?>
             <?php endif; ?>
-        </p>
+        </div>
         <?php endif; ?>
-
-        <div class="sort-by">
-            <label><?php echo __('Sort By') ?></label>
-            <select data-mage-init="{redirectUrl: {event:'change'}}">
+        <div class="sorter">
+            <label class="label" for="sorter"><?php echo __('Sort By') ?></label>
+            <select id="sorter" data-mage-init="{redirectUrl: {event:'change'}}">
                 <?php foreach ($this->getAvailableOrders() as $_key => $_order): ?>
-                <option
-                    value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if ($this->isOrderCurrent($_key)): ?>
-                    selected="selected"<?php endif; ?>>
-                    <?php echo __($_order) ?>
-                </option>
+                    <option
+                        value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if ($this->isOrderCurrent($_key)): ?>
+                        selected="selected"<?php endif; ?>>
+                        <?php echo __($_order) ?>
+                    </option>
                 <?php endforeach; ?>
             </select>
             <?php if ($this->getCurrentDirection() == 'desc'): ?>
-            <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>"
-               title="<?php echo __('Set Ascending Direction') ?>"><img
-                src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/i_desc_arrow.gif') ?>"
-                alt="<?php echo __('Set Ascending Direction') ?>" class="v-middle"/></a>
+                <a title="<?php echo __('Set Ascending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'asc') ?>" class="action sort desc">
+                    <span><?php echo __('Set Ascending Direction') ?></span>
+                </a>
             <?php else: ?>
-            <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>"
-               title="<?php echo __('Set Descending Direction') ?>"><img
-                src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/i_asc_arrow.gif') ?>"
-                alt="<?php echo __('Set Descending Direction') ?>" class="v-middle"/></a>
+                <a title="<?php echo __('Set Descending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'desc') ?>" class="action sort asc">
+                    <span><?php echo __('Set Descending Direction') ?></span>
+                </a>
             <?php endif; ?>
         </div>
     </div>
     <?php endif; ?>
+
+    <div class="pager">
+        <p class="amount">
+            <?php if ($this->getLastPageNum() > 1): ?>
+                <?php echo __('Items %1-%2 of %3', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
+            <?php elseif ($this->getLastPageNum() == 1): ?>
+                <?php echo __('%1 Item', $this->getTotalNum()) ?>
+            <?php else: ?>
+                <?php echo __('%1 Item(s)', $this->getTotalNum()) ?>
+            <?php endif; ?>
+        </p>
+        <div class="limiter">
+            <strong class="label"><?php echo __('Show') ?></strong>
+            <select id="limiter" data-mage-init="{redirectUrl: {event:'change'}}">
+                <?php foreach ($this->getAvailableLimit() as $_key => $_limit): ?>
+                    <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if ($this->isLimitCurrent($_key)): ?>
+                        selected="selected"<?php endif ?>>
+                        <?php echo $_limit ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+            <span class="text"><?php echo __('per page') ?></span>
+        </div>
+        <?php echo $this->getPagerHtml() ?>
+    </div>
 </div>
 <?php endif ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml b/app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml
deleted file mode 100644
index 4c31244eb4a355d3f4f3b42c400b0a1d81283821..0000000000000000000000000000000000000000
--- a/app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if(count($this->getItemCollection()->getItems())): ?>
-<div class="box-collateral box-up-sell">
-    <h2><?php echo __('You may also be interested in the following product(s):') ?></h2>
-    <table class="products-grid" id="upsell-product-table">
-    <?php // $this->setColumnCount(5); // uncomment this line if you want to have another number of columns. also can be changed in layout ?>
-    <?php $this->resetItemsIterator() ?>
-    <?php for($_i=0;$_i<$this->getRowCount();$_i++): ?>
-        <tr>
-        <?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
-            <?php if($_link=$this->getIterableItem()): ?>
-            <td>
-                <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_link) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->escapeHtml($_link->getName()) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>"><?php echo $this->escapeHtml($_link->getName()) ?></a></h3>
-                <?php echo $this->getPriceHtml($_link, true, '-upsell') ?>
-                <?php echo $this->getReviewsSummaryHtml($_link) ?>
-            </td>
-            <?php else: ?>
-            <td class="empty">&nbsp;</td>
-            <?php endif; ?>
-        <?php endfor; ?>
-        </tr>
-    <?php endfor; ?>
-    </table>
-    <script type="text/javascript">(function($) {$('#upsell-product-table').decorate('table')})(jQuery)</script>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/product/listing.phtml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/listing.phtml
rename to app/code/Magento/Catalog/view/frontend/product/listing.phtml
index 4b85d9fb219958134e2c2928653ec5074ee7685f..8138a5a1c86e5a78213b2805e9ba32da28aa16da 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/listing.phtml
@@ -112,9 +112,6 @@ $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
         <?php echo ($iterator==count($_productCollection)+1) ? '</li>' : '' ?>
         <?php endforeach; ?>
     </ol>
-    <script type="text/javascript">
-        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-    </script>
 </div>
 <div class="toolbar-bottom">
     <?php echo $this->getToolbarHtml() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/new.phtml b/app/code/Magento/Catalog/view/frontend/product/new.phtml
deleted file mode 100644
index f5446b2f2695b77dfcfebaf287353f871a3cb6b5..0000000000000000000000000000000000000000
--- a/app/code/Magento/Catalog/view/frontend/product/new.phtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<h2 class="subtitle"><?php echo __('New Products') ?></h2>
-<?php $_columnCount = $this->getColumnCount(); ?>
-    <?php $i=0; foreach ($_products->getItems() as $_product): ?>
-        <?php if ($i++%$_columnCount==0): ?>
-        <ul class="products-grid">
-        <?php endif ?>
-            <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
-                <?php
-                    $_label = $this->escapeHtml($_product->getName());
-                    $_size  = $this->getSmallImageSize();
-                ?>
-                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_label ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_product) ?>" width="<?php echo $_size?>" height="<?php echo $_size?>" alt="<?php echo $_label ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><?php echo $this->escapeHtml($_product->getName()) ?></a></h3>
-                <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                <?php echo $this->getPriceHtml($_product, true, '-new') ?>
-                <div class="actions">
-                    <?php if($_product->isSaleable()): ?>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                    <?php else: ?>
-                        <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                    <?php endif; ?>
-                    <ul class="add-to-links" data-role="add-to-links">
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                            <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-                        <?php endif; ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                            <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-                        <?php endif; ?>
-                    </ul>
-                </div>
-            </li>
-        <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
-        </ul>
-        <?php endif ?>
-    <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml b/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml
index c68ec30f67b8de8db03638a2748dfd6180a27ace..c27bb93222acff235cc3a73955b638868a2dc3fb 100644
--- a/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -37,11 +35,11 @@
     $_product = $this->getProduct();
     $_msrpPrice = "";
 ?>
-    <div class="price-box map-info">
+    <div class="price-box map info">
     <?php $_price = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getMsrp()) ?>
         <?php if ($_product->getMsrp()): ?>
             <?php $_msrpPrice = $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,true) ?>
-            <span class="old-price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo $_msrpPrice ?></span>
+            <span class="old price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo $_msrpPrice ?></span>
         <?php endif; ?>
         <?php $popupId = 'msrp-click-' . $_product->getId() . $this->getRandomString(20); ?>
         <a href="#" id="<?php echo($popupId);?>"><?php echo __('Click for price') ?></a>
@@ -72,5 +70,3 @@
         })(jQuery);
         //]]>
     </script>
-
-
diff --git a/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml b/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml
index 003c3ecc19dc6af6f49bc768019654edffa3c17c..b75c68aea88d5d2a2f42a4c7474ca8ca55329f2e 100644
--- a/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -44,7 +42,7 @@ $_id = $_product->getId();
 $_msrpPrice = '';
 $priceElementIdPrefix = $this->getPriceElementIdPrefix() ? $this->getPriceElementIdPrefix() : 'product-price-';
 ?>
-<div class="price-box map-info">
+<div class="price-box map info">
     <?php $_price = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getMsrp()) ?>
     <?php if ($_product->getMsrp()): ?>
     <?php $_msrpPrice = $_coreHelper->currency($_product->getMsrp(), true, true) ?>
@@ -58,13 +56,13 @@ $priceElementIdPrefix = $this->getPriceElementIdPrefix() ? $this->getPriceElemen
     <a href="#" id="<?php echo($popupId);?>"><?php echo __('Click for price'); ?></a>
 
     <?php else: ?>
-    <span class="msrp-price-hide-message">
+    <span class="msrp price message">
          <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
     </span>
     <?php endif; ?>
 
     <?php $helpLinkId = 'msrp-help-' . $_id . $this->getRandomString(20); ?>
-    <a href="#" id="<?php echo($helpLinkId);?>"><?php echo __("What's this?"); ?></a>
+    <a href="#" id="<?php echo($helpLinkId);?>" class="action show map"><span><?php echo __("What's this?"); ?></span></a>
 </div>
 
 <script type="text/javascript">
diff --git a/app/code/Magento/Catalog/view/frontend/product/view.phtml b/app/code/Magento/Catalog/view/frontend/product/view.phtml
deleted file mode 100644
index ffee792efe996a26b45ce0610b9156655045b339..0000000000000000000000000000000000000000
--- a/app/code/Magento/Catalog/view/frontend/product/view.phtml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Product view template
- *
- * @see \Magento\Catalog\Block\Product\View
- * @see \Magento\Review\Block\Product\View
- */
-?>
-<?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
-<?php $_product = $this->getProduct(); ?>
-<script type="text/javascript">
-    (function ($) {
-        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/price-option.js') ?>", function () {
-            $('#product_addtocart_form').priceOption({"priceConfig":<?php echo $this->getJsonConfig() ?>});
-        });
-    })(jQuery);
-</script>
-<div id="messages_product_view"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
-<div class="product-view" itemscope itemtype="http://schema.org/Product">
-    <div class="product-essential">
-        <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post"
-              id="product_addtocart_form"<?php if ($_product->getOptions()): ?>
-              enctype="multipart/form-data"<?php endif; ?>>
-            <div class="no-display">
-                <input type="hidden" name="product" value="<?php echo $_product->getId() ?>"/>
-                <input type="hidden" name="related_product" id="related-products-field" value=""/>
-            </div>
-
-            <div class="product-shop">
-                <div class="product-name">
-                    <h1 itemprop="name"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name') ?></h1>
-                </div>
-
-                <?php if ($this->canEmailToFriend()): ?>
-                <p class="email-friend"><a
-                    href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"><?php echo __('Email to a Friend') ?></a>
-                </p>
-                <?php endif; ?>
-
-                <?php echo $this->getReviewsSummaryHtml($_product, false, true)?>
-                <?php echo $this->getChildHtml('alert_urls') ?>
-                <?php echo $this->getChildHtml('product_type_data') ?>
-                <?php echo $this->getTierPriceHtml() ?>
-                <?php echo $this->getChildHtml('extrahint') ?>
-
-                <?php if (!$this->hasOptions()): ?>
-                <div class="add-to-box">
-                    <?php if ($_product->isSaleable()): ?>
-                    <?php echo $this->getChildHtml('addtocart') ?>
-                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() || $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product)): ?>
-                        <span class="or"><?php echo __('OR') ?></span>
-                        <?php endif; ?>
-                    <?php endif; ?>
-                    <?php echo $this->getChildHtml('addto') ?>
-                </div>
-                <?php echo $this->getChildHtml('extra_buttons') ?>
-                <?php elseif (!$_product->isSaleable()): ?>
-                <div class="add-to-box">
-                    <?php echo $this->getChildHtml('addto') ?>
-                </div>
-                <?php endif; ?>
-
-                <?php if ($_product->getShortDescription()): ?>
-                <div class="short-description">
-                    <h2><?php echo __('Quick Overview') ?></h2>
-
-                    <div class="std" itemprop="description"><?php echo $_helper->productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description') ?></div>
-                </div>
-                <?php endif;?>
-
-                <?php echo $this->getChildHtml('other');?>
-
-                <?php if ($_product->isSaleable() && $this->hasOptions() && $this->getOptionsContainer() == 'container1'): ?>
-                <?php echo $this->getChildChildHtml('options_container') ?>
-                <?php endif;?>
-
-            </div>
-
-            <div class="product-img-box">
-                <?php echo $this->getChildHtml('base-image') ?>
-                <?php echo $this->getChildHtml('gallery') ?>
-            </div>
-
-            <div class="clearer"></div>
-            <?php if ($_product->isSaleable() && $this->hasOptions() && $this->getOptionsContainer() == 'container2'): ?>
-            <?php echo $this->getChildChildHtml('options_container') ?>
-            <?php endif;?>
-        </form>
-    </div>
-
-    <div class="product-collateral">
-        <?php $layout = $this->getLayout(); ?>
-        <?php foreach ($this->getGroupChildNames('detailed_info') as $name): ?>
-        <?php $html = $layout->renderElement($name); ?>
-        <?php if (!$html) continue; ?>
-        <?php $alias = $layout->getElementAlias($name); ?>
-        <div class="box-collateral <?php echo "box-{$alias}"?>">
-            <?php if ($title = $this->getChildData($alias, 'title')): ?>
-            <h2><?php echo $this->escapeHtml($title); ?></h2>
-            <?php endif;?>
-            <?php echo $html; ?>
-        </div>
-        <?php endforeach;?>
-        <?php echo $this->getChildHtml('upsell_products') ?>
-        <?php echo $this->getChildHtml('product_additional_data') ?>
-    </div>
-</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml b/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml
index 2a05fee5361415c97cc15d5570925515c6a17bc3..323738b782b87571fff216a9a5a00df6715c8687 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/product/view/addto.phtml
index b17cc666a9b19ee5489ea2c8055111deb3ff3aa7..8cae832f2aa9ae943a199bad81fdc3fff6f396f9 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/addto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/addto.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,19 +26,22 @@
 <?php $_product = $this->getProduct(); ?>
 <?php $_wishlistSubmitUrl = $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product); ?>
 
-<ul class="add-to-links" data-role="add-to-links">
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <li><a href="<?php echo $_wishlistSubmitUrl ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-<?php endif; ?>
-<?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
-<?php if($_compareUrl) : ?>
-    <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-<?php endif; ?>
-</ul>
+<div class="product addto links" data-role="add-to-links">
+    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
+        <a href="<?php echo $_wishlistSubmitUrl ?>"
+           class="action towishlist"
+           data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
+    <?php endif; ?>
+    <?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
+    <?php if ($_compareUrl) : ?>
+        <a href="<?php echo $_compareUrl ?>"
+           class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
+    <?php endif; ?>
+</div>
 <script type="text/javascript">
-head.js("<?php echo $this->getViewFileUrl('Magento_Wishlist::js/add-to-wishlist.js') ?>", function () {
-    jQuery('[data-role="add-to-links"]').addToWishlist(
-        <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode(array('productType' => $_product->getTypeId()))?>
-    );
-});
+    head.js("<?php echo $this->getViewFileUrl('Magento_Wishlist::js/add-to-wishlist.js') ?>", function () {
+        jQuery('[data-role="add-to-links"]').addToWishlist(
+            <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode(array('productType' => $_product->getTypeId()))?>
+        );
+    });
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml
index db2fb36af8e10917fc9ae0cf49ddcbdd07a025fc..8491717db945022f1daecd71ea7822b77f08465f 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,27 +25,80 @@
 <?php $_product = $this->getProduct(); ?>
 <?php $buttonTitle = __('Add to Cart'); ?>
 <?php if ($_product->isSaleable()): ?>
-<div class="add-to-cart">
+<div class="box tocart">
     <?php if (!$_product->isGrouped()): ?>
-    <label for="qty"><?php echo __('Qty:') ?></label>
-    <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>"
-            title="<?php echo __('Qty') ?>" class="input-text qty"
-        <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
-            data-validate="{required:true, 'validate-greater-than-zero':true}"/>
-        <?php else: ?>
-            data-validate="{required:true, digits:true}"/>
-        <?php endif; ?>
+    <div class="field qty">
+        <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
+        <div class="control">
+            <input type="text"
+                   name="qty"
+                   id="qty"
+                   maxlength="12"
+                   value="<?php echo $this->getProductDefaultQty() * 1 ?>"
+                   title="<?php echo __('Qty') ?>" class="input-text qty"
+                <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
+                    data-validate="{required:true, 'validate-greater-than-zero':true}"
+                <?php else: ?>
+                    data-validate="{required:true, digits:true}"
+                <?php endif; ?> />
+        </div>
+    </div>
     <?php endif; ?>
-    <button type="submit" title="<?php echo $buttonTitle ?>" class="button btn-cart" id="product-addtocart-button">
-        <span><span><?php echo $buttonTitle ?></span></span></button>
-    <?php echo $this->getChildHtml('', true) ?>
+    <div class="actions">
+        <button type="submit"
+                title="<?php echo $buttonTitle ?>"
+                class="action primary tocart"
+                id="product-addtocart-button">
+            <span><?php echo $buttonTitle ?></span>
+        </button>
+        <?php echo $this->getChildHtml('', true) ?>
+    </div>
 </div>
 <?php endif; ?>
 
 <script type="text/javascript">
     (function ($) {
-        $.mage.extend('validation', 'validation',
-            '<?php echo $this->getViewFileUrl('Magento_Catalog::product/view/validation.js'); ?>');
-        $('#product_addtocart_form').mage('validation');
+        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>", function () {
+                $('#product_addtocart_form').validation({
+                    errorPlacement: function (error, element) {
+                        if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-one-checkbox-required-by-name') > 0) {
+                            error.appendTo('#links-advice-container');
+                        } else if (element.attr('data-validate')&& element.attr('data-validate').indexOf('validate-grouped-qty') > 0) {
+                            $('#super-product-table').siblings(this.errorElement + '.' + this.errorClass).remove();
+                            $('#super-product-table').after(error);
+                        } else if (element.is(':radio, :checkbox')) {
+                            element.closest('.nested').after(error);
+                        } else {
+                            element.after(error);
+                        }
+                    },
+                    highlight: function (element, errorClass) {
+                        if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
+                            $(element).parent().find('.datetime-picker').each(function() {
+                                $(this).removeClass(errorClass);
+                                if ($(this).val().length === 0) {
+                                    $(this).addClass(errorClass);
+                                }
+                            });
+                        } else if ($(element).is(':radio, :checkbox')) {
+                            $(element).closest('.nested').addClass(errorClass+'-group');
+                        } else {
+                            $(element).addClass(errorClass);
+                        }
+                    },
+                    unhighlight: function (element, errorClass) {
+                        if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
+                            $(element).parent().find('.datetime-picker').removeClass(errorClass);
+                        } else if ($(element).is(':radio, :checkbox')) {
+                            $(element).closest('.nested').removeClass(errorClass+'-group');
+                        } else {
+                            $(element).removeClass(errorClass);
+                        }
+                    }
+                });
+            });
     })(jQuery);
 </script>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/product/view/attribute.phtml
similarity index 93%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/attribute.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/attribute.phtml
index ffe146694c70186a53e38e181ae385b453852266..a9cc3eccce53a7ba70f6415fb09c3e399a19e04c 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attribute.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/attribute.phtml
@@ -38,6 +38,7 @@ $_code = $this->getAtCode();
 $_className = $this->getCssClass();
 $_attributeLabel = $this->getAtLabel();
 $_attributeType = $this->getAtType();
+$_attributeAddAttribute = $this->getAddAttribute();
 
 if ( $_attributeLabel && $_attributeLabel == 'default' ) {
     $_attributeLabel = $_product->getResource()->getAttribute($_code)->getFrontendLabel();
@@ -47,13 +48,12 @@ if ( $_attributeType && $_attributeType == 'text' ) {
 } else {
     $_attributeValue = $_helper->productAttribute($_product, $_product->$_call(), $_code);
 }
-
 ?>
 
 <?php if ($_attributeValue): ?>
 <div class="product attibute <?php echo $_className?>">
     <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php echo $_attributeLabel?></strong><?php endif; ?>
-    <div class="value"><?php echo $_attributeValue; ?></div>
+    <div class="value" <?php echo $_attributeAddAttribute;?>><?php echo $_attributeValue; ?></div>
 </div>
 <?php endif; ?>
 
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml
index 0e38831a4a8d236f2a67056f6b54a7b53e8d2c27..3d7c93cb36fc29592307ae7118790799e39b5d8a 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,7 +25,7 @@
 /**
  * Product additional attributes template
  *
- * @see \Magento\Catalog\Block\Product\View\Attributes
+ * @var $this \Magento\Catalog\Block\Product\View\Attributes
  */
 ?>
 <?php
@@ -35,17 +33,14 @@
     $_product = $this->getProduct()
 ?>
 <?php if($_additional = $this->getAdditionalData()): ?>
-    <table class="data-table" id="product-attribute-specs-table">
-        <col width="25%" />
-        <col />
+    <table class="data table additional attributes" id="product-attribute-specs-table">
         <tbody>
         <?php foreach ($_additional as $_data): ?>
             <tr>
-                <th class="label"><?php echo $this->escapeHtml(__($_data['label'])) ?></th>
-                <td class="data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+                <th class="col label"><?php echo $this->escapeHtml(__($_data['label'])) ?></th>
+                <td class="col data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
             </tr>
         <?php endforeach; ?>
         </tbody>
     </table>
-    <script type="text/javascript">(function($) {$('#product-attribute-specs-table').decorate('table')})(jQuery)</script>
 <?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml b/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml
index fb701a64ef767f423cf28a333566903fb5dcb272..179b40ba0e351513f3f1bfce0e016c25bbac3467 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,41 +25,116 @@
 /**
  * Product media data template
  *
- * @see \Magento\Catalog\Block\Product\View\BaseImage
+ * @var $this \Magento\Catalog\Block\Product\View\BaseImage
  */
 ?>
 <?php
-    $_product = $this->getProduct();
-    $_helper = $this->helper('Magento\Catalog\Helper\Output');
+$_product = $this->getProduct();
+$_helper = $this->helper('Magento\Catalog\Helper\Output');
+
+$image = 'product_page_main_image';
+
+$_resizedWidth = $this->getVar("{$image}:width");
+$_resizedHeight = $this->getVar("{$image}:height") ?: $_resizedWidth ;
+
+$_hasImage = ($_product->getImage() && $_product->getImage() != "no_selection") ? true : false;
+
+$_isOldDisplayMode = 0;
+$whiteBorders =  $this->getVar("product_image_white_borders");
 ?>
-<?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
-<p class="product-image product-image-zoom">
-    <?php
-        $_img = '<img data-role="base-image" id="image" itemprop="image" src="'.$this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image').'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
-        echo $_helper->productAttribute($_product, $_img, 'image');
-    ?>
-</p>
-<p class="zoom-notice" id="track-hint"><?php echo __('Double click on above image to view full picture') ?></p>
-<div class="zoom">
-    <img id="zoom-out" src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/slider_btn_zoom_out.gif') ?>" alt="<?php echo __('Zoom Out') ?>" title="<?php echo __('Zoom Out') ?>" class="btn-zoom-out" />
-    <div id="slider"></div>
-    <img id="zoom-in" src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/slider_btn_zoom_in.gif') ?>" alt="<?php echo __('Zoom In') ?>" title="<?php echo __('Zoom In') ?>" class="btn-zoom-in" />
-</div>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/zoom.js')?>", function() {
-        jQuery('#image').zoom({
-            sliderSelector: '#slider',
-            zoomNoticeSelector: '#track-hint',
-            zoomInSelector: '#zoom-in',
-            zoomOutSelector: '#zoom-out'
+<div class="product photo main" data-role="base-image-container">
+    <a class="product photo magento-zoom<?php echo (!$_hasImage) ? ' isPlaceholder' : ''; ?>"
+       id="base-image" data-role="base-image-zoom"
+       href="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>">
+       <?php echo $this->getChildBlock('product.image.main')->setAddAttribute('itemprop="image"')->init($_product, $image)->toHtml() ?>
+    </a>
+    <script type="text/javascript">
+        jQuery('[data-role=base-image-zoom]').attr('rel', '<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>');
+    </script>
+    <p class="notice"></p>
+    <script type="text/javascript">
+        jQuery(function(){
+            <?php if ($_isOldDisplayMode): ?>
+            jQuery('.magento-zoom').magentoZoom({
+                useGallery: false,
+                swapNotices: false,
+                isOldMode: <?php print $_isOldDisplayMode; ?>,
+                messages: {
+                    noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
+                    loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
+                }
+            });
+            <?php else: ?>
+            jQuery('.magento-zoom').magentoZoom({
+                useLens: true,
+                enlarged: {
+                    adjustment: 20,
+                    width: 500,
+                    height: <?php echo $_resizedHeight ?>
+                },
+                useGallery: true,
+                swapNotices: true,
+                isOldMode: <?php print $_isOldDisplayMode; ?>,
+                messages: {
+                    noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
+                    noticeLightBox: '<?php echo $this->escapeJsQuote(__("Click on image to view it full sized")) ?>', loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
+                }
+            });
+            <?php endif; ?>
         });
-    });
-</script>
-<?php else: ?>
-<p class="product-image">
+    </script>
+    <?php  ?>
+</div>
+<?php if (count($this->getGalleryImages()) > 0): ?>
     <?php
-        $_img = '<img data-role="base-image" itemprop="image" src="'.$this->getBaseImageUrl($_product).'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
-        echo $_helper->productAttribute($_product, $_img, 'image');
+        $thumbWidth =  $this->getVar("product_page_more_views:width");
+        $thumbHeight =  $this->getVar("product_page_more_views:height") ? : $thumbWidth;
     ?>
-</p>
+    <div class="product photo thumbs">
+        <strong class="title"><?php echo __('More Views') ?></strong>
+        <ul class="items thumbs">
+            <?php foreach ($this->getGalleryImages() as $_image): ?>
+                <?php if ($_isOldDisplayMode) {
+                    $attributes = ' href="#" data-mage-init="{popupWindow: {windowURL:'
+                        . $this->getGalleryUrl($_image)
+                        . ',windowName:\'gallery\',width:300,height:300,status:1,scrollbars:1,resizable:1}"';
+                } else {
+                    $attributes = ' href="'
+                        . $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())
+                        . '" rel="';
+                    if ($whiteBorders) {
+                        $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->resize($_resizedWidth,$_resizedHeight) . '"';
+                    } else {
+                        $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($_resizedWidth,$_resizedHeight) . '"';
+                    }
+                };?>
+                <li class="item thumb">
+                    <a<?php echo $attributes; ?> class="magento-zoom" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>">
+                        <?php if ($whiteBorders): ?>
+                            <span class="img"
+                                  style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight; ?>px; height:<?php echo $thumbHeight; ?>px;">
+                                <img itemprop="image"
+                                     src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->resize($thumbWidth, $thumbHeight); ?>"
+                                     alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>"/>
+                            </span>
+                        <?php else: ?>
+                            <span class="img"
+                                  style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight; ?>px; height:<?php echo $thumbHeight; ?>px;">
+                                <img itemprop="image"
+                                     src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($thumbWidth, $thumbHeight); ?>"
+                                     alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>"/>
+                            </span>
+                        <?php endif; ?>
+                    </a>
+                </li>
+            <?php endforeach; ?>
+        </ul>
+    </div>
+    <?php if ($_isOldDisplayMode): ?>
+        <script type="text/javascript">
+            (function($) {
+                head.js("<?php echo $this->getViewFileUrl('mage/popup-window.js')?>");
+            })(jQuery);
+        </script>
+    <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/description.phtml b/app/code/Magento/Catalog/view/frontend/product/view/description.phtml
index ef21778ccedac2aa6a85a7801ac0161d498fa7bd..5233768ac0501fea880745778d67077cfbc79f60 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/description.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,12 +25,7 @@
 /**
  * Product description template
  *
- * @see \Magento\Catalog\Block\Product\View\Description
+ * @var $this \Magento\Catalog\Block\Product\View\Description
  */
 ?>
-<?php $_description = $this->getProduct()->getDescription(); ?>
-<?php if ($_description): ?>
-    <div class="std">
-        <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($this->getProduct(), $_description, 'description') ?>
-    </div>
-<?php endif; ?>
+<?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($this->getProduct(), $this->getProduct()->getDescription(), 'description') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/product/view/details.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/details.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/details.phtml
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/product/view/form.phtml
similarity index 90%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/form.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/form.phtml
index ee446447da12059f5f6b4eba5aaa9720d94b89a2..c7a95fc76aaa806744cf533c0afb6ebb428d241c 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/form.phtml
@@ -18,7 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -26,8 +25,8 @@
 /**
  * Product view template
  *
- * @see \Magento\Catalog\Block\Product\View
- * @see \Magento\Review\Block\Product\View
+ * @var $this \Magento\Catalog\Block\Product\View
+ * @var $this \Magento\Review\Block\Product\View
  */
 ?>
 <?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
@@ -41,8 +40,8 @@
     })(jQuery);
 </script>
 <div class="product add form">
-    <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
-
+    <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post"
+          id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
         <input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
         <input type="hidden" name="related_product" id="related-products-field" value="" />
         <?php echo $this->getChildHtml('form_top'); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml
deleted file mode 100644
index c1e5419169e0eef041ada583be137f9e80fa29f4..0000000000000000000000000000000000000000
--- a/app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @var $this \Magento\Catalog\Block\Product\View\Gallery
- */
-?>
-<div class="more-views">
-    <h2><?php echo __('More Views') ?></h2>
-    <ul>
-    <?php $_size = $this->getBaseImageIconSize()?>
-    <?php foreach ($this->getGalleryImages() as $_image): ?>
-        <li>
-            <a href="#" data-magento-init="{popupWindow: {windowURL:'<?php echo $this->getGalleryUrl($_image)?>',windowName:'gallery',width:300,height:300,status:1,scrollbars:1,resizable:1}}" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>"><img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($this->getProduct(), 'image', $_image->getFile())->resize($_size); ?>" width="<?php echo $_size?>" height="<?php echo $_size?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>"/></a>
-        </li>
-    <?php endforeach; ?>
-    </ul>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/product/view/mailto.phtml
similarity index 85%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/mailto.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/mailto.phtml
index 0c7658ab609aec4f718dc31aa98d930febe1fdfc..50b7afdbfc524b6a118770f5da8aa5daded52590 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/mailto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/mailto.phtml
@@ -25,7 +25,9 @@
 ?>
 <?php $_product = $this->getProduct() ?>
 <?php if ($this->canEmailToFriend()): ?>
-    <a title="<?php echo __('Email to a Friend') ?>" class="action mailto" href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>">
+    <a title="<?php echo __('Email to a Friend') ?>"
+       class="action mailto"
+       href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>">
         <span><?php echo __('Email to a Friend') ?></span>
     </a>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options.phtml
index 29c8cb0469d1c1bcc4a9d17bdc3d7c42235a52d3..dab050b3efca27d490b4ed48ed3e05f261f3f41c 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -31,13 +29,14 @@
     <script type="text/javascript">
         (function ($) {
             head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/price-option.js') ?>", function () {
-                $('#product_addtocart_form').priceOption({'optionConfig':<?php echo $this->getJsonConfig()?>}).trigger('reloadPrice');
+                $('#product_addtocart_form').priceOption({
+                    'optionConfig':<?php echo $this->getJsonConfig()?>,
+                    'controlContainer': '.field'
+                }).trigger('reloadPrice');
             });
         })(jQuery);
     </script>
-    <dl>
     <?php foreach($_options as $_option): ?>
         <?php echo $this->getOptionHtml($_option) ?>
     <?php endforeach; ?>
-    </dl>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml
index 2babaf2baf9626a7d45340aac447027e2c1df015..8b3b9698ab9cf6bf3637f4734548429b85ab1a2d 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml
@@ -18,72 +18,70 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <script type="text/javascript">
-//<![CDATA[
-var DateOption = Class.create({
+    //<![CDATA[
+    var DateOption = Class.create({
 
-    getDaysInMonth: function(month, year)
-    {
-        var curDate = new Date();
-        if (!month) {
-            month = curDate.getMonth();
-        }
-        if (2 == month && !year) { // leap year assumption for unknown year
-            return 29;
-        }
-        if (!year) {
-            year = curDate.getFullYear();
-        }
-        return 32 - new Date(year, month - 1, 32).getDate();
-    },
+        getDaysInMonth: function(month, year)
+        {
+            var curDate = new Date();
+            if (!month) {
+                month = curDate.getMonth();
+            }
+            if (2 == month && !year) { // leap year assumption for unknown year
+                return 29;
+            }
+            if (!year) {
+                year = curDate.getFullYear();
+            }
+            return 32 - new Date(year, month - 1, 32).getDate();
+        },
 
-    reloadMonth: function(event)
-    {
-        var selectEl = event.findElement();
-        var idParts = selectEl.id.split("_");
-        if (idParts.length != 3) {
-            return false;
-        }
-        var optionIdPrefix = idParts[0] + "_" + idParts[1];
-        var month = parseInt($(optionIdPrefix + "_month").value);
-        var year = parseInt($(optionIdPrefix + "_year").value);
-        var dayEl = $(optionIdPrefix + "_day");
+        reloadMonth: function(event)
+        {
+            var selectEl = event.findElement();
+            var idParts = selectEl.id.split("_");
+            if (idParts.length != 3) {
+                return false;
+            }
+            var optionIdPrefix = idParts[0] + "_" + idParts[1];
+            var month = parseInt($(optionIdPrefix + "_month").value);
+            var year = parseInt($(optionIdPrefix + "_year").value);
+            var dayEl = $(optionIdPrefix + "_day");
 
-        var days = this.getDaysInMonth(month, year);
+            var days = this.getDaysInMonth(month, year);
 
-        //remove days
-        for (var i = dayEl.options.length - 1; i >= 0; i--) {
-            if (dayEl.options[i].value > days) {
-                dayEl.remove(dayEl.options[i].index);
+            //remove days
+            for (var i = dayEl.options.length - 1; i >= 0; i--) {
+                if (dayEl.options[i].value > days) {
+                    dayEl.remove(dayEl.options[i].index);
+                }
             }
-        }
 
-        // add days
-        var lastDay = parseInt(dayEl.options[dayEl.options.length-1].value);
-        for (i = lastDay + 1; i <= days; i++) {
-            this.addOption(dayEl, i, i);
-        }
-    },
+            // add days
+            var lastDay = parseInt(dayEl.options[dayEl.options.length-1].value);
+            for (i = lastDay + 1; i <= days; i++) {
+                this.addOption(dayEl, i, i);
+            }
+        },
 
-    addOption: function(select, text, value)
-    {
-        var option = document.createElement('OPTION');
-        option.value = value;
-        option.text = text;
+        addOption: function(select, text, value)
+        {
+            var option = document.createElement('OPTION');
+            option.value = value;
+            option.text = text;
 
-        if (select.options.add) {
-            select.options.add(option);
-        } else {
-            select.appendChild(option);
+            if (select.options.add) {
+                select.options.add(option);
+            } else {
+                select.appendChild(option);
+            }
         }
-    }
-});
-dateOption = new DateOption();
-//]]>
+    });
+    dateOption = new DateOption();
+    //]]>
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml
index 2f7fa93ca09fe5e8498c20ee51bbb6777f2fe250..ff28832922fcbd94cded6388725607e64e05d36d 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml
@@ -18,60 +18,69 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php $_option = $this->getOption() ?>
 <?php $_optionId = $_option->getId() ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
-    <?php echo $this->getFormatedPrice() ?></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
+<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
+<div class="field date<?php echo $class; ?>">
+    <label class="label">
+        <span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span>
+        <?php echo $this->getFormatedPrice() ?>
+    </label>
+    <div class="control">
+        <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
+            || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE): ?>
 
-<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
-    || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE): ?>
+            <?php echo $this->getDateHtml() ?>
 
-    <?php echo $this->getDateHtml() ?>
+            <?php if (!$this->useCalendar()): ?>
+                <script type="text/javascript">
+                    //<![CDATA[
+                    (function($) {
+                        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/date-option.js') ?>", function() {
+                            $.mage.dateOption({
+                                datepickerFieldSelector: 'select.datetime-picker',
+                                monthSelector: '#options_<?php echo $_optionId ?>_month',
+                                yearSelector: '#options_<?php echo $_optionId ?>_year'
+                            });
+                        });
+                    })(jQuery);
+                    //]]>
+                </script>
+            <?php endif; ?>
+
+        <?php endif; ?>
+
+        <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
+            || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_TIME): ?>
+            <span class="time-picker"><?php echo $this->getTimeHtml() ?></span>
+        <?php endif; ?>
+
+        <?php if ($_option->getIsRequire()): ?>
+            <input type="hidden"
+                   name="validate_datetime_<?php echo $_optionId ?>"
+                   class="validate-datetime-<?php echo $_optionId ?>"
+                   value=""
+                   data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
+        <?php else: ?>
+            <input type="hidden"
+                   name="validate_datetime_<?php echo $_optionId ?>"
+                   class="validate-datetime-<?php echo $_optionId ?>"
+                   value=""
+                   data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
+        <?php endif; ?>
 
-    <?php if (!$this->useCalendar()): ?>
         <script type="text/javascript">
-        //<![CDATA[
+            //<![CDATA[
             (function($) {
-                head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/date-option.js') ?>", function() {
-                    $.mage.dateOption({
-                        datepickerFieldSelector: 'select.datetime-picker',
-                        monthSelector: '#options_<?php echo $_optionId ?>_month',
-                        yearSelector: '#options_<?php echo $_optionId ?>_year'
-                    });
+                head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>", function() {
+                    $.validator.setDefaults({ignore: ':hidden:not(input[name^="validate_datetime_"])'});
                 });
             })(jQuery);
-        //]]>
+            //]]>
         </script>
-    <?php endif; ?>
-
-<?php endif; ?>
-
-<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
-    || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_TIME): ?>
-    <span class="time-picker"><?php echo $this->getTimeHtml() ?></span>
-<?php endif; ?>
-
-<?php if ($_option->getIsRequire()): ?>
-    <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
-<?php else: ?>
-    <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
-<?php endif; ?>
-
-<script type="text/javascript">
-//<![CDATA[
-    (function($) {
-        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>", function() {
-            $.validator.setDefaults({ignore: ':hidden:not(input[name^="validate_datetime_"])'});
-        });
-    })(jQuery);
-//]]>
-</script>
-
-</dd>
+    </div>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml
index b7bba10166c0c48a2435c4587d10c132865de5d2..01dc10b7090220e20b51c93376bbc9792405dac1 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml
@@ -18,13 +18,11 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php $_option = $this->getOption() ?>
-<dt>
-    <label><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
-</dt>
+<div class="field">
+    <label class="label"><span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span></label>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml
index a1e53759e9b2fee8dd60ce916a53a46bb16da762..63e31c13f6272643ec0ebe93eaae00062a94fd2d 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -31,9 +29,10 @@
 <?php $_fieldNameAction = $_fileName . '_action'; ?>
 <?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
 <?php $_fileNamed = $_fileName . '_name'; ?>
+<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
 
 <script type="text/javascript">
-//<![CDATA[
+    //<![CDATA[
     (function($) {
         head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/file-option.js')?>", function() {
             $('#input-box-<?php echo $_fileName ?>').fileOption({
@@ -45,33 +44,46 @@
             });
         });
     })(jQuery);
-//]]>
+    //]]>
 </script>
 
-<dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
-    <?php echo $this->getFormatedPrice() ?></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
+<div class="field file<?php echo $class; ?>">
+    <label class="label">
+        <span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span>
+        <?php echo $this->getFormatedPrice() ?>
+    </label>
     <?php if ($_fileExists): ?>
+    <div class="control">
         <span class="<?php echo $_fileNamed ?>"><?php echo $_fileInfo->getTitle(); ?></span>
         <a href="javascript:void(0)" class="label" id="change-<?php echo $_fileName ?>" >
             <?php echo __('Change') ?>
-        </a>&nbsp;
-        <?php if (! $_option->getIsRequire()): ?>
-           <input type="checkbox" id="delete-<?php echo $_fileName ?>" />
-           <span class="label"><?php echo __('Delete') ?></span>
+        </a>
+        <?php if (!$_option->getIsRequire()): ?>
+            <input type="checkbox" id="delete-<?php echo $_fileName ?>" />
+            <span class="label"><?php echo __('Delete') ?></span>
         <?php endif; ?>
+    </div>
     <?php endif; ?>
-    <div id="input-box-<?php echo $_fileName ?>" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
-        <input type="file" name="<?php echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
+    <div class="control" id="input-box-<?php echo $_fileName ?>" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
+        <input type="file"
+               name="<?php echo $_fileName; ?>"
+               class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>"
+               <?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
         <input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
         <?php if ($_option->getFileExtension()): ?>
-        <p class="no-margin"><?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong></p>
+            <p class="note">
+                <?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong>
+            </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeX() > 0): ?>
-        <p class="no-margin"><?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong></p>
+            <p class="note">
+                <?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong>
+            </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeY() > 0): ?>
-        <p class="no-margin"><?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong></p>
+            <p class="note">
+                <?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong>
+            </p>
         <?php endif; ?>
     </div>
-</dd>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml
index bb4706be37b2cecbcb6922f87c08a60fddfd76ce..b646551510cb88169c98d75a0a21bcd62d618da4 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml
@@ -18,18 +18,21 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 
 <?php /* @var $this \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
-<?php $_option = $this->getOption() ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
-    <div class="input-box">
+<?php
+$_option = $this->getOption();
+$class = ($_option->getIsRequire()) ? ' required' : '';
+?>
+<div class="field<?php echo $class; ?>">
+    <label class="label">
+        <span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span>
+    </label>
+    <div class="control">
         <?php echo $this->getValuesHtml() ?>
         <?php if ($_option->getIsRequire()): ?>
             <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
@@ -37,4 +40,4 @@
             <?php endif; ?>
         <?php endif;?>
     </div>
-</dd>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml
index b710955d63817c19c2a877d62c8a99f039ad67ae..b3e2266d07c38c60bfb9b71a3467fceab8987f0d 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml
@@ -18,40 +18,58 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php $_option = $this->getOption(); ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo  $this->escapeHtml($_option->getTitle()) ?></label>
-    <?php echo $this->getFormatedPrice() ?></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
-    <div class="input-box">
+<?php
+$_option = $this->getOption();
+$class = ($_option->getIsRequire()) ? ' required' : '';
+?>
+
+<div class="field<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA) {
+    echo ' textarea';
+} ?><?php echo $class ?>">
+    <label class="label">
+        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+        <?php echo $this->getFormatedPrice() ?>
+    </label>
+
+    <div class="control">
         <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_FIELD): ?>
-        <?php $_textValidate = null;
-        if($_option->getIsRequire()){
-            $_textValidate['required'] = true;
-        }
-        if($_option->getMaxCharacters()){
-            $_textValidate['maxlength'] = $_option->getMaxCharacters();
-        }
-        ?>
-        <input type="text" id="options_<?php echo $_option->getId() ?>_text" class="input-text  product-custom-option"  <?php if(!empty($_textValidate))echo 'data-validate='.json_encode($_textValidate) ; ?>  name="options[<?php echo $_option->getId() ?>]" value="<?php echo $this->escapeHtml($this->getDefaultValue()) ?>" />
+            <?php $_textValidate = null;
+            if ($_option->getIsRequire()) {
+                $_textValidate['required'] = true;
+            }
+            if ($_option->getMaxCharacters()) {
+                $_textValidate['maxlength'] = $_option->getMaxCharacters();
+            }
+            ?>
+            <input type="text"
+                   id="options_<?php echo $_option->getId() ?>_text"
+                   class="input-text product-custom-option"
+                   <?php if (!empty($_textValidate)) echo 'data-validate=' . json_encode($_textValidate); ?>
+                   name="options[<?php echo $_option->getId() ?>]"
+                   value="<?php echo $this->escapeHtml($this->getDefaultValue()) ?>"/>
         <?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
-        <?php $_textAreaValidate = null;
-        if($_option->getIsRequire()){
-            $_textAreaValidate['required'] = true;
-        }
-        if($_option->getMaxCharacters()){
-            $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
-        }
-        ?>
-        <textarea id="options_<?php echo $_option->getId() ?>_text" class="product-custom-option" <?php if(!empty($_textAreaValidate))echo 'data-validate='.json_encode($_textAreaValidate) ; ?> name="options[<?php echo $_option->getId() ?>]" rows="5" cols="25"><?php echo $this->escapeHtml($this->getDefaultValue()) ?></textarea>
+            <?php $_textAreaValidate = null;
+            if ($_option->getIsRequire()) {
+                $_textAreaValidate['required'] = true;
+            }
+            if ($_option->getMaxCharacters()) {
+                $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
+            }
+            ?>
+            <textarea id="options_<?php echo $_option->getId() ?>_text"
+                      class="product-custom-option"
+                      <?php if (!empty($_textAreaValidate)) echo 'data-validate=' . json_encode($_textAreaValidate); ?>
+                      name="options[<?php echo $_option->getId() ?>]"
+                      rows="5"
+                      cols="25"><?php echo $this->escapeHtml($this->getDefaultValue()) ?></textarea>
         <?php endif; ?>
         <?php if ($_option->getMaxCharacters()): ?>
-        <p class="note"><?php echo __('Maximum number of characters:')?> <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
+            <p class="note"><?php echo __('Maximum number of characters:') ?>
+                <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
         <?php endif; ?>
     </div>
-</dd>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml
index 55d7c385c2c6a362f3cb707ee0947a0209a8ae3b..2497ca0e80e8b4c575c6d26d91ea91a3c27a17eb 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml
@@ -18,16 +18,18 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<div class="product-options" id="product-options-wrapper">
-    <?php echo $this->getChildHtml('', true);?>
-    <?php if ($this->hasRequiredOptions()):?>
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-    <?php endif;?>
+<?php
+$required = '';
+if ($this->hasRequiredOptions()) {
+    $required = ' data-hasrequired="' . __('* Required Fields') . '"';
+}
+?>
+<div class="product options wrapper" id="product-options-wrapper"<?php echo $required; ?>>
+    <fieldset class="fieldset">
+        <?php echo $this->getChildHtml('', true);?>
+    </fieldset>
 </div>
-<script type="text/javascript">(function($) {$('#product-options-wrapper dl').decorate('generic', ['last'])})(jQuery)</script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml
index faf0181512cf426b2014c06f1a9c2f70e01f7934..273ffaa93735e4b11e39bad17779f97879caed23 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml
@@ -18,12 +18,10 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<div class="product-options-bottom">
+<div class="product options bottom">
     <?php echo $this->getChildHtml('', true);?>
 </div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price.phtml b/app/code/Magento/Catalog/view/frontend/product/view/price.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/price.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/price.phtml
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml b/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml
index e542f129a3858e96af6919daabac39883ea34cb2..17fb51b6078e8ac3e1c37475ea7c38f09ed7f57c 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/rating.phtml b/app/code/Magento/Catalog/view/frontend/product/view/rating.phtml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/rating.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/rating.phtml
index f23bf6963bba636d6804b43458c2d0b590aca6ed..e499749445df7e1114288bbf477f562fd91985d3 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/rating.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/rating.phtml
@@ -18,7 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml b/app/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml
index ef7dcb5db6db637c1259984f58ceb95473f0c7de..8c40fa860c50bbdca1c1b052af7958a232e2b746 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,7 +25,7 @@
 
 <?php
 /**
- * @var $this  \Magento\Catalog\Block\Product\View
+ * @var $this \Magento\Catalog\Block\Product\View
  */
 $_product = $this->getProduct();
 $_tierPrices = $this->getTierPrices();
@@ -43,152 +41,152 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
 
 ?>
 <?php if (count($_tierPrices) > 0): ?>
-    <ul class="<?php echo ($this->getInGrouped() ? 'tier-prices-grouped product-pricing-grouped' : 'tier-prices product-pricing'); ?>">
-    <?php if ($this->getInGrouped()): ?>
-        <?php $_tierPrices = $this->getTierPrices($_product); ?>
-    <?php endif; ?>
-    <?php $this->helper('Magento\Weee\Helper\Data')->processTierPrices($_product, $_tierPrices); ?>
-    <?php foreach ($_tierPrices as $_index => $_price): ?>
-        <li>
-        <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
-            <?php if ($this->getInGrouped()): ?>
-                <?php echo __('Buy %1 for', $_price['price_qty']) ?>:
-            <?php else: ?>
-                <?php echo __('Buy %1', $_price['price_qty']) ?>
-            <?php endif; ?>
-        <?php else: ?>
-
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayBothPrices()): ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
-                <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?>
-            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
-                    <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                    <?php if ($_weeeTaxAttributes): ?>
-                    (<small>
-                    <?php echo __('%1 incl tax', $_price['formated_price_incl_weee']); ?>
-                    <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                        <?php echo $separator; ?>
-                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                    <?php endforeach; ?>
-                    </small>)
-                    <?php endif; ?>
-                    <?php echo __('each') ?>
-            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
-                    <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                    <?php if ($_weeeTaxAttributes): ?>
-                    (<small>
-                    <?php echo __('%1 incl tax', $_price['formated_price_incl_weee']); ?>
-                    <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                        <?php echo $separator; ?>
-                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
-                    <?php endforeach; ?>
-                    </small>)
-                    <?php endif; ?>
-                    <?php echo __('each') ?>
-            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
-                    <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
-                    <?php if ($_weeeTaxAttributes): ?>
-                    (<small>
-                    <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
-                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                    <?php endforeach; ?>
-                    <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
-                    </small>)
+    <ul class="<?php echo ($this->getInGrouped() ? 'tier prices grouped items' : 'prices tier items'); ?>">
+        <?php if ($this->getInGrouped()): ?>
+            <?php $_tierPrices = $this->getTierPrices($_product); ?>
+        <?php endif; ?>
+        <?php $this->helper('Magento\Weee\Helper\Data')->processTierPrices($_product, $_tierPrices); ?>
+        <?php foreach ($_tierPrices as $_index => $_price): ?>
+            <li class="item">
+                <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
+                    <?php if ($this->getInGrouped()): ?>
+                        <?php echo __('Buy %1 for', $_price['price_qty']) ?>:
+                    <?php else: ?>
+                        <?php echo __('Buy %1', $_price['price_qty']) ?>
                     <?php endif; ?>
-                    <?php echo __('each') ?>
-            <?php else: ?>
-                    <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
-            <?php endif; ?>
-        <?php else: ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayPriceIncludingTax()): ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee']) ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_tax']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php endforeach; ?>
-                        <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
                 <?php else: ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_tax']) ?>
-                <?php endif; ?>
-            <?php else: ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee_only']) ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
+
+                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayBothPrices()): ?>
+                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
+                            <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?>
+                        <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
+                            <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+                            <?php if ($_weeeTaxAttributes): ?>
+                                (<small>
+                                    <?php echo __('%1 incl tax.', $_price['formated_price_incl_weee']); ?>
+                                    <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                        <?php echo $separator; ?>
+                                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+                                    <?php endforeach; ?>
+                                </small>)
+                            <?php endif; ?>
+                            <?php echo __('each') ?>
+                        <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
+                            <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+                            <?php if ($_weeeTaxAttributes): ?>
+                                (<small>
+                                    <?php echo __('%1 incl tax.', $_price['formated_price_incl_weee']); ?>
+                                    <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                        <?php echo $separator; ?>
+                                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
+                                    <?php endforeach; ?>
+                                </small>)
+                            <?php endif; ?>
+                            <?php echo __('each') ?>
+                        <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
+                            <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
+                            <?php if ($_weeeTaxAttributes): ?>
+                                (<small>
+                                    <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+                                    <?php endforeach; ?>
+                                    <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
+                                </small>)
+                            <?php endif; ?>
+                            <?php echo __('each') ?>
+                        <?php else: ?>
+                            <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
                         <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php endforeach; ?>
-                        <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee_only']); ?>
-                        </small>)
+                    <?php else: ?>
+                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayPriceIncludingTax()): ?>
+                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
+                                <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee']) ?>
+                            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
+                                <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
+                                <?php if ($_weeeTaxAttributes): ?>
+                                    (<small>
+                                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                            <?php echo $separator; ?>
+                                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+                                            <?php $separator = ' + '; endforeach; ?>
+                                    </small>)
+                                <?php endif; ?>
+                                <?php echo __('each') ?>
+                            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
+                                <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
+                                <?php if ($_weeeTaxAttributes): ?>
+                                    (<small>
+                                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                            <?php echo $separator; ?>
+                                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
+                                            <?php $separator = ' + '; endforeach; ?>
+                                    </small>)
+                                <?php endif; ?>
+                                <?php echo __('each') ?>
+                            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
+                                <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_tax']); ?>
+                                <?php if ($_weeeTaxAttributes): ?>
+                                    (<small>
+                                        <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+                                        <?php endforeach; ?>
+                                        <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
+                                    </small>)
+                                <?php endif; ?>
+                                <?php echo __('each') ?>
+                            <?php else: ?>
+                                <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_tax']) ?>
+                            <?php endif; ?>
+                        <?php else: ?>
+                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
+                                <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee_only']) ?>
+                            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
+                                <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+                                <?php if ($_weeeTaxAttributes): ?>
+                                    (<small>
+                                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                            <?php echo $separator; ?>
+                                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+                                            <?php $separator = ' + '; endforeach; ?>
+                                    </small>)
+                                <?php endif; ?>
+                                <?php echo __('each') ?>
+                            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
+                                <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+                                <?php if ($_weeeTaxAttributes): ?>
+                                    (<small>
+                                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                            <?php echo $separator; ?>
+                                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
+                                            <?php $separator = ' + '; endforeach; ?>
+                                    </small>)
+                                <?php endif; ?>
+                                <?php echo __('each') ?>
+                            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
+                                <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
+                                <?php if ($_weeeTaxAttributes): ?>
+                                    (<small>
+                                        <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
+                                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+                                        <?php endforeach; ?>
+                                        <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee_only']); ?>
+                                    </small>)
+                                <?php endif; ?>
+                                <?php echo __('each') ?>
+                            <?php else: ?>
+                                <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price']) ?>
+                            <?php endif; ?>
                         <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php else: ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price']) ?>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
+                    <?php endif; ?>
 
-        <?php endif; // Can apply MSRP ?>
+                <?php endif; // Can apply MSRP ?>
 
-        <?php if (!$this->getInGrouped()): ?>
-            <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
-            || ($_product->getPrice() != $_product->getFinalPrice() &&  $_product->getFinalPrice() > $_price['price'])): ?>
-                <?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>&nbsp;<span class="percent tier-<?php echo $_index;?>"><?php echo $_price['savePercent']?></span>%
-            <?php endif ?></strong>
-        <?php endif; ?>
+                <?php if (!$this->getInGrouped()): ?>
+                    <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
+                        || ($_product->getPrice() != $_product->getFinalPrice() &&  $_product->getFinalPrice() > $_price['price'])): ?>
+                        <?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>&nbsp;<span class="percent tier-<?php echo $_index;?>"><?php echo $_price['savePercent']?></span>%
+                    <?php endif ?></strong>
+                <?php endif; ?>
 
         <?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
             <?php $popupId = 'msrp-popup-' . $_product->getId() . $this->getRandomString(20); ?>
@@ -202,9 +200,9 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
             <span class="msrp-price-hide-message">
                 <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
             </span>
-        <?php endif; ?>
-        </li>
-    <?php endforeach ?>
+                <?php endif; ?>
+            </li>
+        <?php endforeach ?>
     </ul>
     <?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
         <script type="text/javascript">
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml b/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml
index d895c793b88950441991cb5a6203c892de867133..ae518e37324f015cb2158c83fc48603127b0baa6 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -29,10 +27,12 @@
 
 <?php if ($this->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable()): ?>
-        <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+        <p class="stock available" title="<?php echo __('Availability') ?>">
+            <span><?php echo __('In stock') ?></span>
+        </p>
     <?php else: ?>
-        <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+        <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+            <span><?php echo __('Out of stock') ?></span>
+        </p>
     <?php endif; ?>
 <?php endif; ?>
-<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<?php echo $this->getPriceHtml($_product) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml b/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml
index 5ce0026339aa5641859f281f75b17c5521c164ff..c8eb7a5bef241436a4e0a34f56a693209dd95d57 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,8 +25,8 @@
 /**
  * Grouped product data template
  *
- * @see \Magento\Catalog\Block\Product\View\BaseImage
- * @see \Magento\Catalog\Block\Product\View\Type\Grouped
+ * @var $this \Magento\Catalog\Block\Product\View\BaseImage
+ * @var $this \Magento\Catalog\Block\Product\View\Type\Grouped
  */
 ?>
 <?php $this->setPreconfiguredValue(); ?>
@@ -37,35 +35,36 @@
 <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
 <?php if ($this->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
-        <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+        <p class="stock available" title="<?php echo __('Availability') ?>">
+            <span><?php echo __('In stock') ?></span>
+        </p>
     <?php else: ?>
-        <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+        <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+            <span><?php echo __('Out of stock') ?></span>
+        </p>
     <?php endif; ?>
 <?php endif; ?>
-<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<table class="data-table grouped-items-table" id="super-product-table">
-    <col />
-    <col />
-    <col width="1" />
+
+<table class="table data grouped" id="super-product-table">
     <thead>
-        <tr>
-            <th><?php echo __('Product Name') ?></th>
-            <?php if ($this->getCanShowProductPrice($_product)): ?>
-            <th class="a-right"><?php echo __('Price') ?></th>
-            <?php endif; ?>
-            <?php if ($_product->isSaleable()): ?>
-            <th class="a-center"><?php echo __('Qty') ?></th>
-            <?php endif; ?>
-        </tr>
+    <tr>
+        <th class="col item"><?php echo __('Product Name') ?></th>
+        <?php if ($this->getCanShowProductPrice($_product)): ?>
+            <th class="col price"><?php echo __('Price') ?></th>
+        <?php endif; ?>
+        <?php if ($_product->isSaleable()): ?>
+            <th class="col qty"><?php echo __('Qty') ?></th>
+        <?php endif; ?>
+    </tr>
     </thead>
     <tbody>
     <?php if ($_hasAssociatedProducts): ?>
     <?php foreach ($_associatedProducts as $_item): ?>
         <?php $_finalPriceInclTax = $this->helper('Magento\Tax\Helper\Data')->getPrice($_item, $_item->getFinalPrice(), true) ?>
         <tr>
-            <td><?php echo $this->escapeHtml($_item->getName()) ?></td>
+            <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
             <?php if ($this->getCanShowProductPrice($_product)): ?>
-            <td class="a-right">
+            <td class="col price">
                 <?php if ($this->getCanShowProductPrice($_item)): ?>
                 <?php echo $this->getPriceHtml($_item, true) ?>
                 <?php echo $this->getTierPriceHtml($_item) ?>
@@ -73,21 +72,32 @@
             </td>
             <?php endif; ?>
             <?php if ($_product->isSaleable()): ?>
-            <td class="a-center">
+            <td class="col qty">
             <?php if ($_item->isSaleable()) : ?>
-                <input type="text" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{'validate-grouped-qty':'#super-product-table'}"/>
+                <div class="control qty">
+                    <input type="text" name="super_group[<?php echo $_item->getId() ?>]"
+                           maxlength="12"
+                           value="<?php echo $_item->getQty() * 1 ?>"
+                           title="<?php echo __('Qty') ?>"
+                           class="input-text qty"
+                           data-validate="{'validate-grouped-qty':'#super-product-table'}"/>
+                </div>
             <?php else: ?>
-                <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
+                <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+                    <span><?php echo __('Out of stock') ?></span>
+                </p>
             <?php endif; ?>
             </td>
             <?php endif; ?>
         </tr>
     <?php endforeach; ?>
     <?php else: ?>
-       <tr>
-           <td colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>"><?php echo __('No options of this product are available.') ?></td>
-       </tr>
+        <tr>
+            <td class="unavailable"
+                colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>">
+                <?php echo __('No options of this product are available.') ?>
+            </td>
+        </tr>
     <?php endif; ?>
     </tbody>
 </table>
-<script type="text/javascript">(function($) {$('#super-product-table').decorate('table')})(jQuery)</script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml b/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml
index ee424b617e06d912877afd960f32910b115edb5f..419fd11e1ab84b7bea427f17d273050340fcbc5a 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -31,24 +29,29 @@ $_product    = $this->getProduct();
 $_attributes = $this->decorateArray($this->getAllowAttributes());
 ?>
 <?php if ($_product->isSaleable() && count($_attributes)):?>
-    <dl>
+    <div class="product options configure">
     <?php foreach($_attributes as $_attribute): ?>
-        <dt><label class="required"><em>*</em><?php echo $this->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></label></dt>
-        <dd<?php if ($_attribute->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
-            <div class="input-box">
-                <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]" data-validate="{required:true}" id="attribute<?php echo $_attribute->getAttributeId() ?>" class="super-attribute-select">
+        <div class="field required">
+            <label class="label" for="attribute<?php echo $_attribute->getAttributeId() ?>">
+                <span><?php echo $this->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></span>
+            </label>
+            <div class="control">
+                <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]"
+                        data-validate="{required:true}"
+                        id="attribute<?php echo $_attribute->getAttributeId() ?>"
+                        class="super-attribute-select">
                     <option><?php echo __('Choose an Option...') ?></option>
-                  </select>
-              </div>
-        </dd>
+                </select>
+            </div>
+        </div>
     <?php endforeach; ?>
-    </dl>
+    </div>
     <script type="text/javascript">
         (function ($) {
             head.js("<?php echo $this->getViewFileUrl('jquery/jquery.parsequery.js') ?>",
                 "<?php echo $this->getViewFileUrl('Magento_Catalog::js/configurable.js') ?>", function () {
-                $('#product_addtocart_form').configurable({"spConfig":<?php echo $this->getJsonConfig() ?>});
-            })
+                    $('#product_addtocart_form').configurable({"spConfig":<?php echo $this->getJsonConfig() ?>});
+                })
         })(jQuery);
     </script>
 <?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml
index d945ba82cdc7b1e3c2b1f7d4254f0dcf2cc59ef3..d7e235f05b8fec2df65b5267d291780d1cd17b62 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml
@@ -18,10 +18,10 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-product-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<div class="widget product link">
+    <a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml
index b061345fa6d7806ac3bf8c3f0c84c7af9ca9feb8..7a8dd8e1124e42f400e81e5b9a4f745304134b1b 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml
@@ -18,10 +18,10 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<span class="widget widget-product-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<span class="widget product link">
+    <a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a>
+</span>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml
index 63b944d82114919c6e555a20270a6001ab016123..261226fc376e3b5eba66db9f59af1fe3be37ae49 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml
@@ -18,39 +18,60 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
-    <div class="block block-products">
-        <div class="block-title">
-            <strong><span><?php echo __('New Products') ?></span></strong>
+<?php if (($items$_products = $this->getProductCollection()) && $_products->getSize()): ?>
+    <?php $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');?>
+    <div class="block widget new minilist">
+        <div class="title">
+            <strong><?php echo __('New Products') ?></strong>
         </div>
-        <div class="block-content">
+        <div class="content">
             <?php echo $this->getPagerHtml() ?>
             <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-list" id="widget-new-products-<?php echo $suffix; ?>">
-            <?php foreach ($_products->getItems() as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product) ?>" width="<?php echo $this->getThumbnailSidebarSize() ?>" height="<?php echo $this->getThumbnailSidebarSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                    <div class="product-details">
-                        <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-new-'.$suffix) ?>
-                        <?php if ($_product->getIsSalable()): ?>
-                            <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
-                        <?php else: ?>
-                            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
+            <?php $iterator = 1; ?>
+            <ol class="items minilist products" id="widget-new-products-<?php echo $suffix; ?>">
+                <?php foreach ($_products->getItems() as $_product): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                    <div class="product">
+                        <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+                           title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+                            <?php echo $imageBlock->init($_product, 'side_column_widget_product_thumbnail')->toHtml() ?>
+                        </a>
+                        <div class="product details">
+                            <strong class="product name">
+                                <a href="<?php echo $_product->getProductUrl() ?>"
+                                   title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)">
+                                    <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getPriceHtml($_product, true, '-widget-new-'.$suffix) ?>
+                            <div class="product actions">
+                                <div class="primary">
+                                    <?php if($_product->isSaleable()): ?>
+                                        <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="action tocart">
+                                            <span><?php echo __('Add to Cart') ?></span>
+                                        </a>
+                                    <?php else: ?>
+                                        <?php if ($_product->getIsSalable()): ?>
+                                            <p class="stock available" title="<?php echo __('Availability') ?>">
+                                                <span><?php echo __('In stock') ?></span>
+                                            </p>
+                                        <?php else: ?>
+                                            <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+                                                <span><?php echo __('Out of stock') ?></span>
+                                            </p>
+                                        <?php endif; ?>
+                                    <?php endif; ?>
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                </li>
-            <?php endforeach; ?>
+                    <?php echo ($iterator==count($_products->getItems())+1) ? '</li>' : '' ?>
+                <?php endforeach; ?>
             </ol>
-            <script type="text/javascript">(function($) {$('#widget-new-products-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
         </div>
     </div>
-</div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml
index b5c37159abc3a4f4712c6041c01e1319770c1084..5b8c54356af77bd62751895d9a417e51a4253067 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml
@@ -18,30 +18,30 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
-    <div class="block block-list">
-        <div class="block-title">
-            <strong><span><?php echo __('New Products') ?></span></strong>
+    <?php $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
+    <div class="widget block new photos">
+        <div class="title">
+            <strong><?php echo __('New Products') ?></strong>
         </div>
-        <div class="block-content">
+        <div class="content">
             <?php echo $this->getPagerHtml() ?>
             <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-images-list" id="widget-new-products-<?php echo $suffix; ?>">
-            <?php foreach ($_products->getItems() as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize() ?>" height="<?php echo $this->getThumbnailSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                </li>
-            <?php endforeach; ?>
+            <ol class="items" id="widget-new-products-<?php echo $suffix; ?>">
+                <?php foreach ($_products->getItems() as $_product): ?>
+                    <li class="item">
+                        <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+                           title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+                            <?php /* new_products_images_only_widget */ ?>
+                            <?php echo $imageBlock->init($_product, 'new_products_images_only_widget')->toHtml() ?>
+                        </a>
+                    </li>
+                <?php endforeach; ?>
             </ol>
-            <script type="text/javascript">(function($) {$('#widget-new-products-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
         </div>
     </div>
-</div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml
index 88f4256b6145320c366380b935b0922e8eee37a2..eb378db366673be8621301abf610071b4c103dbc 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml
@@ -18,30 +18,30 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
-    <div class="block block-list">
-        <div class="block-title">
-            <strong><span><?php echo __('New Products') ?></span></strong>
+    <div class="widget block new names">
+        <div class="title">
+            <strong><?php echo __('New Products') ?></strong>
         </div>
-        <div class="block-content">
+        <div class="content">
             <?php echo $this->getPagerHtml() ?>
             <?php $suffix = $this->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?php echo $suffix; ?>">
-            <?php foreach ($_products->getItems() as $_product): ?>
-                <li class="item">
-                    <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
-                </li>
-            <?php endforeach; ?>
+            <ol class="items" id="widget-new-products-<?php echo $suffix; ?>">
+                <?php foreach ($_products->getItems() as $_product): ?>
+                    <li class="item">
+                        <strong class="product name">
+                            <a href="<?php echo $_product->getProductUrl() ?>"
+                               title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)">
+                                <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?>
+                            </a>
+                        </strong>
+                    </li>
+                <?php endforeach; ?>
             </ol>
-            <script type="text/javascript">(function($) {$('#widget-new-products-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
         </div>
     </div>
-</div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml
index bb0def3b601d8feb6e9dc2e4c52d278c5fa61adc..c2dc1163d7e770a23355d6cd501326bc2efba3be 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml
@@ -18,49 +18,101 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
-    <div class="widget-title">
-        <h2><?php echo __('New Products') ?></h2>
-    </div>
-    <div class="widget-products">
-    <?php echo $this->getPagerHtml() ?>
-    <?php $_columnCount = $this->getColumnCount(); ?>
-        <?php $i=0; foreach ($_products->getItems() as $_product): ?>
-        <?php if ($i++%$_columnCount==0): ?>
-        <ul class="products-grid">
-        <?php endif ?>
-            <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
-                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize() ?>" height="<?php echo $this->getSmallImageSidebarSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                <?php echo $this->getPriceHtml($_product, true, '-widget-new-grid') ?>
-                <div class="actions">
-                    <?php if ($_product->isSaleable()): ?>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                    <?php else: ?>
-                        <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                    <?php endif; ?>
-                    <ul class="add-to-links" data-role="add-to-links">
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                            <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-                        <?php endif; ?>
-                        <?php if($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
-                            <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-                        <?php endif; ?>
-                    </ul>
-                </div>
-            </li>
-        <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
-        </ul>
-        <?php endif ?>
-        <?php endforeach; ?>
+<?php
+if ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
+    $type = 'widget-new-grid';
+
+    $class = 'widget new grid';
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image ='new_products_content_widget_grid';
+    $title = __('New Products');
+    $items = $this->getProductCollection()->getItems();
+
+    $showWishlist = true;
+    $showCompare = true;
+    $showCart = true;
+    $rating = true;
+    $description = false;
+}
+?>
+
+<?php if ($exist):?>
+    <div class="block <?php echo $class; ?>">
+        <div class="title">
+            <strong><?php echo $title; ?></strong>
+        </div>
+        <div class="content">
+            <?php echo $this->getPagerHtml() ?>
+            <?php echo '<!-- ' . $image . '-->' ?>
+            <ol class="products list items <?php echo $type; ?>">
+                <?php $iterator = 1; ?>
+                <?php foreach($items as $_item): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                    <div class="product">
+                        <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+                            <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+                        </a>
+                        <div class="product details">
+                            <strong class="product name">
+                                <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+                                   href="<?php echo $this->getProductUrl($_item) ?>">
+                                    <?php echo $this->escapeHtml($_item->getName()) ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+
+                            <?php if ($_item->getRatingSummary() && $rating): ?>
+                                <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
+                            <?php endif; ?>
+
+                            <?php if($showWishlist || $showCompare || $showCart): ?>
+                                <div class="product actions">
+                                    <?php if($showCart): ?>
+                                        <div class="primary">
+                                            <?php if($_item->isSaleable()): ?>
+                                                <button class="action tocart"
+                                                        data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+                                                        type="button" title="<?php echo __('Add to Cart') ?>">
+                                                    <span><?php echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php if ($_item->getIsSalable()): ?>
+                                                    <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                                <?php else: ?>
+                                                    <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                                <?php endif; ?>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if($showWishlist || $showCompare): ?>
+                                        <div class="secondary addto links">
+                                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+                                                   class="action towishlist" data-action="add-to-wishlist"
+                                                   title="<?php echo __('Add to Wishlist') ?>">
+                                                    <span><?php echo __('Add to Wishlist') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                            <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+                                                <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+                                                   class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+                                                    <span><?php echo __('Add to Compare') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
+                            <?php endif; ?>
+                        </div>
+                    </div>
+                    <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+                <?php endforeach ?>
+            </ol>
+        </div>
     </div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml
index 4b21c4133a5f9f495af82f9ccdf94d5850acc62d..b674bcb5c159e164a29701170f98d9571eccee89 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml
@@ -18,46 +18,101 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
-    <div class="widget-title">
-        <h2><?php echo __('New Products') ?></h2>
-    </div>
-    <div class="widget-products">
-        <?php echo $this->getPagerHtml() ?>
-        <ol class="products-list">
-        <?php $i=0; foreach ($_products->getItems() as $_product): ?>
-            <li class="item<?php echo (++$i == count($_products))?' last':''; ?>">
-                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize() ?>" height="<?php echo $this->getSmallImageSidebarSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                <div class="product-shop">
-                    <div class="f-fix">
-                        <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                        <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-new-list') ?>
-                        <?php if ($_product->isSaleable()): ?>
-                            <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                        <?php else: ?>
-                            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
-                        <ul class="add-to-links" data-role="add-to-links">
-                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                                <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
+<?php
+if ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
+    $type = 'widget-new-list';
+
+    $class = 'widget new list';
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image ='new_products_content_widget_list';
+    $title = __('New Products');
+    $items = $this->getProductCollection()->getItems();
+
+    $showWishlist = true;
+    $showCompare = true;
+    $showCart = true;
+    $rating = true;
+    $description = true;
+}
+?>
+
+<?php if ($exist):?>
+    <div class="block <?php echo $class; ?>">
+        <div class="title">
+            <strong><?php echo $title; ?></strong>
+        </div>
+        <div class="content">
+            <?php echo $this->getPagerHtml() ?>
+            <?php echo '<!-- ' . $image . '-->' ?>
+            <ol class="products list items <?php echo $type; ?>">
+                <?php $iterator = 1; ?>
+                <?php foreach($items as $_item): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                    <div class="product">
+                        <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+                            <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+                        </a>
+                        <div class="product details">
+                            <strong class="product name">
+                                <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+                                   href="<?php echo $this->getProductUrl($_item) ?>">
+                                    <?php echo $this->escapeHtml($_item->getName()) ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+
+                            <?php if ($_item->getRatingSummary() && $rating): ?>
+                                <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
                             <?php endif; ?>
-                            <?php if($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
-                                <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+
+                            <?php if($showWishlist || $showCompare || $showCart): ?>
+                                <div class="product actions">
+                                    <?php if($showCart): ?>
+                                        <div class="primary">
+                                            <?php if($_item->isSaleable()): ?>
+                                                <button class="action tocart"
+                                                        data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+                                                        type="button" title="<?php echo __('Add to Cart') ?>">
+                                                    <span><?php echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php if ($_item->getIsSalable()): ?>
+                                                    <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                                <?php else: ?>
+                                                    <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                                <?php endif; ?>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if($showWishlist || $showCompare): ?>
+                                        <div class="secondary addto links">
+                                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+                                                   class="action towishlist" data-action="add-to-wishlist"
+                                                   title="<?php echo __('Add to Wishlist') ?>">
+                                                    <span><?php echo __('Add to Wishlist') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                            <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+                                                <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+                                                   class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+                                                    <span><?php echo __('Add to Compare') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             <?php endif; ?>
-                        </ul>
+                        </div>
                     </div>
-                </div>
-            </li>
-        <?php endforeach; ?>
-        </ol>
+                    <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+                <?php endforeach ?>
+            </ol>
+        </div>
     </div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml b/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml
index f82bac064a9939730806ad78b264401ac1ea21cc..9bec2cf9605d3d917ec47407cf8bfdd67a0f6e4c 100644
--- a/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml
+++ b/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -29,7 +27,7 @@
 /**
  * Template for displaying product price in RSS feeds
  *
- * @see \Magento\Catalog\Block\Product\Price
+ * @var $this \Magento\Catalog\Block\Product\Price
  */
 ?>
 
diff --git a/app/code/Magento/Catalog/view/frontend/widgets.css b/app/code/Magento/Catalog/view/frontend/widgets.css
index 40c76d0561be7b59415a3a409c9d2a7736c23207..cd054d6416f77ebb235ec742da27c4fc2aadcdb5 100644
--- a/app/code/Magento/Catalog/view/frontend/widgets.css
+++ b/app/code/Magento/Catalog/view/frontend/widgets.css
@@ -22,33 +22,3 @@
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-
-.widget .mini-products-images-list .product-image { display:block; width:76px; height:76px; border:1px solid #a9a9a9; margin:0 auto; }
-.widget .mini-products-images-list li.item { float:left; width:77px; height:77px; }
-
-/* Widget: Catalog New Proructs List */
-.widget-new-products { display:block; }
-.col-main .widget-new-products { margin:7px 0; }
-.widget-new-products .products-grid .product-image,
-.widget-new-products .products-list .product-image { width:85px; height:85px; }
-.widget-new-products .products-list .product-shop { margin-left:100px; }
-.sidebar .widget-new-products .block { font-size:11px; line-height:1.25; }
-.sidebar .widget-new-products .block-title strong { background:url(images/i_widget-new.gif) 0 1px no-repeat; padding-left:21px; color:#dc5033; }
-
-/* Widget: Catalog Product Link */
-.widget-product-link-inline { display:inline; }
-
-.col-main .widget-product-link { display:block; text-align:right; margin:7px 0; }
-.col-main .widget-product-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding-right:15px; }
-
-.sidebar .widget-product-link { display:block; margin:0 0 15px; padding:0 10px; }
-.sidebar .widget-product-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding:0 15px 0 0; }
-
-/* Widget: Catalog Category Link */
-.widget-category-link-inline { display:inline; }
-
-.col-main .widget-category-link { display:block; text-align:right; margin:7px 0; }
-.col-main .widget-category-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding-right:15px; }
-
-.sidebar .widget-category-link { display:block; margin:0 0 15px; padding:0 10px; }
-.sidebar .widget-category-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding:0 15px 0 0; }
diff --git a/app/code/Magento/Catalog/view/frontend/zoom.css b/app/code/Magento/Catalog/view/frontend/zoom.css
index 3946ee7708e1e455168c864cd2737e842a991f9f..a89fd54fa0b9a107b6cb0b502fe5054146c3f9e2 100644
--- a/app/code/Magento/Catalog/view/frontend/zoom.css
+++ b/app/code/Magento/Catalog/view/frontend/zoom.css
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    frontend image zoom
- * @package     mage
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
new file mode 100644
index 0000000000000000000000000000000000000000..e6685fdc1f0075309bd075ad3223f8b7d2c378f9
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\CatalogInventory\Model\Adminhtml\Stock;
+
+/**
+ * Catalog Inventory Stock Model for adminhtml area
+ */
+class Item extends \Magento\CatalogInventory\Model\Stock\Item
+{
+    /**
+     * Getter for customer group id, return default group if not set
+     *
+     * @return int
+     */
+    public function getCustomerGroupId()
+    {
+        if ($this->_customerGroupId === null) {
+            return \Magento\Customer\Model\Group::CUST_GROUP_ALL;
+        }
+        return parent::getCustomerGroupId();
+    }
+
+    /**
+     * Check if qty check can be skipped. Skip checking in adminhtml area
+     *
+     * @return bool
+     */
+    protected function _isQtyCheckApplicable()
+    {
+        return false;
+    }
+
+    /**
+     * Check if notification message should be added despite of backorders notification flag
+     *
+     * @return bool
+     */
+    protected function _hasDefaultNotificationMessage()
+    {
+        return true;
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/Model/Stock.php b/app/code/Magento/CatalogInventory/Model/Stock.php
index f81aa7e3570d9865635b84440ef1c74d23bea0f1..8a8eb65a16cb854e8d7046dfa70968ab36a491f5 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock.php
@@ -235,7 +235,7 @@ class Stock extends \Magento\Core\Model\AbstractModel
                 if ($item->getStoreId()) {
                     $stockItem->setStoreId($item->getStoreId());
                 }
-                if ($stockItem->checkQty($item->getQtyOrdered()) || $this->_storeManager->getStore()->isAdmin()) {
+                if ($stockItem->checkQty($item->getQtyOrdered())) {
                     $stockItem->subtractQty($item->getQtyOrdered());
                     $stockItem->save();
                 }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index b3bb34fe97b18af18c9933ff2f97d470b83220c5..145e04d6ed72e45b07d3a818539e683d7639dc74 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -126,7 +126,7 @@ class Item extends \Magento\Core\Model\AbstractModel
      *
      * @var int|null
      */
-    protected $_customerGroupId;
+    protected $_customerGroupId = null;
 
     /**
      * Whether index events should be processed immediately
@@ -377,12 +377,15 @@ class Item extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Getter for customer group id
+     * Getter for customer group id, return current customer group if not set
      *
      * @return int
      */
     public function getCustomerGroupId()
     {
+        if ($this->_customerGroupId === null) {
+            return $this->_customerSession->getCustomerGroupId();
+        }
         return $this->_customerGroupId;
     }
 
@@ -406,12 +409,6 @@ class Item extends \Magento\Core\Model\AbstractModel
     public function getMinSaleQty()
     {
         $customerGroupId = $this->getCustomerGroupId();
-        if (!$customerGroupId) {
-            $customerGroupId = $this->_storeManager->getStore()->isAdmin()
-                ? \Magento\Customer\Model\Group::CUST_GROUP_ALL
-                : $this->_customerSession->getCustomerGroupId();
-        }
-
         if (!isset($this->_minSaleQtyCache[$customerGroupId])) {
             $minSaleQty = $this->getUseConfigMinSaleQty()
                 ? $this->_catalogInventoryMinsaleqty->getConfigValue($customerGroupId)
@@ -540,7 +537,7 @@ class Item extends \Magento\Core\Model\AbstractModel
      */
     public function checkQty($qty)
     {
-        if (!$this->getManageStock() || $this->_storeManager->getStore()->isAdmin()) {
+        if (!$this->_isQtyCheckApplicable()) {
             return true;
         }
 
@@ -714,7 +711,7 @@ class Item extends \Magento\Core\Model\AbstractModel
                                 __('We don\'t have "%1" in the requested quantity, so we\'ll back order the remaining %2.', $this->getProductName(), ($backorderQty * 1))
                             );
                         }
-                    } elseif ($this->_storeManager->getStore()->isAdmin()) {
+                    } elseif ($this->_hasDefaultNotificationMessage()) {
                         $result->setMessage(
                             __('We don\'t have as many "%1" as you requested.', $this->getProductName())
                         );
@@ -997,4 +994,24 @@ class Item extends \Magento\Core\Model\AbstractModel
         $this->_processIndexEvents = $process;
         return $this;
     }
+
+    /**
+     * Check if qty check can be skipped
+     *
+     * @return bool
+     */
+    protected function _isQtyCheckApplicable()
+    {
+        return (bool)$this->getManageStock();
+    }
+
+    /**
+     * Check if notification message should be added despite of backorders notification flag
+     *
+     * @return bool
+     */
+    protected function _hasDefaultNotificationMessage()
+    {
+        return false;
+    }
 }
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
similarity index 86%
rename from app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml
rename to app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
index 2f306b55b6e658561b294f426183f258d4730015..537d35c6854f090038034367122549649a1495a0 100644
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml
+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
@@ -23,6 +23,6 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="catalog_product_view_type_configurable"/>
-</layout>
+<config>
+    <preference for="Magento\CatalogInventory\Model\Stock\Item" type="Magento\CatalogInventory\Model\Adminhtml\Stock\Item" />
+</config>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml b/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml
index 65c9e063dc038e81b1fba4a584a1042ac4e3ddfc..60835877108330acc24aff3ccb0323038d35752e 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml
@@ -19,17 +19,16 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
 /**
- * @see \Magento\CatalogInventory\Block\Qtyincrements
+ * @var $this \Magento\CatalogInventory\Block\Qtyincrements
  */
 ?>
 <?php if ($this->getProductQtyIncrements()) : ?>
-    <div class="product-pricing">
+    <div class="product pricing">
         <?php echo __('%1 is available for purchase in increments of %2', $this->getProductName(), $this->getProductQtyIncrements()) ?>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml b/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml
index c9cd37644dc7f6de4b8e408835abca8a19dc75fa..21530c5adf22d93e3d3534068e4d26826eded1b6 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml
@@ -19,42 +19,43 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
 /**
- * @see \Magento\CatalogInventory\Block\Stockqty\Composite
+ * @var $this \Magento\CatalogInventory\Block\Stockqty\Composite
  */
 ?>
 <?php if($this->isMsgVisible()): ?>
-    <p class="availability-only">
-        <a href="#" data-mage-init='{toggleAdvanced: {selectorsToggleClass: "no-display", baseToggleClass: "expanded", toggleContainers: "#<?php echo $this->getDetailsPlaceholderId() ?>"}}'
-           id="<?php echo $this->getPlaceholderId() ?>" title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>"><?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?></a>
-    </p>
-    <table id="<?php echo $this->getDetailsPlaceholderId() ?>" class="availability-only-details no-display">
-        <col />
-        <col width="1" />
-        <thead>
-            <tr>
-                <th><?php echo __('Product Name') ?></th>
-                <th class="a-center"><?php echo __('Qty') ?></th>
-            </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($this->getChildProducts() as $childProduct) : ?>
-            <?php $childProductStockQty = $this->getProductStockQty($childProduct); ?>
-            <?php if ($childProductStockQty > 0) : ?>
+    <div class="availability only">
+        <a href="#"
+           data-mage-init='{toggleAdvanced: {selectorsToggleClass: "active", baseToggleClass: "expanded", toggleContainers: "#<?php echo $this->getDetailsPlaceholderId() ?>"}}'
+           id="<?php echo $this->getPlaceholderId() ?>"
+           title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>"
+           class="action show">
+            <?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?>
+        </a>
+    </div>
+    <div class="availability only detailed" id="<?php echo $this->getDetailsPlaceholderId() ?>">
+        <table class="data table">
+            <thead>
                 <tr>
-                    <td><?php echo $childProduct->getName() ?></td>
-                    <td class="a-center"><?php echo $childProductStockQty ?></td>
+                    <th class="col item"><?php echo __('Product Name') ?></th>
+                    <th class="col qty"><?php echo __('Qty') ?></th>
                 </tr>
-            <?php endif ?>
-        <?php endforeach ?>
-        </tbody>
-    </table>
-    <script type="text/javascript">
-        jQuery('#<?php echo $this->getDetailsPlaceholderId() ?>').decorate('table');
-    </script>
+            </thead>
+            <tbody>
+            <?php foreach ($this->getChildProducts() as $childProduct) : ?>
+                <?php $childProductStockQty = $this->getProductStockQty($childProduct); ?>
+                <?php if ($childProductStockQty > 0) : ?>
+                    <tr>
+                        <td class="col item"><?php echo $childProduct->getName() ?></td>
+                        <td class="col qty"><?php echo $childProductStockQty ?></td>
+                    </tr>
+                <?php endif ?>
+            <?php endforeach ?>
+            </tbody>
+        </table>
+    </div>
 <?php endif ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml b/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml
index 5bf7d535622077dfb99c7636ce81f5ce160361e6..e8b2fa71807d7fa0ae39bc98c2608bcef90578cf 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml
@@ -19,17 +19,16 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
 /**
- * @see \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
+ * @var $this \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
  */
 ?>
 <?php if($this->isMsgVisible()): ?>
-    <p class="availability-only">
-        <span title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>"><?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?></span>
-    </p>
+    <div class="availability only" title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>">
+        <?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?>
+    </div>
 <?php endif ?>
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php
index 0354db80ea33146f16ef77bcf19e324fb7e6cb38..2f81946a4db4107ff7aa681d8ac3e11f61867e38 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php
@@ -33,6 +33,6 @@
  */
 namespace Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit;
 
-class Js extends \Magento\Adminhtml\Block\Template
+class Js extends \Magento\Backend\Block\Template
 {
 }
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index 9f37961ec2e0c3420257cc5a6648915d0adb44e3..aaeaff41f8045e8078c14e0791c22987bc1add70 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -41,6 +41,11 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
      */
     const SECONDS_IN_DAY = 86400;
 
+    /**
+     * @var \Magento\Logger
+     */
+    protected $_logger;
+
     /**
      * Store associated with rule entities information map
      *
@@ -106,6 +111,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Event\ManagerInterface $eventManager
      * @param \Magento\CatalogRule\Helper\Data $catalogRuleData
+     * @param \Magento\Logger $logger
      * @param \Magento\Stdlib\DateTime $dateTime
      */
     public function __construct(
@@ -116,6 +122,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Event\ManagerInterface $eventManager,
         \Magento\CatalogRule\Helper\Data $catalogRuleData,
+        \Magento\Logger $logger,
         \Magento\Stdlib\DateTime $dateTime        
     ) {
         $this->_storeManager = $storeManager;
@@ -124,6 +131,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
         $this->_eavConfig = $eavConfig;
         $this->_eventManager = $eventManager;
         $this->_catalogRuleData = $catalogRuleData;
+        $this->_logger = $logger;
         $this->dateTime = $dateTime;
         parent::__construct($resource);
     }
@@ -396,7 +404,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
 
         $select->join(
             array('pp_default'=>$priceTable),
-            sprintf($joinCondition, 'pp_default', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+            sprintf($joinCondition, 'pp_default', \Magento\Core\Model\Store::DEFAULT_STORE_ID),
             array('default_price'=>'pp_default.value')
         );
 
@@ -406,7 +414,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
             if ($defaultGroup instanceof \Magento\Core\Model\Store\Group) {
                 $storeId = $defaultGroup->getDefaultStoreId();
             } else {
-                $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+                $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
             }
 
             $select->joinInner(
@@ -431,7 +439,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
                 if ($defaultGroup instanceof \Magento\Core\Model\Store\Group) {
                     $storeId = $defaultGroup->getDefaultStoreId();
                 } else {
-                    $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+                    $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
                 }
 
                 $tableAlias = 'pp' . $websiteId;
@@ -594,6 +602,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
 
             $write->commit();
         } catch (\Exception $e) {
+            $this->_logger->logException($e);
             $write->rollback();
             throw $e;
         }
diff --git a/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml
index fe58df5de9396c2d64cf2d3c4439ee43ccc6a3ba..d3303c56286f716feaa225536f7bfb73fae667d3 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,68 +26,126 @@
 /**
  * Catalog advanced search form
  *
- * @see \Magento\CatalogSearch\Block\Advanced\Form
+ * @var $this \Magento\CatalogSearch\Block\Advanced\Form
  */
 ?>
 <?php $maxQueryLength= $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
-<div class="page-title">
-    <h1><?php echo __('Catalog Advanced Search') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
-    <div class="fieldset advanced-search">
-        <h2 class="legend"><?php echo __('Search Settings') ?></h2>
-        <ul class="form-list" id="advanced-search-list">
-            <?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
-            <?php $_code = $_attribute->getAttributeCode() ?>
-            <li>
-                <label for="<?php echo $_code ?>"><?php echo $this->getAttributeLabel($_attribute) ?></label>
-                <?php switch($this->getAttributeInputType($_attribute)):
-                    case 'number': ?>
-                    <div class="input-range">
-                        <input type="text" name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
-                        <span class="separator">-</span>
-                        <input type="text" name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+<form class="form search advanced" action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
+<fieldset class="fieldset">
+    <legend class="legend"><span><?php echo __('Search Settings') ?></span></legend><br />
+    <?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
+    <?php $_code = $_attribute->getAttributeCode() ?>
+        <div class="field <?php echo $_code ?>">
+            <label class="label" for="<?php echo $_code ?>">
+                <span><?php echo $this->getAttributeLabel($_attribute) ?></span>
+            </label>
+            <div class="control">
+            <?php switch($this->getAttributeInputType($_attribute)):
+                case 'number': ?>
+                <div class="range fields group group-2">
+                    <div class="field no-label">
+                        <div class="control">
+                            <input type="text"
+                                   name="<?php echo $_code ?>[from]"
+                                   value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>"
+                                   id="<?php echo $_code ?>"
+                                   title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+                                   class="input-text"
+                                   maxlength="<?php echo $maxQueryLength;?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
+                        </div>
                     </div>
-                    <?php break;
-                    case 'price': ?>
-                    <div class="input-range">
-                        <input name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"  class="input-text" type="text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
-                        <span class="separator">-</span>
-                        <input name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"  class="input-text" type="text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
-                        <small>(<?php echo $this->getCurrency($_attribute); ?>)</small>
+                    <div class="field no-label">
+                        <div class="control">
+                            <input type="text"
+                                   name="<?php echo $_code ?>[to]"
+                                   value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>"
+                                   id="<?php echo $_code ?>_to"
+                                   title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+                                   class="input-text"
+                                   maxlength="<?php echo $maxQueryLength;?>"
+                                   data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+                        </div>
                     </div>
-                    <?php break;
-                    case 'select': ?>
-                        <div class="input-box">
-                            <?php echo $this->getAttributeSelectElement($_attribute) ?>
+                </div>
+                <?php break;
+                case 'price': ?>
+                <div class="range price fields group group-2">
+                    <div class="field no-label">
+                        <div class="control">
+                            <input name="<?php echo $_code ?>[from]"
+                                   value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>"
+                                   id="<?php echo $_code ?>"
+                                   title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+                                   class="input-text"
+                                   type="text"
+                                   maxlength="<?php echo $maxQueryLength;?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
                         </div>
-                    <?php break;
-                    case 'yesno': ?>
-                        <?php echo $this->getAttributeYesNoElement($_attribute) ?>
-                    <?php break;
-                    case 'date': ?>
-                    <div class="input-range">
-                        <?php echo $this->getDateInput($_attribute, 'from') ?>
-                        <span class="separator">-</span>
-                        <?php echo $this->getDateInput($_attribute, 'to') ?>
                     </div>
-                    <?php break;
-                    default: ?>
-                    <div class="input-box">
-                        <input type="text" name="<?php echo $_code ?>" id="<?php echo $_code ?>" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute)) ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"  class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>" maxlength="<?php echo $maxQueryLength;?>" />
+                    <div class="field with-addon no-label">
+                        <div class="control">
+                            <div class="addon">
+                                <input name="<?php echo $_code ?>[to]"
+                                       value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>"
+                                       id="<?php echo $_code ?>_to"
+                                       title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+                                       class="input-text"
+                                       type="text"
+                                       maxlength="<?php echo $maxQueryLength;?>"
+                                       data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+                                <label class="addafter"
+                                       for="<?php echo $_code ?>_to">
+                                    <?php echo $this->getCurrency($_attribute); ?>
+                                </label>
+                            </div>
+                        </div>
                     </div>
-                <?php endswitch; ?>
-            </li>
-            <?php endforeach; ?>
-        </ul>
-        <script type="text/javascript">(function($) {$('#advanced-search-list').decorate('list')})(jQuery)</script>
-    </div>
-    <div class="buttons-set">
-        <button type="submit" title="<?php echo __('Search') ?>" class="button"><span><span><?php echo __('Search') ?></span></span></button>
-    </div>
+                </div>
+                <?php break;
+                case 'select': ?>
+                    <?php echo $this->getAttributeSelectElement($_attribute) ?>
+                <?php break;
+                case 'yesno': ?>
+                    <?php echo $this->getAttributeYesNoElement($_attribute) ?>
+                <?php break;
+                case 'date': ?>
+                <div class="range dates fields group group-2">
+                    <div class="field date no-label">
+                        <div class="control">
+                            <?php echo $this->getDateInput($_attribute, 'from') ?>
+                        </div>
+                    </div>
+                    <div class="field date no-label">
+                        <div class="control">
+                            <?php echo $this->getDateInput($_attribute, 'to') ?>
+                        </div>
+                    </div>
+                </div>
+                <?php break;
+                default: ?>
+                <input type="text"
+                       name="<?php echo $_code ?>"
+                       id="<?php echo $_code ?>"
+                       value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute)) ?>"
+                       title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+                       class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>"
+                       maxlength="<?php echo $maxQueryLength;?>" />
+            <?php endswitch; ?>
+            </div>
+        </div>
+    <?php endforeach; ?>
+</fieldset>
+<div class="actions">
+    <button type="submit"
+            class="action search"
+            title="<?php echo __('Search') ?>">
+        <span><?php echo __('Search') ?></span>
+    </button>
+</div>
 </form>
 <script type="text/javascript">
+    //<![CDATA[
     (function($) {
         head.js(
             "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
@@ -100,7 +156,7 @@
                 $('#form-validate').validation({
                     errorPlacement: function (error, element) {
                         var parent = element.parent();
-                        if (parent.hasClass('input-range')) {
+                        if (parent.hasClass('range')) {
                             parent.find(this.errorElement + '.' + this.errorClass).remove().end().append(error);
                         } else {
                             error.insertAfter(element);
@@ -113,4 +169,5 @@
                 });
             });
     })(jQuery);
+    //]]>
 </script>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml
index 432ef79ca5826a28dffcbbb789109bda223f473b..3938edb1e6df8dc4dc41d3be05253ebaeca88e73 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml
@@ -18,43 +18,43 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<div class="page-title">
-    <h1><?php echo __('Catalog Advanced Search') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
 <?php if($this->getResultCount()): ?>
-    <p class="advanced-search-amount">
-        <?php echo __('<strong>%1 item(s)</strong> were found using the following search criteria.', $this->getResultCount()); ?>
-    </p>
+    <div class="search found">
+        <?php echo __('<strong>%1 item(s)</strong> were found using the following search criteria', $this->getResultCount()); ?>
+    </div>
 <?php else: ?>
-    <p class="error-msg"><?php echo __('We didn\'t find any items using this search criteria.');?> <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a></p>
+    <div class="message error">
+        <div>
+            <?php echo __('No items were found using the following search criteria.');?> <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
+        </div>
+    </div>
 <?php endif; ?>
 
-<div class="advanced-search-summary">
-    <?php $searchCriterias=$this->getSearchCriterias(); ?>
-        <?php foreach (array('left', 'right') as $side): ?>
-            <?php if(@$searchCriterias[$side]): ?>
-                <ul>
-                    <?php foreach($searchCriterias[$side] as $criteria): ?>
-                        <li><strong><?php echo $this->escapeHtml(__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?>
-        <?php endforeach; ?>
-    <?php if($this->getResultCount()): ?>
-        <p>
+<?php $searchCriterias=$this->getSearchCriterias(); ?>
+<div class="search summary">
+    <?php foreach (array('left', 'right') as $side): ?>
+        <?php if(@$searchCriterias[$side]): ?>
+            <ul class="items">
+                <?php foreach($searchCriterias[$side] as $criteria): ?>
+                    <li class="item"><strong><?php echo $this->escapeHtml(__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
+                <?php endforeach; ?>
+            </ul>
+        <?php endif; ?>
+    <?php endforeach; ?>
+</div>
+<?php if($this->getResultCount()): ?>
+    <div class="message notice">
+        <div>
             <?php echo __("Don't see what you're looking for?"); ?>
             <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
-        </p>
-    <?php endif; ?>
-</div>
+        </div>
+    </div>
+<?php endif; ?>
 <?php if($this->getResultCount()): ?>
-    <?php echo $this->getProductListHtml() ?>
+    <div class="search results"><?php echo $this->getProductListHtml() ?></div>
 <?php endif; ?>
 <?php $this->getSearchCriterias(); ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/form-mini.js b/app/code/Magento/CatalogSearch/view/frontend/form-mini.js
index 33d501634ae5c24ddcaf39549d58cc192f2e1cb9..423c0ca6835a674a5940b6c53885327d59972bf0 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/form-mini.js
+++ b/app/code/Magento/CatalogSearch/view/frontend/form-mini.js
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    catalogsearch search
- * @package     mage
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml b/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml
index 34325028b58f51cb8d91be80927ea4edb48aaa21..3510ed3f34ed365423029eaeecd9478205c2fb69 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -29,25 +27,46 @@
 /** @var $helper \Magento\CatalogSearch\Helper\Data */
 $helper = $this->helper('Magento\CatalogSearch\Helper\Data');
 ?>
-<form id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>" method="get">
-    <div class="form-search">
-        <label for="search"><?php echo __('Search:') ?></label>
-        <input id="search" type="text" name="<?php echo $helper->getQueryParamName() ?>" value="<?php echo $helper->getEscapedQueryText() ?>" class="input-text" />
-        <button type="submit" title="<?php echo __('Search') ?>" class="button"><span><span><?php echo __('Search') ?></span></span></button>
-        <div id="search_autocomplete" class="search-autocomplete"></div>
-        <script type="text/javascript">
-        //<![CDATA[
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
-                $('#search').catalogSearch({
-                    formSelector: '#search_mini_form',
-                    placeholder: '<?php echo __('Search entire store here...') ?>',
-                    url: '<?php echo $helper->getSuggestUrl() ?>',
-                    destinationSelector: '#search_autocomplete'
+<div class="block search">
+    <div class="title"><strong><?php echo __('Search'); ?></strong></div>
+    <div class="content search">
+        <form class="form minisearch" id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>" method="get">
+            <div class="field search">
+                <label class="label" for="search"><?php echo __('Search'); ?></label>
+                <div class="control">
+                    <input id="search"
+                           type="text"
+                           name="<?php echo $helper->getQueryParamName() ?>"
+                           value="<?php echo $helper->getEscapedQueryText() ?>"
+                           placeholder="<?php echo __('Search entire store here...'); ?>"
+                           class="input-text"
+                           autocomplete="off"/>
+                    <div id="search_autocomplete" class="search autocomplete"></div>
+                    <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>">
+                        <?php echo __('Advanced Search'); ?>
+                    </a>
+                </div>
+            </div>
+            <div class="actions">
+                <button type="submit"
+                        title="<?php echo __('Search'); ?>"
+                        class="action search">
+                    <span><?php echo __('Search'); ?></span>
+                </button>
+            </div>
+            <script type="text/javascript">
+            //<![CDATA[
+            (function($) {
+                head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
+                    $('#search').catalogSearch({
+                        formSelector: '#search_mini_form',
+                        url: '<?php echo $helper->getSuggestUrl() ?>',
+                        destinationSelector: '#search_autocomplete'
+                    });
                 });
-            });
-        })(jQuery);
-        //]]>
-        </script>
+            })(jQuery);
+            //]]>
+            </script>
+        </form>
     </div>
-</form>
+</div>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml
index 5dc716342e983a54e9de6ef3d418c4c1e7a62cb6..5c6ebc268d9ee0709dff331665c2da5a478218f3 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml
@@ -24,11 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-right.phtml</argument>
-        </action>
-    </referenceBlock>
+    <update handle="page_one_column"/>
     <referenceBlock name="head">
         <action method="setTitle">
             <argument translate="true" name="title" xsi:type="string">Advanced Search</argument>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
index 39879244cb2eadd13589a96c5b3cde8dc5d3a498..f9f661d884d83bc45f578dab4a4d52d829184751 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
@@ -24,33 +24,18 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="page_two_columns_right"/>
+    <update handle="page_two_columns_left"/>
+    <referenceBlock name="page.main.title">
+        <action method="setPageTitle">
+            <argument translate="true" name="title" xsi:type="string">Catalog Advanced Search</argument>
+        </action>
+    </referenceBlock>
     <referenceContainer name="content">
         <block class="Magento\CatalogSearch\Block\Advanced\Result" name="catalogsearch_advanced_result" template="advanced/result.phtml">
             <block class="Magento\Catalog\Block\Product\ListProduct" name="search_result_list" template="product/list.phtml">
                 <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
                     <block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
                 </block>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">empty</argument>
-                    <argument name="count" xsi:type="string">6</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">one_column</argument>
-                    <argument name="count" xsi:type="string">5</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">two_columns_left</argument>
-                    <argument name="count" xsi:type="string">4</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">two_columns_right</argument>
-                    <argument name="count" xsi:type="string">4</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">three_columns</argument>
-                    <argument name="count" xsi:type="string">3</argument>
-                </action>
                 <action method="setToolbarBlockName">
                     <argument name="name" xsi:type="string">product_list_toolbar</argument>
                 </action>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
index 4f59da57d67dd0fc0e5e569f5cdc9f13de318826..81182cf4c0e66a1dca61c57e97cd8f6ded089a8f 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
@@ -24,46 +24,25 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">3columns.phtml</argument>
-        </action>
-    </referenceBlock>
+    <update handle="page_two_columns_left"/>
     <referenceContainer name="left">
-        <block class="Magento\CatalogSearch\Block\Layer" name="catalogsearch.leftnav" after="currency" template="Magento_Catalog::layer/view.phtml"/>
+        <block class="Magento\CatalogSearch\Block\Layer" name="catalogsearch.leftnav" before="-" template="Magento_Catalog::layer/view.phtml"/>
     </referenceContainer>
     <referenceContainer name="content">
         <block class="Magento\CatalogSearch\Block\Result" name="search.result" template="result.phtml">
             <block class="Magento\Catalog\Block\Product\ListProduct" name="search_result_list" template="product/list.phtml">
+                <arguments>
+                    <!-- If position of argument is depend on image size changable in VDE:
+                        positions:list-secondary,grid-secondary,list-actions,grid-actions,list-primary,grid-primary
+                    -->
+                    <argument name="positioned" xsi:type="string">positions:list-secondary</argument>
+                </arguments>
                 <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
                     <block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
                 </block>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">empty</argument>
-                    <argument name="count" xsi:type="string">6</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">one_column</argument>
-                    <argument name="count" xsi:type="string">5</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">two_columns_left</argument>
-                    <argument name="count" xsi:type="string">4</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">two_columns_right</argument>
-                    <argument name="count" xsi:type="string">4</argument>
-                </action>
-                <action method="addColumnCountLayoutDepend">
-                    <argument name="layout" xsi:type="string">three_columns</argument>
-                    <argument name="count" xsi:type="string">3</argument>
-                </action>
                 <action method="setToolbarBlockName">
                     <argument name="name" xsi:type="string">product_list_toolbar</argument>
                 </action>
-                <action method="setPageLayout">
-                    <argument name="layout" xsi:type="string">three_columns</argument>
-                </action>
             </block>
             <action method="setListOrders"/>
             <action method="setListModes"/>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml
index 4eb92eddb8b84cc16717582ea681722a602fba2d..eb25e84c00e1c308da6cb4c971f13ee7cdce8b11 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml
@@ -24,14 +24,10 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="page_one_column"/>
     <referenceBlock name="head">
         <action method="setTitle">
-            <argument translate="true" name="title" xsi:type="string">Search Terms</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
+            <argument translate="true" name="title" xsi:type="string">Popular Search Terms</argument>
         </action>
     </referenceBlock>
     <referenceContainer name="content">
diff --git a/app/code/Magento/CatalogSearch/view/frontend/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/result.phtml
index 3c21f96f26943312f8a1022dbfea33e048f32b73..8cc3982ee83ceabdca15ec3e9bd223e0ad16dae3 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/result.phtml
@@ -18,37 +18,35 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php if($this->getResultCount()): ?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="page-title">
-    <?php echo $this->getChildHtml('tagged_product_list_rss_link'); ?>
-    <h1><?php echo ($this->getHeaderText() || $this->getHeaderText() === false) ? $this->getHeaderText() : __("Search results for '%1'", $this->helper('Magento\CatalogSearch\Helper\Data')->getEscapedQueryText()) ?></h1>
-</div>
+<?php echo $this->getChildHtml('tagged_product_list_rss_link'); ?>
+<div class="search results">
     <?php if ($messages = $this->getNoteMessages()):?>
-    <p class="note-msg">
-        <?php foreach ($messages as $message):?>
-            <?php echo $message?><br />
-        <?php endforeach;?>
-    </p>
+    <div class="message notice">
+        <div>
+            <?php foreach ($messages as $message):?>
+                <?php echo $message?><br />
+            <?php endforeach;?>
+        </div>
+    </div>
     <?php endif; ?>
     <?php echo $this->getProductListHtml() ?>
+</div>
 <?php else: ?>
-<div class="page-title">
-    <h1><?php echo ($this->getHeaderText() || $this->getHeaderText() === false) ? $this->getHeaderText() : __("Search results for '%1'", $this->helper('Magento\CatalogSearch\Helper\Data')->getEscapedQueryText()) ?></h1>
+
+<div class="message notice">
+    <div>
+        <?php echo ($this->getNoResultText()) ? $this->getNoResultText() : __('Your search returns no results.') ?>
+        <?php echo $this->getAdditionalHtml() ?>
+        <?php if ($messages = $this->getNoteMessages()):?>
+            <?php foreach ($messages as $message):?>
+                <br /><?php echo $message?>
+            <?php endforeach;?>
+        <?php endif; ?>
+    </div>
 </div>
-<p class="note-msg">
-    <?php echo ($this->getNoResultText()) ? $this->getNoResultText() : __('Your search returns no results.') ?>
-    <?php echo $this->getAdditionalHtml() ?>
-    <?php if ($messages = $this->getNoteMessages()):?>
-        <?php foreach ($messages as $message):?>
-        <br /><?php echo $message?>
-        <?php endforeach;?>
-    <?php endif; ?>
-</p>
 <?php endif; ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/term.phtml b/app/code/Magento/CatalogSearch/view/frontend/term.phtml
index 7043064f3bb132ce2592cb8d7ee16722f8bbcb8d..97b4f45c05f2baf9a74819eb3c76bff434f5bccc 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/term.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/term.phtml
@@ -18,21 +18,23 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<div class="page-title">
-    <h1><?php echo __('Popular Search Terms') ?></h1>
-</div>
 <?php if( sizeof($this->getTerms()) > 0 ): ?>
-    <ul class="tags-list">
+    <ul class="search terms">
         <?php foreach ($this->getTerms() as $_term): ?>
-            <li><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_term->getName()) ?></a></li>
+            <li class="item">
+                <a href="<?php echo $this->getSearchUrl($_term) ?>"
+                   style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;">
+                    <?php echo $this->escapeHtml($_term->getName()) ?>
+                </a>
+            </li>
         <?php endforeach; ?>
     </ul>
 <?php else: ?>
-    <p class="note-msg"><?php echo __('There are no search terms available.'); ?></p>
+    <div class="message notice">
+        <div><?php echo __('There are no search terms available.'); ?></div>
+    </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Centinel/Model/Service.php b/app/code/Magento/Centinel/Model/Service.php
index 6a93403372499bd21ca910587463e3c8f50ce9a2..d21950e74fdfc86b135ddb50dd745de797f1606a 100644
--- a/app/code/Magento/Centinel/Model/Service.php
+++ b/app/code/Magento/Centinel/Model/Service.php
@@ -80,14 +80,7 @@ class Service extends \Magento\Object
      *
      * @var \Magento\UrlInterface
      */
-    protected $_backendUrl;
-
-    /**
-     * Frontend url
-     *
-     * @var \Magento\UrlInterface
-     */
-    protected $_frontendUrl;
+    protected $_url;
 
     /**
      * Centinel session
@@ -103,13 +96,6 @@ class Service extends \Magento\Object
      */
     protected $_session;
 
-    /**
-     * Store manager
-     *
-     * @var \Magento\Core\Model\StoreManagerInterface
-     */
-    protected $_storeManager;
-
     /**
      * State factory
      *
@@ -124,36 +110,38 @@ class Service extends \Magento\Object
      */
     protected $_validationState;
 
+    /**
+     * @var string
+     */
+    protected $_urlPrefix;
+
     /**
      * @param \Magento\Centinel\Model\Config $config
      * @param \Magento\Centinel\Model\Api $api
-     * @param \Magento\UrlInterface $backendUrl
-     * @param \Magento\UrlInterface $frontendUrl
+     * @param \Magento\UrlInterface $url
      * @param \Magento\Core\Model\Session\AbstractSession $centinelSession
      * @param \Magento\Core\Model\Session $session
-     * @param \Magento\Core\Model\StoreManagerInterface $storeManager
      * @param \Magento\Centinel\Model\StateFactory $stateFactory
+     * @param string $urlPrefix
      * @param array $data
      */
     public function __construct(
         \Magento\Centinel\Model\Config $config,
         \Magento\Centinel\Model\Api $api,
-        \Magento\UrlInterface $backendUrl,
-        \Magento\UrlInterface $frontendUrl,
+        \Magento\UrlInterface $url,
         \Magento\Core\Model\Session\AbstractSession $centinelSession,
         \Magento\Core\Model\Session $session,
-        \Magento\Core\Model\StoreManagerInterface $storeManager,
         \Magento\Centinel\Model\StateFactory $stateFactory,
+        $urlPrefix = 'centinel/index/',
         array $data = array()
     ) {
         $this->_config = $config;
         $this->_api = $api;
-        $this->_backendUrl = $backendUrl;
-        $this->_frontendUrl = $frontendUrl;
+        $this->_url = $url;
         $this->_centinelSession = $centinelSession;
         $this->_session = $session;
-        $this->_storeManager = $storeManager;
         $this->_stateFactory = $stateFactory;
+        $this->_urlPrefix = $urlPrefix;
         parent::__construct($data);
     }
 
@@ -170,11 +158,12 @@ class Service extends \Magento\Object
     /**
      * Generate checksum from all passed parameters
      *
+     * @param string $paymentMethodCode
      * @param string $cardType
      * @param string $cardNumber
      * @param string $cardExpMonth
      * @param string $cardExpYear
-     * @param double $amount
+     * @param float $amount
      * @param string $currencyCode
      * @return string
      */
@@ -190,7 +179,7 @@ class Service extends \Magento\Object
      * @param bool $current
      * @return string
      */
-    private function _getUrl($suffix, $current = false)
+    protected function _getUrl($suffix, $current = false)
     {
         $params = array(
             '_secure'  => true,
@@ -198,11 +187,7 @@ class Service extends \Magento\Object
             'form_key' => $this->_session->getFormKey(),
             'isIframe' => true
         );
-        if ($this->_storeManager->getStore()->isAdmin()) {
-            return $this->_backendUrl->getUrl('adminhtml/centinel_index/' . $suffix, $params);
-        } else {
-            return $this->_frontendUrl->getUrl('centinel/index/' . $suffix, $params);
-        }
+        return $this->_url->getUrl($this->_urlPrefix . $suffix, $params);
     }
 
     /**
@@ -444,12 +429,12 @@ class Service extends \Magento\Object
         return $validationState && $validationState->isAuthenticateSuccessful();
     }
 
-     /**
+    /**
      * Export cmpi lookups and authentication information stored in session into array
      *
      * @param mixed $to
      * @param array $map
-     * @return mixed $to
+     * @return mixed
      */
     public function exportCmpiData($to, $map = false)
     {
diff --git a/app/code/Magento/Centinel/etc/adminhtml/di.xml b/app/code/Magento/Centinel/etc/adminhtml/di.xml
index 0d65b30b450931ff16d393bb161094b9d3f12a65..0d312b21fca2a1a16f43ed4d670f003d5a06ecb2 100644
--- a/app/code/Magento/Centinel/etc/adminhtml/di.xml
+++ b/app/code/Magento/Centinel/etc/adminhtml/di.xml
@@ -33,14 +33,14 @@
         </param>
     </virtualType>
     <type name="Magento\Centinel\Model\Service">
-        <param name="backendUrl">
+        <param name="url">
             <instance type="Magento\Backend\Model\Url" />
         </param>
-        <param name="frontendUrl">
-            <instance type="Magento\Core\Model\Url" />
-        </param>
         <param name="centinelSession">
             <instance type="Magento\Core\Model\Session" />
         </param>
+        <param name="urlPrefix">
+            <value>adminhtml/centinel_index/</value>
+        </param>
     </type>
-</config>
\ No newline at end of file
+</config>
diff --git a/app/code/Magento/Checkout/Controller/Multishipping.php b/app/code/Magento/Checkout/Controller/Multishipping.php
index 740efd0d365214f9cc4f4f212c849e25b8258abd..e85468dec2eb40a473724ca1dcd13ca5055b161f 100644
--- a/app/code/Magento/Checkout/Controller/Multishipping.php
+++ b/app/code/Magento/Checkout/Controller/Multishipping.php
@@ -76,6 +76,26 @@ class Multishipping extends \Magento\Checkout\Controller\Action
         return $this->_objectManager->get('Magento\Checkout\Model\Session');
     }
 
+    /**
+     * @var \Magento\Core\Model\Url
+     */
+    protected $_urlBuilder;
+
+
+    /**
+     * @param \Magento\App\Action\Context $context
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Core\Model\Url $urlBuilder
+     */
+    public function __construct(
+        \Magento\App\Action\Context $context,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Core\Model\Url $urlBuilder
+    ) {
+        parent::__construct($context, $customerSession);
+        $this->_urlBuilder = $urlBuilder;
+    }
+    
     /**
      * Dispatch request
      *
@@ -196,7 +216,7 @@ class Multishipping extends \Magento\Checkout\Controller\Action
             $registerForm->setShowAddressFields(true)
                 ->setBackUrl($this->_getHelper()->getMSLoginUrl())
                 ->setSuccessUrl($this->_getHelper()->getMSShippingAddressSavedUrl())
-                ->setErrorUrl($this->_getHelper()->getCurrentUrl());
+                ->setErrorUrl($this->_urlBuilder->getCurrentUrl());
         }
 
         $this->_view->renderLayout();
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index eef0d2f0c9425e85e3c280a7a0a0b8d70561a8c5..b6182e3bff1650205db7cb123fa0aaa89d285144 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -106,7 +106,7 @@ class Cart extends \Magento\Core\Helper\Url
      */
     public function getAddUrl($product, $additional = array())
     {
-        $continueUrl    = $this->_coreData->urlEncode($this->getCurrentUrl());
+        $continueUrl    = $this->_coreData->urlEncode($this->_urlBuilder->getCurrentUrl());
         $urlParamName   = \Magento\App\Action\Action::PARAM_NAME_URL_ENCODED;
 
         $routeParams = array(
@@ -134,7 +134,7 @@ class Cart extends \Magento\Core\Helper\Url
     /**
      * Retrieve url for remove product from cart
      *
-     * @param   \Magento\Sales\Quote\Item $item
+     * @param   \Magento\Sales\Model\Quote\Item $item
      * @return  string
      */
     public function getRemoveUrl($item)
diff --git a/app/code/Magento/Checkout/Model/Type/Multishipping.php b/app/code/Magento/Checkout/Model/Type/Multishipping.php
index c7b60d8f68a41c5909e9bbbcdd1a44c2d53d920c..511a9ef8b8864b4293287f235ceee56e6b5b22d6 100644
--- a/app/code/Magento/Checkout/Model/Type/Multishipping.php
+++ b/app/code/Magento/Checkout/Model/Type/Multishipping.php
@@ -234,7 +234,7 @@ class Multishipping extends \Magento\Checkout\Model\Type\AbstractType
                 }
 
                 /**
-                 * Require shiping rate recollect
+                 * Require shipping rate recollect
                  */
                 $address->setCollectShippingRates((boolean) $this->getCollectRatesFlag());
 
@@ -385,7 +385,7 @@ class Multishipping extends \Magento\Checkout\Model\Type\AbstractType
                     $quoteAddress->addItem($quoteItem, $qty);
                 }
                 /**
-                 * Require shiping rate recollect
+                 * Require shipping rate recollect
                  */
                 $quoteAddress->setCollectShippingRates((boolean) $this->getCollectRatesFlag());
             }
diff --git a/app/code/Magento/Checkout/view/frontend/onepage/login.phtml b/app/code/Magento/Checkout/view/frontend/onepage/login.phtml
index a66ba381e917a45404acee1c659a75fd2f068c33..084ebdadb563760593a26e0b1c3ce0585fc0a917 100644
--- a/app/code/Magento/Checkout/view/frontend/onepage/login.phtml
+++ b/app/code/Magento/Checkout/view/frontend/onepage/login.phtml
@@ -54,7 +54,7 @@
                 <div class="actions">
                     <input name="context" type="hidden" value="checkout" />
                     <div class="primary">
-                        <button type="submit" class="action login"><span><?php echo __('Login') ?></span></button>
+                        <button type="submit" class="action login" data-action="checkout-method-login"><span><?php echo __('Login') ?></span></button>
                     </div>
                     <div class="secondary">
                         <a class="action remind" href="<?php echo $this->helper('Magento\Customer\Helper\Data')->getForgotPasswordUrl()?>">
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
index 08c145f3c92673edace74baf372645ff9c05e833..0e7ec3871ce2c4b7810309707c19d6aaff414f57 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;
 
-class Files extends \Magento\Adminhtml\Block\Template
+class Files extends \Magento\Backend\Block\Template
 {
     /**
      * Files collection object
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
index 2240478bf1c7e1bc79d4323e79211cbf0fd761bf..1967872438c84fff0be652d2138de9405c1a6a33 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;
 
-class Newfolder extends \Magento\Adminhtml\Block\Template
+class Newfolder extends \Magento\Backend\Block\Template
 {
 
 }
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
index f671873764064bd298fd1cdcd9c289edaa85313f..9cde9c297cc78092ac3e230d0af4867924691d5b 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;
 
-class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
+class Uploader extends \Magento\Backend\Block\Media\Uploader
 {
     /**
      * @var \Magento\Cms\Model\Wysiwyg\Images\Storage
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index d828961cc218158e582f11ef28f57828ed210b92..f3b98b928f9f8eb6a3877517e4267e1c1b7860bb 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images;
 
-class Tree extends \Magento\Adminhtml\Block\Template
+class Tree extends \Magento\Backend\Block\Template
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page.php b/app/code/Magento/Cms/Controller/Adminhtml/Page.php
index f3f9040ec45b5f2f462b17e94937493d5fd21817..12cdfe8a41fcf0bf581e676e1c9b1be3229b5134 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page.php
@@ -282,8 +282,8 @@ class Page extends \Magento\Backend\App\Action
     {
         $errorNo = true;
         if (!empty($data['layout_update_xml']) || !empty($data['custom_layout_update_xml'])) {
-            /** @var $validatorCustomLayout \Magento\Adminhtml\Model\LayoutUpdate\Validator */
-            $validatorCustomLayout = $this->_objectManager->create('Magento\Adminhtml\Model\LayoutUpdate\Validator');
+            /** @var $validatorCustomLayout \Magento\Core\Model\Layout\Update\Validator */
+            $validatorCustomLayout = $this->_objectManager->create('Magento\Core\Model\Layout\Update\Validator');
             if (!empty($data['layout_update_xml']) && !$validatorCustomLayout->isValid($data['layout_update_xml'])) {
                 $errorNo = false;
             }
diff --git a/app/code/Magento/Cms/Model/Resource/Block.php b/app/code/Magento/Cms/Model/Resource/Block.php
index d15eb9f7910bc389e94bad457cece2e14668aba5..654e972b2e8fc57797b82b1474814dcf84bfe906 100644
--- a/app/code/Magento/Cms/Model/Resource/Block.php
+++ b/app/code/Magento/Cms/Model/Resource/Block.php
@@ -202,7 +202,7 @@ class Block extends \Magento\Core\Model\Resource\Db\AbstractDb
         if ($object->getStoreId()) {
             $stores = array(
                 (int) $object->getStoreId(),
-                \Magento\Core\Model\AppInterface::ADMIN_STORE_ID,
+                \Magento\Core\Model\Store::DEFAULT_STORE_ID,
             );
 
             $select->join(
@@ -227,7 +227,7 @@ class Block extends \Magento\Core\Model\Resource\Db\AbstractDb
     public function getIsUniqueBlockToStores(\Magento\Core\Model\AbstractModel $object)
     {
         if ($this->_storeManager->hasSingleStore()) {
-            $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+            $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
         } else {
             $stores = (array)$object->getData('stores');
         }
diff --git a/app/code/Magento/Cms/Model/Resource/Block/Collection.php b/app/code/Magento/Cms/Model/Resource/Block/Collection.php
index fd4001399378a91cf51622d4c7e389b9994aa05b..3fa548f1047554df2ab7738f5a3eead7d4faa142 100644
--- a/app/code/Magento/Cms/Model/Resource/Block/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Block/Collection.php
@@ -74,7 +74,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
         }
 
         if ($withAdmin) {
-            $store[] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+            $store[] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
         }
 
         $this->addFilter('store', array('in' => $store), 'public');
diff --git a/app/code/Magento/Cms/Model/Resource/Page.php b/app/code/Magento/Cms/Model/Resource/Page.php
index 7226b38da31a7ee8e6ac6e4fd7c45f9e1c06d4c8..0f3ebf954f4c8d7682b023ec4f7cc8560eaddb80 100644
--- a/app/code/Magento/Cms/Model/Resource/Page.php
+++ b/app/code/Magento/Cms/Model/Resource/Page.php
@@ -238,7 +238,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
         $select = parent::_getLoadSelect($field, $value, $object);
 
         if ($object->getStoreId()) {
-            $storeIds = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, (int)$object->getStoreId());
+            $storeIds = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, (int)$object->getStoreId());
             $select->join(
                 array('cms_page_store' => $this->getTable('cms_page_store')),
                 $this->getMainTable() . '.page_id = cms_page_store.page_id',
@@ -287,7 +287,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
     public function getIsUniquePageToStores(\Magento\Core\Model\AbstractModel $object)
     {
         if ($this->_storeManager->hasSingleStore() || !$object->hasStores()) {
-            $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+            $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
         } else {
             $stores = (array)$object->getData('stores');
         }
@@ -341,7 +341,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
      */
     public function checkIdentifier($identifier, $storeId)
     {
-        $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, $storeId);
+        $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, $storeId);
         $select = $this->_getLoadByIdentifierSelect($identifier, $stores, 1);
         $select->reset(\Zend_Db_Select::COLUMNS)
             ->columns('cp.page_id')
@@ -359,7 +359,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
      */
     public function getCmsPageTitleByIdentifier($identifier)
     {
-        $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+        $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
         if ($this->_store) {
             $stores[] = (int)$this->getStore()->getId();
         }
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
index e0b164fadc51f313489a6ce3b6ca947b763b35b2..497c0fe17019c08469201892d9c4ce73209bb6bc 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
@@ -181,7 +181,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
             }
 
             if ($withAdmin) {
-                $store[] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+                $store[] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
             }
 
             $this->addFilter('store', array('in' => $store), 'public');
diff --git a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php
index 2b6f5a0095c5e3e1a19787499259709381d10c95..b08b467ba4885325a2a3ce8811b35ebfa55a8f1e 100644
--- a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php
+++ b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php
@@ -34,7 +34,7 @@
 namespace Magento\Connect\Block\Adminhtml\Extension\Custom\Edit\Tab;
 
 class Load
-    extends \Magento\Adminhtml\Block\Template
+    extends \Magento\Backend\Block\Template
 {
     /**
      * Retrieve Grid Block HTML
diff --git a/app/code/Magento/Core/App/Request/PathInfoProcessor.php b/app/code/Magento/Core/App/Request/PathInfoProcessor.php
index 2c802b8bea5c0f092210866acf38cdb4a8beee8a..6882236203df82442f2c55f2f2ca7719c6710f54 100644
--- a/app/code/Magento/Core/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Core/App/Request/PathInfoProcessor.php
@@ -50,7 +50,7 @@ class PathInfoProcessor implements \Magento\App\Request\PathInfoProcessorInterfa
         $pathParts = explode('/', ltrim($pathInfo, '/'), 2);
         $storeCode = $pathParts[0];
 
-        $stores = $this->_storeManager->getStores(true, true);
+        $stores = $this->_storeManager->getStores(false, true);
         if (isset($stores[$storeCode]) && $stores[$storeCode]->isUseStoreInUrl()) {
             if (!$request->isDirectAccessFrontendName($storeCode)) {
                 $this->_storeManager->setCurrentStore($storeCode);
@@ -64,4 +64,4 @@ class PathInfoProcessor implements \Magento\App\Request\PathInfoProcessorInterfa
         }
         return $pathInfo;
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Core/Helper/Url.php b/app/code/Magento/Core/Helper/Url.php
index 14b93e86b45640ee3f383ea7109b810f1a246702..b0f07d5f1b8f7df3123ba269d380d5a33c62fdba 100644
--- a/app/code/Magento/Core/Helper/Url.php
+++ b/app/code/Magento/Core/Helper/Url.php
@@ -52,27 +52,6 @@ class Url extends \Magento\App\Helper\AbstractHelper
         $this->_storeManager = $storeManager;
     }
 
-
-    /**
-     * Retrieve current url
-     *
-     * @return string
-     */
-    public function getCurrentUrl()
-    {
-        $request = $this->_getRequest();
-        $port = $this->_getRequest()->getServer('SERVER_PORT');
-        if ($port) {
-            $defaultPorts = array(
-                \Magento\App\Request\Http::DEFAULT_HTTP_PORT,
-                \Magento\App\Request\Http::DEFAULT_HTTPS_PORT
-            );
-            $port = (in_array($port, $defaultPorts)) ? '' : ':' . $port;
-        }
-        $url = $request->getScheme() . '://' . $request->getHttpHost() . $port . $request->getServer('REQUEST_URI');
-        return $url;
-    }
-
     /**
      * Retrieve current url in base64 encoding
      *
@@ -80,13 +59,13 @@ class Url extends \Magento\App\Helper\AbstractHelper
      */
     public function getCurrentBase64Url()
     {
-        return $this->urlEncode($this->getCurrentUrl());
+        return $this->urlEncode($this->_urlBuilder->getCurrentUrl());
     }
 
     public function getEncodedUrl($url = null)
     {
         if (!$url) {
-            $url = $this->getCurrentUrl();
+            $url = $this->_urlBuilder->getCurrentUrl();
         }
         return $this->urlEncode($url);
     }
@@ -151,8 +130,8 @@ class Url extends \Magento\App\Helper\AbstractHelper
     public function removeRequestParam($url, $paramKey, $caseSensitive = false)
     {
         $regExpression = '/\\?[^#]*?(' . preg_quote($paramKey, '/') . '\\=[^#&]*&?)/' . ($caseSensitive ? '' : 'i');
-        while (preg_match($regExpression, $url, $mathes) != 0) {
-            $paramString = $mathes[1];
+        while (preg_match($regExpression, $url, $matches) != 0) {
+            $paramString = $matches[1];
             if (preg_match('/&$/', $paramString) == 0) {
                 $url = preg_replace('/(&|\\?)?' . preg_quote($paramString, '/') . '/', '', $url);
             } else {
diff --git a/app/code/Magento/Core/Model/AbstractModel.php b/app/code/Magento/Core/Model/AbstractModel.php
index 87b274e927afb6c13edb8ca2edb4ee876f329fb5..92892941e13f7a742c49b1bc1fff94ed88b26fd4 100644
--- a/app/code/Magento/Core/Model/AbstractModel.php
+++ b/app/code/Magento/Core/Model/AbstractModel.php
@@ -193,7 +193,7 @@ abstract class AbstractModel extends \Magento\Object
     public function __sleep()
     {
         $properties = array_keys(get_object_vars($this));
-        $properties = array_diff($properties, array('_eventManager', '_cacheManager', '_coreRegistry'));
+        $properties = array_diff($properties, array('_eventManager', '_cacheManager', '_coreRegistry', '_appState'));
         return $properties;
     }
 
@@ -206,6 +206,10 @@ abstract class AbstractModel extends \Magento\Object
         $this->_eventManager = $objectManager->get('Magento\Event\ManagerInterface');
         $this->_cacheManager = $objectManager->get('Magento\App\CacheInterface');
         $this->_coreRegistry = $objectManager->get('Magento\Core\Model\Registry');
+        $context = $objectManager->get('Magento\Core\Model\Context');
+        if ($context instanceof \Magento\Core\Model\Context) {
+            $this->_appState = $context->getAppState();
+        }
     }
 
     /**
@@ -353,7 +357,7 @@ abstract class AbstractModel extends \Magento\Object
     /**
      * Check whether model has changed data.
      * Can be overloaded in child classes to perform advanced check whether model needs to be saved
-     * e.g. usign resouceModel->hasDataChanged() or any other technique
+     * e.g. using resourceModel->hasDataChanged() or any other technique
      *
      * @return boolean
      */
@@ -637,10 +641,7 @@ abstract class AbstractModel extends \Magento\Object
         if ($this->_coreRegistry->registry('isSecureArea')) {
             return;
         }
-        /* Store manager does not work well in this place when injected via context */
-        if (!\Magento\App\ObjectManager::getInstance()
-            ->get('Magento\Core\Model\StoreManager')->getStore()->isAdmin()
-        ) {
+        if ($this->_appState->getAreaCode() !== \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
             throw new \Magento\Core\Exception(__('Cannot complete this operation from non-admin area.'));
         }
     }
@@ -680,7 +681,7 @@ abstract class AbstractModel extends \Magento\Object
     }
 
     /**
-     * Retreive entity id
+     * Retrieve entity id
      *
      * @return mixed
      */
diff --git a/app/code/Magento/Core/Model/App.php b/app/code/Magento/Core/Model/App.php
index 19ea96827e36b65d1f5ad757bdd2b69773d77350..2249f8191790ba76d6b9835b4a546501a5475b77 100644
--- a/app/code/Magento/Core/Model/App.php
+++ b/app/code/Magento/Core/Model/App.php
@@ -53,7 +53,7 @@ class App implements \Magento\Core\Model\AppInterface
     /**
      * Magento version
      */
-    const VERSION = '2.0.0.0-dev53';
+    const VERSION = '2.0.0.0-dev54';
 
 
     /**
@@ -801,7 +801,7 @@ class App implements \Magento\Core\Model\AppInterface
             'revision'  => '0',
             'patch'     => '0',
             'stability' => 'dev',
-            'number'    => '53',
+            'number'    => '54',
         );
     }
 }
diff --git a/app/code/Magento/Core/Model/App/Emulation.php b/app/code/Magento/Core/Model/App/Emulation.php
index c623c2e632b0f35e4340c70c5507e973e61359c3..32fda75c306923d1707c88a6271e1bb2f3af6540 100644
--- a/app/code/Magento/Core/Model/App/Emulation.php
+++ b/app/code/Magento/Core/Model/App/Emulation.php
@@ -72,6 +72,11 @@ class Emulation extends \Magento\Object
      */
     protected $_design;
 
+    /**
+     * @var \Magento\Core\Model\Translate\Inline\ConfigFactory
+     */
+    protected $_configFactory;
+
     /**
      * @param \Magento\Core\Model\App $app
      * @param \Magento\Core\Model\StoreManagerInterface $storeManager
@@ -80,6 +85,7 @@ class Emulation extends \Magento\Object
      * @param \Magento\Core\Model\Translate $translate
      * @param \Magento\Core\Helper\Translate $helperTranslate
      * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+     * @param \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory
      * @param \Magento\Core\Model\LocaleInterface $locale
      * @param array $data
      */
@@ -91,6 +97,7 @@ class Emulation extends \Magento\Object
         \Magento\Core\Model\Translate $translate,
         \Magento\Core\Helper\Translate $helperTranslate,
         \Magento\Core\Model\Store\Config $coreStoreConfig,
+        \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory,
         \Magento\Core\Model\LocaleInterface $locale,
         array $data = array()
     ) {
@@ -103,6 +110,7 @@ class Emulation extends \Magento\Object
         $this->_translate = $translate;
         $this->_helperTranslate = $helperTranslate;
         $this->_coreStoreConfig = $coreStoreConfig;
+        $this->_configFactory = $configFactory;
     }
 
     /**
@@ -139,7 +147,7 @@ class Emulation extends \Magento\Object
     }
 
     /**
-     * Stop enviromment emulation
+     * Stop environment emulation
      *
      * Function restores initial store environment
      *
@@ -173,11 +181,7 @@ class Emulation extends \Magento\Object
         if (is_null($storeId)) {
             $newTranslateInline = false;
         } else {
-            if ($area == \Magento\Core\Model\App\Area::AREA_ADMIN) {
-                $newTranslateInline = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active_admin', $storeId);
-            } else {
-                $newTranslateInline = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active', $storeId);
-            }
+            $newTranslateInline = $this->_configFactory->create($area)->isActive($storeId);
         }
         $translateInline = $this->_translate->getTranslateInline();
         $this->_translate->setTranslateInline($newTranslateInline);
diff --git a/app/code/Magento/Core/Model/AppInterface.php b/app/code/Magento/Core/Model/AppInterface.php
index 7b57c3fffaaaabcfa3a2c782e1f1ff5a68764bc1..f786cdadd9731bd1f31bdaec299223d4e7ffe72b 100644
--- a/app/code/Magento/Core/Model/AppInterface.php
+++ b/app/code/Magento/Core/Model/AppInterface.php
@@ -44,12 +44,6 @@ interface AppInterface extends \Magento\Core\Model\StoreManagerInterface
      */
     const DISTRO_STORE_CODE     = \Magento\Core\Model\Store::DEFAULT_CODE;
 
-    /**
-     * Admin store Id
-     *
-     */
-    const ADMIN_STORE_ID = 0;
-
     /**
      * Dependency injection configuration node name
      */
diff --git a/app/code/Magento/Core/Model/Context.php b/app/code/Magento/Core/Model/Context.php
index e33bca05e775d347df94d527a582a18e0964f945..a35ecc64acca3a87408edb9559f5426a69f49dba 100644
--- a/app/code/Magento/Core/Model/Context.php
+++ b/app/code/Magento/Core/Model/Context.php
@@ -43,7 +43,6 @@ class Context implements \Magento\ObjectManager\ContextInterface
     protected $_logger;
 
     /**
-     * @param \Magento\Logger $logger
      * @var \Magento\App\State
      */
     protected $_appState;
diff --git a/app/code/Magento/Core/Model/Cookie.php b/app/code/Magento/Core/Model/Cookie.php
index aab242c83139ccf89f165745d78bcbb250ff76d0..ed1271fbabab76ea9eda2d4ffe013a9e0b79bd7e 100644
--- a/app/code/Magento/Core/Model/Cookie.php
+++ b/app/code/Magento/Core/Model/Cookie.php
@@ -219,15 +219,11 @@ class Cookie
 
     /**
      * Is https secure request
-     * Use secure on adminhtml only
      *
      * @return bool
      */
     public function isSecure()
     {
-        if ($this->getStore()->isAdmin()) {
-            return $this->_getRequest()->isSecure();
-        }
         return false;
     }
 
@@ -307,7 +303,7 @@ class Cookie
     /**
      * Retrieve cookie or false if not exists
      *
-     * @param string $neme The cookie name
+     * @param string $name The cookie name
      * @return mixed
      */
     public function get($name = null)
diff --git a/app/code/Magento/Core/Model/EntityFactory.php b/app/code/Magento/Core/Model/EntityFactory.php
index 0a2d1c3542c77260599699ed983d5cd501019696..0b73590c276981f3f02f2e2d3c3cc9b8fce6e409 100644
--- a/app/code/Magento/Core/Model/EntityFactory.php
+++ b/app/code/Magento/Core/Model/EntityFactory.php
@@ -24,7 +24,7 @@
 
 namespace Magento\Core\Model;
 
-class EntityFactory
+class EntityFactory implements \Magento\Data\Collection\EntityFactoryInterface
 {
     /**
      * Object Manager instance
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index 3ae1327c44487d034af25e33455f7724345e9aad..a7ce7e97cb0684fbe1b43c21e6075db97bff3c56 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -38,7 +38,7 @@ class Storage extends \Magento\Core\Model\AbstractModel
     const STORAGE_MEDIA_DATABASE            = 1;
 
     /**
-     * Config pathes for storing storage configuration
+     * Config paths for storing storage configuration
      */
     const XML_PATH_STORAGE_MEDIA            = 'system/media_storage_configuration/media_storage';
     const XML_PATH_STORAGE_MEDIA_DATABASE   = 'system/media_storage_configuration/media_database';
diff --git a/app/code/Magento/Core/Model/Layout.php b/app/code/Magento/Core/Model/Layout.php
index c5eddc4c0a28df159e5d9e1107772340514ab4f0..9afb7c7a3b371fa8411f528ad46edc7192495daa 100644
--- a/app/code/Magento/Core/Model/Layout.php
+++ b/app/code/Magento/Core/Model/Layout.php
@@ -361,7 +361,6 @@ class Layout extends \Magento\Simplexml\Config implements \Magento\View\LayoutIn
     /**
      * Retrieve layout area
      *
-     * @deparecated
      * @return string
      */
     public function getArea()
diff --git a/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php b/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
index 4c404907103a3d16d0623aa1aa31da455d5b5c14..2c72abf591a77538deba77c89fba8651a48ab0b8 100644
--- a/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
+++ b/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
@@ -61,7 +61,7 @@ abstract class AbstractHandler
     }
 
     /**
-     * Check whether updater used and value not overwriten
+     * Check whether updater used and value not overwritten
      *
      * @param \Magento\View\Layout\Element $argument
      * @return string
diff --git a/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php b/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
index 89d68ef43cd071b90016c93275de26ff280e9ad2..3927a804aed872cdb9ad22f2b7b391a72f135a8a 100644
--- a/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
+++ b/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
@@ -91,7 +91,7 @@ class ArrayHandler extends \Magento\Core\Model\Layout\Argument\AbstractHandler
     }
 
     /**
-     * Retrive value from Array argument
+     * Retrieve value from Array argument
      *
      * @param \Magento\View\Layout\Element $argument
      * @return array|null
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php
index 9ee6813d4b50f6f31f56f0d81c6646937bccfa1c..3975d5a91f93d0f01029fcd57d87c16a897ac581 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/app/code/Magento/Core/Model/Layout/Merge.php
@@ -114,7 +114,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
     protected $_cache;
 
     /**
-     * @var \Magento\Adminhtml\Model\LayoutUpdate\Validator
+     * @var \Magento\Core\Model\Layout\Update\Validator
      */
     protected $_layoutValidator;
 
@@ -132,7 +132,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
      * @param \Magento\Core\Model\Resource\Layout\Update $resource
      * @param \Magento\App\State $appState
      * @param \Magento\Cache\FrontendInterface $cache
-     * @param \Magento\Adminhtml\Model\LayoutUpdate\Validator $validator
+     * @param \Magento\Core\Model\Layout\Update\Validator $validator
      * @param \Magento\Logger $logger
      * @param \Magento\View\Design\ThemeInterface $theme Non-injectable theme instance
      */
@@ -143,7 +143,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
         \Magento\Core\Model\Resource\Layout\Update $resource,
         \Magento\App\State $appState,
         \Magento\Cache\FrontendInterface $cache,
-        \Magento\Adminhtml\Model\LayoutUpdate\Validator $validator,
+        \Magento\Core\Model\Layout\Update\Validator $validator,
         \Magento\Logger $logger,
         \Magento\View\Design\ThemeInterface $theme = null
     ) {
@@ -373,7 +373,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
         if ($this->_appState->getMode() === \Magento\App\State::MODE_DEVELOPER) {
             if (!$this->_layoutValidator->isValid(
                     $layout,
-                    \Magento\Adminhtml\Model\LayoutUpdate\Validator::LAYOUT_SCHEMA_MERGED,
+                    \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_MERGED,
                     false
             )) {
                 $messages = $this->_layoutValidator->getMessages();
@@ -592,11 +592,17 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
         $layoutStr = '';
         $theme = $this->_getPhysicalTheme($this->_theme);
         $updateFiles = $this->_fileSource->getFiles($theme);
+        $useErrors = libxml_use_internal_errors(true);
         foreach ($updateFiles as $file) {
-            $fileStr = file_get_contents($file->getFilename());
+            $fileStr = (string)file_get_contents($file->getFilename());
             $fileStr = $this->_substitutePlaceholders($fileStr);
             /** @var $fileXml \Magento\View\Layout\Element */
             $fileXml = $this->_loadXmlString($fileStr);
+            if (!$fileXml instanceof \Magento\View\Layout\Element) {
+                $this->_logXmlErrors($file->getFilename(), libxml_get_errors());
+                libxml_clear_errors();
+                continue;
+            }
             if (!$file->isBase() && $fileXml->xpath(self::XPATH_HANDLE_DECLARATION)) {
                 throw new \Magento\Exception(sprintf(
                     "Theme layout update file '%s' must not declare page types.",
@@ -608,11 +614,34 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
             $handleStr = '<handle ' . $handleAttributes . '>' . $fileXml->innerXml() . '</handle>';
             $layoutStr .= $handleStr;
         }
+        libxml_use_internal_errors($useErrors);
         $layoutStr = '<layouts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . $layoutStr . '</layouts>';
         $layoutXml = $this->_loadXmlString($layoutStr);
         return $layoutXml;
     }
 
+    /**
+     * Log xml errors to system log
+     *
+     * @param string $fileName
+     * @param array $libXmlErrors
+     */
+    protected function _logXmlErrors($fileName, $libXmlErrors)
+    {
+        $errors = array();
+        if (count($libXmlErrors)) {
+            foreach ($libXmlErrors as $error) {
+                $errors[] = "{$error->message} Line: {$error->line}";
+            }
+
+            $this->_logger->log(sprintf(
+                "Theme layout update file '%s' is not valid.\n%s",
+                $fileName,
+                implode("\n", $errors)
+            ), \Zend_Log::ERR);
+        }
+    }
+
     /**
      * Find the closest physical theme among ancestors and a theme itself
      *
diff --git a/app/code/Magento/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/Magento/Core/Model/Layout/Update/Validator.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Model/LayoutUpdate/Validator.php
rename to app/code/Magento/Core/Model/Layout/Update/Validator.php
index f0225f5f5b16d1b69b5c3e1cd9eac6dddc227910..cbef69f550a9cad1e2e328f7353641587e66349e 100644
--- a/app/code/Magento/Adminhtml/Model/LayoutUpdate/Validator.php
+++ b/app/code/Magento/Core/Model/Layout/Update/Validator.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Core
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -31,10 +31,10 @@
  * Validator checked XML validation and protected expressions
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Core
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Model\LayoutUpdate;
+namespace Magento\Core\Model\Layout\Update;
 
 class Validator extends \Zend_Validate_Abstract
 {
@@ -103,7 +103,7 @@ class Validator extends \Zend_Validate_Abstract
     /**
      * Initialize messages templates with translating
      *
-     * @return \Magento\Adminhtml\Model\LayoutUpdate\Validator
+     * @return \Magento\Core\Model\Layout\Update\Validator
      */
     protected function _initMessageTemplates()
     {
diff --git a/app/code/Magento/Core/Model/Locale.php b/app/code/Magento/Core/Model/Locale.php
index a27a76729a4468caa8822eb725a911207cd7372f..081cb07ce79dfb3ad99826625da7bd0bd26c0a83 100644
--- a/app/code/Magento/Core/Model/Locale.php
+++ b/app/code/Magento/Core/Model/Locale.php
@@ -172,7 +172,7 @@ class Locale implements \Magento\Core\Model\LocaleInterface
     }
 
     /**
-     * REtrieve default locale code
+     * Retrieve default locale code
      *
      * @return string
      */
@@ -670,7 +670,7 @@ class Locale implements \Magento\Core\Model\LocaleInterface
 
     /**
      * Get store timestamp
-     * Timstamp will be builded with store timezone settings
+     * Timestamp will be built with store timezone settings
      *
      * @param   mixed $store
      * @return  int
diff --git a/app/code/Magento/Core/Model/LocaleInterface.php b/app/code/Magento/Core/Model/LocaleInterface.php
index d1e262aa627b7d0fda9bba7ebeaafd3ac647bd74..01fc274c6e99cb1080171474f3fc92ef408f362c 100644
--- a/app/code/Magento/Core/Model/LocaleInterface.php
+++ b/app/code/Magento/Core/Model/LocaleInterface.php
@@ -64,7 +64,7 @@ interface LocaleInterface
     public function setDefaultLocale($locale);
 
     /**
-     * REtrieve default locale code
+     * Retrieve default locale code
      *
      * @return string
      */
@@ -115,7 +115,7 @@ interface LocaleInterface
     public function setLocaleCode($code);
 
     /**
-     * Get options array for locale dropdown in currunt locale
+     * Get options array for locale dropdown in current locale
      *
      * @return array
      */
@@ -244,7 +244,7 @@ interface LocaleInterface
 
     /**
      * Get store timestamp
-     * Timstamp will be builded with store timezone settings
+     * Timestamp will be built with store timezone settings
      *
      * @param   mixed $store
      * @return  int
diff --git a/app/code/Magento/Core/Model/Resource/Config/Data.php b/app/code/Magento/Core/Model/Resource/Config/Data.php
index 5c6be5693e64343b5a99b528001078e31f435eae..709c365c9d4af355136d117987c255cfeb310a03 100644
--- a/app/code/Magento/Core/Model/Resource/Config/Data.php
+++ b/app/code/Magento/Core/Model/Resource/Config/Data.php
@@ -105,7 +105,7 @@ class Data extends \Magento\Core\Model\Resource\Db\AbstractDb
     }
 
     /**
-     * Cleare store data
+     * Clear store data
      *
      * @param array $storeIds
      */
diff --git a/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php b/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
index 3d69a68fb81779e71b80d2271d5d779d00aba413..e262c4613146ed890ea1df46f4e7195e5f76eecc 100644
--- a/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
+++ b/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
@@ -86,7 +86,7 @@ abstract class AbstractDb extends \Magento\Core\Model\Resource\AbstractResource
     protected $_idFieldName;
 
     /**
-     * Primery key auto increment flag
+     * Primary key auto increment flag
      *
      * @var bool
      */
diff --git a/app/code/Magento/Core/Model/Resource/Setup.php b/app/code/Magento/Core/Model/Resource/Setup.php
index b9d8d40a136d490482cd6d41761919c93ec11d35..5fb3a2d6ad1be327bff500a7d8c6d334dc0f6889 100644
--- a/app/code/Magento/Core/Model/Resource/Setup.php
+++ b/app/code/Magento/Core/Model/Resource/Setup.php
@@ -791,7 +791,7 @@ class Setup implements \Magento\Module\Updater\SetupInterface
 
     /**
      * Run each time after applying of all updates,
-     * if setup model setted  $_callAfterApplyAllUpdates flag to true
+     * if setup model setted $_callAfterApplyAllUpdates flag to true
      *
      * @return \Magento\Core\Model\Resource\Setup
      */
diff --git a/app/code/Magento/Core/Model/Resource/Store.php b/app/code/Magento/Core/Model/Resource/Store.php
index e310ab00a459b7b1a00b5790ac0ca056e69c9134..ab98631f3dcf77ff13e672c0081005cba4618317 100644
--- a/app/code/Magento/Core/Model/Resource/Store.php
+++ b/app/code/Magento/Core/Model/Resource/Store.php
@@ -154,7 +154,7 @@ class Store extends \Magento\Core\Model\Resource\Db\AbstractDb
             $storeId = $adapter->fetchOne($select, 'default_store_id');
 
             if ($storeId == $model->getId()) {
-                $bind = array('default_store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+                $bind = array('default_store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID);
                 $where = array('group_id = ?' => $model->getOriginalGroupId());
                 $this->_getWriteAdapter()->update($this->getTable('core_store_group'), $bind, $where);
             }
diff --git a/app/code/Magento/Core/Model/Resource/Transaction.php b/app/code/Magento/Core/Model/Resource/Transaction.php
index 6a17c7e244832f5cf98803d37b889b391a19fbb4..a9f158997631bde15daed800ef6fd2c225fc8eb2 100644
--- a/app/code/Magento/Core/Model/Resource/Transaction.php
+++ b/app/code/Magento/Core/Model/Resource/Transaction.php
@@ -28,7 +28,7 @@
 /**
  * Resource transaction model
  *
- * @todo need collect conection by name
+ * @todo need collect connection by name
  * @category   Magento
  * @package    Magento_Core
  * @author      Magento Core Team <core@magentocommerce.com>
diff --git a/app/code/Magento/Core/Model/Resource/Translate.php b/app/code/Magento/Core/Model/Resource/Translate.php
index df19b8e40532035b362b7d9b7340d06d11e1ed04..65f7986a5e4f2e36081fa96254dc20e385b82584 100644
--- a/app/code/Magento/Core/Model/Resource/Translate.php
+++ b/app/code/Magento/Core/Model/Resource/Translate.php
@@ -85,7 +85,7 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
         }
 
         if (is_null($storeId)) {
-            $storeId = $this->_storeManager->getStore()->getId();
+            $storeId = $this->_getStoreId();
         }
 
         $adapter = $this->_getReadAdapter();
@@ -105,7 +105,6 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
         );
 
         return $adapter->fetchPairs($select, $bind);
-
     }
 
     /**
@@ -122,7 +121,7 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
         }
 
         if (is_null($storeId)) {
-            $storeId = $this->_storeManager->getStore()->getId();
+            $this->_getStoreId();
         }
 
         $adapter = $this->_getReadAdapter();
@@ -154,4 +153,14 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
     {
         return $this->getChecksum($this->getMainTable());
     }
+
+    /**
+     * Get store id for translations
+     *
+     * @return int
+     */
+    protected function _getStoreId()
+    {
+        return $this->_storeManager->getStore()->getId();
+    }
 }
diff --git a/app/code/Magento/Core/Model/Resource/Translate/String.php b/app/code/Magento/Core/Model/Resource/Translate/String.php
index e9a949301c0b761feaa4dcab592018e51f17f052..50174eccfc8b3588c03f54cac096ef739df6ba08 100644
--- a/app/code/Magento/Core/Model/Resource/Translate/String.php
+++ b/app/code/Magento/Core/Model/Resource/Translate/String.php
@@ -104,7 +104,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
     protected function _getLoadSelect($field, $value, $object)
     {
         $select = parent::_getLoadSelect($field, $value, $object);
-        $select->where('store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+        $select->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
         return $select;
     }
 
@@ -141,7 +141,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
 
         $bind = array(
             'string'   => $object->getString(),
-            'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+            'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
         );
 
         $object->setId($adapter->fetchOne($select, $bind));
@@ -213,7 +213,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
         );
 
         if ($storeId === false) {
-            $where['store_id > ?'] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+            $where['store_id > ?'] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
         } elseif ($storeId !== null) {
             $where['store_id = ?'] = $storeId;
         }
@@ -242,7 +242,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
         }
 
         if (is_null($storeId)) {
-            $storeId = $this->_storeManager->getStore()->getId();
+            $storeId = $this->_getStoreId();
         }
 
         $select = $write->select()
@@ -280,4 +280,14 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
 
         return $this;
     }
+
+    /**
+     * Get current store id
+     *
+     * @return int
+     */
+    protected function _getStoreId()
+    {
+        return $this->_storeManager->getStore()->getId();
+    }
 }
diff --git a/app/code/Magento/Core/Model/Resource/Url/Rewrite.php b/app/code/Magento/Core/Model/Resource/Url/Rewrite.php
index 4b313bc6f9712d25706e10e3af9ed3bd1d074836..7a1d7f5aaafcedf8b4dd766447271838b7f3cdd0 100644
--- a/app/code/Magento/Core/Model/Resource/Url/Rewrite.php
+++ b/app/code/Magento/Core/Model/Resource/Url/Rewrite.php
@@ -79,7 +79,7 @@ class Rewrite extends \Magento\Core\Model\Resource\Db\AbstractDb
         $select = parent::_getLoadSelect($field, $value, $object);
 
         if (!is_null($object->getStoreId())) {
-            $select->where('store_id IN(?)', array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, $object->getStoreId()));
+            $select->where('store_id IN(?)', array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, $object->getStoreId()));
             $select->order('store_id ' . \Magento\DB\Select::SQL_DESC);
             $select->limit(1);
         }
@@ -140,7 +140,7 @@ class Rewrite extends \Magento\Core\Model\Resource\Db\AbstractDb
         $select  = $adapter->select()
             ->from($this->getMainTable())
             ->where('request_path IN (:' . implode(', :', array_flip($pathBind)) . ')')
-            ->where('store_id IN(?)', array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, (int)$object->getStoreId()));
+            ->where('store_id IN(?)', array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, (int)$object->getStoreId()));
 
         $items = $adapter->fetchAll($select, $pathBind);
 
diff --git a/app/code/Magento/Core/Model/Resource/Variable.php b/app/code/Magento/Core/Model/Resource/Variable.php
index f531298210a2d0f3e24574b53ef987706d17259f..9abf84faa249c5524417098b1d7c95dd03283f84 100644
--- a/app/code/Magento/Core/Model/Resource/Variable.php
+++ b/app/code/Magento/Core/Model/Resource/Variable.php
@@ -136,8 +136,10 @@ class Variable extends \Magento\Core\Model\Resource\Db\AbstractDb
      * @param integer $storeId
      * @return \Magento\Core\Model\Resource\Variable
      */
-    protected function _addValueToSelect(\Zend_Db_Select $select, $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
-    {
+    protected function _addValueToSelect(
+        \Zend_Db_Select $select,
+        $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID
+    ) {
         $adapter = $this->_getReadAdapter();
         $ifNullPlainValue = $adapter->getCheckSql('store.plain_value IS NULL', 'def.plain_value', 'store.plain_value');
         $ifNullHtmlValue  = $adapter->getCheckSql('store.html_value IS NULL', 'def.html_value', 'store.html_value');
diff --git a/app/code/Magento/Core/Model/Resource/Variable/Collection.php b/app/code/Magento/Core/Model/Resource/Variable/Collection.php
index 4881f81d19c74c0586167ea0d72c0d6d9b435322..540dc3bd5d89bd6548682dca1fdc6927753f6116 100644
--- a/app/code/Magento/Core/Model/Resource/Variable/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Variable/Collection.php
@@ -26,7 +26,7 @@
 
 
 /**
- * Custom variabel collection
+ * Custom variable collection
  *
  * @category    Magento
  * @package     Magento_Core
diff --git a/app/code/Magento/Core/Model/Session/AbstractSession.php b/app/code/Magento/Core/Model/Session/AbstractSession.php
index 05afd75a8d840cbdad259538b1406fe8978661cd..574e7b1f540fd82ce76a29a4516cacad43fae53d 100644
--- a/app/code/Magento/Core/Model/Session/AbstractSession.php
+++ b/app/code/Magento/Core/Model/Session/AbstractSession.php
@@ -264,7 +264,6 @@ class AbstractSession extends \Magento\Object
         if ($this->_cacheLimiter) {
             session_cache_limiter($this->_cacheLimiter);
         }
-
         session_start();
 
         \Magento\Profiler::stop('session_start');
@@ -581,18 +580,12 @@ class AbstractSession extends \Magento\Object
      */
     public function setSessionId($id = null)
     {
-
-        if (null === $id
-            && ($this->_storeManager->getStore()->isAdmin()
-                || $this->_coreStoreConfig->getConfig(self::XML_PATH_USE_FRONTEND_SID)
-            )
-        ) {
+        if (null === $id && $this->_isSidUsedFromQueryParam()) {
             $_queryParam = $this->getSessionIdQueryParam();
             if (isset($_GET[$_queryParam]) && $this->_url->isOwnOriginUrl()) {
                 $id = $_GET[$_queryParam];
             }
         }
-
         $this->_addHost();
         if (!is_null($id) && preg_match('#^[0-9a-zA-Z,-]+$#', $id)) {
             session_id($id);
@@ -681,9 +674,7 @@ class AbstractSession extends \Magento\Object
             self::$_urlHostCache[$urlHost] = $sessionId;
         }
 
-        return $this->_storeManager->getStore()->isAdmin() || $this->isValidForPath($urlPath)
-            ? self::$_urlHostCache[$urlHost]
-            : $this->getEncryptedSessionId();
+        return $this->isValidForPath($urlPath) ? self::$_urlHostCache[$urlHost] : $this->getEncryptedSessionId();
     }
 
     /**
@@ -755,6 +746,16 @@ class AbstractSession extends \Magento\Object
         return $this;
     }
 
+    /**
+     * Whether to take session id from GET
+     *
+     * @return bool
+     */
+    protected function _isSidUsedFromQueryParam()
+    {
+        return $this->_coreStoreConfig->getConfig(self::XML_PATH_USE_FRONTEND_SID);
+    }
+
     /**
      * Retrieve session save method
      *
diff --git a/app/code/Magento/Core/Model/Store.php b/app/code/Magento/Core/Model/Store.php
index 18e4bf89fe7f750ed6bb742c5a9876f4f46b3397..7689e317703f7b8d16b9aa638025f9cf83caf3e2 100644
--- a/app/code/Magento/Core/Model/Store.php
+++ b/app/code/Magento/Core/Model/Store.php
@@ -128,6 +128,12 @@ class Store extends \Magento\Core\Model\AbstractModel
      */
     const BASE_URL_PLACEHOLDER            = '{{base_url}}';
 
+    /**
+     * Identifier of default store
+     * used for loading data of default scope
+     */
+    const DEFAULT_STORE_ID = 0;
+
     /**
      * @var \Magento\App\Cache\Type\Config
      */
@@ -336,10 +342,8 @@ class Store extends \Magento\Core\Model\AbstractModel
         $properties = parent::__sleep();
         $properties = array_diff($properties, array(
             '_coreFileStorageDatabase',
-            '_eventDispatcher',
-            '_cacheManager',
             '_coreStoreConfig',
-            '_coreConfig'
+            '_config'
         ));
         return $properties;
     }
@@ -350,16 +354,12 @@ class Store extends \Magento\Core\Model\AbstractModel
     public function __wakeup()
     {
         parent::__wakeup();
-        $this->_eventManager = \Magento\App\ObjectManager::getInstance()
-            ->get('Magento\Event\ManagerInterface');
-        $this->_cacheManager    = \Magento\App\ObjectManager::getInstance()
-            ->get('Magento\App\CacheInterface');
+        $this->_coreFileStorageDatabase = \Magento\App\ObjectManager::getInstance()
+            ->get('Magento\Core\Helper\File\Storage\Database');
         $this->_coreStoreConfig = \Magento\App\ObjectManager::getInstance()
             ->get('Magento\Core\Model\Store\Config');
         $this->_config = \Magento\App\ObjectManager::getInstance()
             ->get('Magento\Core\Model\Config');
-        $this->_coreFileStorageDatabase = \Magento\App\ObjectManager::getInstance()
-            ->get('Magento\Core\Helper\File\Storage\Database');
     }
 
     /**
@@ -595,14 +595,14 @@ class Store extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Remove script file name from url in case when server rewrites are enabled
+     * Append script file name to url in case when server rewrites are disabled
      *
      * @param   string $url
      * @return  string
      */
     protected function _updatePathUseRewrites($url)
     {
-        if ($this->isAdmin()
+        if ($this->getForceDisableRewrites()
             || !$this->getConfig(self::XML_PATH_USE_REWRITES)
             || !$this->_appState->isInstalled()
         ) {
@@ -668,9 +668,9 @@ class Store extends \Magento\Core\Model\AbstractModel
      */
     public function isUseStoreInUrl()
     {
-        return $this->_appState->isInstalled()
-        && $this->getConfig(self::XML_PATH_STORE_IN_URL)
-        && !$this->isAdmin();
+        return !($this->hasDisableStoreInUrl() && $this->getDisableStoreInUrl())
+            && $this->_appState->isInstalled()
+            && $this->getConfig(self::XML_PATH_STORE_IN_URL);
     }
 
     /**
@@ -684,42 +684,27 @@ class Store extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Check if store is admin store
-     *
-     * @return boolean
-     */
-    public function isAdmin()
-    {
-        return $this->getId() == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
-    }
-
-
-    /**
-     * Check if backend URLs should be secure
+     * Check if frontend URLs should be secure
      *
      * @return boolean
      */
-    public function isAdminUrlSecure()
+    public function isFrontUrlSecure()
     {
-        if ($this->_isAdminSecure === null) {
-            $this->_isAdminSecure = (boolean) (int) (string) $this->_config
-                ->getValue(\Magento\Core\Model\Url::XML_PATH_SECURE_IN_ADMIN, 'default');
+        if ($this->_isFrontSecure === null) {
+            $this->_isFrontSecure = $this->_coreStoreConfig->getConfigFlag(
+                \Magento\Core\Model\Url::XML_PATH_SECURE_IN_FRONT,
+                $this->getId()
+            );
         }
-        return $this->_isAdminSecure;
+        return $this->_isFrontSecure;
     }
 
     /**
-     * Check if frontend URLs should be secure
-     *
-     * @return boolean
+     * @return bool
      */
-    public function isFrontUrlSecure()
+    public function isUrlSecure()
     {
-        if ($this->_isFrontSecure === null) {
-            $this->_isFrontSecure = $this->_coreStoreConfig->getConfigFlag(\Magento\Core\Model\Url::XML_PATH_SECURE_IN_FRONT,
-                $this->getId());
-        }
-        return $this->_isFrontSecure;
+        return $this->isFrontUrlSecure();
     }
 
     /**
diff --git a/app/code/Magento/Core/Model/Store/Group.php b/app/code/Magento/Core/Model/Store/Group.php
index 103ecae8dfb3cb35929763a79f7581be485c6525..ccb452f1899127670f57ba141c08762d1f562582 100644
--- a/app/code/Magento/Core/Model/Store/Group.php
+++ b/app/code/Magento/Core/Model/Store/Group.php
@@ -198,7 +198,7 @@ class Group extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retrieve wersite store objects
+     * Retrieve website store objects
      *
      * @return array
      */
diff --git a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
index 0f122ccf30746115c2f362a9cd6b2682c486a18a..be2840430f46f5f9fc553566dcb582872c80bb9a 100644
--- a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
+++ b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
@@ -67,7 +67,7 @@ class DefaultStorage implements \Magento\Core\Model\Store\StorageInterface
     }
 
     /**
-     * Initialize current applicaition store
+     * Initialize current application store
      */
     public function initCurrentStore()
     {
diff --git a/app/code/Magento/Core/Model/Template.php b/app/code/Magento/Core/Model/Template.php
index 8e460fe7e10825f706714c34aee9230a58fee072..b788b4282f94c605c1fed57beaf43e5128efc00d 100644
--- a/app/code/Magento/Core/Model/Template.php
+++ b/app/code/Magento/Core/Model/Template.php
@@ -48,7 +48,7 @@ abstract class Template extends \Magento\Core\Model\AbstractModel
     const DEFAULT_DESIGN_AREA = 'frontend';
 
     /**
-     * Configuration of desing package for template
+     * Configuration of design package for template
      *
      * @var \Magento\Object
      */
@@ -56,7 +56,7 @@ abstract class Template extends \Magento\Core\Model\AbstractModel
 
 
     /**
-     * Configuration of emulated desing package.
+     * Configuration of emulated design package.
      *
      * @var \Magento\Object|boolean
      */
diff --git a/app/code/Magento/Core/Model/Theme.php b/app/code/Magento/Core/Model/Theme.php
index aebdc4a5e6ccf7afcdb90bc331299ba916f05878..708f584b851ff68cfaabf69fc33f304063f25c38 100644
--- a/app/code/Magento/Core/Model/Theme.php
+++ b/app/code/Magento/Core/Model/Theme.php
@@ -277,7 +277,6 @@ class Theme extends \Magento\Core\Model\AbstractModel implements \Magento\View\D
 
     /**
      * {@inheritdoc}
-     * @deprecated
      */
     public function getArea()
     {
diff --git a/app/code/Magento/Core/Model/Translate.php b/app/code/Magento/Core/Model/Translate.php
index dde1871f4207e855c50d7048c81ea13a2d2ca1c6..3efb28bbc3ca5c9547fa233e292aa02d75d96fbe 100644
--- a/app/code/Magento/Core/Model/Translate.php
+++ b/app/code/Magento/Core/Model/Translate.php
@@ -27,6 +27,7 @@
 namespace Magento\Core\Model;
 use Magento\TranslateInterface;
 
+
 /**
  * Translate model
  *
diff --git a/app/code/Magento/Core/Model/Translate/Inline.php b/app/code/Magento/Core/Model/Translate/Inline.php
index bf41766b772bcfe7d0fd00a62c7823bc03cce6a2..c18bd207236ba91ea61213c1f49f9d2a843c00c0 100644
--- a/app/code/Magento/Core/Model/Translate/Inline.php
+++ b/app/code/Magento/Core/Model/Translate/Inline.php
@@ -62,11 +62,6 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
      */
     protected $_isScriptInserted    = false;
 
-    /**
-     * @var \Magento\Backend\Model\Url
-     */
-    protected $_backendUrl;
-
     /**
      * @var \Magento\Core\Model\Url
      */
@@ -78,41 +73,36 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
     protected $_layout;
 
     /**
-     * Core store config
-     *
-     * @var \Magento\Core\Model\Store\Config
+     * @var \Magento\App\State
      */
-    protected $_coreStoreConfig;
+    protected $_appState;
 
     /**
-     * @var \Magento\App\State
+     * @var \Magento\Core\Model\Translate\Inline\ConfigFactory
      */
-    protected $_appState;
+    protected $_configFactory;
 
     /**
      * Initialize inline translation model
      *
      * @param InlineParser $parser
      * @param \Magento\Core\Model\Translate $translate
-     * @param \Magento\Backend\Model\Url $backendUrl
      * @param \Magento\Core\Model\Url $url
      * @param \Magento\View\LayoutInterface $layout
-     * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+     * @param \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory
      * @param \Magento\App\State $appState
      */
     public function __construct(
         \Magento\Core\Model\Translate\InlineParser $parser,
         \Magento\Core\Model\Translate $translate,
-        \Magento\Backend\Model\Url $backendUrl,
         \Magento\Core\Model\Url $url,
         \Magento\View\LayoutInterface $layout,
-        \Magento\Core\Model\Store\Config $coreStoreConfig,
+        \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory,
         \Magento\App\State $appState
     ) {
-        $this->_coreStoreConfig = $coreStoreConfig;
+        $this->_configFactory = $configFactory;
         $this->_parser = $parser;
         $this->_translator = $translate;
-        $this->_backendUrl = $backendUrl;
         $this->_url = $url;
         $this->_layout = $layout;
         $this->_appState = $appState;
@@ -134,11 +124,7 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
                 $store = $this->_parser->getStoreManager()->getStore($store);
             }
 
-            if ($this->_parser->getDesignPackage()->getArea() == 'adminhtml') {
-                $active = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active_admin', $store);
-            } else {
-                $active = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active', $store);
-            }
+            $active = $this->_configFactory->create()->isActive($store);
             $this->_isAllowed = $active && $this->_parser->getHelper()->isDevAllowed($store);
         }
         return $this->_translator->getTranslateInline() && $this->_isAllowed;
@@ -194,21 +180,10 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
             return;
         }
 
-        $store = $this->_parser->getStoreManager()->getStore();
-        if ($store->isAdmin()) {
-            $urlPrefix = \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
-            $urlModel = $this->_backendUrl;
-        } else {
-            $urlPrefix = 'core';
-            $urlModel = $this->_url;
-        }
-        $ajaxUrl = $urlModel->getUrl($urlPrefix . '/ajax/translate',
-            array('_secure' => $store->isCurrentlySecure()));
-
         /** @var $block \Magento\View\Block\Template */
         $block = $this->_layout->createBlock('Magento\View\Block\Template');
 
-        $block->setAjaxUrl($ajaxUrl);
+        $block->setAjaxUrl($this->_getAjaxUrl());
 
         $block->setTemplate('Magento_Core::translate_inline.phtml');
 
@@ -219,6 +194,17 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
         $this->_isScriptInserted = true;
     }
 
+    /**
+     * Return URL for ajax requests
+     *
+     * @return string
+     */
+    protected function _getAjaxUrl()
+    {
+        $store = $this->_parser->getStoreManager()->getStore();
+        return $this->_url->getUrl('core/ajax/translate', array('_secure' => $store->isCurrentlySecure()));
+    }
+
     /**
      * Strip inline translations from text
      *
diff --git a/app/code/Magento/Core/Model/Translate/Inline/Config.php b/app/code/Magento/Core/Model/Translate/Inline/Config.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d313715714a21f3eeb7e7b27e0e2d11f8c7b1ad
--- /dev/null
+++ b/app/code/Magento/Core/Model/Translate/Inline/Config.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Core
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Inline Translation config
+ */
+namespace Magento\Core\Model\Translate\Inline;
+
+class Config implements ConfigInterface
+{
+    /**
+     * Core store config
+     *
+     * @var \Magento\Core\Model\Store\Config
+     */
+    protected $_coreStoreConfig;
+
+    /**
+     * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+     */
+    public function __construct(\Magento\Core\Model\Store\Config $coreStoreConfig)
+    {
+        $this->_coreStoreConfig = $coreStoreConfig;
+    }
+
+    /**
+     * Check whether inline translation is enabled
+     *
+     * @param int|null $store
+     * @return bool
+     */
+    public function isActive($store = null)
+    {
+        return $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active', $store);
+    }
+}
diff --git a/app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php b/app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..317f06cf572400731c42598c2d72e0513620835f
--- /dev/null
+++ b/app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Core
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+/**
+ * Inline Translation config factory
+ */
+namespace Magento\Core\Model\Translate\Inline;
+
+class ConfigFactory
+{
+    /**
+     * @var \Magento\ObjectManager
+     */
+    protected $_objectManager;
+
+    /**
+     * @param \Magento\ObjectManager $objectManager
+     */
+    public function __construct(\Magento\ObjectManager $objectManager)
+    {
+        $this->_objectManager = $objectManager;
+    }
+
+    /**
+     * Create instance of inline translate config
+     *
+     * @param string|null $area
+     * @return \Magento\Core\Model\Translate\Inline\ConfigInterface
+     */
+    public function create($area = null)
+    {
+        return $this->_objectManager->create('Magento\Core\Model\Translate\Inline\Config');
+    }
+}
diff --git a/app/code/Magento/Adminhtml/Helper/Data.php b/app/code/Magento/Core/Model/Translate/Inline/ConfigInterface.php
similarity index 75%
rename from app/code/Magento/Adminhtml/Helper/Data.php
rename to app/code/Magento/Core/Model/Translate/Inline/ConfigInterface.php
index a51abb6fc5cabd5d6d9d644958e525ec82221ef5..a35362750b157e77139fb5ecfc3bb69fd69b5449 100644
--- a/app/code/Magento/Adminhtml/Helper/Data.php
+++ b/app/code/Magento/Core/Model/Translate/Inline/ConfigInterface.php
@@ -19,22 +19,24 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Core
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+
 /**
- * Adminhtml base helper
- *
- * @category   Magento
- * @package    Magento_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
- * @deprecated Moved to module Magento_Backend
+ * Inline Translation config interface
  */
-namespace Magento\Adminhtml\Helper;
+namespace Magento\Core\Model\Translate\Inline;
 
-class Data extends \Magento\Backend\Helper\Data
+interface ConfigInterface
 {
-
+    /**
+     * Check whether inline translation is enabled
+     *
+     * @param int|null $store
+     * @return bool
+     */
+    public function isActive($store = null);
 }
diff --git a/app/code/Magento/Core/Model/Url.php b/app/code/Magento/Core/Model/Url.php
index 076b20b9c56cffb2645e0750aa46f3dad4ee7a31..975f93222712821b46841445b8a585b4cf7554e6 100644
--- a/app/code/Magento/Core/Model/Url.php
+++ b/app/code/Magento/Core/Model/Url.php
@@ -324,15 +324,37 @@ class Url extends \Magento\Object implements \Magento\UrlInterface
         }
         $path = $prefix . $key;
 
-        $cacheId = $this->getStore()->getCode() . '/' . $path;
+        $cacheId = $this->_getConfigCacheId($path);
         if (!isset(self::$_configDataCache[$cacheId])) {
-            $data = $this->getStore()->getConfig($path);
+            $data = $this->_getConfig($path);
             self::$_configDataCache[$cacheId] = $data;
         }
 
         return self::$_configDataCache[$cacheId];
     }
 
+    /**
+     * Get cache id for config path
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function _getConfigCacheId($path)
+    {
+        return $this->getStore()->getCode() . '/' . $path;
+    }
+
+    /**
+     * Get config data by path
+     *
+     * @param string $path
+     * @return null|string
+     */
+    protected function _getConfig($path)
+    {
+        return $this->getStore()->getConfig($path);
+    }
+
     /**
      * Set request
      *
@@ -379,23 +401,19 @@ class Url extends \Magento\Object implements \Magento\UrlInterface
             return (bool)$this->getData('secure');
         }
 
-        $store = $this->getStore();
-
-        if ($store->isAdmin() && !$store->isAdminUrlSecure()) {
-            return false;
-        }
-        if (!$store->isAdmin() && !$store->isFrontUrlSecure()) {
+        if (!$this->getStore()->isUrlSecure()) {
             return false;
         }
 
         if (!$this->hasData('secure')) {
-            if ($this->getType() == \Magento\Core\Model\Store::URL_TYPE_LINK && !$store->isAdmin()) {
+            if ($this->getType() == \Magento\Core\Model\Store::URL_TYPE_LINK) {
                 $pathSecure = $this->_urlSecurityInfo->isSecure('/' . $this->getActionPath());
                 $this->setData('secure', $pathSecure);
             } else {
                 $this->setData('secure', true);
             }
         }
+
         return $this->getData('secure');
     }
 
@@ -1271,4 +1289,25 @@ class Url extends \Magento\Object implements \Magento\UrlInterface
 
         return $url;
     }
+
+    /**
+     * Retrieve current url
+     *
+     * @return string
+     */
+    public function getCurrentUrl()
+    {
+        $port = $this->_request->getServer('SERVER_PORT');
+        if ($port) {
+            $defaultPorts = array(
+                \Magento\App\Request\Http::DEFAULT_HTTP_PORT,
+                \Magento\App\Request\Http::DEFAULT_HTTPS_PORT
+            );
+            $port = (in_array($port, $defaultPorts)) ? '' : ':' . $port;
+        }
+        $requestUri = $this->_request->getServer('REQUEST_URI');
+        $url = $this->_request->getScheme() . '://' . $this->_request->getHttpHost()
+                . $port . $requestUri;
+        return $url;
+    }
 }
diff --git a/app/code/Magento/Core/Model/Variable/Config.php b/app/code/Magento/Core/Model/Variable/Config.php
index e4d202dd4953fbb4bfee2a36d771ceffc45b0f6b..810d02d2ede7944bd303ea59ff7fb1b6450b855e 100644
--- a/app/code/Magento/Core/Model/Variable/Config.php
+++ b/app/code/Magento/Core/Model/Variable/Config.php
@@ -100,6 +100,6 @@ class Config
      */
     public function getVariablesWysiwygActionUrl()
     {
-        return $this->_url->getUrl('*/system_variable/wysiwygPlugin');
+        return $this->_url->getUrl('adminhtml/system_variable/wysiwygPlugin');
     }
 }
diff --git a/app/code/Magento/Core/Model/View/Design.php b/app/code/Magento/Core/Model/View/Design.php
index fd682ebdb28452b1e39d701be0c61d5dc7125b81..b35fc64bacf14c5dd7feabe841c848e68aa7b4a7 100644
--- a/app/code/Magento/Core/Model/View/Design.php
+++ b/app/code/Magento/Core/Model/View/Design.php
@@ -156,7 +156,6 @@ class Design implements \Magento\View\DesignInterface
     /**
      * Retrieve package area
      *
-     * @deprecated
      * @return string
      */
     public function getArea()
diff --git a/app/code/Magento/Core/Model/Website.php b/app/code/Magento/Core/Model/Website.php
index 673024dd10f560386bcba9b38bdd586ec12dd885..0461b18e6effe29d6a275853215ce4c0694c72a6 100644
--- a/app/code/Magento/Core/Model/Website.php
+++ b/app/code/Magento/Core/Model/Website.php
@@ -422,7 +422,7 @@ class Website extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retrieve wersite store objects
+     * Retrieve website store objects
      *
      * @return array
      */
diff --git a/app/code/Magento/Core/etc/config.xml b/app/code/Magento/Core/etc/config.xml
index 584bb881beff581714d020172680ece940ef221c..ebf0803954d8f9b8b9f8c57b7b9a1369b0d55424 100644
--- a/app/code/Magento/Core/etc/config.xml
+++ b/app/code/Magento/Core/etc/config.xml
@@ -241,7 +241,7 @@
         </admin>
         <general>
             <country>
-                <eu_countries>AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HU,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB</eu_countries>
+                <eu_countries>AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HR,HU,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB</eu_countries>
             </country>
             <locale>
                 <firstday>0</firstday>
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index b6cf71c7d81a09873e96a9fca45b63234fbe68e6..1283d811a86711c716dddb8d6a6fcf25131171fc 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -54,6 +54,7 @@
     <preference for="Magento\App\ViewInterface" type="Magento\App\View" />
     <preference for="Magento\TranslateInterface" type="Magento\Core\Model\Translate" />
     <preference for="Magento\App\Response\RedirectInterface" type="Magento\Core\App\Response\Redirect" />
+    <preference for="Magento\Data\Collection\EntityFactoryInterface" type="Magento\Core\Model\EntityFactory" />
     <type name="Magento\App\DefaultPath\DefaultPath">
         <param name="parts">
             <value>
@@ -451,14 +452,23 @@
             <instance type="Magento\App\FrontController\Proxy" />
         </param>
     </type>
+    <type name="Magento\Core\Model\App\Area">
+        <param name="translator">
+            <instance type="Magento\Core\Model\Translate\Proxy" />
+        </param>
+        <param name="design">
+            <instance type="Magento\Core\Model\Design\Proxy" />
+        </param>
+    </type>
     <type name="Magento\App\FrontController">
         <plugin name="dispatchExceptionHandler" type="Magento\Core\App\FrontController\Plugin\DispatchExceptionHandler" sortOrder="30"/>
         <plugin name="clickjacking" type="Magento\App\FrontController\Plugin\Clickjacking" sortOrder="0"/>
     </type>
     <type name="Magento\App\Action\Action">
         <plugin name="installInitializer" type="Magento\Core\App\Action\Plugin\Install" sortOrder="5"/>
-        <plugin name="sessionInitializer" type="Magento\Core\App\Action\Plugin\Session" sortOrder="10"/>
-        <plugin name="designLoader" type="Magento\Core\App\Action\Plugin\Design" sortOrder="20"/>
+        <plugin name="storeCheck" type="Magento\Core\App\Action\Plugin\StoreCheck" sortOrder="10"/>
+        <plugin name="sessionInitializer" type="Magento\Core\App\Action\Plugin\Session" sortOrder="20"/>
+        <plugin name="designLoader" type="Magento\Core\App\Action\Plugin\Design" sortOrder="30"/>
     </type>
     <type name="Magento\Core\Model\Locale">
         <param name="dateModel">
diff --git a/app/code/Magento/Core/i18n/fr_FR.csv b/app/code/Magento/Core/i18n/fr_FR.csv
index 2672553f605f7329ed8bf6522e5024868c855da6..c838b5da378bebeaae55b56b43ff295763837f29 100644
--- a/app/code/Magento/Core/i18n/fr_FR.csv
+++ b/app/code/Magento/Core/i18n/fr_FR.csv
@@ -13,7 +13,7 @@
 "Advanced","Avancé(e)"
 "After selecting a new media storage location, press the Synchronize button
                                 to transfer all media to that location. Media will not be available in the new
-                                location until the synchronization process is complete.","Après avoir sélectionn un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé."
+                                location until the synchronization process is complete.","Après avoir sélectionné un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé."
 "Allow Countries","Permettre pays"
 "Allow Symlinks","Autoriser les Symlinks"
 "Allowed IPs (comma separated)","IPs permis (séparés par virgule)"
@@ -24,7 +24,7 @@
 "An error occurred while saving. Please review the error log.","Une erreur est survenue durant sauvegarde. Veuillez consulter le journal de bord des erreurs."
 "Anchor Text for Next","Ancrer texte pour suivant"
 "Anchor Text for Previous","Ancrer texte pour précédent"
-"Anchor symbol (#) is not supported in request path","Le symbolr d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès"
+"Anchor symbol (#) is not supported in request path","Le symbole d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès"
 "Anchor symbol (#) is not supported in url rewrite suffix","Le symbole d'ancrage (#) n'est pas pris en charge dans le suffixe de réécriture de l'url"
 "Are you sure?","Etes-vous sûr ?"
 "Auto-redirect to Base URL","Redirige automatiquement vers base URL"
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
index 1c8912517d80384a095398dbd0ace67e743bbe60..0b69229b0865cd712251d7a0bdd1bee01d3905d5 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
@@ -46,18 +46,18 @@ class Services extends \Magento\Backend\Block\Template
      */
     protected $_srcCurrencyFactory;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory,
+        array $data = array()
+    ) {
         $this->_srcCurrencyFactory = $srcCurrencyFactory;
         parent::__construct($context, $coreData, $data);
     }
@@ -71,7 +71,7 @@ class Services extends \Magento\Backend\Block\Template
     {
         $this->setChild(
             'import_services',
-            $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+            $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
                 ->setOptions($this->_srcCurrencyFactory->create()->toOptionArray())
                 ->setId('rate_services')
                 ->setName('rate_services')
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
index 6289ee10d50f7fd7f94498fe26580414a771d6c4..cd2fde10f784aae319dc2cda101ea07e69f060a8 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -115,7 +115,7 @@ class Dashboard extends \Magento\View\Block\Template
 
     public function getManageNewsletterUrl()
     {
-        return $this->getUrl('*/newsletter/manage');
+        return $this->getUrl('newsletter/manage');
     }
 
     public function getSubscriptionText()
diff --git a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
index a157877af3631daee485e2b4285f3de8262539b5..7ce43d8b6e5f4ff3bf4fc5258888c8c5f8e7a2ba 100644
--- a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
+++ b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
@@ -44,7 +44,7 @@ interface RendererInterface
     function setType(\Magento\Object $type);
 
     /**
-     * Retrive format type object
+     * Retrieve format type object
      *
      * @return \Magento\Object
      */
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
index 07d33b4df090d90cd260b2daf9e5083f5187b148..475c1d330b96cb869e8f971fee78a2e7e4519397 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
@@ -62,7 +62,7 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abstra
 
         $actions[] = array(
             '@'	=>  array(
-                'href'  => $this->getUrl('adminhtml/newsletter_template/preview',
+                'href'  => $this->getUrl('newsletter/template/preview',
                     array(
                         'id'        => $row->getTemplateId(),
                         'subscriber'=> $this->_coreRegistry->registry('subscriber')->getId()
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
index 4408372a05762bd64ba835373c4686b0bde01b21..0548277ebeef68a9702e5a2b35c49bf86650cef1 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
 
-class Reviews extends \Magento\Adminhtml\Block\Review\Grid
+class Reviews extends \Magento\Review\Block\Adminhtml\Grid
 {
     /**
      * Hide grid mass action elements
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
index b09949e9a88706196b1105d2691e53fd2deed2d8..dccfcde274a8820e966065e86e0eb509060a3460 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
@@ -30,7 +30,7 @@ namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
  * Customer account form block
  */
 class View
-    extends \Magento\Adminhtml\Block\Template
+    extends \Magento\Backend\Block\Template
     implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
 {
     /**
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Online.php b/app/code/Magento/Customer/Block/Adminhtml/Online.php
index 14387d81d181a0268941c1deaedab80492aaddef..545b28f0447fd944076ed8d04ed4b39c0c0edf90 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Online.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Online.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Customer\Block\Adminhtml;
 
-class Online extends \Magento\Adminhtml\Block\Template
+class Online extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'online.phtml';
diff --git a/app/code/Magento/Customer/Controller/Address.php b/app/code/Magento/Customer/Controller/Address.php
index 9345c7b8c62ea694658a5e694f07943d67dff130..042c7f0fc15b3cababfa92f7aa8be9e700ef5ab9 100644
--- a/app/code/Magento/Customer/Controller/Address.php
+++ b/app/code/Magento/Customer/Controller/Address.php
@@ -53,6 +53,13 @@ class Address extends \Magento\App\Action\Action
      */
     protected $_addressFormFactory;
 
+    /**
+     * Customer data
+     *
+     * @var \Magento\Customer\Helper\Data
+     */
+    protected $_customerData;
+
     /**
      * @var \Magento\Core\App\Action\FormKeyValidator
      */
@@ -63,6 +70,7 @@ class Address extends \Magento\App\Action\Action
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\AddressFactory $addressFactory
      * @param \Magento\Customer\Model\Address\FormFactory $addressFormFactory
+     * @param \Magento\Customer\Helper\Data $customerData
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      */
     public function __construct(
@@ -70,11 +78,13 @@ class Address extends \Magento\App\Action\Action
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\AddressFactory $addressFactory,
         \Magento\Customer\Model\Address\FormFactory $addressFormFactory,
+        \Magento\Customer\Helper\Data $customerData,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
     ) {
         $this->_customerSession = $customerSession;
         $this->_addressFactory = $addressFactory;
         $this->_addressFormFactory = $addressFormFactory;
+        $this->_customerData = $customerData;
         $this->_formKeyValidator = $formKeyValidator;
         parent::__construct($context);
     }
@@ -164,6 +174,19 @@ class Address extends \Magento\App\Action\Action
             $address = $this->_extractAddress();
             $this->_validateAddress($address);
             $address->save();
+
+            // set in VAT observer
+            if ($address->getVatValidationResult()) {
+                $validationMessage = $this->_customerData->getVatValidationUserMessage(
+                    $address,
+                    $this->_getSession()->getCustomer()->getDisableAutoGroupChange(),
+                    $address->getVatValidationResult()
+                );
+                $validationMessage->getIsError()
+                    ? $this->_getSession()->addError($validationMessage->getMessage())
+                    : $this->_getSession()->addSuccess($validationMessage->getMessage());
+            }
+
             $this->_getSession()->addSuccess(__('The address has been saved.'));
             $url = $this->_buildUrl('*/*/index', array('_secure'=>true));
             $this->getResponse()->setRedirect($this->_redirect->success($url));
diff --git a/app/code/Magento/Adminhtml/Block/Html/Date.php b/app/code/Magento/Customer/Model/Backend/Customer.php
similarity index 71%
rename from app/code/Magento/Adminhtml/Block/Html/Date.php
rename to app/code/Magento/Customer/Model/Backend/Customer.php
index b66f44d120cbd81d791292cf7f17c314b9f87838..ec13ab65f8afa6debf9dc1d57a6e3ce04badc46c 100644
--- a/app/code/Magento/Adminhtml/Block/Html/Date.php
+++ b/app/code/Magento/Customer/Model/Backend/Customer.php
@@ -19,20 +19,25 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Customer
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-/**
- * Adminhtml HTML select element block
- *
- * @category   Magento
- * @package    Magento_Core
- * @author     Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Adminhtml\Block\Html;
+namespace Magento\Customer\Model\Backend;
 
-class Date extends \Magento\View\Block\Html\Date
+class Customer extends \Magento\Customer\Model\Customer
 {
+    /**
+     * Get store id
+     *
+     * @return int
+     */
+    public function getStoreId()
+    {
+        if(($this->getWebsiteId() * 1)) {
+            return $this->_getWebsiteStoreId();
+        }
+        return parent::getStoreId();
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 911e203610821f1de72f473601476864a41a479b..28705a39c6850164710f17654a917ce50044db40 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -37,7 +37,7 @@ namespace Magento\Customer\Model;
 class Customer extends \Magento\Core\Model\AbstractModel
 {
     /**
-     * Configuration pathes for email templates and identities
+     * Configuration paths for email templates and identities
      */
     const XML_PATH_REGISTER_EMAIL_TEMPLATE = 'customer/create_account/email_template';
     const XML_PATH_REGISTER_EMAIL_IDENTITY = 'customer/create_account/email_identity';
@@ -735,13 +735,8 @@ class Customer extends \Magento\Core\Model\AbstractModel
      */
     public function sendPasswordReminderEmail()
     {
-        $storeId = $this->getStoreId();
-        if (\Magento\Core\Model\AppInterface::ADMIN_STORE_ID == $storeId && ($this->getWebsiteId() * 1)) {
-            $storeId = $this->_getWebsiteStoreId();
-        }
-
         $this->_sendEmailTemplate(self::XML_PATH_REMIND_EMAIL_TEMPLATE, self::XML_PATH_FORGOT_EMAIL_IDENTITY,
-            array('customer' => $this), $storeId);
+            array('customer' => $this), $this->getStoreId());
 
         return $this;
     }
@@ -894,7 +889,7 @@ class Customer extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retrive shared website ids
+     * Retrieve shared website ids
      *
      * @return array
      */
@@ -1007,7 +1002,7 @@ class Customer extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive errors
+     * Retrieve errors
      *
      * @return array
      */
diff --git a/app/code/Magento/Customer/Model/Observer.php b/app/code/Magento/Customer/Model/Observer.php
index 1247b1706d9af91103e0e29a27ec12a0a2d783f6..82b0e892853ab3a05af403d3b7ec6e19a89b3129 100644
--- a/app/code/Magento/Customer/Model/Observer.php
+++ b/app/code/Magento/Customer/Model/Observer.php
@@ -62,35 +62,19 @@ class Observer
      */
     protected $_customerData;
 
-    /**
-     * @var \Magento\Core\Model\StoreManagerInterface
-     */
-    protected $_storeManager;
-
-    /**
-     * @var \Magento\Customer\Model\Session
-     */
-    protected $_customerSession;
-
     /**
      * @param \Magento\Customer\Helper\Data $customerData
      * @param \Magento\Customer\Helper\Address $customerAddress
      * @param \Magento\Core\Model\Registry $coreRegistry
-     * @param \Magento\Core\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Customer\Model\Session $customerSession
      */
     public function __construct(
         \Magento\Customer\Helper\Data $customerData,
         \Magento\Customer\Helper\Address $customerAddress,
-        \Magento\Core\Model\Registry $coreRegistry,
-        \Magento\Core\Model\StoreManagerInterface $storeManager,
-        \Magento\Customer\Model\Session $customerSession
+        \Magento\Core\Model\Registry $coreRegistry
     ) {
         $this->_customerData = $customerData;
         $this->_customerAddress = $customerAddress;
         $this->_coreRegistry = $coreRegistry;
-        $this->_storeManager = $storeManager;
-        $this->_customerSession = $customerSession;
     }
 
     /**
@@ -217,16 +201,7 @@ class Observer
                     $customer->save();
                 }
 
-                if (!$this->_storeManager->getStore()->isAdmin()) {
-                    $validationMessage = $this->_customerData->getVatValidationUserMessage($customerAddress,
-                        $customer->getDisableAutoGroupChange(), $result);
-
-                    if (!$validationMessage->getIsError()) {
-                        $this->_customerSession->addSuccess($validationMessage->getMessage());
-                    } else {
-                        $this->_customerSession->addError($validationMessage->getMessage());
-                    }
-                }
+                $customerAddress->setVatValidationResult($result);
             }
         } catch (\Exception $e) {
             $this->_coreRegistry->register(self::VIV_PROCESSED_FLAG, false, true);
diff --git a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php
index 073b4abb1c82f4b8f686073803ff6c2f3a44ae9f..629cc59314182b48a29b5aacf2b36646d08e4ce3 100644
--- a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php
+++ b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php
@@ -58,7 +58,7 @@ class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
     }
 
     /**
-     * Retreive all options
+     * Retrieve all options
      *
      * @return array
      */
diff --git a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php
index b1058355480aa23e71a8ed76f7f44dcca9579fa7..a9e3b867b520bb62fd17a68971d18248237ace9e 100644
--- a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php
+++ b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php
@@ -58,7 +58,7 @@ class Region extends \Magento\Eav\Model\Entity\Attribute\Source\Table
     }
 
     /**
-     * Retreive all region options
+     * Retrieve all region options
      *
      * @return array
      */
diff --git a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
index f578d61c89341ca8ddd1664cab052085eccb90e1..c361746935ac86798b078dedf9070bc24c9b48ea 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
@@ -36,11 +36,21 @@ namespace Magento\Customer\Model\Resource\Customer;
 
 class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
 {
+    /**
+     * Name of collection model
+     */
+    const CUSTOMER_MODEL_NAME = 'Magento\Customer\Model\Customer';
+
     /**
      * @var \Magento\Object\Copy\Config
      */
     protected $_fieldsetConfig;
 
+    /**
+     * @var string
+     */
+    protected $_modelName;
+
     /**
      * @param \Magento\Event\ManagerInterface $eventManager
      * @param \Magento\Logger $logger
@@ -52,6 +62,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Validator\UniversalFactory $universalFactory
      * @param \Magento\Object\Copy\Config $fieldsetConfig
+     * @param string $modelName
      */
     public function __construct(
         \Magento\Event\ManagerInterface $eventManager,
@@ -63,9 +74,11 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Validator\UniversalFactory $universalFactory,
-        \Magento\Object\Copy\Config $fieldsetConfig
+        \Magento\Object\Copy\Config $fieldsetConfig,
+        $modelName = self::CUSTOMER_MODEL_NAME
     ) {
         $this->_fieldsetConfig = $fieldsetConfig;
+        $this->_modelName = $modelName;
         parent::__construct(
             $eventManager,
             $logger,
@@ -84,7 +97,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
      */
     protected function _construct()
     {
-        $this->_init('Magento\Customer\Model\Customer', 'Magento\Customer\Model\Resource\Customer');
+        $this->_init($this->_modelName, 'Magento\Customer\Model\Resource\Customer');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Model/Resource/Group/Collection.php b/app/code/Magento/Customer/Model/Resource/Group/Collection.php
index 334e515dc875155ceb11ab566862891ca90154c9..20d3ed35530feb06d48faa460177cdd012235d30 100644
--- a/app/code/Magento/Customer/Model/Resource/Group/Collection.php
+++ b/app/code/Magento/Customer/Model/Resource/Group/Collection.php
@@ -82,7 +82,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
     }
 
     /**
-     * Retreive option array
+     * Retrieve option array
      *
      * @return array
      */
@@ -92,7 +92,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
     }
 
     /**
-     * Retreive option hash
+     * Retrieve option hash
      *
      * @return array
      */
diff --git a/app/code/Magento/Customer/Model/Resource/Setup.php b/app/code/Magento/Customer/Model/Resource/Setup.php
index b8025a63bc8a855350a4f976aaa233f8baf76c76..dfbbdd4d6612aebfe3274a918eb1947eb9c6957e 100644
--- a/app/code/Magento/Customer/Model/Resource/Setup.php
+++ b/app/code/Magento/Customer/Model/Resource/Setup.php
@@ -161,7 +161,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
     }
 
     /**
-     * Retreive default entities: customer, customer_address
+     * Retrieve default entities: customer, customer_address
      *
      * @return array
      */
diff --git a/app/code/Magento/Customer/etc/adminhtml/di.xml b/app/code/Magento/Customer/etc/adminhtml/di.xml
index fe1f5d11436b8f38940e91434660ffab128d0e92..0c16ddd66c5c32644a028867fe502d273895840c 100644
--- a/app/code/Magento/Customer/etc/adminhtml/di.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/di.xml
@@ -24,9 +24,15 @@
  */
 -->
 <config>
+    <preference for="Magento\Customer\Model\Customer" type="Magento\Customer\Model\Backend\Customer" />
     <type name="Magento\Customer\Model\Session">
         <param name="sessionName">
             <value>adminhtml</value>
         </param>
     </type>
+    <type name="Magento\Customer\Model\Resource\Customer\Collection">
+        <param name="modelName">
+            <value>Magento\Customer\Model\Backend\Customer</value>
+        </param>
+    </type>
 </config>
diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
index befdce1ccfd4f928bad355e9f4d8ef1bc1d1253f..40327482b2c2a501fcea35b6707cc276832d1c06 100644
--- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
+++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
@@ -28,7 +28,7 @@
         <block class="Magento\Customer\Block\Adminhtml\Edit" name="customer_edit"/>
     </referenceContainer>
     <referenceBlock name="head">
-        <block class="Magento\Adminhtml\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
+        <block class="Magento\Backend\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
         <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-composite-configure-js">
             <arguments>
                 <argument name="file" xsi:type="string">Magento_Catalog::catalog/product/composite/configure.js</argument>
@@ -58,7 +58,7 @@
         </block>
     </referenceContainer>
     <referenceContainer name="js">
-        <block class="Magento\Adminhtml\Block\Template" template="Magento_Customer::edit/js.phtml" name="customer.edit.js" as="customer_edit_js"/>
+        <block class="Magento\Backend\Block\Template" template="Magento_Customer::edit/js.phtml" name="customer.edit.js" as="customer_edit_js"/>
     </referenceContainer>
     <referenceBlock name="customer_edit_tabs">
         <action method="addTab">
diff --git a/app/code/Magento/Customer/view/email/account_new.html b/app/code/Magento/Customer/view/email/account_new.html
index fafe6fd5b616645c819980070c4f111592b75551..1b9a1b4963566d5cf0ca87de530cf5cb21a0f247 100644
--- a/app/code/Magento/Customer/view/email/account_new.html
+++ b/app/code/Magento/Customer/view/email/account_new.html
@@ -21,18 +21,18 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
                 <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
                     <tr>
                         <td valign="top">
-                            <a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
+                            <a href="{{store url=''}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
                     </tr>
                 <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{escapehtml var=$customer.name}},</h1>
-                            <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{escapehtml var=$customer.name}},</h1>
+                            <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url='customer/account/'}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url='customer/account/'}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
                             <p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0; padding:13px 18px; background:#f9f9f9;">
                                 Use the following values when prompted to log in:<br/>
                                 <strong>E-mail</strong>: {{var customer.email}}<br/>
                                 <strong>Password</strong>: Only you know that! (Hint: It’s the password you created at {{var store.getFrontendName()}})<br/>
-                                Forgot your Account password? No problems. Click <a href="{{store url="customer/account/createpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}">here</a> to reset it.</p>
+                                Forgot your Account password? No problems. Click <a href="{{store url='customer/account/createpassword/' _query_id=$customer.id _query_token=$customer.rp_token}}">here</a> to reset it.</p>
                             </p>
                             <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you log in to your account, you will be able to do the following:</p>
                             <ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">
diff --git a/app/code/Magento/Customer/view/email/account_new_confirmed.html b/app/code/Magento/Customer/view/email/account_new_confirmed.html
index 1d9a5930011c190ac0b2fd5a9be8f9df64c85703..62a7095eb0d7f16e7d71229a932e8519f3a30a48 100644
--- a/app/code/Magento/Customer/view/email/account_new_confirmed.html
+++ b/app/code/Magento/Customer/view/email/account_new_confirmed.html
@@ -26,7 +26,7 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
                     <!-- [ middle starts here] -->
                     <tr>
                         <td valign="top">
-                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{escapehtml var=$customer.name}},</h1>
+                            <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{escapehtml var=$customer.name}},</h1>
                             <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
                             <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you log in to your account, you will be able to do the following:</p>
                             <ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">
diff --git a/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml b/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml
index b0c420fc344ee5dae4864954c75837c728f5c227..0346fd1d6280ea6c51952fed3256f734a518732e 100644
--- a/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml
+++ b/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml
@@ -32,7 +32,7 @@
         <div class="box address billing">
             <strong class="subtitle">
                 <span><?php echo __('Default Billing Address') ?></span>
-                <a class="action edit" href="<?php echo $this->getPrimaryBillingAddressEditUrl() ?>"><span><?php echo __('Edit Address') ?></span></a>
+                <a class="action edit" href="<?php echo $this->getPrimaryBillingAddressEditUrl() ?>" data-ui-id="default-billing-edit-link"><span><?php echo __('Edit Address') ?></span></a>
             </strong>
             <address>
                 <?php echo $this->getPrimaryBillingAddressHtml() ?>
@@ -41,7 +41,7 @@
         <div class="box address shipping">
             <strong class="subtitle">
                 <span><?php echo __('Default Shipping Address') ?></span>
-                <a class="action edit" href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>"><span><?php echo __('Edit Address') ?></span></a>
+                <a class="action edit" href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>" data-ui-id="default-shipping-edit-link"><span><?php echo __('Edit Address') ?></span></a>
             </strong>
             <address>
                 <?php echo $this->getPrimaryShippingAddressHtml() ?>
diff --git a/app/code/Magento/Customer/view/frontend/account/navigation.phtml b/app/code/Magento/Customer/view/frontend/account/navigation.phtml
index 4c32d5168570839dadcf6d99dcda2f42ff761a63..cab46eb40b90e0a5e7f07affe42ada9d3b3621a5 100644
--- a/app/code/Magento/Customer/view/frontend/account/navigation.phtml
+++ b/app/code/Magento/Customer/view/frontend/account/navigation.phtml
@@ -30,10 +30,10 @@
         <strong><?php echo __('My Account'); ?></strong>
     </div>
     <div class="content">
-        <navigation class="account nav">
+        <nav class="account nav">
             <ul class="nav items">
                 <?php echo $this->getChildHtml();?>
             </ul>
-        </navigation>
+        </nav>
     </div>
 </div>
diff --git a/app/code/Magento/Directory/Helper/Url.php b/app/code/Magento/Directory/Helper/Url.php
index 4715813156bb04363b752b05dcc573e839894653..e4479a1fb2635a621efb4b0056a1a3f4bb5f1007 100644
--- a/app/code/Magento/Directory/Helper/Url.php
+++ b/app/code/Magento/Directory/Helper/Url.php
@@ -66,7 +66,7 @@ class Url extends \Magento\Core\Helper\Url
             $url = $this->_storeManager->getStore()->getBaseUrl()
                 . $this->_getRequest()->getAlias('rewrite_request_path');
         } else {
-            $url = $this->getCurrentUrl();
+            $url = $this->_urlBuilder->getCurrentUrl();
         }
         $params[\Magento\App\Action\Action::PARAM_NAME_URL_ENCODED] = $this->_coreData->urlEncode($url);
         return $this->_getUrl('directory/currency/switch', $params);
diff --git a/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml b/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml
index f57c2bcc72c7bce7f46997b00c6107f65e5f0759..8ea42528566209f567e67c28a6b1f4fd65849746 100644
--- a/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml
+++ b/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml
@@ -29,7 +29,7 @@
 /**
  * JS block for including Countries with Optional Zip
  *
- * @see \Magento\Adminhtml\Block\Template
+ * @see \Magento\Backend\Block\Template
  */
 ?>
 <script type="text/javascript">
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 78dff1cca1eccae9e43ec3bb252e928745edd50f..890f781ec375aa1603fcfeb2f0d72f2d90ecc14e 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -93,30 +93,30 @@ class Links
      */
     protected $_urlFactory;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
-     * @param \Magento\Downloadable\Helper\File $downloadableFile
-     * @param \Magento\Core\Model\Registry $coreRegistry
-     * @param \Magento\Backend\Model\Config\Source\Yesno $sourceModel
-     * @param \Magento\Downloadable\Model\Link $link
-     * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
-     * @param \Magento\Backend\Model\UrlFactory $urlFactory
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
+     * @param \Magento\Downloadable\Helper\File $downloadableFile
+     * @param \Magento\Core\Model\Registry $coreRegistry
+     * @param \Magento\Backend\Model\Config\Source\Yesno $sourceModel
+     * @param \Magento\Downloadable\Model\Link $link
+     * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
+     * @param \Magento\Backend\Model\UrlFactory $urlFactory
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
-        \Magento\Downloadable\Helper\File $downloadableFile,
-        \Magento\Core\Model\Registry $coreRegistry,
-        \Magento\Backend\Model\Config\Source\Yesno $sourceModel,
-        \Magento\Downloadable\Model\Link $link,
-        \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
-        \Magento\Backend\Model\UrlFactory $urlFactory,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
+        \Magento\Downloadable\Helper\File $downloadableFile,
+        \Magento\Core\Model\Registry $coreRegistry,
+        \Magento\Backend\Model\Config\Source\Yesno $sourceModel,
+        \Magento\Downloadable\Model\Link $link,
+        \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
+        \Magento\Backend\Model\UrlFactory $urlFactory,
+        array $data = array()
+    ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_coreFileStorageDb = $coreFileStorageDatabase;
         $this->_downloadableFile = $downloadableFile;
@@ -173,7 +173,7 @@ class Links
      */
     public function getPurchasedSeparatelySelect()
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setName('product[links_purchased_separately]')
             ->setId('downloadable_link_purchase_type')
             ->setOptions($this->_sourceModel->toOptionArray())
diff --git a/app/code/Magento/Downloadable/etc/adminhtml/menu.xml b/app/code/Magento/Downloadable/etc/adminhtml/menu.xml
index 3189e594778417e7ef268bd439a9373571754711..b4652a6aa2456e337ec11047a0116215b86a8ed3 100644
--- a/app/code/Magento/Downloadable/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Downloadable/etc/adminhtml/menu.xml
@@ -27,6 +27,6 @@
 -->
 <config>
     <menu>
-        <add id="Magento_Downloadable::report_products_downloads" title="Downloads" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_products" action="adminhtml/report_product/downloads" resource="Magento_Reports::downloads"/>
+        <add id="Magento_Downloadable::report_products_downloads" title="Downloads" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_products" action="reports/report_product/downloads" resource="Magento_Reports::downloads"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml
index 8a7140a47e9920934a8aea6853b2991da57b1693..3d84f8141c8b0487061cf30b73e698bdcb9aeb96 100644
--- a/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,40 +25,41 @@
 <?php /* @var $this \Magento\Downloadable\Block\Catalog\Product\Links */ ?>
 <?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
 <?php if ($this->getProduct()->isSaleable() && $this->hasLinks()):?>
-    <dl>
-        <?php $_links = $this->getLinks(); ?>
-        <?php $_isRequired = $this->getLinkSelectionRequired(); ?>
-        <dt><label<?php if ($_isRequired) echo ' class="required"' ?>><?php if ($_isRequired) echo '<em>*</em>' ?><?php echo $this->getLinksTitle() ?></label></dt>
-        <dd>
-            <ul id="downloadable-links-list" class="options-list">
+    <?php $_links = $this->getLinks(); ?>
+    <?php $_isRequired = $this->getLinkSelectionRequired(); ?>
+    <div class="field downloads<?php if ($_isRequired) echo ' required' ?>">
+        <label class="label"><span><?php echo $this->getLinksTitle() ?></span></label>
+        <div class="control" id="downloadable-links-list">
             <?php foreach ($_links as $_link): ?>
-            <li>
-                <?php if ($_linksPurchasedSeparately): ?>
-                <input type="checkbox" <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
-                       class="checkbox" name="links[]" id="links_<?php echo $_link->getId() ?>"
-                       value="<?php echo $_link->getId(); ?>" <?php echo $this->getLinkCheckedValue($_link); ?> />
-                <?php endif; ?>
-                <span class="label">
-                        <label for="links_<?php echo $_link->getId() ?>">
-                            <?php echo $this->escapeHtml($_link->getTitle()); ?>
-                        </label>
-                    <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-                        &nbsp;(<a href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>><?php echo __('sample') ?></a>)
-                    <?php endif; ?>
+                <div class="field choice">
                     <?php if ($_linksPurchasedSeparately): ?>
-                    <?php echo $this->getFormattedLinkPrice($_link); ?>
+                        <input type="checkbox"
+                               <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
+                               name="links[]"
+                               id="links_<?php echo $_link->getId() ?>"
+                               value="<?php echo $_link->getId(); ?>" <?php echo $this->getLinkCheckedValue($_link); ?> />
                     <?php endif; ?>
-                </span>
-            </li>
+                    <label class="label" for="links_<?php echo $_link->getId() ?>">
+                        <span><?php echo $this->escapeHtml($_link->getTitle()); ?></span>
+                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
+                            <a class="sample"
+                               href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>>
+                                <?php echo __('sample') ?>
+                            </a>
+                        <?php endif; ?>
+                        <?php if ($_linksPurchasedSeparately): ?>
+                            <?php echo $this->getFormattedLinkPrice($_link); ?>
+                        <?php endif; ?>
+                    </label>
+                </div>
             <?php endforeach; ?>
-        </ul>
-
-            <?php if ($_isRequired): ?>
-                <span id="links-advice-container"></span>
-            <?php endif;?>
-        </dd>
-    </dl>
+        </div>
+        <?php if ($_isRequired): ?>
+            <span id="links-advice-container"></span>
+        <?php endif;?>
+    </div>
     <script type="text/javascript">
+        //<![CDATA[
         (function ($) {
             head.js("<?php echo $this->getViewFileUrl('Magento_Downloadable::downloadable.js') ?>", function () {
                 $('#downloadable-links-list').downloadable({
@@ -68,6 +67,7 @@
                     config: <?php echo $this->getJsonConfig() ?>
                 });
             });
-    })(jQuery);
-</script>
+        })(jQuery);
+        //]]>
+    </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml
index 64c947f7f8c5b7b05fde574d2ffac651a5b51e29..0e3559a5e68e1615f6cdb532b6f185d587c98833 100644
--- a/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml
@@ -18,27 +18,27 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
-
 /**
  * Downloadable product links
  *
- * @see \Magento\Downloadable\Block\Catalog\Product\Samples
+ * @var $this \Magento\Downloadable\Block\Catalog\Product\Samples
  */
 ?>
 
 <?php if ($this->hasSamples()): ?>
-    <dl class="item-options">
+    <dl class="downloadable samples">
         <dt><?php echo $this->getSamplesTitle() ?></dt>
         <?php $_samples = $this->getSamples() ?>
         <?php foreach ($_samples as $_sample): ?>
             <dd>
-                <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo  $this->escapeHtml($_sample->getTitle()) ?></a>
+                <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>
+                   class="sample">
+                    <?php echo $this->escapeHtml($_sample->getTitle()) ?>
+                </a>
             </dd>
         <?php endforeach; ?>
     </dl>
diff --git a/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml
index a99cd2a1270f84b95b1fc2aeaf304d5b0947a121..95aaf3aa3d690846cad7ad6f2189542b9739519f 100644
--- a/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,16 +25,19 @@
 /**
  * Downloadable product type
  *
- * @see \Magento\Downloadable\Block\Catalog\Product\View\Type
+ * @var $this \Magento\Downloadable\Block\Catalog\Product\View\Type
  */
 ?>
 <?php $_product = $this->getProduct() ?>
 
-<?php if($_product->isSaleable()): ?>
-    <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+<?php if($_product->getIsSalable()): ?>
+    <p class="stock available" title="<?php echo __('Availability') ?>">
+        <span><?php echo __('In stock') ?></span>
+    </p>
 <?php else: ?>
-    <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+    <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+        <span><?php echo __('Out of stock') ?></span>
+    </p>
 <?php endif; ?>
 <?php echo $this->getChildHtml('product_type_data_extra') ?>
-<?php echo $this->getPriceHtml($_product) ?>
 <?php echo $this->getChildHtml('samples') ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml
index ebcebc2f0174f152efc31caf7598ec96fcd7c8de..cd08fb99f34662036c4b61169dbb81e2e51b315d 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml
@@ -18,272 +18,290 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
-    $_item = $this->getItem();
-    $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
+$_item = $this->getItem();
+$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
+$canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
 ?>
-<tr>
-    <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image" title="<?php echo $this->escapeHtml($this->getProductName()) ?>"><img src="<?php echo $this->getProductThumbnailUrl() ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a></td>
-    <td>
-        <h2 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h2>
-        <?php if ($_options = $this->getOptionList()):?>
-        <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
-            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                <div class="truncated_full_value">
-                    <dl class="item-options">
-                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+<?php echo $this->getChildHtml('item_extra') ?>
+<tbody class="cart item">
+    <tr class="item info">
+        <td class="col item">
+            <?php if ($this->hasProductUrl()): ?>
+                <a href="<?php echo $this->getProductUrl() ?>"
+                   title="<?php echo $this->escapeHtml($this->getProductName()) ?>"
+                   class="product photo">
+            <?php endif; ?>
+            <?php echo $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($_item->getProduct(), 'cart_page_product_thumbnail')->toHtml(); ?>
+            <?php if ($this->hasProductUrl()):?></a><?php endif;?>
+            <div class="product details">
+                <strong class="product name">
+                    <?php if ($this->hasProductUrl()):?>
+                        <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
+                    <?php else: ?>
+                        <?php echo $this->escapeHtml($this->getProductName()) ?>
+                    <?php endif; ?>
+                </strong>
+                <?php if ($_options = $this->getOptionList()):?>
+                    <dl class="cart item options">
+                        <?php foreach ($_options as $_option) : ?>
+                            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                    <div class="truncated_full_value">
+                                        <dl class="item options">
+                                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                        </dl>
+                                    </div>
+                                <?php endif; ?>
+                            </dd>
+                        <?php endforeach; ?>
+                    </dl>
+                <?php endif;?>
+                <?php /* downloadable */ ?>
+                <?php if ($links = $this->getLinks()): ?>
+                    <dl class="cart item options">
+                        <dt><?php echo $this->getLinksTitle() ?></dt>
+                        <?php foreach ($links as $link): ?>
+                            <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
+                        <?php endforeach; ?>
                     </dl>
-                </div>
                 <?php endif; ?>
-            </dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif;?>
-        <!-- downloadable -->
-        <?php if ($links = $this->getLinks()): ?>
-        <dl class="item-options">
-            <dt><?php echo $this->getLinksTitle() ?></dt>
-            <?php foreach ($links as $link): ?>
-                <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <!-- EOF downloadable -->
-
-        <?php if ($messages = $this->getMessages()): ?>
-        <?php foreach ($messages as $message): ?>
-        <div class="shopping-cart-item-message <?php echo $message['type'] ?>">
-            * <?php echo $this->escapeHtml($message['text']) ?>
-        </div>
-        <?php endforeach; ?>
-        <?php endif; ?>
-    </td>
-    <td class="a-center">
-        <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><?php echo __('Edit') ?></a>
-    </td>
-    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
-    <td class="a-center">
-        <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Move'); ?></a>
-    </td>
-    <?php endif ?>
-<?php if ($canApplyMsrp): ?>
-    <td class="a-right"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
-        <span class="cart-price">
-            <span class="cart-msrp-unit"><?php echo __('See price before order confirmation.'); ?></span>
-            <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
-            <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo __("What's this?"); ?></a>
-            <?php $_product = $_item->getProduct(); ?>
-            <script type="text/javascript">
-                (function ($) {
-                    head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>", function () {
-                        $('#<?php echo $helpLinkId ?>').addToCart({
-                            popupId: "#<?php echo $helpLinkId ?>",
-                            productName: '<?php echo $_product->getName() ?>',
-                            realPrice: '<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>',
-                            msrpPrice: '<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,true) ?>',
-                            closeButtonId: '#map-popup-close',
-                            showAddToCart: false
-                        });
-                    });
-                })(jQuery);
-            </script>
-        </span>
-    </td>
-<?php else: ?>
-
-
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
+                <?php echo $this->getChildHtml('item_extra'); ?>
+                <?php /* EOF downloadable */ ?>
+                <?php if ($messages = $this->getMessages()): ?>
+                    <?php foreach ($messages as $message): ?>
+                        <p class="cart item message <?php echo $message['type'] ?>">* <?php echo $this->escapeHtml($message['text']) ?></p>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+                <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+                <?php if ($addInfoBlock): ?>
+                    <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
+                <?php endif;?>
+            </div>
+            <?php $cols = 1; ?>
+        </td>
+    <?php if ($canApplyMsrp): ?>
+        <td class="col msrp"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
+            <span class="cart price">
+                <span class="msrp notice"><?php echo __('See price before order confirmation.'); ?></span>
+                <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
+                <a id="<?php echo $helpLinkId ?>" href="#" class="action help map"><?php echo __("What's this?"); ?></a>
+                <script type="text/javascript">
+                    Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo __("What's this?") ?>");
+                </script>
+            </span>
+            <?php $cols++; ?>
+        </td>
+    <?php else: ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+        <td class="col price excl tax">
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+            <?php else: ?>
+                <span class="cart price">
+            <?php endif; ?>
             <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                 <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
             <?php else: ?>
                 <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
             <?php endif; ?>
-
-        </div>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
+            </span>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+                <div class="cart tax info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php endif; ?>
                 </div>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                    <div class="cart tax total"
+                         data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                        <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
+                    </div>
+                <?php endif; ?>
             <?php endif; ?>
+            <?php $cols++; ?>
+        </td>
         <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+            <td class="col price incl tax">
+                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                <?php else: ?>
+                    <span class="cart price">
+                <?php endif; ?>
 
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-            <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+                <?php else: ?>
+                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
+                <?php endif; ?>
+                </span>
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
 
-        </div>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+                    <div class="cart tax info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                                <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
+                            <?php endforeach; ?>
+                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                                <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+                            <?php endforeach; ?>
+                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                                <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+                            <?php endforeach; ?>
+                        <?php endif; ?>
+                    </div>
 
-            <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                            <div class="cart tax total"
+                                 data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                            <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+                        </div>
+                    <?php endif; ?>
                 <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-                </div>
-            <?php endif; ?>
+                <?php $cols++; ?>
+            </td>
         <?php endif; ?>
-    </td>
     <?php endif; ?>
-<?php endif; ?>
-    <td class="a-center">
-        <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" />
-    </td>
+        <td class="col qty">
+            <div class="control qty">
+                <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" type="text" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{required:true,'validate-greater-than-zero':true}"/>
+            </div>
+            <?php $cols++; ?>
+        </td>
     <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
+        <td class="col subtotal excl tax">
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+            <?php else: ?>
+                <span class="cart price">
+            <?php endif; ?>
 
-        <?php if ($canApplyMsrp): ?>
-            <span class="cart-msrp-subtotal">--</span>
-        <?php else: ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+            <?php if ($canApplyMsrp): ?>
+                <span class="cart msrp subtotal">--</span>
             <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+                <?php else: ?>
+                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+                <?php endif; ?>
             <?php endif; ?>
-        <?php endif; ?>
 
-        </div>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+            </span>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
 
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-            </div>
+                <div class="cart tax info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php endif; ?>
+                </div>
 
             <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                </div>
+                    <div class="cart tax total"
+                         data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                        <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
+                    </div>
+                <?php endif; ?>
             <?php endif; ?>
-        <?php endif; ?>
-    </td>
+            <?php $cols++; ?>
+        </td>
     <?php endif; ?>
     <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-        <?php if ($canApplyMsrp): ?>
-            <span class="cart-msrp-subtotal">--</span>
-        <?php else: ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+        <td class="col subtotal incl tax">
+            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
             <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+                <span class="cart price">
             <?php endif; ?>
-        <?php endif; ?>
-
-        </div>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
+                <?php if ($canApplyMsrp): ?>
+                    <span class="cart msrp subtotal">--</span>
+                <?php else: ?>
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+                    <?php else: ?>
+                        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+                    <?php endif; ?>
                 <?php endif; ?>
-            </div>
+            </span>
 
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+                <div class="cart tax info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+                        <?php endforeach; ?>
+                    <?php endif; ?>
                 </div>
+
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+                    <div class="cart tax total"
+                         data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                        <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+                    </div>
+                <?php endif; ?>
             <?php endif; ?>
-        <?php endif; ?>
-    </td>
+            <?php $cols++; ?>
+        </td>
     <?php endif; ?>
-    <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo __('Remove Item')?>" class="btn-remove btn-remove2"><?php echo __('Remove Item') ?></a></td>
-</tr>
+    </tr>
+    <tr class="item actions">
+        <td colspan="<?php echo $cols;?>">
+            <div class="actions">
+                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
+                    <?php if ($isVisibleProduct): ?>
+                        <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="use-ajax action towishlist">
+                            <span><?php echo __('Move to Wishlist'); ?></span>
+                        </a>
+                    <?php endif ?>
+                <?php endif ?>
+                <?php if ($isVisibleProduct): ?>
+                    <a class="action edit" href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><span><?php echo __('Edit') ?></span></a>
+                <?php endif ?>
+                <a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo __('Remove item')?>" class="action delete"><span><?php echo __('Remove item')?></span></a>
+            </div>
+        </td>
+    </tr>
+</tbody>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml
index 374f81e2c63ffbb1c40c354af2e6b8ab7d897e66..b73e8678748427a809101d3a9308b16b2d627ead 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml
@@ -18,40 +18,39 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
-<!-- item custom options -->
-<?php if ($_options = $this->getOptionList()):?>
-<dl class="item-options">
-    <?php foreach ($_options as $_option) : ?>
-    <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-    <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-        <?php if (isset($_formatedOptionValue['full_view'])): ?>
-        <div class="truncated_full_value">
-            <dl class="item-options">
+<div class="product details">
+    <strong class="product name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong>
+    <?php if ($_options = $this->getOptionList()): ?>
+        <dl class="item options">
+            <?php foreach ($_options as $_option) : ?>
+                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
                 <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-            </dl>
-        </div>
-        <?php endif; ?>
-    </dd>
-    <?php endforeach; ?>
-</dl>
-<?php endif;?>
-<!-- / -->
-    <!-- downloadable -->
+                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
+                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                        <dl class="item options">
+                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                        </dl>
+                    <?php endif; ?>
+                </dd>
+            <?php endforeach; ?>
+        </dl>
+    <?php endif; ?>
+    <?php /* downloadable */ ?>
     <?php if ($links = $this->getLinks()): ?>
-    <dl class="item-options">
-        <dt><?php echo $this->getLinksTitle() ?></dt>
-        <?php foreach ($links as $link): ?>
-            <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
-        <?php endforeach; ?>
-    </dl>
+        <dl class="item options">
+            <dt><?php echo $this->getLinksTitle() ?></dt>
+            <?php foreach ($links as $link): ?>
+                <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
+            <?php endforeach; ?>
+        </dl>
+    <?php endif; ?>
+    <?php /* EOF downloadable */ ?>
+    <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()): ?>
+        <?php echo $addtInfoBlock->setItem($this->getItem())->toHtml() ?>
     <?php endif; ?>
-    <!-- EOF downloadable -->
+</div>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml
index cdbdcffdae09f6f7259affc7e3e980efc6b7def2..c9889e3e48be98f11c451b415e20970da7f94662 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml
@@ -18,229 +18,226 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php $_item = $this->getItem()?>
 <tr>
-    <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
-        <!-- item custom options -->
+    <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($this->getProductName()) ?></strong>
         <?php if ($_options = $this->getOptionList()):?>
-        <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
-            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                <div class="truncated_full_value">
-                    <dl class="item-options">
-                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                    </dl>
-                </div>
-                <?php endif; ?>
-            </dd>
-            <?php endforeach; ?>
-        </dl>
+            <dl class="review item options">
+                <?php foreach ($_options as $_option) : ?>
+                    <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                    <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
+                        <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                            <div class="truncated_full_value">
+                                <dl class="item options">
+                                    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                    <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                </dl>
+                            </div>
+                        <?php endif; ?>
+                    </dd>
+                <?php endforeach; ?>
+            </dl>
         <?php endif;?>
         <?php if ($links = $this->getLinks()): ?>
-        <dl class="item-options">
-            <dt><?php echo $this->getLinksTitle() ?></dt>
-            <?php foreach ($links as $link): ?>
-                <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
-            <?php endforeach; ?>
-        </dl>
+            <dl class="review item options">
+                <dt><?php echo $this->getLinksTitle() ?></dt>
+                <?php foreach ($links as $link): ?>
+                    <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
+                <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
-        <!-- EOF downloadable -->
+        <?php /* EOF downloadable */ ?>
+        <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
+            <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
+        <?php endif;?>
     </td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+    <td class="col price excl tax">
         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+        <span class="cart tax total"
+              data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
         <?php else: ?>
-            <div class="cart-price">
+            <span class="cart price">
         <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-            <?php endif; ?>
-
-        </div>
-
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
+        <?php else: ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+        <?php endif; ?>
+        </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+            <div class="cart tax info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small><br />
                     <?php endforeach; ?>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php endif; ?>
             </div>
 
             <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
+                <div class="cart tax total"
+                     data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                    <?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
                 </div>
             <?php endif; ?>
         <?php endif; ?>
     </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
+<?php endif; ?>
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+    <td class="col price incl tax">
         <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+        <span class="cart tax total"
+              data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
         <?php else: ?>
-            <div class="cart-price">
+            <span class="cart price">
         <?php endif; ?>
 
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-            <?php endif; ?>
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+        <?php else: ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
+        <?php endif; ?>
 
-        </div>
+        </span>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+            <div class="cart tax info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small><br />
                     <?php endforeach; ?>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php endif; ?>
             </div>
 
             <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+                <div class="cart tax total"
+                     data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                    <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
                 </div>
             <?php endif; ?>
         <?php endif; ?>
     </td>
-    <?php endif; ?>
-    <td class="a-center"><?php echo $_item->getQty() ?></td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
+<?php endif; ?>
+    <td class="col qty"><span class="qty"><?php echo $_item->getQty() ?></span></td>
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+    <td class="col subtotal excl tax">
         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+        <span class="cart tax total"
+              data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
         <?php else: ?>
-            <div class="cart-price">
+        <span class="cart price">
         <?php endif; ?>
 
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-        </div>
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+        <?php else: ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+        <?php endif; ?>
+        </span>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+            <div class="cart tax info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small><br />
                     <?php endforeach; ?>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php endif; ?>
             </div>
-
             <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
+                <div class="cart tax total"
+                     data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                    <?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
                 </div>
             <?php endif; ?>
         <?php endif; ?>
     </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
+<?php endif; ?>
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+    <td class="col subtotal incl tax">
         <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+        <span class="cart tax total"
+              data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
         <?php else: ?>
-            <div class="cart-price">
+            <span class="cart price">
         <?php endif; ?>
 
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            <?php endif; ?>
-
-        </div>
-
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+        <?php else: ?>
+            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+        <?php endif; ?>
+        </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+            <div class="cart tax info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small><br />
                     <?php endforeach; ?>
                 <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
                     <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?><br />
+                        <?php endforeach; ?>
                     </small>
                 <?php endif; ?>
             </div>
 
             <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+                <div class="cart tax total"
+                     data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+                    <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
                 </div>
             <?php endif; ?>
         <?php endif; ?>
     </td>
-    <?php endif; ?>
+<?php endif; ?>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml
index ab901cfed25cefedea1b2c13b02cbaeedfaf8547..6c6367c6a8fd260a71a180543c562916d58b5cb7 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Downloadable/view/frontend/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/customer/products/list.phtml
index 737fb159424b09e502dec84d6c2414f2ef875243..4e6157bf2eb9d02eaa9cd35d577738d653f119d0 100644
--- a/app/code/Magento/Downloadable/view/frontend/customer/products/list.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/customer/products/list.phtml
@@ -18,57 +18,59 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
 /**
- * @see \Magento\Downloadable\Block\Customer\Products\ListProducts
+ * @var $this \Magento\Downloadable\Block\Customer\Products\ListProducts
  */
 ?>
 <?php $_items = $this->getItems(); ?>
-<div class="page-title">
-    <h1><?php echo __('My Downloadable Products') ?></h1>
+<div class="downloadable products toolbar">
+    <?php echo $this->getChildHtml('pager'); ?>
 </div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php echo $this->getChildHtml('pager'); ?>
 <?php if(count($_items)): ?>
-    <table class="data-table" id="my-downloadable-products-table">
-        <col width="1" />
-        <col width="1" />
-        <col />
-        <col width="1" />
-        <col width="1" />
+    <table id="my-downloadable-products-table" class="data table downloadable products">
         <thead>
             <tr>
-                <th><?php echo __('Order #') ?></th>
-                <th><?php echo __('Date') ?></th>
-                <th><?php echo __('Title') ?></th>
-                <th><?php echo __('Status') ?></th>
-                <th><span class="nobr"><?php echo __('Remaining Downloads') ?></span></th>
+                <th class="col id"><?php echo __('Order #') ?></th>
+                <th class="col date"><?php echo __('Date') ?></th>
+                <th class="col title"><?php echo __('Title') ?></th>
+                <th class="col status"><?php echo __('Status') ?></th>
+                <th class="col remaining"><?php echo __('Remaining Downloads') ?></th>
             </tr>
         </thead>
         <tbody>
-            <?php $_odd = ''; ?>
-            <?php foreach ($_items as $_item): ?>
-                <tr>
-                    <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo __('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
-                    <td><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
-                    <td><?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo __('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()) ?></a></td>
-                    <td><em><?php echo __(ucfirst($_item->getStatus())) ?></em></td>
-                    <td><?php echo $this->getRemainingDownloads($_item) ?></td>
-                </tr>
-            <?php endforeach; ?>
+        <?php foreach ($_items as $_item): ?>
+            <tr>
+                <td class="col id">
+                    <a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo __('View Order') ?>">
+                        <?php echo $_item->getPurchased()->getOrderIncrementId() ?>
+                    </a>
+                </td>
+                <td class="col date"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
+                <td class="col title">
+                    <?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo __('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()) ?></a>
+                </td>
+                <td class="col status"><?php echo __(ucfirst($_item->getStatus())) ?></td>
+                <td class="col remaining"><?php echo $this->getRemainingDownloads($_item) ?></td>
+            </tr>
+        <?php endforeach; ?>
         </tbody>
     </table>
-    <script type="text/javascript">(function($) {$('#my-downloadable-products-table').decorate('table')})(jQuery)</script>
 <?php else: ?>
-    <p><?php echo __('You have not purchased any downloadable products.'); ?></p>
+    <p class="empty"><?php echo __('You have not purchased any downloadable products yet.'); ?></p>
 <?php endif; ?>
-<?php echo $this->getChildHtml('pager'); ?>
-<div class="buttons-set">
-    <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
+<div class="downloadable products toolbar">
+    <?php echo $this->getChildHtml('pager'); ?>
 </div>
+
+<div class="actions">
+    <div class="secondary">
+        <a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="action back">
+            <span><?php echo __('Back') ?></span>
+        </a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Downloadable/view/frontend/downloadable.js b/app/code/Magento/Downloadable/view/frontend/downloadable.js
index 9d125c4e47926b5030cb94f04f12c7abdd7a4e93..9373fe88260d10c352aa3a27a1996b7cd6deaee2 100644
--- a/app/code/Magento/Downloadable/view/frontend/downloadable.js
+++ b/app/code/Magento/Downloadable/view/frontend/downloadable.js
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    mage downloadable view
- * @package     mage
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
index 1c26d3d58ae463f6e99b4be137ad4fc3a6c6d8ca..a476967ac50ac4df74a44a09e50911f14850455c 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
@@ -24,12 +24,12 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
+    <referenceContainer name="product.info.type">
         <block class="Magento\Downloadable\Block\Catalog\Product\View\Type" name="product.info.downloadable" as="product_type_data" template="catalog/product/type.phtml">
             <block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml"/>
             <block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" name="product.info.downloadable.extra" as="product_type_data_extra" template="stockqty/default.phtml"/>
         </block>
-    </referenceBlock>
+    </referenceContainer>
     <referenceBlock name="product.info.options.wrapper">
         <block class="Magento\Downloadable\Block\Catalog\Product\Links" name="product.info.downloadable.options" as="type_downloadable_options" before="-" template="catalog/product/links.phtml"/>
     </referenceBlock>
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
index 87ee2ecd428c1c450d3b87647f75b63437b05c2d..b8f5e1921341cf9a3c32bfb8d274f367d76dbab9 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="checkout.cart">
+    <referenceBlock name="checkout.cart.form">
         <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="checkout/cart/item/default.phtml"/>
     </referenceBlock>
 </layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml b/app/code/Magento/Downloadable/view/frontend/layout/default.xml
similarity index 89%
rename from app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/default.xml
index b8f5e1921341cf9a3c32bfb8d274f367d76dbab9..54612da7f8238ead9514dc4a96c60ab4e7ceedd2 100644
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/default.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="checkout.cart.form">
-        <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="checkout/cart/item/default.phtml"/>
+    <referenceBlock name="minicart">
+        <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="Magento_Checkout::cart/sidebar/default.phtml"/>
     </referenceBlock>
 </layout>
diff --git a/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml
index 738e4d15f4981a32e9b4945905078c081ecff8af..def0cc439758e22b364399ddd01e3571d895534d 100644
--- a/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -29,227 +27,228 @@
 <?php $_item = $this->getItem() ?>
 <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
 <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
+    <td class="col name">
+        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
+            <dl class="item options">
+                <?php foreach ($_options as $_option) : ?>
+                    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                    <?php if (!$this->getPrintStatus()): ?>
+                        <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
+                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                <div class="truncated_full_value">
+                                    <dl class="item options">
+                                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                    </dl>
+                                </div>
+                            <?php endif; ?>
+                        </dd>
+                    <?php else: ?>
+                        <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
                     <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+                <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
-
-        <!-- downloadable -->
+        <?php /* downloadable */?>
         <?php if ($links = $this->getLinks()): ?>
-            <dl class="item-options">
+            <dl class="item options">
                 <dt><?php echo $this->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
-        <!-- EOF downloadable -->
+        <?php /* EOF downloadable */?>
 
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
-            <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId() ?>"><?php echo __('Gift Message') ?></a>
+            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="action show"
+               aria-controls="order-item-gift-message-<?php echo $_item->getId() ?>"
+               data-item-id="<?php echo $_item->getId() ?>"><?php echo __('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="a-right nowrap">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+    <td  class="col sku"><?php echo $this->prepareSku($this->getSku()) ?></td>
+    <td class="col price">
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+            <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+        <?php else: ?>
+            <span class="cart price">
+        <?php endif; ?>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+        <?php else: ?>
+            <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
+        <?php endif; ?>
+        </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+            <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+                    <?php endforeach; ?>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                        <?php endforeach; ?>
+                    </small>
                 <?php endif; ?>
             </span>
-            <br />
+
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                    <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+                </span>
+            <?php endif; ?>
         <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+        </span>
+        <br />
+        <?php endif; ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+            <span class="price incl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
+            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+                <span class="cart price">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+            <?php else: ?>
+                <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
+            <?php endif; ?>
+            </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
+                        </small>
                     <?php endif; ?>
+                </span>
+
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
             </span>
         <?php endif; ?>
     </td>
-    <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
-    <td class="a-right nowrap">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+    <td class="col qty"><?php echo $_item->getQty()*1 ?></td>
+    <td class="col subtotal">
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+        <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+            <span class="cart price">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+            <?php else: ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
+            <?php endif; ?>
+            </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
+                        </small>
+                    <?php endif; ?>
                     </span>
 
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
             </span>
             <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+            <span class="price incl tax">
+                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <span class="cart price">
                     <?php endif; ?>
                         <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -258,52 +257,50 @@
                 <?php endif; ?>
                 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
+                <span class="cart price">
                 <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
+                <?php endif; ?>
+            </span>
 
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
+                        </small>
                     <?php endif; ?>
+                </span>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                    </span>
                 <?php endif; ?>
-
-            </span>
+            <?php endif; ?>
+        </span>
         <?php endif; ?>
     </td>
-    <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-    <td class="last a-right">
+    <td class="col discount"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
+    <td class="cot total">
         <?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml
index 9da5814e059c1c87e305240d9abd9a7c58c21157..e7e668b66327a2711efee89a191e47b2348dc229 100644
--- a/app/code/Magento/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -28,282 +26,283 @@
 ?>
 <?php $_item = $this->getItem() ?>
 <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
+<tr id="order-item-row-<?php echo $_item->getId() ?>">
+    <td class="col name">
+        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
+            <dl class="item options">
+                <?php foreach ($_options as $_option) : ?>
+                    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                    <?php if (!$this->getPrintStatus()): ?>
+                        <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
+                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                <div class="truncated_full_value">
+                                    <dl class="item options">
+                                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                    </dl>
+                                </div>
+                            <?php endif; ?>
+                        </dd>
+                    <?php else: ?>
+                        <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
                     <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+                <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
-
-        <!-- downloadable -->
+        <?php /* downloadable */ ?>
         <?php if ($links = $this->getLinks()): ?>
-            <dl class="item-options">
+            <dl class="item options">
                 <dt><?php echo $this->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
-        <!-- EOF downloadable -->
-
+        <?php /* EOF downloadable */ ?>
+        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addInfoBlock) :?>
+            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
-            <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId() ?>"><?php echo __('Gift Message') ?></a>
+            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="action show"
+               aria-controls="order-item-gift-message-<?php echo $_item->getId() ?>"
+               data-item-id="<?php echo $_item->getId() ?>"><?php echo __('Gift Message') ?></a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="a-right nowrap">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+    <td class="col sku"><?php echo $this->prepareSku($this->getSku()) ?></td>
+    <td class="col price">
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+            <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+            <span class="cart price">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+            <?php else: ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
+            <?php endif; ?>
+            </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                      style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
+                        </small>
                     <?php endif; ?>
+                </span>
+
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
             </span>
             <br />
         <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+            <span class="price incl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
+            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+            <span class="cart price">
+        <?php endif; ?>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+        <?php else: ?>
+            <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
+        <?php endif; ?>
+        </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
+        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+            <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+                    <?php endforeach; ?>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                        <?php endforeach; ?>
+                    </small>
                 <?php endif; ?>
             </span>
+
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                    <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+                </span>
+            <?php endif; ?>
+        <?php endif; ?>
+        </span>
         <?php endif; ?>
     </td>
-    <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
-        <td class="a-right nowrap">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+    <td class="col qty">
+        <span class="qty summary"><?php echo $_item->getQty()*1 ?></span>
+    </td>
+    <td class="col subtotal">
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+        <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
+                <?php endif; ?>
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+            <span class="cart price">
+            <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
                 <?php else: ?>
-                    <span class="cart-price">
+                    <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
                 <?php endif; ?>
+            </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
+                        </small>
                     <?php endif; ?>
+                </span>
+
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
             </span>
             <br />
         <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+        <span class="price incl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
+                <?php endif; ?>
+            <?php endif; ?>
+            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
+                <span class="cart price">
                 <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
+                <?php endif; ?>
+            </span>
 
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info"
+                      id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                      style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
+                        </small>
                     <?php endif; ?>
-                <?php endif; ?>
-
-
+                </span>
 
-            </span>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                    </span>
+                <?php endif; ?>
+            <?php endif; ?>
+        </span>
         <?php endif; ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml
index 81aa14f43a9a2b32858aac9a6732d99384e56274..150b23ea60029393dcd0dc1dae7cd21dcb705cda 100644
--- a/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml
@@ -18,8 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,305 +25,311 @@
 /** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
 ?>
 <?php $_item = $this->getItem() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
+<tr id="order-item-row-<?php echo $_item->getId() ?>">
+    <td class="col name">
+        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
         <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
+            <dl class="item options">
+                <?php foreach ($_options as $_option) : ?>
+                    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                    <?php if (!$this->getPrintStatus()): ?>
+                        <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
+                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                                <div class="truncated_full_value">
+                                    <dl class="item options">
+                                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                                    </dl>
+                                </div>
+                            <?php endif; ?>
+                        </dd>
+                    <?php else: ?>
+                        <dd>
+                            <?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
+                        </dd>
                     <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+                <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
-
-        <!-- downloadable -->
+        <?php /* downloadable */ ?>
         <?php if ($links = $this->getLinks()): ?>
-            <dl class="item-options">
+            <dl class="item options">
                 <dt><?php echo $this->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
-        <!-- EOF downloadable -->
-
+        <?php /* EOF downloadable */ ?>
+        <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+        <?php if ($addtInfoBlock) :?>
+            <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
+        <?php endif; ?>
         <?php echo $this->escapeHtml($_item->getDescription()) ?>
         <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
-            <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId() ?>"><?php echo __('Gift Message') ?></a>
+            <a href="#"
+               id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
+               class="action show"
+               aria-controls="order-item-gift-message-<?php echo $_item->getId()?>"
+               data-item-id="<?php echo $_item->getId()?>">
+                <?php echo __('Gift Message') ?>
+            </a>
         <?php endif; ?>
     </td>
-    <td><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="a-right nowrap">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+    <td class="col sku"><?php echo $this->prepareSku($this->getSku()) ?></td>
+    <td class="col price">
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+            <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+            <span class="cart price">
+            <?php endif; ?>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+            <?php else: ?>
+                <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
+            <?php endif; ?>
+            </span>
 
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                      style="display:none;">
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+                    <?php endforeach; ?>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php endif; ?>
                 </span>
 
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
                     </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
                 <?php endif; ?>
+            <?php endif; ?>
             </span>
             <br />
         <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+            <span class="price incl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
+            <?php endif; ?>
+            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+                <span class="cart price">
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+            <?php else: ?>
+                <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
+            <?php endif; ?>
+            </span>
 
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                      style="display:none;">
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                        <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+                    <?php endforeach; ?>
+                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <small>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+                        <?php endforeach; ?>
+                    </small>
+                <?php endif; ?>
+            </span>
 
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                    <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
                 </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
+            <?php endif; ?>
+            <?php endif; ?>
             </span>
         <?php endif; ?>
     </td>
-    <td class="a-right nowrap">
-        <span class="nobr">
-                <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
-            <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyShipped() > 0): ?>
-            <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
-            <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
-            <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
-        <?php endif; ?>
+    <td class="col qty">
+        <span class="qty summary">
+            <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
+                <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
+            <?php endif; ?>
+            <?php if ($this->getItem()->getQtyShipped() > 0): ?>
+                <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
+            <?php endif; ?>
+            <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
+                <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
+            <?php endif; ?>
+            <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
+                <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
+            <?php endif; ?>
         </span>
     </td>
-    <td class="a-right nowrap">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
+    <td class="col subtotal">
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+        <span class="price excl tax">
+            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart price">
                 <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
+                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+                <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    </span>
                 <?php endif; ?>
-
+            <?php endif; ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <span class="cart tax total"
+                  data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php else: ?>
+                <span class="cart price">
+            <?php endif; ?>
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
                     <?php else: ?>
                         <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
                     <?php endif; ?>
-
                 </span>
 
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
+                <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                      style="display:none;">
+                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
                             <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
+                        </small>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                            <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+                        <?php endforeach; ?>
+                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <small>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+                                <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
                             <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
+                        </small>
                     <?php endif; ?>
+                </span>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <span class="cart tax total"
+                          data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                        <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+                    </span>
                 <?php endif; ?>
-            </span>
-            <br />
+            <?php endif; ?>
+        </span>
+        <br />
         <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+            <span class="price incl tax">
+                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                        <span class="cart price">
                     <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+                    <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
                     <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
+            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                <span class="cart tax total"
+                      data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
                 <?php else: ?>
-                    <span class="cart-price">
+                <span class="cart price">
+                <?php endif; ?>
+                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+                <?php else: ?>
+                    <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
                 <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
                 </span>
 
-
                 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+                    <span class="cart tax info"
+                          id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+                          style="display:none;">
                         <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+                                <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
                             <?php endforeach; ?>
                         <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
                             <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
+                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+                                    <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+                                <?php endforeach; ?>
                             </small>
                         <?php endif; ?>
                     </span>
 
                     <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
+                        <span class="cart tax total"
+                              data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+                            <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
                         </span>
                     <?php endif; ?>
                 <?php endif; ?>
-
-
-
             </span>
         <?php endif; ?>
     </td>
-    <!--
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
-    <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
-    <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
-    <?php endif; ?>
-    -->
+    <?php /*
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+        <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
+        <?php endif; ?>
+        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+        <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
+        <?php endif; ?>
+    */ ?>
 </tr>
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 3321db97b453401798f250a78b7a43c65347c399..c9fb0a1332b72ebac34b4332e7f302a947e02329 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Eav\Block\Adminhtml\Attribute\Edit;
 
-class Js extends \Magento\Adminhtml\Block\Template
+class Js extends \Magento\Backend\Block\Template
 {
     protected $_template = 'attribute/edit/js.phtml';
 }
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
index 501864983b6773de9c256a74c89348a315ae2f27..8aab043bd8ba3e92c3a2714bf172d737c5ab0a6d 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
@@ -203,7 +203,7 @@ class Options extends \Magento\Backend\Block\Template
 
         foreach ($this->getStores() as $store) {
             $storeId = $store->getId();
-            $value['store' . $storeId] = $storeId == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+            $value['store' . $storeId] = $storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID
                 ? $valuePrefix . $this->escapeHtml($option['label'])
                 : '';
         }
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 4602cbe313a7dcde67cb0d3f680d00dafd8d24d6..3c9156d0d3f196b2490361883f04cd3599373e0e 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -320,7 +320,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
     }
 
     /**
-     * Retreive table name
+     * Retrieve table name
      *
      * @param string $alias
      * @return string
@@ -549,7 +549,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
     }
 
     /**
-     * Retreive partial load flag
+     * Retrieve partial load flag
      *
      * @param boolean $flag
      * @return boolean
@@ -564,7 +564,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
     }
 
     /**
-     * Retreive partial save flag
+     * Retrieve partial save flag
      *
      * @param boolean $flag
      * @return boolean
@@ -1000,7 +1000,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
     }
 
     /**
-     * Retreive default source model
+     * Retrieve default source model
      *
      * @return string
      */
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 913425b1f828484744387a3c0690ec188dda55d7..90fcd088d755936f73d453ef3331fe4c0080a0bb 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -395,14 +395,12 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
             return $this->getData('store_label');
         }
         $store = $this->_storeManager->getStore($storeId);
-        $label = false;
-        if (!$store->isAdmin()) {
-            $labels = $this->getStoreLabels();
-            if (isset($labels[$store->getId()])) {
-                return $labels[$store->getId()];
-            }
+        $labels = $this->getStoreLabels();
+        if (isset($labels[$store->getId()])) {
+            return $labels[$store->getId()];
+        } else {
+            return $this->getFrontendLabel();
         }
-        return $this->getFrontendLabel();
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index e33c05a0844373f1653f9308ffe7d489a1cd9c84..e08de73638a2aab5a744e0590d3a0cf9d49e746f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -88,7 +88,7 @@ abstract class AbstractFrontend
     }
 
     /**
-     * Retreive lable
+     * Retrieve lable
      *
      * @return string
      */
@@ -103,7 +103,7 @@ abstract class AbstractFrontend
     }
 
     /**
-     * Retreive attribute value
+     * Retrieve attribute value
      *
      * @param $object
      * @return mixed
@@ -226,7 +226,7 @@ abstract class AbstractFrontend
     }
 
     /**
-     * Retreive option by option id
+     * Retrieve option by option id
      *
      * @param int $optionId
      * @return mixed|boolean
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
index 20fea14ef0b7fa9ca98ce05060abb53e26444182..642fd87e6f7dd1a1ee9ab911a9235b6614f26f21 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -47,7 +47,7 @@ class Datetime extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFron
     }
 
     /**
-     * Retreive attribute value
+     * Retrieve attribute value
      *
      * @param $object
      * @return mixed
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 12ef2eb3f7bdccb41d1727b8fc86426e4290adb2..5fcd87e6ff2a2e5f957f1f4f978a83a248b9625a 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -955,7 +955,7 @@ abstract class AbstractCollection extends \Magento\Data\Collection\Db
     }
 
     /**
-     * Retrive all ids for collection
+     * Retrieve all ids for collection
      *
      * @param null|int|string $limit
      * @param null|int|string $offset
@@ -1051,7 +1051,7 @@ abstract class AbstractCollection extends \Magento\Data\Collection\Db
     }
 
     /**
-     * Retreive row id field name
+     * Retrieve row id field name
      *
      * @return string
      */
@@ -1257,7 +1257,7 @@ abstract class AbstractCollection extends \Magento\Data\Collection\Db
     }
 
     /**
-     * Retreive attribute field name by attribute code
+     * Retrieve attribute field name by attribute code
      *
      * @param string $attributeCode
      * @return string
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index 5e2b6b72e7ff41390f4682125d1d2a6a4bc2d2aa..7623c79d310e409540979a88e4b523cad9262324 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -180,7 +180,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Init and retreive attribute collection
+     * Init and retrieve attribute collection
      *
      * @return \Magento\Eav\Model\Resource\Entity\Attribute\Collection
      */
@@ -210,7 +210,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive new incrementId
+     * Retrieve new incrementId
      *
      * @param int $storeId
      * @return string
@@ -265,7 +265,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive entity id field
+     * Retrieve entity id field
      *
      * @return string|null
      */
@@ -275,7 +275,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive entity table name
+     * Retrieve entity table name
      *
      * @return string|null
      */
@@ -326,7 +326,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive entity type id
+     * Retrieve entity type id
      *
      * @return string|null
      */
@@ -336,7 +336,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive entity type code
+     * Retrieve entity type code
      *
      * @return string|null
      */
@@ -346,7 +346,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive attribute codes
+     * Retrieve attribute codes
      *
      * @return array|null
      */
@@ -370,7 +370,7 @@ class Type extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive resource entity object
+     * Retrieve resource entity object
      *
      * @return \Magento\Core\Model\Resource\AbstractResource
      */
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
index 4271128a2476dcce32b26299494479d9be1ee2fd..21f76a0340897bfb6794e20f469b796c294fb5a9 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
@@ -566,7 +566,7 @@ class Attribute extends \Magento\Core\Model\Resource\Db\AbstractDb
             ." AND %s.store_id = %d";
         $joinCondition = sprintf($joinConditionTemplate,
             'e', 't1', 't1', 't1', 't1',
-            \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+            \Magento\Core\Model\Store::DEFAULT_STORE_ID);
         if ($attribute->getFlatAddChildData()) {
             $joinCondition .= ' AND e.child_id = t1.entity_id';
         }
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php
index 87185c010768c8925582725d54783c0b992f9bdf..b8c8605b3632d65cb44b21fc0346c251d9c0e110 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php
@@ -103,7 +103,7 @@ class Group extends \Magento\Core\Model\Resource\Db\AbstractDb
     }
 
     /**
-     * Retreive max sort order
+     * Retrieve max sort order
      *
      * @param \Magento\Core\Model\AbstractModel $object
      * @return int
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php
index c5845df695bad57a75a7869287d551254a530159..54c7cc8e11c3ac7ca601937adde5d8518057abca 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php
@@ -100,7 +100,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
             . " AND %s.attribute_id = " . $attribute->getId()
             . " AND %s.store_id = %d";
         $joinCondition = sprintf($joinConditionTemplate, 'e', 't1', 't1', 't1', 't1',
-            \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+            \Magento\Core\Model\Store::DEFAULT_STORE_ID);
         if ($attribute->getFlatAddChildData()) {
             $joinCondition .= ' AND e.child_id = t1.entity_id';
         }
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
index a30afd562b9f1d0c2a934396d2986a2127695e00..5282d3053f9da34884015ca240f989911baba01f 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
@@ -278,18 +278,14 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
 
 
         // add store attribute label
-        if ($store->isAdmin()) {
-            $select->columns(array('store_label' => 'ea.frontend_label'));
-        } else {
-            $storeLabelExpr = $connection->getCheckSql('al.value IS NULL', 'ea.frontend_label', 'al.value');
-            $joinExpression = $connection
-                ->quoteInto('al.attribute_id = main_table.attribute_id AND al.store_id = ?', (int)$store->getId());
-            $select->joinLeft(
-                array('al' => $this->getTable('eav_attribute_label')),
-                $joinExpression,
-                array('store_label' => $storeLabelExpr)
-            );
-        }
+        $storeLabelExpr = $connection->getCheckSql('al.value IS NULL', 'ea.frontend_label', 'al.value');
+        $joinExpression = $connection
+            ->quoteInto('al.attribute_id = main_table.attribute_id AND al.store_id = ?', (int)$store->getId());
+        $select->joinLeft(
+            array('al' => $this->getTable('eav_attribute_label')),
+            $joinExpression,
+            array('store_label' => $storeLabelExpr)
+        );
 
         // add entity type filter
         $select->where('ea.entity_type_id = ?', (int)$entityType->getId());
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
index 4ecc292e8b78bd4b75f919a79d1ec38023710dd5..aee0059cacfa375f5ad227e97d8a2c915b4b40fb 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -34,7 +34,7 @@
 
 namespace Magento\Email\Block\Adminhtml;
 
-class Template extends \Magento\Adminhtml\Block\Template
+class Template extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'template/list.phtml';
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index b9d05532fe5c728ec2f2846f1247027e5ea3d6e9..82deb06e4d2ca58405f7703f006ead322e641770 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -336,7 +336,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive email template model
+     * Retrieve email template model
      *
      * @return \Magento\Email\Model\Template
      */
@@ -392,7 +392,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Convert xml config pathes to decorated names
+     * Convert xml config paths to decorated names
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @param array $paths
diff --git a/app/code/Magento/Email/Model/Resource/Template.php b/app/code/Magento/Email/Model/Resource/Template.php
index b7f07521946db670f989bd0c51ecd798ea35ebe6..382c6a8c5a7dc85dfa5e707e0a358915ebc38ec8 100644
--- a/app/code/Magento/Email/Model/Resource/Template.php
+++ b/app/code/Magento/Email/Model/Resource/Template.php
@@ -127,7 +127,7 @@ class Template extends \Magento\Core\Model\Resource\Db\AbstractDb
     }
 
     /**
-     * Retrieve config scope and scope id of specified email template by email pathes
+     * Retrieve config scope and scope id of specified email template by email paths
      *
      * @param array $paths
      * @param int|string $templateId
@@ -136,13 +136,13 @@ class Template extends \Magento\Core\Model\Resource\Db\AbstractDb
     public function getSystemConfigByPathsAndTemplateId($paths, $templateId)
     {
         $orWhere = array();
-        $pathesCounter = 1;
+        $pathsCounter = 1;
         $bind = array();
         foreach ($paths as $path) {
-            $pathAlias = 'path_' . $pathesCounter;
+            $pathAlias = 'path_' . $pathsCounter;
             $orWhere[] = 'path = :' . $pathAlias;
             $bind[$pathAlias] = $path;
-            $pathesCounter++;
+            $pathsCounter++;
         }
         $bind['template_id'] = $templateId;
         $select = $this->_getReadAdapter()->select()
diff --git a/app/code/Magento/Email/Model/Template/Mailer.php b/app/code/Magento/Email/Model/Template/Mailer.php
index 843a93a564ea77731dd2073d7d14eb287fd15f8b..1a612e2051480e220c4d81e8b67f1b68864431a7 100644
--- a/app/code/Magento/Email/Model/Template/Mailer.php
+++ b/app/code/Magento/Email/Model/Template/Mailer.php
@@ -87,7 +87,7 @@ class Mailer extends \Magento\Object
         // Send all emails from corresponding list
         while (!empty($this->_emailInfos)) {
             $emailInfo = array_pop($this->_emailInfos);
-            // Handle "Bcc" recepients of the current email
+            // Handle "Bcc" recipients of the current email
             $emailTemplate->addBcc($emailInfo->getBccEmails());
             // Set required design parameters and delegate email sending to \Magento\Email\Model\Template
             $designConfig = array(
@@ -172,7 +172,7 @@ class Mailer extends \Magento\Object
     }
 
     /**
-     * Set tempate parameters
+     * Set template parameters
      *
      * @param array $templateParams
      * @return \Magento\Email\Model\Template\Mailer
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
index 2c765dedfc49fcb4458dcd83868296ee010b2903..65cf2850d365ddd186b9e2a89d65dbe215c38db7 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create;
 
-class Form extends \Magento\Adminhtml\Block\Template
+class Form extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Adminhtml\Model\Session\Quote
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
index 499f0706fa3bba068602b2964856209d6d4c88bf..43655d3002a8804528ed4cf18c995ed69e8b654d 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create;
 
-class Giftoptions extends \Magento\Adminhtml\Block\Template
+class Giftoptions extends \Magento\Backend\Block\Template
 {
     /**
      * Get order item object from parent block
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
index d89bab4630119238113bb722b396f76b556251c2..798d57319e6e89a4dc339f8fcce56dd0b1aaf2a9 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create;
 
-class Items extends \Magento\Adminhtml\Block\Template
+class Items extends \Magento\Backend\Block\Template
 {
     /**
      * Get order item
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
index 7e1f7d1d92a17d9715e7a8f7d59c0cb9072f43b7..56816d7e187e8d0ea12f62f5300fcdd607e134a6 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\View;
 
-class Giftoptions extends \Magento\Adminhtml\Block\Template
+class Giftoptions extends \Magento\Backend\Block\Template
 {
     /**
      * Get order item object from parent block
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
index 7131415fe4a1ed7cfc2dbb93f0cad1431ae8312c..8a521ce46f1e9014fe9fae73517f49301c65ac05 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\View;
 
-class Items extends \Magento\Adminhtml\Block\Template
+class Items extends \Magento\Backend\Block\Template
 {
     /**
      * Gift message array
@@ -53,7 +53,7 @@ class Items extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive default value for giftmessage sender
+     * Retrieve default value for giftmessage sender
      *
      * @return string
      */
@@ -71,7 +71,7 @@ class Items extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive default value for giftmessage recipient
+     * Retrieve default value for giftmessage recipient
      *
      * @return string
      */
@@ -99,7 +99,7 @@ class Items extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive real name for field
+     * Retrieve real name for field
      *
      * @param string $name
      * @return string
@@ -110,7 +110,7 @@ class Items extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive real html id for field
+     * Retrieve real html id for field
      *
      * @param string $name
      * @return string
@@ -121,7 +121,7 @@ class Items extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive field html id prefix
+     * Retrieve field html id prefix
      *
      * @return string
      */
@@ -152,7 +152,7 @@ class Items extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive gift message for entity
+     * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
      */
@@ -180,7 +180,7 @@ class Items extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive block html id
+     * Retrieve block html id
      *
      * @return string
      */
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 3ae7a15250c1c4b10c164381e9fed3ba12c94e4c..cf5cd08fab397fcca23bb644c359b9fcaa819d57 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -111,7 +111,7 @@ class Message extends \Magento\Core\Helper\Data
     }
 
     /**
-     * Retrive inline giftmessage edit form for specified entity
+     * Retrieve inline giftmessage edit form for specified entity
      *
      * @param string $type
      * @param \Magento\Object $entity
@@ -222,7 +222,7 @@ class Message extends \Magento\Core\Helper\Data
     }
 
     /**
-     * Retrive escaped and preformated gift message text for specified entity
+     * Retrieve escaped and preformated gift message text for specified entity
      *
      * @param \Magento\Object $entity
      * @return unknown
@@ -237,7 +237,7 @@ class Message extends \Magento\Core\Helper\Data
     }
 
     /**
-     * Retrive gift message for entity. If message not exists return null
+     * Retrieve gift message for entity. If message not exists return null
      *
      * @param \Magento\Object $entity
      * @return \Magento\GiftMessage\Model\Message
@@ -252,7 +252,7 @@ class Message extends \Magento\Core\Helper\Data
     }
 
     /**
-     * Retrive internal cached data with specified key.
+     * Retrieve internal cached data with specified key.
      *
      * If cached data not found return null.
      *
@@ -309,7 +309,7 @@ class Message extends \Magento\Core\Helper\Data
     }
 
     /**
-     * Check availability for multishiping checkout items
+     * Check availability for multishipping checkout items
      *
      * @param array $items
      * @param \Magento\Core\Model\Store|integer $store
@@ -326,7 +326,7 @@ class Message extends \Magento\Core\Helper\Data
     }
 
     /**
-     * Retrive gift message with specified id
+     * Retrieve gift message with specified id
      *
      * @param integer $messageId
      * @return \Magento\GiftMessage\Model\Message
diff --git a/app/code/Magento/GiftMessage/Helper/Url.php b/app/code/Magento/GiftMessage/Helper/Url.php
index cba75c44a40e9ca503b5b9eb45c5599f198581a4..4863f56b99143fc49e8358a070955be2bd630001 100644
--- a/app/code/Magento/GiftMessage/Helper/Url.php
+++ b/app/code/Magento/GiftMessage/Helper/Url.php
@@ -37,7 +37,7 @@ namespace Magento\GiftMessage\Helper;
 class Url extends \Magento\Core\Helper\Url
 {
     /**
-     * Retrive gift message save url
+     * Retrieve gift message save url
      *
      * @param \Magento\Object $item
      * @param string $type
@@ -56,7 +56,7 @@ class Url extends \Magento\Core\Helper\Url
     }
 
     /**
-     * Retrive gift message button block url
+     * Retrieve gift message button block url
      *
      * @param integer $itemId
      * @param string $type
@@ -70,7 +70,7 @@ class Url extends \Magento\Core\Helper\Url
     }
 
     /**
-     * Retrive gift message remove url
+     * Retrieve gift message remove url
      *
      * @param integer $itemId
      * @param string $type
@@ -84,7 +84,7 @@ class Url extends \Magento\Core\Helper\Url
     }
 
     /**
-     * Retrive gift message save url
+     * Retrieve gift message save url
      *
      * @param integer $itemId
      * @param string $type
diff --git a/app/code/Magento/GiftMessage/Model/Observer.php b/app/code/Magento/GiftMessage/Model/Observer.php
index f1e2d302a58d09a4572b8f8aee0de003fb21e21b..9c73a27953419d01a2b8588ff14cfa5a7c9edf67 100644
--- a/app/code/Magento/GiftMessage/Model/Observer.php
+++ b/app/code/Magento/GiftMessage/Model/Observer.php
@@ -91,7 +91,7 @@ class Observer extends \Magento\Object
     /**
      * Operate with gift messages on checkout proccess
      *
-     * @param Varieb_Object $observer
+     * @param Varien_Object $observer
      * @return \Magento\GiftMessage\Model\Observer
      */
     public function checkoutEventCreateGiftMessage($observer)
diff --git a/app/code/Magento/Adminhtml/Model/Giftmessage/Save.php b/app/code/Magento/GiftMessage/Model/Save.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Model/Giftmessage/Save.php
rename to app/code/Magento/GiftMessage/Model/Save.php
index 22a9bfe8aa9bcb4c106bdcc0d5b6625831821a70..099d7bb01cda68f9f027ee3a545dec20642abcd8 100644
--- a/app/code/Magento/Adminhtml/Model/Giftmessage/Save.php
+++ b/app/code/Magento/GiftMessage/Model/Save.php
@@ -32,7 +32,7 @@
  * @package    Magento_Adminhtml
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Model\Giftmessage;
+namespace Magento\GiftMessage\Model;
 
 class Save extends \Magento\Object
 {
@@ -81,7 +81,7 @@ class Save extends \Magento\Object
     /**
      * Save all seted giftmessages
      *
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     public function saveAllInQuote()
     {
@@ -123,7 +123,7 @@ class Save extends \Magento\Object
      *
      * @param integer $entityId
      * @param array $giftmessage
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     protected function _saveOne($entityId, $giftmessage)
     {
@@ -177,7 +177,7 @@ class Save extends \Magento\Object
      *
      * @param \Magento\GiftMessage\Model\Message|null $giftmessageModel
      * @param \Magento\Object $entityModel
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     protected function _deleteOne($entityModel, $giftmessageModel=null)
     {
@@ -195,7 +195,7 @@ class Save extends \Magento\Object
      * Set allowed quote items for gift messages
      *
      * @param array $items
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     public function setAllowQuoteItems($items)
     {
@@ -207,7 +207,7 @@ class Save extends \Magento\Object
      * Add allowed quote item for gift messages
      *
      * @param int $item
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     public function addAllowQuoteItem($item)
     {
@@ -221,7 +221,7 @@ class Save extends \Magento\Object
     }
 
     /**
-     * Retrive allowed quote items for gift messages
+     * Retrieve allowed quote items for gift messages
      *
      * @return array
      */
@@ -235,7 +235,7 @@ class Save extends \Magento\Object
     }
 
     /**
-     * Retrive allowed quote items products for gift messages
+     * Retrieve allowed quote items products for gift messages
      *
      * @return array
      */
@@ -348,7 +348,7 @@ class Save extends \Magento\Object
     }
 
     /**
-     * Retrive mapped type for entity
+     * Retrieve mapped type for entity
      *
      * @param string $type
      * @return string
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
index 41b3d45f7631aaa2768ee2d5e0c3d171f099bfb3..6d03e0138f17f615f0214ac38847161faa4125fe 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
@@ -30,7 +30,7 @@
         </block>
     </referenceBlock>
     <referenceBlock name="items_grid">
-        <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+        <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
             <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
         </block>
     </referenceBlock>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
index 41b3d45f7631aaa2768ee2d5e0c3d171f099bfb3..6d03e0138f17f615f0214ac38847161faa4125fe 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -30,7 +30,7 @@
         </block>
     </referenceBlock>
     <referenceBlock name="items_grid">
-        <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+        <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
             <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
         </block>
     </referenceBlock>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
index 41b3d45f7631aaa2768ee2d5e0c3d171f099bfb3..6d03e0138f17f615f0214ac38847161faa4125fe 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
@@ -30,7 +30,7 @@
         </block>
     </referenceBlock>
     <referenceBlock name="items_grid">
-        <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+        <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
             <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
         </block>
     </referenceBlock>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
index dc4e678ea9b01519fbf5a542d95250b2d10a62c5..8e55cc917a54216cdbac17726aec24b2357e11e1 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
@@ -37,7 +37,7 @@
         </block>
     </referenceBlock>
     <referenceBlock name="order_tab_info">
-        <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+        <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
             <block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\View\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
         </block>
     </referenceBlock>
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
index eb1d9ad3683218958f09f2b64d7f9046ea6a287d..feb6bdeef69c48b6682bda549d9cb8f47ba8255d 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
@@ -34,7 +34,7 @@
  */
 namespace Magento\GoogleShopping\Block\Adminhtml;
 
-class Captcha extends \Magento\Adminhtml\Block\Template
+class Captcha extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'captcha.phtml';
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
index d8099511b1b63ed1b5688d10d8365c48cac28d6c..7ca86bc0a71e33b607f0a8a5521d1c82585f0c03 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
@@ -43,7 +43,7 @@ class Switcher extends \Magento\Backend\Block\Store\Switcher
     protected $_hasDefaultOption = false;
 
     /**
-     * Set overriden params
+     * Set overridden params
      */
     protected function _construct()
     {
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php
index 3f9731d8953f9dfa6aeb1113dace40eb98d521a7..6af7a6169a28cf27bce6d644dbc409914da6fad3 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php
@@ -53,20 +53,20 @@ class Attributes
      */
     protected $_attributeFactory;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\GoogleShopping\Model\Config $config
-     * @param \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\GoogleShopping\Model\Config $config
+     * @param \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\GoogleShopping\Model\Config $config,
-        \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\GoogleShopping\Model\Config $config,
+        \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory,
+        array $data = array()
+    ) {
         $this->_config = $config;
         $this->_attributeFactory = $attributeFactory;
         parent::__construct($context, $coreData, $data);
@@ -159,7 +159,7 @@ class Attributes
      */
     public function getAttributesSelectHtml($escapeJsQuotes = false)
     {
-        $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+        $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
             ->setId($this->getFieldId().'_{{index}}_attribute')
             ->setName($this->getFieldName().'[{{index}}][attribute_id]')
             ->setOptions($this->_getAttributes($this->getAttributeSetId(), $escapeJsQuotes));
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php
index e7d63931a8e8f78cd53ccbd15b847de6bd1b49b9..5c707cabd9797bacdaa41792e675b3eaa4b6934e 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\GoogleShopping\Block\Adminhtml\Types\Edit;
 
-class Select extends \Magento\Adminhtml\Block\Template
+class Select extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'types/edit/select.phtml';
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
index 9d24b46024140cd47345059dab35cbe0ea0bf814..5152d148228a1c9bfe01cb64cc7279c21d412adf 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\ImportExport\Block\Adminhtml\Import\Frame;
 
-class Result extends \Magento\Adminhtml\Block\Template
+class Result extends \Magento\Backend\Block\Template
 {
     /**
      * JavaScript actions for response.
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index d3245b8c867036b7f5898df05594d5d8dc9f538c..da3a2c1b9264e4e1c03c68ba433b21dae4978807 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -254,7 +254,7 @@ abstract class AbstractEav
             $index = in_array($attribute->getAttributeCode(), $this->_indexValueAttributes) ? 'value' : 'label';
 
             // only default (admin) store values used
-            $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+            $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             try {
                 foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index cf8db424bd630fbaa1fbca74e375a9439ea1996c..0f6ca15ecf3b3c348b43f3e45124465b1ee68661 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -397,7 +397,7 @@ abstract class AbstractEntity
             $index = in_array($attribute->getAttributeCode(), $this->_indexValueAttributes) ? 'value' : 'label';
 
             // only default (admin) store values used
-            $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+            $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             try {
                 foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php b/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
index ca57b64cf3862a85943919df69a909cb02626b29..ecb949983b4afb38fb705554805e1b6b858861f2 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
@@ -62,7 +62,7 @@ class Customer
     /**#@-*/
 
     /**
-     * Overriden attributes parameters.
+     * Overridden attributes parameters.
      *
      * @var array
      */
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product.php b/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
index 6fa192e70b7d5c1d933ae9abd58d8f37e95ea58c..7e4d1096c5973497a80eba5d215a79ea9cc2d7f6 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
@@ -734,7 +734,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
         try {
             $collection = $this->_getEntityCollection();
             $validAttrCodes = $this->_getExportAttrCodes();
-            $defaultStoreId  = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+            $defaultStoreId  = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
             $dataRows        = array();
             $rowCategories   = array();
             $rowWebsites     = array();
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php
index 4f18c9587af46af5e146d980b618a2247944c184..52db223c07563d4d73204ca9ced2ecd05564efd5 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php
@@ -36,7 +36,7 @@ namespace Magento\ImportExport\Model\Export\Entity\Product\Type;
 abstract class AbstractType
 {
     /**
-     * Overriden attributes parameters.
+     * Overridden attributes parameters.
      *
      * @var array
      */
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php
index 2ffeeb339384708e4f0bb340dbbbbd9f73a08576..7b72225b3bfe5647d14ed07446852f5c9650bc4b 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php
@@ -37,7 +37,7 @@ class Simple
     extends \Magento\ImportExport\Model\Export\Entity\Product\Type\AbstractType
 {
     /**
-     * Overriden attributes parameters.
+     * Overridden attributes parameters.
      *
      * @var array
      */
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index c64a85c42aa7f4b5faeb6f94250b5adc38dea7a4..260b0a6d564e7bdf2d6550d6ab3433068bfe888d 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -238,7 +238,7 @@ abstract class AbstractEav
             $index = in_array($attribute->getAttributeCode(), $indexAttributes) ? 'value' : 'label';
 
             // only default (admin) store values used
-            $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+            $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             try {
                 foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index 12d8f3a596039633d39e2cd8e9e8e57ac6712d6e..d4e00f3583bd4a6b3829e30aa608c64507a89edd 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -408,7 +408,7 @@ abstract class AbstractEntity
             $index = in_array($attribute->getAttributeCode(), $indexValAttrs) ? 'value' : 'label';
 
             // only default (admin) store values used
-            $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+            $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             try {
                 foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Product.php b/app/code/Magento/ImportExport/Model/Import/Entity/Product.php
index bef3264b42052407757d57ebe4e30a779087eeb8..bbd505dcc83a6f95e826e75505cd7aeabd587875 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Product.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Product.php
@@ -92,6 +92,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     const ERROR_GROUP_PRICE_DATA_INCOMPLETE  = 'groupPriceDataIsIncomplete';
     const ERROR_SKU_NOT_FOUND_FOR_DELETE     = 'skuNotFoundToDelete';
     const ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND = 'superProductsSkuNotFound';
+    const ERROR_MEDIA_DATA_INCOMPLETE        = 'mediaDataIsIncomplete';
 
     /**
      * Pairs of attribute set ID-to-name.
@@ -180,7 +181,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         self::ERROR_INVALID_TIER_PRICE_GROUP     => 'Tier Price customer group ID is invalid',
         self::ERROR_TIER_DATA_INCOMPLETE         => 'Tier Price data is incomplete',
         self::ERROR_SKU_NOT_FOUND_FOR_DELETE     => 'Product with specified SKU not found',
-        self::ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND => 'Product with specified super products SKU not found'
+        self::ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND => 'Product with specified super products SKU not found',
+        self::ERROR_MEDIA_DATA_INCOMPLETE        => 'Media data is incomplete'
     );
 
     /**
@@ -788,23 +790,25 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     protected function _isTierPriceValid(array $rowData, $rowNum)
     {
         if ((isset($rowData['_tier_price_website']) && strlen($rowData['_tier_price_website']))
-                || (isset($rowData['_tier_price_customer_group']) && strlen($rowData['_tier_price_customer_group']))
-                || (isset($rowData['_tier_price_qty']) && strlen($rowData['_tier_price_qty']))
-                || (isset($rowData['_tier_price_price']) && strlen($rowData['_tier_price_price']))
+            || (isset($rowData['_tier_price_customer_group']) && strlen($rowData['_tier_price_customer_group']))
+            || (isset($rowData['_tier_price_qty']) && strlen($rowData['_tier_price_qty']))
+            || (isset($rowData['_tier_price_price']) && strlen($rowData['_tier_price_price']))
         ) {
             if (!isset($rowData['_tier_price_website']) || !isset($rowData['_tier_price_customer_group'])
-                    || !isset($rowData['_tier_price_qty']) || !isset($rowData['_tier_price_price'])
-                    || !strlen($rowData['_tier_price_website']) || !strlen($rowData['_tier_price_customer_group'])
-                    || !strlen($rowData['_tier_price_qty']) || !strlen($rowData['_tier_price_price'])
+                || !isset($rowData['_tier_price_qty']) || !isset($rowData['_tier_price_price'])
+                || !strlen($rowData['_tier_price_website']) || !strlen($rowData['_tier_price_customer_group'])
+                || !strlen($rowData['_tier_price_qty']) || !strlen($rowData['_tier_price_price'])
             ) {
                 $this->addRowError(self::ERROR_TIER_DATA_INCOMPLETE, $rowNum);
                 return false;
             } elseif ($rowData['_tier_price_website'] != self::VALUE_ALL
-                    && !isset($this->_websiteCodeToId[$rowData['_tier_price_website']])) {
+                && !isset($this->_websiteCodeToId[$rowData['_tier_price_website']])
+            ) {
                 $this->addRowError(self::ERROR_INVALID_TIER_PRICE_SITE, $rowNum);
                 return false;
             } elseif ($rowData['_tier_price_customer_group'] != self::VALUE_ALL
-                    && !isset($this->_customerGroups[$rowData['_tier_price_customer_group']])) {
+                && !isset($this->_customerGroups[$rowData['_tier_price_customer_group']])
+            ) {
                 $this->addRowError(self::ERROR_INVALID_TIER_PRICE_GROUP, $rowNum);
                 return false;
             } elseif ($rowData['_tier_price_qty'] <= 0 || $rowData['_tier_price_price'] <= 0) {
@@ -849,6 +853,22 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         return true;
     }
 
+    /**
+     * Check media information
+     *
+     * @param array $rowData
+     * @param int $rowNum
+     * @return bool
+     */
+    protected function _isMediaValid($rowData, $rowNum)
+    {
+        if (!empty($rowData['_media_image']) && empty($rowData['_media_attribute_id'])) {
+            $this->addRowError(self::ERROR_MEDIA_DATA_INCOMPLETE, $rowNum);
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Check super products SKU
      *
@@ -1466,7 +1486,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
                 $valueArr = array(
                     'value_id' => $insertValue['value_id'],
-                    'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+                    'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                     'label'    => $insertValue['label'],
                     'position' => $insertValue['position'],
                     'disabled' => $insertValue['disabled']
@@ -1740,6 +1760,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         $this->_isTierPriceValid($rowData, $rowNum);
         $this->_isGroupPriceValid($rowData, $rowNum);
         $this->_isSuperProductsSkuValid($rowData, $rowNum);
+        $this->_isMediaValid($rowData, $rowNum);
 
         if (self::SCOPE_DEFAULT == $rowScope) { // SKU is specified, row is SCOPE_DEFAULT, new product block begins
             $this->_processedEntitiesCount ++;
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php
index 51313f6938a715a56829f9591d52a405ba8989d0..571ddd38fba2650a7a5ef1ea1e0766fb5402309d 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php
@@ -784,7 +784,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
             $storeCode = $rowData[self::COLUMN_STORE];
             $storeId = $this->_storeCodeToId[$storeCode];
         } else {
-            $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+            $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
         }
         if (isset($this->_productsSkuToId[$this->_rowProductSku])) {
             // save in existing data array
@@ -1129,20 +1129,20 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
                 $typeValues[$prevOptionId][] = $specificTypeData['value'];
 
                 // ensure default title is set
-                if (!isset($typeTitles[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID])) {
-                    $typeTitles[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID]
+                if (!isset($typeTitles[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID])) {
+                    $typeTitles[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID]
                         = $specificTypeData['title'];
                 }
                 $typeTitles[$nextValueId][$this->_rowStoreId] = $specificTypeData['title'];;
 
                 if ($specificTypeData['price']) {
                     if ($this->_isPriceGlobal) {
-                        $typePrices[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID]
+                        $typePrices[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID]
                             = $specificTypeData['price'];
                     } else {
                         // ensure default price is set
-                        if (!isset($typePrices[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID])) {
-                            $typePrices[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID]
+                        if (!isset($typePrices[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID])) {
+                            $typePrices[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID]
                                 = $specificTypeData['price'];
                         }
                         $typePrices[$nextValueId][$this->_rowStoreId] = $specificTypeData['price'];
@@ -1163,10 +1163,11 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     protected function _collectOptionTitle(array $rowData, $prevOptionId, array &$titles)
     {
+        $defaultStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
         if (!empty($rowData[self::COLUMN_TITLE])) {
-            if (!isset($titles[$prevOptionId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID])) {
+            if (!isset($titles[$prevOptionId][$defaultStoreId])) {
                 // ensure default title is set
-                $titles[$prevOptionId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID] = $rowData[self::COLUMN_TITLE];
+                $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
             }
             $titles[$prevOptionId][$this->_rowStoreId] = $rowData[self::COLUMN_TITLE];
         }
@@ -1224,7 +1225,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
             }
             $this->_rowStoreId = $this->_storeCodeToId[$rowData[self::COLUMN_STORE]];
         } else {
-            $this->_rowStoreId = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+            $this->_rowStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
         }
         // Init option type and set param which tell that row is main
         if (!empty($rowData[self::COLUMN_TYPE])) { // get custom option type if its specified
@@ -1339,7 +1340,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
             && strlen($rowData[self::COLUMN_PREFIX . 'price']) > 0) {
             $priceData = array(
                 'option_id'  => $optionId,
-                'store_id'   => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+                'store_id'   => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
                 'price_type' => 'fixed'
             );
 
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php
index 9aa8c2eaa068f7b1bf2cc0df4defffa7a57d36b5..abe164fd975b87349ec46185273f6346c2ff48d8 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php
@@ -91,7 +91,7 @@ class Grouped
     }
 
     /**
-     * Retrive model behavior
+     * Retrieve model behavior
      *
      * @return string
      */
diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml
index 7c9f5f02f680c79e6c3d1811a1be4e71a772428e..0124a1f82ad0755bdf2a8f0b5c9844ceb07d09da 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml
+++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml
@@ -26,6 +26,6 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <container name="root" label="Root" output="1">
         <block class="Magento\ImportExport\Block\Adminhtml\Export\Filter" name="export.filter"/>
-        <block class="Magento\Adminhtml\Block\Template" template="Magento_ImportExport::export/form/filter/after.phtml" name="export.form.after" as="form_after"/>
+        <block class="Magento\Backend\Block\Template" template="Magento_ImportExport::export/form/filter/after.phtml" name="export.form.after" as="form_after"/>
     </container>
 </layout>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
index 421ca1bf78d0a2c11a6be21088a90f2b23c2ce96..301a97dd2777f75ce5f2a0cced19028c35cf4f48 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
+++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
@@ -25,7 +25,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Template" template="Magento_ImportExport::export/form/before.phtml" name="export.form.before" as="form_before"/>
+        <block class="Magento\Backend\Block\Template" template="Magento_ImportExport::export/form/before.phtml" name="export.form.before" as="form_before"/>
         <block class="Magento\ImportExport\Block\Adminhtml\Export\Edit" name="export.form.container"/>
         <block class="Magento\ImportExport\Block\Adminhtml\Form\After" template="Magento_ImportExport::export/form/after.phtml" name="export.form.after" as="form_after"/>
     </referenceContainer>
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Problem.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
index 7a9af30931af38547fcb49f59c296c467137052d..15256a4debb3a500034d680843c939e05087d6ad 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Problem.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
@@ -19,24 +19,24 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter problem block template.
+ * Newsletter problem block template.
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
 
-class Problem extends \Magento\Adminhtml\Block\Template
+class Problem extends \Magento\Backend\Block\Template
 {
 
-    protected $_template = 'newsletter/problem/list.phtml';
+    protected $_template = 'problem/list.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\Resource\Problem\Collection
@@ -105,4 +105,4 @@ class Problem extends \Magento\Adminhtml\Block\Template
     {
         return $this->_problemCollection->getSize() > 0;
     }
-}// Class \Magento\Adminhtml\Block\Newsletter\Problem END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
similarity index 83%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
index 4f5e7cb99376e8ec8f36b7e6c654803adf10b850..b4e108e8386914237e4c9ebd80edaf25d3e8e53d 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers grid filter checkbox
+ * Newsletter subscribers grid filter checkbox
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Problem\Grid\Filter;
+namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Filter;
 
 class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
@@ -45,4 +45,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Abstra
     {
         return '<input type="checkbox" onclick="problemController.checkCheckboxes(this)"/>';
     }
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
similarity index 83%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
index d91543403f11bbce6ceacda742ef670e84d33338..258a0fb9391faeffb395e7e00c8874c864051cf7 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers grid checkbox item renderer
+ * Newsletter subscribers grid checkbox item renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Problem\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Renderer;
 
 class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -46,4 +46,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abst
     {
         return '<input type="checkbox" name="problem[]" value="' . $row->getId() . '" class="problemCheckbox"/>';
     }
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
index 7dac9990abcdf3b92e9d2f97beded54ae6cb8abd..acdd2df811a5ee9fe9a1529e744b8595aefdec3d 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter queue edit block
+ * Newsletter queue edit block
  */
-namespace Magento\Adminhtml\Block\Newsletter\Queue;
+namespace Magento\Newsletter\Block\Adminhtml\Queue;
 
-class Edit extends \Magento\Adminhtml\Block\Template
+class Edit extends \Magento\Backend\Block\Template
 {
-    protected $_template = 'newsletter/queue/edit.phtml';
+    protected $_template = 'queue/edit.phtml';
 
     /**
      * Core registry
@@ -86,7 +86,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
     protected  function _beforeToHtml()
     {
         $this->setChild('form',
-            $this->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form','form')
+            $this->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form','form')
         );
         return parent::_beforeToHtml();
     }
@@ -98,7 +98,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
         } else {
             $params = array('id' => $this->getRequest()->getParam('id'));
         }
-        return $this->getUrl('adminhtml/*/save', $params);
+        return $this->getUrl('*/*/save', $params);
     }
 
     protected function _prepareLayout()
@@ -150,7 +150,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
         $this->addChild('back_button','Magento\Adminhtml\Block\Widget\Button', array(
             'label'   => __('Back'),
             'onclick' => "window.location.href = '" . $this->getUrl((
-                $this->getTemplateId() ? '*/newsletter_template/' : '*/*')) . "'",
+                $this->getTemplateId() ? '*/template' : '*/*')) . "'",
             'class'   => 'action-back'
         ));
 
@@ -164,7 +164,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
      */
     public function getPreviewUrl()
     {
-        return $this->getUrl('adminhtml/*/preview');
+        return $this->getUrl('*/*/preview');
     }
 
     /**
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
index 58a32c934080231564f4d4bea776f7d25f9a9607..349353454346b60c0f19b29c509229bd2e933c75 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter queue edit form
+ * Newsletter queue edit form
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Edit;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -83,7 +83,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * or from  newsletter queue grid by edit option.
      *
      * @param void
-     * @return \Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form
+     * @return \Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form
      */
     protected function _prepareForm()
     {
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
similarity index 77%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
index b7e0c66d064261dcabb808b1ae60dbd7746d9096..7a9f46b2b8b996edcb6df1574f75b4be6570d412 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter queue grid block action item renderer
+ * Newsletter queue grid block action item renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Grid\Renderer;
 
 class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
 {
@@ -43,18 +43,18 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
         if($row->getQueueStatus()==\Magento\Newsletter\Model\Queue::STATUS_NEVER) {
                if(!$row->getQueueStartAt() && $row->getSubscribersTotal()) {
                 $actions[] = array(
-                    'url' => $this->getUrl('adminhtml/*/start', array('id'=>$row->getId())),
+                    'url' => $this->getUrl('*/*/start', array('id'=>$row->getId())),
                     'caption'	=> __('Start')
                 );
             }
         } else if ($row->getQueueStatus()==\Magento\Newsletter\Model\Queue::STATUS_SENDING) {
             $actions[] = array(
-                    'url' => $this->getUrl('adminhtml/*/pause', array('id'=>$row->getId())),
+                    'url' => $this->getUrl('*/*/pause', array('id'=>$row->getId())),
                     'caption'	=>	__('Pause')
             );
 
             $actions[] = array(
-                'url'		=>	$this->getUrl('adminhtml/*/cancel', array('id'=>$row->getId())),
+                'url'		=>	$this->getUrl('*/*/cancel', array('id'=>$row->getId())),
                 'confirm'	=>	__('Do you really want to cancel the queue?'),
                 'caption'	=>	__('Cancel')
             );
@@ -63,14 +63,14 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
         } else if ($row->getQueueStatus()==\Magento\Newsletter\Model\Queue::STATUS_PAUSE) {
 
             $actions[] = array(
-                'url' => $this->getUrl('adminhtml/*/resume', array('id'=>$row->getId())),
+                'url' => $this->getUrl('*/*/resume', array('id'=>$row->getId())),
                 'caption'	=>	__('Resume')
             );
 
         }
 
         $actions[] = array(
-            'url'       =>  $this->getUrl('adminhtml/newsletter_queue/preview',array('id'=>$row->getId())),
+            'url'       =>  $this->getUrl('*/*/preview',array('id'=>$row->getId())),
             'caption'   =>  __('Preview'),
             'popup'     =>  true
         );
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
index e42e83e22f2b0f5e18a95975b828f3cdadeedb1c..58d240b98873848efbd60403bd2702b6d09fe6bc 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter template preview block
+ * Newsletter template preview block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Queue;
+namespace Magento\Newsletter\Block\Adminhtml\Queue;
 
 class Preview extends \Magento\Adminhtml\Block\Widget
 {
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
index 5f7d41b59435989050df12224f59c0219e4426e6..3933ff50c68ad42ba1b406afe78684d22ad77731 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Admin form widget
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Preview;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Preview;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -46,7 +46,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
         $form = $this->_formFactory->create(array(
             'attributes' => array(
                 'id' => 'preview_form',
-                'action' => $this->getUrl('adminhtml/*/drop', array('_current' => true)),
+                'action' => $this->getUrl('*/*/drop', array('_current' => true)),
                 'method' => 'post',
             ))
         );
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
index 77983dbce8d05f3f42d2136b95ddfc6a122ea957..6ec289fd7c6c80bcdeaae5d06c2d652f2f593c17 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
@@ -19,22 +19,22 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscriber grid block
+ * Newsletter subscriber grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
 
-class Subscriber extends \Magento\Adminhtml\Block\Template
+class Subscriber extends \Magento\Backend\Block\Template
 {
     /**
      * Queue collection
@@ -43,7 +43,7 @@ class Subscriber extends \Magento\Adminhtml\Block\Template
      */
     protected $_queueCollection = null;
 
-    protected $_template = 'newsletter/subscriber/list.phtml';
+    protected $_template = 'subscriber/list.phtml';
 
     /**
      * @var \Magento\Newsletter\Model\Resource\Queue\CollectionFactory
@@ -69,7 +69,7 @@ class Subscriber extends \Magento\Adminhtml\Block\Template
     /**
      * Prepares block to render
      *
-     * @return \Magento\Adminhtml\Block\Newsletter\Subscriber
+     * @return \Magento\Newsletter\Block\Adminhtml\Subscriber
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
index 58d5307b946a5fcdfc8eec5176904a724c5913c7..db184b5912e554a286e2ab2cdf7fc341ef75510a 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers grid block
+ * Newsletter subscribers grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber;
 
 class Grid extends \Magento\Backend\Block\Widget\Grid
 {
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
similarity index 83%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
index 34144d5d71057b9e77b86ad30b0e80944cb83b26..a2f94fa1850d790f4cc41daf013ebb7c2eebfed4 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers grid filter checkbox
+ * Newsletter subscribers grid filter checkbox
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Filter;
 
 class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
@@ -45,4 +45,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Abstra
     {
         return '<input type="checkbox" onclick="subscriberController.checkCheckboxes(this)"/>';
     }
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
index 69b889266f1433db96089fbc1474e5b039748bc6..ee139ca5be6e940d81d0edea7e23c9198e47bf3d 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
@@ -19,15 +19,15 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers grid website filter
+ * Newsletter subscribers grid website filter
  */
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Filter;
 
 class Website
     extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
index b611525e22472305132e58892e184cfffdad37d1..bbdfa60cf8c3d0680206d7e6068df17f2ba16cd7 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers grid checkbox item renderer
+ * Newsletter subscribers grid checkbox item renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Renderer;
 
 class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -51,4 +51,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abst
         }
 
     }
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
similarity index 74%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index 87842f7a1bfe4763728c9da50e46475d96760645..be67aae6cbc707e5a97ecd5f3ee5c0cb9368ec49 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -19,37 +19,37 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter templates page content block
+ * Newsletter templates page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
 
-class Template extends \Magento\Adminhtml\Block\Template
+class Template extends \Magento\Backend\Block\Template
 {
-    protected $_template = 'newsletter/template/list.phtml';
+    protected $_template = 'template/list.phtml';
 
     protected function _prepareLayout()
     {
         $this->setChild(
             'grid',
-            $this->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Grid', 'newsletter.template.grid')
+            $this->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Template\Grid', 'newsletter.template.grid')
         );
         return parent::_prepareLayout();
     }
 
     public function getCreateUrl()
     {
-        return $this->getUrl('adminhtml/*/new');
+        return $this->getUrl('*/*/new');
     }
 
     public function getHeaderText()
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index e5e39f2044038cedeb333a2a231f2689162b2dac..713c2d132cf6e1f6bf16ebfb11c83331f8f5c145 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml Newsletter Template Edit Block
+ * Newsletter Template Edit Block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Template;
+namespace Magento\Newsletter\Block\Adminhtml\Template;
 
 class Edit extends \Magento\Adminhtml\Block\Widget
 {
@@ -86,7 +86,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
     /**
      * Preparing block layout
      *
-     * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit
+     * @return \Magento\Newsletter\Block\Adminhtml\Template\Edit
      */
     protected function _prepareLayout()
     {
@@ -98,7 +98,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
 
         $this->addChild('back_button', 'Magento\Adminhtml\Block\Widget\Button', array(
             'label'     => __('Back'),
-            'onclick'   => "window.location.href = '" . $this->getUrl('adminhtml/*') . "'",
+            'onclick'   => "window.location.href = '" . $this->getUrl('*/*') . "'",
             'class'     => 'action-back'
         ));
 
@@ -234,7 +234,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
      * Set edit flag for block
      *
      * @param boolean $value
-     * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit
+     * @return \Magento\Newsletter\Block\Adminhtml\Template\Edit
      */
     public function setEditMode($value = true)
     {
@@ -274,7 +274,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
     public function getForm()
     {
         return $this->getLayout()
-            ->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Edit\Form')
+            ->createBlock('Magento\Newsletter\Block\Adminhtml\Template\Edit\Form')
             ->toHtml();
     }
 
@@ -295,7 +295,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
      */
     public function getSaveUrl()
     {
-        return $this->getUrl('adminhtml/*/save');
+        return $this->getUrl('*/*/save');
     }
 
     /**
@@ -305,7 +305,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
      */
     public function getPreviewUrl()
     {
-        return $this->getUrl('adminhtml/*/preview');
+        return $this->getUrl('*/*/preview');
     }
 
     /**
@@ -325,7 +325,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
      */
     public function getDeleteUrl()
     {
-        return $this->getUrl('adminhtml/*/delete', array('id' => $this->getRequest()->getParam('id')));
+        return $this->getUrl('*/*/delete', array('id' => $this->getRequest()->getParam('id')));
     }
 
     /**
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
index aca73a4d278775d02b9a2b56a4a92172441b5c3f..f0a77f8b77d7203cd7023fdf2363d9ad82ffbf83 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 
 /**
- * Adminhtml Newsletter Template Edit Form Block
+ * Newsletter Template Edit Form Block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Template\Edit;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Edit;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -74,7 +74,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     /**
      * Prepare form before rendering HTML
      *
-     * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit\Form
+     * @return \Magento\Newsletter\Block\Adminhtml\Template\Edit\Form
      */
     protected function _prepareForm()
     {
@@ -169,7 +169,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
             ));
         }
 
-        $form->setAction($this->getUrl('adminhtml/*/save'));
+        $form->setAction($this->getUrl('*/*/save'));
         $form->setUseContainer(true);
         $this->setForm($form);
 
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
index e065b186a583f0d9e4fb9f4c08f2de616d507331..a9d911787ce838950263a6b9275386dfbd6b46c5 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter templates grid block
+ * Newsletter templates grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Template;
+namespace Magento\Newsletter\Block\Adminhtml\Template;
 
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -115,7 +115,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
             array(
                 'header'    => __('Sender'),
                 'index'     => 'template_sender_email',
-                'renderer'  => 'Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer\Sender',
+                'renderer'  => 'Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender',
                 'header_css_class'  => 'col-sender',
                 'column_css_class'  => 'col-sender'
         ));
@@ -140,7 +140,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
                 'sortable'  => false,
                 'filter'    => false,
                 'no_link'   => true,
-                'renderer'  => 'Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer\Action',
+                'renderer'  => 'Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Action',
                 'header_css_class'  => 'col-actions',
                 'column_css_class'  => 'col-actions'
         ));
@@ -150,7 +150,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 
     public function getRowUrl($row)
     {
-        return $this->getUrl('adminhtml/*/edit', array('id'=>$row->getId()));
+        return $this->getUrl('*/*/edit', array('id'=>$row->getId()));
     }
 }
 
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
similarity index 80%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
index e30fbd8a666f75965a057cde9c5babe8f22e0613..90d062c18e7d69214a7709bd1f0268058ee006d6 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter templates grid block action item renderer
+ * Newsletter templates grid block action item renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer;
 
 class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
 {
@@ -46,13 +46,13 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
     {
         if($row->isValidForSend()) {
             $actions[] = array(
-                'url' => $this->getUrl('adminhtml/newsletter_queue/edit', array('template_id' => $row->getId())),
+                'url' => $this->getUrl('*/queue/edit', array('template_id' => $row->getId())),
                 'caption' => __('Queue Newsletter...')
             );
         }
 
         $actions[] = array(
-            'url'     => $this->getUrl('adminhtml/*/preview', array('id'=>$row->getId())),
+            'url'     => $this->getUrl('*/*/preview', array('id'=>$row->getId())),
             'popup'   => true,
             'caption' => __('Preview')
         );
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index 87f22efadd797ba8270744650cc68a811c0f7fdd..3c9adbac05fe4ad10da5c62c7e948600ca03d64f 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -19,20 +19,20 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter templates grid block sender item renderer
+ * Newsletter templates grid block sender item renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
  
-namespace Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer;
 
 class Sender extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
index f60823e8bcd46889bd40d63e55e4c026ebf0afd6..745ae4d6a8619900ca394de9a635ca362cdc1e95 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter template preview block
+ * Newsletter template preview block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Template;
+namespace Magento\Newsletter\Block\Adminhtml\Template;
 
 class Preview extends \Magento\Adminhtml\Block\Widget
 {
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
index 77b03cd1cca2492a494b4df9f2c698be1cfae795..77d8a9abe3799b89b7a6e0222f2f6c59b8391dd8 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Admin form widget
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Newsletter\Template\Preview;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Preview;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -46,7 +46,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
         $form = $this->_formFactory->create(array(
             'attributes' => array(
                 'id' => 'preview_form',
-                'action' => $this->getUrl('adminhtml/*/drop', array('_current' => true)),
+                'action' => $this->getUrl('*/*/drop', array('_current' => true)),
                 'method' => 'post',
             ))
         );
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
index e8a921042102cca73c9b465e0878f8cf28c94ecc..b6b32228ad0e8207b04c3c7b2d9135811d9f7e99 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers controller
+ * Newsletter subscribers controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
 
 class Problem extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
index 440e022e2ca8f5e9d700567a2dfe102248e37a86..c4071fb7fc940513ef92bbf8daabf2e06f6358f1 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter queue controller
+ * Newsletter queue controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
 
 class Queue extends \Magento\Backend\App\Action
 {
@@ -81,7 +81,7 @@ class Queue extends \Magento\Backend\App\Action
      */
     public function dropAction()
     {
-        $this->_view->loadLayout('newsletter_queue_preview');
+        $this->_view->loadLayout('newsletter_queue_preview_popup');
         $this->_view->renderLayout();
     }
 
@@ -122,7 +122,7 @@ class Queue extends \Magento\Backend\App\Action
             if (!in_array($queue->getQueueStatus(),
                           array(\Magento\Newsletter\Model\Queue::STATUS_NEVER,
                                  \Magento\Newsletter\Model\Queue::STATUS_PAUSE))) {
-                   $this->_redirect('adminhtml/*');
+                   $this->_redirect('*/*');
                 return;
             }
 
@@ -131,7 +131,7 @@ class Queue extends \Magento\Backend\App\Action
                 ->save();
         }
 
-        $this->_redirect('adminhtml/*');
+        $this->_redirect('*/*');
     }
 
     public function pauseAction()
@@ -141,14 +141,14 @@ class Queue extends \Magento\Backend\App\Action
 
         if (!in_array($queue->getQueueStatus(),
                       array(\Magento\Newsletter\Model\Queue::STATUS_SENDING))) {
-               $this->_redirect('adminhtml/*');
+               $this->_redirect('*/*');
             return;
         }
 
         $queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_PAUSE);
         $queue->save();
 
-        $this->_redirect('adminhtml/*');
+        $this->_redirect('*/*');
     }
 
     public function resumeAction()
@@ -158,14 +158,14 @@ class Queue extends \Magento\Backend\App\Action
 
         if (!in_array($queue->getQueueStatus(),
                       array(\Magento\Newsletter\Model\Queue::STATUS_PAUSE))) {
-               $this->_redirect('adminhtml/*');
+               $this->_redirect('*/*');
             return;
         }
 
         $queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_SENDING);
         $queue->save();
 
-        $this->_redirect('adminhtml/*');
+        $this->_redirect('*/*');
     }
 
     public function cancelAction()
@@ -175,14 +175,14 @@ class Queue extends \Magento\Backend\App\Action
 
         if (!in_array($queue->getQueueStatus(),
                       array(\Magento\Newsletter\Model\Queue::STATUS_SENDING))) {
-               $this->_redirect('adminhtml/*');
+               $this->_redirect('*/*');
             return;
         }
 
         $queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_CANCEL);
         $queue->save();
 
-        $this->_redirect('adminhtml/*');
+        $this->_redirect('*/*');
     }
 
     public function sendingAction()
@@ -225,7 +225,7 @@ class Queue extends \Magento\Backend\App\Action
         $this->_addBreadcrumb(
             __('Newsletter Queue'),
             __('Newsletter Queue'),
-            $this->getUrl('adminhtml/newsletter_queue')
+            $this->getUrl('*/*')
         );
         $this->_addBreadcrumb(__('Edit Queue'), __('Edit Queue'));
 
@@ -257,7 +257,7 @@ class Queue extends \Magento\Backend\App\Action
                    array(\Magento\Newsletter\Model\Queue::STATUS_NEVER,
                          \Magento\Newsletter\Model\Queue::STATUS_PAUSE))
             ) {
-                $this->_redirect('adminhtml/*');
+                $this->_redirect('*/*');
                 return;
             }
 
@@ -282,12 +282,12 @@ class Queue extends \Magento\Backend\App\Action
             $this->_getSession()->addSuccess(__('The newsletter queue has been saved.'));
             $this->_getSession()->setFormData(false);
 
-            $this->_redirect('adminhtml/*');
+            $this->_redirect('*/*');
         } catch (\Magento\Core\Exception $e) {
             $this->_getSession()->addError($e->getMessage());
             $id = $this->getRequest()->getParam('id');
             if ($id) {
-                $this->_redirect('adminhtml/*/edit', array('id' => $id));
+                $this->_redirect('*/*/edit', array('id' => $id));
             } else {
                 $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
             }
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
index a91f652f1266fb3502b35c8ff212f4fac1b55adc..3e834133b71b72129fa13b50c391106293ee7ab4 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
@@ -19,19 +19,19 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 /**
- * Adminhtml newsletter subscribers controller
+ * Newsletter subscribers controller
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
 
 class Subscriber extends \Magento\Backend\App\Action
 {
@@ -120,7 +120,7 @@ class Subscriber extends \Magento\Backend\App\Action
             }
         }
 
-        $this->_redirect('adminhtml/*/index');
+        $this->_redirect('*/*/index');
     }
 
     public function massDeleteAction()
@@ -143,7 +143,7 @@ class Subscriber extends \Magento\Backend\App\Action
             }
         }
 
-        $this->_redirect('adminhtml/*/index');
+        $this->_redirect('*/*/index');
     }
 
     protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Template.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
index 53537fe7b08232e6b919ead5f7e14c89f9c1bb6a..1b73f0767d3d8546388f7b2e1c503a901a00a12a 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Newsletter
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,10 +27,10 @@
  * Manage Newsletter Template Controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Newsletter
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
 
 class Template extends \Magento\Backend\App\Action
 {
@@ -66,7 +66,7 @@ class Template extends \Magento\Backend\App\Action
     /**
      * Set title of page
      *
-     * @return \Magento\Adminhtml\Controller\Newsletter\Template
+     * @return \Magento\Newsletter\Controller\Adminhtml\Template
      */
     protected function _setTitle()
     {
@@ -88,7 +88,7 @@ class Template extends \Magento\Backend\App\Action
         $this->_view->loadLayout();
         $this->_setActiveMenu('Magento_Newsletter::newsletter_template');
         $this->_addBreadcrumb(__('Newsletter Templates'), __('Newsletter Templates'));
-        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Template', 'template'));
+        $this->_addContent($this->_view->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Template', 'template'));
         $this->_view->renderLayout();
     }
 
@@ -99,7 +99,7 @@ class Template extends \Magento\Backend\App\Action
     public function gridAction()
     {
         $this->_view->loadLayout();
-        $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Grid')
+        $grid = $this->_view->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Template\Grid')
             ->toHtml();
         $this->getResponse()->setBody($grid);
     }
@@ -164,7 +164,7 @@ class Template extends \Magento\Backend\App\Action
      */
     public function dropAction()
     {
-        $this->_view->loadLayout('newsletter_template_preview');
+        $this->_view->loadLayout('newsletter_template_preview_popup');
         $this->_view->renderLayout();
     }
 
@@ -176,7 +176,7 @@ class Template extends \Magento\Backend\App\Action
     {
         $request = $this->getRequest();
         if (!$request->isPost()) {
-            $this->getResponse()->setRedirect($this->getUrl('adminhtml/newsletter_template'));
+            $this->getResponse()->setRedirect($this->getUrl('*/template'));
         }
         $template = $this->_objectManager->create('Magento\Newsletter\Model\Template');
 
@@ -211,7 +211,7 @@ class Template extends \Magento\Backend\App\Action
             $this->_getSession()->addSuccess(__('The newsletter template has been saved.'));
             $this->_getSession()->setFormData(false);
 
-            $this->_redirect('adminhtml/*');
+            $this->_redirect('*/template');
             return;
         } catch (\Magento\Core\Exception $e) {
             $this->_getSession()->addError(nl2br($e->getMessage()));
@@ -248,7 +248,7 @@ class Template extends \Magento\Backend\App\Action
                 );
             }
         }
-        $this->_redirect('adminhtml/*');
+        $this->_redirect('*/template');
     }
 
     /**
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index e984546d0080119c4af94c8205df3c2d3d6d9d5a..bf741f12592f1288f1faa6697c1fc61b15b93129 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -372,7 +372,7 @@ class Subscriber extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Returns sting of random chars
+     * Returns string of random chars
      *
      * @param int $length
      * @return string
diff --git a/app/code/Magento/Newsletter/etc/adminhtml/menu.xml b/app/code/Magento/Newsletter/etc/adminhtml/menu.xml
index b9780f264302da64a7eb9c3d121d599cdad50b7c..81dead1b53a73b40af6427ca308feb667a3d5924 100644
--- a/app/code/Magento/Newsletter/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Newsletter/etc/adminhtml/menu.xml
@@ -27,9 +27,9 @@
 -->
 <config>
     <menu>
-        <add id="Magento_Newsletter::newsletter_template" title="Newsletter Template" module="Magento_Newsletter" parent="Magento_Adminhtml::marketing_communications" sortOrder="30" action="adminhtml/newsletter_template/" resource="Magento_Newsletter::template"/>
-        <add id="Magento_Newsletter::newsletter_queue" title="Newsletter Queue" module="Magento_Newsletter" sortOrder="40" parent="Magento_Adminhtml::marketing_communications" action="adminhtml/newsletter_queue/" resource="Magento_Newsletter::queue"/>
-        <add id="Magento_Newsletter::newsletter_subscriber" title="Newsletter Subscribers" module="Magento_Newsletter" sortOrder="50" parent="Magento_Adminhtml::marketing_communications" action="adminhtml/newsletter_subscriber/" resource="Magento_Newsletter::subscriber"/>
-        <add id="Magento_Newsletter::newsletter_problem" title="Newsletter Problem Reports" module="Magento_Newsletter" sortOrder="50" parent="Magento_Reports::report_marketing" action="adminhtml/newsletter_problem/" resource="Magento_Newsletter::problem"/>
+        <add id="Magento_Newsletter::newsletter_template" title="Newsletter Template" module="Magento_Newsletter" parent="Magento_Adminhtml::marketing_communications" sortOrder="30" action="newsletter/template/" resource="Magento_Newsletter::template"/>
+        <add id="Magento_Newsletter::newsletter_queue" title="Newsletter Queue" module="Magento_Newsletter" sortOrder="40" parent="Magento_Adminhtml::marketing_communications" action="newsletter/queue/" resource="Magento_Newsletter::queue"/>
+        <add id="Magento_Newsletter::newsletter_subscriber" title="Newsletter Subscribers" module="Magento_Newsletter" sortOrder="50" parent="Magento_Adminhtml::marketing_communications" action="newsletter/subscriber/" resource="Magento_Newsletter::subscriber"/>
+        <add id="Magento_Newsletter::newsletter_problem" title="Newsletter Problem Reports" module="Magento_Newsletter" sortOrder="50" parent="Magento_Reports::report_marketing" action="newsletter/problem/" resource="Magento_Newsletter::problem"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/tag_customer_view.xml b/app/code/Magento/Newsletter/etc/adminhtml/routes.xml
similarity index 84%
rename from app/code/Magento/Catalog/view/frontend/layout/tag_customer_view.xml
rename to app/code/Magento/Newsletter/etc/adminhtml/routes.xml
index 2c2e829daa8ec0998d3eeb68050fccc9897db2b8..59ea1753f4a8dbf2c034dc24823882ab74515487 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/tag_customer_view.xml
+++ b/app/code/Magento/Newsletter/etc/adminhtml/routes.xml
@@ -23,6 +23,10 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="MAP_popup"/>
-</layout>
+<config>
+    <router id="admin">
+        <route id="newsletter" frontName="newsletter">
+            <module name="Magento_Newsletter" />
+        </route>
+    </router>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
index b07f47bd869dee9423e71cdab7063dcc459b17f4..bd38e5695c146847ab605e3702c206385e264b0a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
@@ -41,8 +41,8 @@
                 <block class="Magento\Backend\Block\Widget\Grid\Column" as="checkbox">
                     <arguments>
                         <argument name="sortable" xsi:type="string">0</argument>
-                        <argument name="filter" xsi:type="string">Magento\Adminhtml\Block\Newsletter\Problem\Grid\Filter\Checkbox</argument>
-                        <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Newsletter\Problem\Grid\Renderer\Checkbox</argument>
+                        <argument name="filter" xsi:type="string">Magento\Newsletter\Block\Adminhtml\Problem\Grid\Filter\Checkbox</argument>
+                        <argument name="renderer" xsi:type="string">Magento\Newsletter\Block\Adminhtml\Problem\Grid\Renderer\Checkbox</argument>
                         <argument name="header_css_class" xsi:type="string">col-select</argument>
                         <argument name="column_css_class" xsi:type="string">col-select</argument>
                     </arguments>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml
index 4da677d02338f3c0a2f95778b7f16d71b234d99e..c96e57a0fa54a039253248cca050626eb54ef9ee 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_newsletter_problem_block"/>
+    <update handle="newsletter_problem_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.problem.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml
index 1042c4f79af8b730c80df0817fabba139fbbfcbf..74b303f2008e60e61334c19bd57d14779454581e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml
@@ -25,8 +25,8 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_newsletter_problem_block"/>
+    <update handle="newsletter_problem_block"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Newsletter\Problem" name="adminhtml.newsletter.problem.container"/>
+        <block class="Magento\Newsletter\Block\Adminhtml\Problem" name="adminhtml.newsletter.problem.container"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml
index fdf7afc7ddcb132081fe94910cd736c901831a6f..516baf9cc90e6ae91d09a5b5e2871fdda3413197 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml
@@ -48,6 +48,6 @@
         </block>
     </referenceBlock>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Newsletter\Queue\Edit" name="queue_edit" template="newsletter/queue/edit.phtml"/>
+        <block class="Magento\Newsletter\Block\Adminhtml\Queue\Edit" name="queue_edit" template="queue/edit.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml
similarity index 95%
rename from app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml
index c70bb225c0bbfbd078abc19813496ae0dea9199f..81031f3537d2f569503872b147965d6183bbb011 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_newsletter_queue_grid_block"/>
+    <update handle="newsletter_queue_grid_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.queue.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
 </layout>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
similarity index 99%
rename from app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid_block.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
index d4d8b71fdd2edffd8622059e94f6489623d64fb4..7fce7dea72721d6d6a926045754e8cdcc92c91d2 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
@@ -115,7 +115,7 @@
                         <argument name="filter" xsi:type="string">0</argument>
                         <argument name="sortable" xsi:type="string">0</argument>
                         <argument name="no_link" xsi:type="string">1</argument>
-                        <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Newsletter\Queue\Grid\Renderer\Action</argument>
+                        <argument name="renderer" xsi:type="string">Magento\Newsletter\Block\Adminhtml\Queue\Grid\Renderer\Action</argument>
                         <argument name="header_css_class" xsi:type="string">col-actions</argument>
                         <argument name="column_css_class" xsi:type="string">col-actions</argument>
                     </arguments>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml
similarity index 95%
rename from app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_index.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml
index 7646cd1fc345fe2eafd39ccc23b47377a848800d..91cf03575217cf4ce2a943a4b83227fcb3088db1 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_index.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_newsletter_queue_grid_block"/>
+    <update handle="newsletter_queue_grid_block"/>
     <referenceContainer name="content">
         <block class="Magento\Backend\Block\Template" template="Magento_Newsletter::queue/list.phtml" name="adminhtml.newsletter.queue.grid.container"/>
     </referenceContainer>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml
similarity index 82%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml
index e68af194f9916c459536397effd80213b14cee2b..ae22fc6d5c76c1aa4209a9bf84bae1b56717a245 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml
@@ -26,9 +26,9 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceBlock name="root">
         <action method="setTemplate">
-            <argument name="template" xsi:type="string">newsletter/preview/iframeswitcher.phtml</argument>
+            <argument name="template" xsi:type="string">Magento_Newsletter::preview/iframeswitcher.phtml</argument>
         </action>
-        <block class="Magento\Adminhtml\Block\Newsletter\Queue\Preview\Form" name="preview_form"/>
-        <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Adminhtml::newsletter/preview/store.phtml"/>
+        <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview\Form" name="preview_form"/>
+        <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Newsletter::preview/store.phtml"/>
     </referenceBlock>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml
similarity index 85%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml
index 596315b0f0caeda1256d0e2a4ceeb2123e7b603c..ceac2a7218715ca2bac9b85692cddb7c49543af0 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml
@@ -24,8 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Adminhtml::newsletter/queue/preview.phtml">
-        <block class="Magento\Adminhtml\Block\Newsletter\Queue\Preview" name="content" as="content"/>
+    <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Newsletter::queue/preview.phtml">
+        <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview" name="content" as="content"/>
     </block>
-    <block class="Magento\Adminhtml\Block\Newsletter\Queue\Preview" name="preview_template"/>
+    <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview" name="preview_template"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
index 2dbf6c7b132a1ee4df95948c6176a10563a0abd0..0ab01650f7fbe14faa5db1348014b79b43225059 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
@@ -25,7 +25,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceBlock name="adminhtml.newsletter.subscriber.container">
-        <block class="Magento\Adminhtml\Block\Newsletter\Subscriber\Grid" name="adminhtml.newslettrer.subscriber.grid" as="grid">
+        <block class="Magento\Newsletter\Block\Adminhtml\Subscriber\Grid" name="adminhtml.newslettrer.subscriber.grid" as="grid">
             <arguments>
                 <argument name="id" xsi:type="string">subscriberGrid</argument>
                 <argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\Resource\Subscriber\Grid\Collection</argument>
@@ -41,11 +41,11 @@
                     <argument name="options" xsi:type="array">
                         <item name="unsubscribe" xsi:type="array">
                             <item name="label" xsi:type="string" translate="true">Unsubscribe</item>
-                            <item name="url" xsi:type="string">adminhtml/*/massUnsubscribe</item>
+                            <item name="url" xsi:type="string">*/*/massUnsubscribe</item>
                         </item>
                         <item name="delete" xsi:type="array">
                             <item name="label" xsi:type="string" translate="true">Delete</item>
-                            <item name="url" xsi:type="string">adminhtml/*/massDelete</item>
+                            <item name="url" xsi:type="string">*/*/massDelete</item>
                         </item>
                     </argument>
                 </arguments>
@@ -54,11 +54,11 @@
                 <arguments>
                     <argument name="exportTypes" xsi:type="array">
                         <item name="csv" xsi:type="array">
-                            <item name="urlPath" xsi:type="string">adminhtml/*/exportCsv</item>
+                            <item name="urlPath" xsi:type="string">*/*/exportCsv</item>
                             <item name="label" xsi:type="string" translate="true">CSV</item>
                         </item>
                         <item name="excel" xsi:type="array">
-                            <item name="urlPath" xsi:type="string">adminhtml/*/exportXml</item>
+                            <item name="urlPath" xsi:type="string">*/*/exportXml</item>
                             <item name="label" xsi:type="string" translate="true">Excel XML</item>
                         </item>
                     </argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportcsv.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportcsv.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml
index 43d631c3b09b2069cf9c19b04044cc17f907764a..e869d6edb46bc661a46fe874a1a84dbfa3859297 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportcsv.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_newsletter_subscriber_block"/>
+    <update handle="newsletter_subscriber_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml
index 43d631c3b09b2069cf9c19b04044cc17f907764a..e869d6edb46bc661a46fe874a1a84dbfa3859297 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_newsletter_subscriber_block"/>
+    <update handle="newsletter_subscriber_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml
index c44ea1914038495145c28d5ba746d7d07276daea..2809a33e1f3c8c4e10a39ceb49d015319c74473b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_newsletter_subscriber_block"/>
+    <update handle="newsletter_subscriber_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml
index 14e2fbf661c56ea2fa52eb4571768069d8e02662..2797a8bbe9c3f49894ff3a61c4d857a799b4f8db 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml
@@ -25,8 +25,8 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_newsletter_subscriber_block"/>
+    <update handle="newsletter_subscriber_block"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Newsletter\Subscriber" name="adminhtml.newsletter.subscriber.container"/>
+        <block class="Magento\Newsletter\Block\Adminhtml\Subscriber" name="adminhtml.newsletter.subscriber.container"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml
index f3d508d79c899b60e312b56f33246dbe664e4d71..2b67f4ce7e5b3aff7e1ae8b6ecae18c4ebd82975 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml
@@ -58,6 +58,6 @@
         </block>
     </referenceBlock>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Newsletter\Template\Edit" name="template_edit" template="newsletter/template/edit.phtml"/>
+        <block class="Magento\Newsletter\Block\Adminhtml\Template\Edit" name="template_edit" template="template/edit.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml
similarity index 83%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml
index 263293d5f071a306c034598ee26d70466d7f0705..e7fd0912ad8b3591a5cab8f27b75d471493ea36a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml
@@ -26,9 +26,9 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceBlock name="root">
         <action method="setTemplate">
-            <argument name="template" xsi:type="string">newsletter/preview/iframeswitcher.phtml</argument>
+            <argument name="template" xsi:type="string">Magento_Newsletter::preview/iframeswitcher.phtml</argument>
         </action>
-        <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview\Form" name="preview_form"/>
-        <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Adminhtml::newsletter/preview/store.phtml"/>
+        <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview\Form" name="preview_form"/>
+        <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Newsletter::preview/store.phtml"/>
     </referenceBlock>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml
similarity index 85%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml
index 5fbce706060eeae837eb5236a945e8e874893cdb..e7c0615d8e35ba93b041f7a8026953ffeff87ecf 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml
@@ -24,8 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Adminhtml::newsletter/template/preview.phtml">
-        <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview" name="content" as="content"/>
+    <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Newsletter::template/preview.phtml">
+        <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="content" as="content"/>
     </block>
-    <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview" name="preview_template"/>
+    <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="preview_template"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml
index f92336d5d09d73869d131fc397f993192b93bb5c..48ec7d0baa00217188fc705bf16491b08ccf16e7 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Adminhtml::newsletter/template/preview.phtml">
-        <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview" name="content" as="content"/>
+    <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Newsletter::template/preview.phtml">
+        <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="content" as="content"/>
     </block>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/preview/iframeswitcher.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/iframeswitcher.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/preview/iframeswitcher.phtml
index 8c58f4ededb0a8f110bd5b2932f522ba226a0e09..945708a62ee0a69365ea03868dc9b8733e2afb1f 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/preview/iframeswitcher.phtml
@@ -25,7 +25,7 @@
  */
 ?>
 <?php
-/* @var $this \Magento\Adminhtml\Block\Page */
+/* @var $this \Magento\Backend\Block\Page */
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/store.phtml b/app/code/Magento/Newsletter/view/adminhtml/preview/store.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/store.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/preview/store.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/problem/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/problem/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/problem/list.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/problem/list.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/queue/edit.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/edit.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/queue/edit.phtml
index e8aa2497ac387ac2c8d33888ca35176a7f520272..ebe4b0de3ef60fe7d5980bbeee4063a09ddfbdc9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/queue/edit.phtml
@@ -23,7 +23,7 @@
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-/* @var $this \Magento\Adminhtml\Block\Newsletter\Queue\Edit */
+/* @var $this \Magento\Newsletter\Block\Adminhtml\Queue\Edit */
 ?>
 <div class="page-actions">
     <?php echo $this->getBackButtonHtml() ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/preview.phtml b/app/code/Magento/Newsletter/view/adminhtml/queue/preview.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/preview.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/queue/preview.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/subscriber/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/subscriber/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/subscriber/list.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/subscriber/list.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/template/edit.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/edit.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/template/edit.phtml
index e8f34e3019bc8bf0a5cb0f02ca12e83deb1a2cfe..8b964cd7e11f70ca0d90c4bcae83dbd7e9ff9afd 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/template/edit.phtml
@@ -23,7 +23,7 @@
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-/* @var $this \Magento\Adminhtml\Block\Newsletter\Template\Edit */
+/* @var $this \Magento\Newsletter\Block\Adminhtml\Template\Edit */
 ?>
 <div class="page-actions">
     <?php echo $this->getBackButtonHtml(); ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/template/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/list.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/template/list.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/preview.phtml b/app/code/Magento/Newsletter/view/adminhtml/template/preview.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/preview.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/template/preview.phtml
diff --git a/app/code/Magento/Newsletter/view/frontend/newsletter.js b/app/code/Magento/Newsletter/view/frontend/newsletter.js
index 010a1e46a986b9d377476940d4148912c5a9549c..da13f42afbab0fc18f3d2c9e52f8ae730e4dfe10 100644
--- a/app/code/Magento/Newsletter/view/frontend/newsletter.js
+++ b/app/code/Magento/Newsletter/view/frontend/newsletter.js
@@ -17,8 +17,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    frontend newsletter
- * @package     mage
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Newsletter/view/frontend/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/subscribe.phtml
index c3e4533928135c4cea858b5f0c785aff77c16706..c33c07b7907daec0ebf9d612a5e8e7d384704f60 100644
--- a/app/code/Magento/Newsletter/view/frontend/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/subscribe.phtml
@@ -18,7 +18,6 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
@@ -27,19 +26,21 @@
     <div class="title"><strong>Newsletter</strong></div>
     <div class="content">
         <form action="<?php echo $this->getFormActionUrl() ?>" method="post" id="newsletter-validate-detail">
-            <div class="field newsletter">
-                <label class="label" for="newsletter"><?php echo __('Sign Up for Our Newsletter:') ?></label>
-                <div class="control">
-                    <input name="email" type="text" id="newsletter"
-                                  placeholder="<?php echo __('Enter your email address') ?>"
-                                  data-validate="{required:true, 'validate-email':true}"/>
+            <fieldset class="fieldset">
+                <div class="field newsletter">
+                    <label class="label" for="newsletter"><span><?php echo __('Sign Up for Our Newsletter:') ?></span></label>
+                    <div class="control">
+                        <input name="email" type="text" id="newsletter"
+                                      placeholder="<?php echo __('Enter your email address') ?>"
+                                      data-validate="{required:true, 'validate-email':true}"/>
+                    </div>
+                    <div class="actions">
+                        <button class="action subscribe" title="<?php echo __('Subscribe') ?>" type="submit">
+                            <span><?php echo __('Subscribe') ?></span>
+                        </button>
+                    </div>
                 </div>
-                <div class="actions">
-                    <button class="action subscribe" title="<?php echo __('Subscribe') ?>" type="submit">
-                        <span><?php echo __('Subscribe') ?></span>
-                    </button>
-                </div>
-            </div>
+            </fieldset>
         </form>
     </div>
 </div>
diff --git a/app/code/Magento/Page/Block/Html/Header.php b/app/code/Magento/Page/Block/Html/Header.php
index 46e24c337faf48382c1c0130172cb243fe3a3fd3..8a55b5178bfe56eb4be1ca9496690eff507c3dda 100644
--- a/app/code/Magento/Page/Block/Html/Header.php
+++ b/app/code/Magento/Page/Block/Html/Header.php
@@ -64,11 +64,14 @@ class Header extends \Magento\View\Block\Template
     /**
      * Check if current url is url for home page
      *
-     * @return true
+     * @return bool
      */
     public function getIsHomePage()
     {
-        return $this->getUrl('') == $this->getUrl('*/*/*', array('_current'=>true, '_use_rewrite'=>true));
+        return $this->getUrl('', array('_current' => true)) == $this->getUrl(
+            '*/*/*',
+            array('_current' => true, '_use_rewrite' => true)
+        );
     }
 
     public function setLogo($logo_src, $logo_alt)
diff --git a/app/code/Magento/Page/etc/adminhtml/system.xml b/app/code/Magento/Page/etc/adminhtml/system.xml
index 769974e04d4203ba7ff2978e82a39e8e21fab72b..2f45806cae3d63fea67dfb5658cc04fdb54a7a1e 100644
--- a/app/code/Magento/Page/etc/adminhtml/system.xml
+++ b/app/code/Magento/Page/etc/adminhtml/system.xml
@@ -73,7 +73,7 @@
                 </field>
                 <field id="reset_to_defaults" translate="label comment" type="button" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Reset to Defaults</label>
-                    <frontend_model>Magento\Adminhtml\Block\Page\System\Config\Robots\Reset</frontend_model>
+                    <frontend_model>Magento\Backend\Block\Page\System\Config\Robots\Reset</frontend_model>
                     <comment>This action will delete your custom instructions and reset robots.txt file to system's default settings.</comment>
                 </field>
             </group>
diff --git a/app/code/Magento/Page/view/frontend/1column.phtml b/app/code/Magento/Page/view/frontend/1column.phtml
index d51c07bf5832f56a31bdf138560bc4496078d927..da0e81c630b1c94112566860fe71d3cf28eba786 100644
--- a/app/code/Magento/Page/view/frontend/1column.phtml
+++ b/app/code/Magento/Page/view/frontend/1column.phtml
@@ -32,12 +32,15 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="col1-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col1-layout<?php echo $bodyCss ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute() ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
     <?php echo $this->getChildHtml('after_body_start') ?>
     <div class="page wrapper">
         <?php echo $this->getChildHtml('global_notices') ?>
diff --git a/app/code/Magento/Page/view/frontend/2columns-left.phtml b/app/code/Magento/Page/view/frontend/2columns-left.phtml
index 89f053986364d9268ff16415c24c028c0a2529b4..6af17516b6837ad736b74d351385ad511f98c2f1 100644
--- a/app/code/Magento/Page/view/frontend/2columns-left.phtml
+++ b/app/code/Magento/Page/view/frontend/2columns-left.phtml
@@ -32,12 +32,15 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="col2-left-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col2-left-layout<?php echo $bodyCss ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute(); ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
     <?php echo $this->getChildHtml('after_body_start') ?>
     <div class="page wrapper">
         <?php echo $this->getChildHtml('global_notices') ?>
diff --git a/app/code/Magento/Page/view/frontend/2columns-right.phtml b/app/code/Magento/Page/view/frontend/2columns-right.phtml
index 50a3a64967221ff363f567be6b8bd4770b3462b8..7b5aae3b2b84d2ccdb618da7d820bad30ceb9460 100644
--- a/app/code/Magento/Page/view/frontend/2columns-right.phtml
+++ b/app/code/Magento/Page/view/frontend/2columns-right.phtml
@@ -32,12 +32,15 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="col2-right-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col2-right-layout<?php echo $bodyCss ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute() ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
     <?php echo $this->getChildHtml('after_body_start') ?>
     <div class="page wrapper">
         <?php echo $this->getChildHtml('global_notices') ?>
diff --git a/app/code/Magento/Page/view/frontend/3columns.phtml b/app/code/Magento/Page/view/frontend/3columns.phtml
index c5e2fa8df9a2a778550e76f57217aa07c7e14cd1..565563d3fa96daab2f5a6bda1ae28ed5f85e9536 100644
--- a/app/code/Magento/Page/view/frontend/3columns.phtml
+++ b/app/code/Magento/Page/view/frontend/3columns.phtml
@@ -32,12 +32,15 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="col3-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col3-layout<?php echo $bodyCss ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute() ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
     <?php echo $this->getChildHtml('after_body_start') ?>
     <div class="page wrapper">
         <?php echo $this->getChildHtml('global_notices') ?>
diff --git a/app/code/Magento/Page/view/frontend/empty.phtml b/app/code/Magento/Page/view/frontend/empty.phtml
index 6d44c2cacfbc2f2920f58327258eecb0f1060e18..ccdcbfcd6b0cdba36d18c64e759b984429a7c0f0 100644
--- a/app/code/Magento/Page/view/frontend/empty.phtml
+++ b/app/code/Magento/Page/view/frontend/empty.phtml
@@ -32,12 +32,15 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="page-empty<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="page-empty<?php echo $bodyCss ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute() ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
     <?php echo $this->getChildHtml('after_body_start') ?>
     <div class="page wrapper">
         <?php echo $this->getChildHtml('global_notices') ?>
diff --git a/app/code/Magento/Page/view/frontend/html/title.phtml b/app/code/Magento/Page/view/frontend/html/title.phtml
index 103a2c8d32fc3e7e46c5b2e347754796529cc205..f0bb0228b0abba393696ba021358cf79bca85ed6 100644
--- a/app/code/Magento/Page/view/frontend/html/title.phtml
+++ b/app/code/Magento/Page/view/frontend/html/title.phtml
@@ -31,7 +31,7 @@ $prefix = $this->getPrefix() ? '<span class="prefix">' . $this->getPrefix() . '<
 $suffix = $this->getSuffix() ? '<span class="suffix">' . $this->getSuffix() . '</span>' : '';
 $title = '';
 if (trim($this->getPageTitle())) {
-    $title = $prefix . '<span class="base">' . $this->getPageTitle() . '</span>' . $suffix;
+    $title = $prefix . '<span class="base" data-ui-id="page-title" ' .  $this->getAddBaseAttribute() . '>' . $this->getPageTitle() . '</span>' . $suffix;
 }
 ?>
 <?php if ($title): ?>
@@ -39,4 +39,4 @@ if (trim($this->getPageTitle())) {
     <h1 class="title"><?php echo $title ?></h1>
     <?php echo $this->getChildHtml(); ?>
 </div>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/app/code/Magento/Page/view/frontend/page.phtml b/app/code/Magento/Page/view/frontend/page.phtml
index 09cf7c396405d94b2093a3976db86ebb7b294d62..bea91f0711dde2c5653e46b87c17e37a321e4de3 100644
--- a/app/code/Magento/Page/view/frontend/page.phtml
+++ b/app/code/Magento/Page/view/frontend/page.phtml
@@ -32,12 +32,15 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="<?php echo $bodyCss ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute() ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
     <?php echo $this->getChildHtml('after_body_start') ?>
     <div class="page wrapper">
         <?php echo $this->getChildHtml('global_notices') ?>
diff --git a/app/code/Magento/Page/view/frontend/popup.phtml b/app/code/Magento/Page/view/frontend/popup.phtml
index 6d012f7bf1489f538845869f98fa088a1d11931f..fcf6f9c669a33b896d66700af903de3b675023b4 100644
--- a/app/code/Magento/Page/view/frontend/popup.phtml
+++ b/app/code/Magento/Page/view/frontend/popup.phtml
@@ -32,12 +32,15 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
 <!doctype html>
 <html lang="<?php echo $this->getLang() ?>" class="no-js">
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="page popup<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="page popup<?php echo $bodyCss ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute() ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
     <?php echo $this->getChildHtml('after_body_start') ?>
     <div class="page wrapper">
         <?php echo $this->getChildHtml('main') ?>
diff --git a/app/code/Magento/Page/view/frontend/print.phtml b/app/code/Magento/Page/view/frontend/print.phtml
index d16f0a93241ec6ff55ae845e5a3d5c1031d2c384..157e58e456ea0376b404e3a9488b4b8c3b33b07a 100644
--- a/app/code/Magento/Page/view/frontend/print.phtml
+++ b/app/code/Magento/Page/view/frontend/print.phtml
@@ -34,7 +34,10 @@
 <head>
 <?php echo $this->getChildHtml('head') ?>
 </head>
-<body class="page print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="page print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>"
+      data-container="body"
+      <?php echo $this->getAddAttribute() ?>
+      data-mage-init="{loaderAjax: {}, loader: {}}">
 <?php echo $this->getChildHtml('after_body_start') ?>
 <div class="page print wrapper">
     <header class="header print">
diff --git a/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php b/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php
index 7182ff076c39c248bb188f10d2bf27889451097e..4af8a927688a526f14213bff5e51fe0b9678a00e 100644
--- a/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php
+++ b/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php
@@ -31,7 +31,7 @@ class Cc extends \Magento\Payment\Block\Form
     protected $_template = 'Magento_Paygate::form/cc.phtml';
 
     /**
-     * Retreive payment method form html
+     * Retrieve payment method form html
      *
      * @return string
      */
diff --git a/app/code/Magento/Payment/Block/Form/Cc.php b/app/code/Magento/Payment/Block/Form/Cc.php
index 91f7e34dc602dc480bfed1815e7f8c493fc16f98..48245e15900c681f20bfc63b71404b1ab87c35fc 100644
--- a/app/code/Magento/Payment/Block/Form/Cc.php
+++ b/app/code/Magento/Payment/Block/Form/Cc.php
@@ -109,7 +109,7 @@ class Cc extends \Magento\Payment\Block\Form
     }
 
     /**
-     * Retrive has verification configuration
+     * Retrieve has verification configuration
      *
      * @return boolean
      */
diff --git a/app/code/Magento/Payment/Block/Info.php b/app/code/Magento/Payment/Block/Info.php
index 0a6bf7486514fec4804028f33f2aa5c2f0195d81..7baed204b2b5dde9ad985e3b60fe085f09c30add 100644
--- a/app/code/Magento/Payment/Block/Info.php
+++ b/app/code/Magento/Payment/Block/Info.php
@@ -144,7 +144,9 @@ class Info extends \Magento\View\Block\Template
         if (!$method = $payment->getMethodInstance()) {
             return true;
         }
-        return !$this->_storeManager->getStore($method->getStore())->isAdmin();
+
+        $methodStore = $this->_storeManager->getStore($method->getStore());
+        return $methodStore->getId() != \Magento\Core\Model\Store::DEFAULT_STORE_ID;
     }
 
     /**
diff --git a/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php b/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php
index b61468f5f86aa8fff751ee74fcc569aae8fa54ea..c74ffc2bd137211ed093cf24acf7c6a5a66dcd23 100644
--- a/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php
+++ b/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php
@@ -99,7 +99,7 @@ abstract class AbstractAgreement extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Retreive payment method instance
+     * Retrieve payment method instance
      *
      * @return \Magento\Payment\Model\Method\AbstractMethod
      */
@@ -132,7 +132,7 @@ abstract class AbstractAgreement extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Before save, it's overriden just to make data validation on before save event
+     * Before save, it's overridden just to make data validation on before save event
      *
      * @throws \Magento\Core\Exception
      * @return \Magento\Core\Model\AbstractModel
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
index 2c4091f348a3c741fbd3bdee6d39b3bc48c0984f..686a166772bbe1a966d4f6fe868baebba89784d8 100644
--- a/app/code/Magento/Paypal/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -1024,7 +1024,7 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
         try {
             $http = new \Magento\HTTP\Adapter\Curl();
             $config = array(
-                'timeout'    => 30,
+                'timeout'    => 60,
                 'verifypeer' => $this->_config->verifyPeer
             );
             if ($this->getUseProxy()) {
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 9d04246d87f67d7138acbf71a97ff71713849740..ae315b847043a750b9fbbb824a162fd02fca8638 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1117,6 +1117,9 @@ class Config
         if ($this->getMerchantCountry() == 'MY' && $code == 'MYR') {
             return true;
         }
+        if ($this->getMerchantCountry() == 'TR' && $code == 'TRY') {
+            return true;
+        }
         return false;
     }
 
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index abb958687d2a75ca186c5d946f7c732384cb87be..2d1839694990ca4bc423465f6e1829e9c101f522 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -43,7 +43,7 @@ class Checkout
      * Uses additional_information as storage
      */
     const PAYMENT_INFO_TRANSPORT_TOKEN    = 'paypal_express_checkout_token';
-    const PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN = 'paypal_express_checkout_shipping_overriden';
+    const PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN = 'paypal_express_checkout_shipping_overridden';
     const PAYMENT_INFO_TRANSPORT_SHIPPING_METHOD = 'paypal_express_checkout_shipping_method';
     const PAYMENT_INFO_TRANSPORT_PAYER_ID = 'paypal_express_checkout_payer_id';
     const PAYMENT_INFO_TRANSPORT_REDIRECT = 'paypal_express_checkout_redirect_required';
@@ -439,13 +439,13 @@ class Checkout
             $this->_api->setSuppressShipping(true);
         } else {
             $address = $this->_quote->getShippingAddress();
-            $isOverriden = 0;
+            $isOverridden = 0;
             if (true === $address->validate()) {
-                $isOverriden = 1;
+                $isOverridden = 1;
                 $this->_api->setAddress($address);
             }
             $this->_quote->getPayment()->setAdditionalInformation(
-                self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN, $isOverriden
+                self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN, $isOverridden
             );
             $this->_quote->getPayment()->save();
         }
@@ -572,7 +572,7 @@ class Checkout
             throw new \Magento\Core\Exception(__('Payer is not identified.'));
         }
         $this->_quote->setMayEditShippingAddress(
-            1 != $this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN)
+            1 != $this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN)
         );
         $this->_quote->setMayEditShippingMethod(
             '' == $this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_SHIPPING_METHOD)
diff --git a/app/code/Magento/ProductAlert/Block/Email/Price.php b/app/code/Magento/ProductAlert/Block/Email/Price.php
index 2907aa10f0636ca561cbc06a8c3d6ed2a49086fe..0741e4dbc5a2fec6fa05df70ea5aaf927e7dcb6a 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Price.php
@@ -39,7 +39,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
     protected $_template = 'email/price.phtml';
 
     /**
-     * Retrive unsubscribe url for product
+     * Retrieve unsubscribe url for product
      *
      * @param int $productId
      * @return string
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
index e1c746325774ecc830cbb9c01eee18a3a8ea06a8..4661f346bcf860d767b97cfdc47d618900b8ca49 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -62,7 +62,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
     }
 
     /**
-     * Retrive unsubscribe url for product
+     * Retrieve unsubscribe url for product
      *
      * @param int $productId
      * @return string
diff --git a/app/code/Magento/ProductAlert/view/frontend/product/view.phtml b/app/code/Magento/ProductAlert/view/frontend/product/view.phtml
index 202c7b2d1c7b420b268c6c9f51ee6be999b1ff77..997f9e67590bdd76ee9e489c6a48b5cbf16d0343 100644
--- a/app/code/Magento/ProductAlert/view/frontend/product/view.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/product/view.phtml
@@ -18,14 +18,14 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php /* @var $this \Magento\ProductAlert\Block\Product\View */?>
 <div class="product alert <?php echo $this->getHtmlClass() ?>">
-    <a href="<?php echo $this->escapeHtml($this->getSignupUrl()) ?>" title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>" class="action alert">
+    <a href="<?php echo $this->escapeHtml($this->getSignupUrl()) ?>"
+       title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>" class="action alert">
         <?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>
     </a>
 </div>
diff --git a/app/code/Magento/Rating/Block/Adminhtml/Edit.php b/app/code/Magento/Rating/Block/Adminhtml/Edit.php
index 3a233582b5ef6622b88621bf4d4164b9052f4a43..028e707825585e34ed3bee3aa5131df272a3159a 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Rating
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
index a77bf8dbb5d06fcd40b23bfa411d8f3483694ba0..c2fc01181326c1dd45bd078e934348fe008fd654 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Rating
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
index 03ed3e41e3731e25b5877e22aa3f5aebdb3e4cf7..93dd0c2fcdddacdc18b92feca0a0a38854cb481b 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Rating
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
index 32cd245a7488e64931005e284e95223f4bd43f87..5684753ad5ecfb182b9af04b4a94c3f3407e0ff8 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Rating
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
index f4b8e81db564abea47f5894294271c65f39ded28..dc05869d08bf405a6b2b91ef69afd4c06dd71297 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Rating
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Rating/Block/Adminhtml/Rating.php b/app/code/Magento/Rating/Block/Adminhtml/Rating.php
index 37664b5f8da0726250e30f15ff701820c51e2124..9ad6934ea8cd70d577945a761a02de5ab25d2938 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Rating.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Rating.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Rating
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Rating/Controller/Adminhtml/Index.php b/app/code/Magento/Rating/Controller/Adminhtml/Index.php
index 835f2ace53f00b1accc1a268e705b3c518cebbd2..9b15b7dfeb03a5620e97b5e9c8bd4e4db47befe4 100644
--- a/app/code/Magento/Rating/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Rating/Controller/Adminhtml/Index.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Rating
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
diff --git a/app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php
rename to app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
index bac7e8db8b2baf1c68d83e755d8a4e4ed057879b..e7720c02316d3b8089e3314d096f83c9722a3223 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Dashboard Month-To-Date Day starts Field Renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Config\Form\Field;
+namespace Magento\Reports\Block\Adminhtml\Config\Form\Field;
 
 class MtdStart extends \Magento\Backend\Block\System\Config\Form\Field
 {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php
rename to app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
index d5fdeb3b6d2f8c15729c3e509f06134ae617efc7..cea3c719a98c717acb9a0f40379ffa048f5d6b7a 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Dashboard Year-To-Date Month and Day starts Field Renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Config\Form\Field;
+namespace Magento\Reports\Block\Adminhtml\Config\Form\Field;
 
 class YtdStart extends \Magento\Backend\Block\System\Config\Form\Field
 {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
index 5875cc08a12c1dde51171e2b14bc2da77dfa2ee9..63c96077718f834b9977efb4b4027064bf3813ad 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
@@ -40,7 +40,8 @@ class Accounts extends \Magento\Backend\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_customer_accounts';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_customer_accounts';
         $this->_headerText = __('New Accounts');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
index a0a63eb9c2df58e0dbb64ab7eba6e88efda23a46..049683e204110536446f5bb298e3f8dbf5568186 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
@@ -45,7 +45,8 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_customer_orders';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_customer_orders';
         $this->_headerText = __('Customers by number of orders');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
index ee66625a473ad1a6b67a657c6c3c1b4403f68476..a8233a66de2cdd3257b1932eddd67982b61609b2 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
@@ -40,7 +40,8 @@ class Totals extends \Magento\Backend\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_customer_totals';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_customer_totals';
         $this->_headerText = __('Customers by Orders Total');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Filter/Form.php
rename to app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
index cd74153c9abd325ec3eda1ca39c1f9848ce13e27..5ac73eae5a1fb674ae4d8d2c2e1de0eeffd125fb 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml report filter form
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Filter;
+namespace Magento\Reports\Block\Adminhtml\Filter;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -103,7 +103,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      *
      * @param string $key
      * @param string $value
-     * @return \Magento\Adminhtml\Block\Report\Filter\Form
+     * @return \Magento\Reports\Block\Adminhtml\Filter\Form
      */
     public function addReportTypeOption($key, $value)
     {
@@ -114,11 +114,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     /**
      * Add fieldset with general report fields
      *
-     * @return \Magento\Adminhtml\Block\Report\Filter\Form
+     * @return \Magento\Reports\Block\Adminhtml\Filter\Form
      */
     protected function _prepareForm()
     {
-        $actionUrl = $this->getUrl('adminhtml/*/sales');
+        $actionUrl = $this->getUrl('*/*/sales');
 
         /** @var \Magento\Data\Form $form */
         $form   = $this->_formFactory->create(array(
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/AbstractGrid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 2d729bcff57247f0348d1083c3398210b8841424..3d1e86ac38129b72f99723f719f17597fc6b9cce 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -19,13 +19,13 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 
-namespace Magento\Adminhtml\Block\Report\Grid;
+namespace Magento\Reports\Block\Adminhtml\Grid;
 
 class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -55,24 +55,24 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      */
     protected $_resourceFactory;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Core\Model\Url $urlModel
-     * @param \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory
-     * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
-     * @param \Magento\Reports\Helper\Data $reportsData
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Core\Model\Url $urlModel
+     * @param \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory
+     * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
+     * @param \Magento\Reports\Helper\Data $reportsData
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Core\Model\Url $urlModel,
-        \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory,
-        \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
-        \Magento\Reports\Helper\Data $reportsData,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Core\Model\Url $urlModel,
+        \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory,
+        \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
+        \Magento\Reports\Helper\Data $reportsData,
+        array $data = array()
+    ) {
         $this->_resourceFactory = $resourceFactory;
         $this->_collectionFactory = $collectionFactory;
         $this->_reportsData = $reportsData;
@@ -121,13 +121,13 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
 
     /**
      * Add column to grid
-     * Overriden to add support for visibility_filter column option
+     * Overridden to add support for visibility_filter column option
      * It stands for conditional visibility of the column depending on filter field values
      * Value of visibility_filter supports (filter_field_name => filter_field_value) pairs
      *
      * @param   string $columnId
      * @param   array $column
-     * @return  \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+     * @return  \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      */
     public function addColumn($columnId, $column)
     {
@@ -326,7 +326,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      *
      * @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
      * @param \Magento\Object $filterData
-     * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+     * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      */
     protected function _addOrderStatusFilter($collection, $filterData)
     {
@@ -340,7 +340,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
      *
      * @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
      * @param \Magento\Object $filterData
-     * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+     * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      */
     protected function _addCustomFilter($collection, $filterData)
     {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
index 75993519809565a9ccd43ff9f2962edc6ddc3eff..57130d86ab6cc378875f698fef72668711a6fbf8 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml grid item renderer number or blank line
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
 
 class Blanknumber extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Number
 {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index bffdb7f813253149fafa76ab1f6f9e6a822bf2a1..de73deb962e6586794f9b121cf1898ab69daf7e9 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml grid item renderer currency
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
 
 class Currency
     extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
index 89662e998c86c8826c121e0f4d988be4afe81b87..48a589bc47b126b556658608f40e6c19de8b28ee 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,10 +29,10 @@
  * Adminhtml Report Customers Reviews renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
 
 class Customer
     extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
index 7e2f7e3381bc0688961229e9cd977d05c21769f3..b598d5e34539f778e4c20b032a16385ae1c6c21a 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,10 +29,10 @@
  * Adminhtml Report Products Reviews renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
 
 class Product
     extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
index 51b4fbd42d4873f310fb951e56d3ee6129a5e06e..df193b18293653937e54b95102f01fab21e1d124 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml shopping carts report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Grid;
+namespace Magento\Reports\Block\Adminhtml\Grid;
 
 class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -49,7 +49,7 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
      * storeIds setter
      *
      * @param  array $storeIds
-     * @return \Magento\Adminhtml\Block\Report\Grid\Shopcart
+     * @return \Magento\Reports\Block\Adminhtml\Grid\Shopcart
      */
     public function setStoreIds($storeIds)
     {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Product.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product.php
index de2056200a261ae8033db162fafa22ab46ddfa27..35355169e3e2ad22c0274c274ae1d71dc7d63513 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,18 @@
  * Adminhtml products report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report;
+namespace Magento\Reports\Block\Adminhtml;
 
 class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
 
     protected function _construct()
     {
-        $this->_controller = 'report_product';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_product';
         $this->_headerText = __('Products Report');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
index 469f8fa7bb7539d4613ecf713a109be18679255f..86695e021cf7a6b93a93ae0e4d9c1fb99353b21d 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,18 @@
  * Adminhtml product downloads report
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
 
 class Downloads extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
     protected function _construct()
     {
-        $this->_controller = 'report_product_downloads';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_product_downloads';
         $this->_headerText = __('Downloads');
         parent::_construct();
         $this->_removeButton('add');
@@ -49,7 +50,7 @@ class Downloads extends \Magento\Adminhtml\Block\Widget\Grid\Container
         $this->setChild('store_switcher',
             $this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
                 ->setUseConfirm(false)
-                ->setSwitchUrl($this->getUrl('adminhtml/*/*', array('store'=>null)))
+                ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
                 ->setTemplate('Magento_Reports::store/switcher.phtml')
         );
         return parent::_prepareLayout();
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
index 92839062b40710e41e23abef31d8eeb08ae3d14e..81b117d39eb6346d959fdd40a6a8b0274dfa99fc 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml product downloads report grid
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Product\Downloads;
+namespace Magento\Reports\Block\Adminhtml\Product\Downloads;
 
 class Grid extends \Magento\Adminhtml\Block\Widget\Grid
 {
@@ -123,7 +123,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
             'filter'    => false,
             'index'     => 'purchases',
             'type'      => 'number',
-            'renderer'  => 'Magento\Adminhtml\Block\Report\Product\Downloads\Renderer\Purchases',
+            'renderer'  => 'Magento\Reports\Block\Adminhtml\Product\Downloads\Renderer\Purchases',
             'header_css_class'  => 'col-purchases',
             'column_css_class'  => 'col-purchases'
         ));
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
index d1748cd80592fbc306682d0f09aa1d8e3550351a..7fd67755895371b36920ca8b48b8cb4a837b464a 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml Product Downloads Purchases Renderer
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Product\Downloads\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Product\Downloads\Renderer;
 
 class Purchases
     extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
index e5b71fae7b322dca7c25f81dd3a608e05060e525..7fc96321abc1469f53a57a566f0ed24d44df9eed 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml products report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
 
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
index 83c2f2736d96b2b77a16814e131e0e5444e32141..3492e84a22200554390fb47d584e5c43062ed8af 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,18 @@
  * Adminhtml low stock products report content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
 
 class Lowstock extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
     protected function _construct()
     {
-        $this->_controller = 'report_product_lowstock';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_product_lowstock';
         $this->_headerText = __('Low stock');
         parent::_construct();
         $this->_removeButton('add');
@@ -49,7 +50,7 @@ class Lowstock extends \Magento\Adminhtml\Block\Widget\Grid\Container
         $this->setChild('store_switcher',
             $this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
                 ->setUseConfirm(false)
-                ->setSwitchUrl($this->getUrl('adminhtml/*/*', array('store'=>null)))
+                ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
                 ->setTemplate('Magento_Reports::store/switcher.phtml')
         );
 
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
index 5f415544878d0ef87f5ab0ebb6ba36322bc2ae85..aada0221fe9490cb660867769bb503bc5b208abd 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml low stock products report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Product\Lowstock;
+namespace Magento\Reports\Block\Adminhtml\Product\Lowstock;
 
 class Grid extends \Magento\Backend\Block\Widget\Grid
 {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
index 166de41fbb5fba55ff3191b660fcec1e179c5dfc..11a46b6b0cea6a70c076f023b6d3ba9b02e457da 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
@@ -44,7 +44,8 @@ class Sold extends \Magento\Backend\Block\Widget\Grid\Container
      */
     protected function _construct()
     {
-        $this->_controller = 'report_product_sold';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_product_sold';
         $this->_headerText = __('Products Ordered');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
index 5e4d81c4b9022d6e206599531c7f4ff76c9d1156..2d8fc1e213ed705740ce3632bf43e8c2cd1c3b71 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml most viewed products report content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
 
 class Viewed extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -40,7 +40,8 @@ class Viewed extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_product_viewed';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_product_viewed';
         $this->_headerText = __('Most Viewed');
         parent::_construct();
 
@@ -60,6 +61,6 @@ class Viewed extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/viewed', array('_current' => true));
+        return $this->getUrl('*/*/viewed', array('_current' => true));
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
index d23166185dde2be2461cdd64546cc061d0d8d648..6c2b19145c070195531aa1ae0d1d82653a0a5e1f 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml most viewed products report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Product\Viewed;
+namespace Magento\Reports\Block\Adminhtml\Product\Viewed;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     /**
      * Column for grid to be grouped by
@@ -71,7 +71,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'width'         => 100,
             'sortable'      => false,
             'period_type'   => $this->getPeriodType(),
-            'renderer'      => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'      => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'  => __('Total'),
             'html_decorators' => array('nobr'),
             'header_css_class'  => 'col-period',
@@ -125,7 +125,8 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
      *
      * @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
      * @param \Magento\Object $filterData
-     * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+     * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _addOrderStatusFilter($collection, $filterData)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php b/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
index e86b04cd4cb2ab46d6edd3aa13b75016ec830fc4..c0be8410e0980e43248c5fa6763931fbd99fc498 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
@@ -40,7 +40,8 @@ class Statistics extends \Magento\Backend\Block\Widget\Grid\Container
      */
     protected function _construct()
     {
-        $this->_controller = 'report_refresh_statistics';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_refresh_statistics';
         $this->_headerText = __('Refresh Statistics');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Customer.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
index c23a87c18736049535482caa19b452a7fc10d793..f6c8043617dfb02c374687be04da5097c3da04de 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,18 +28,19 @@
  * Adminhtml cms blocks content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Review;
+namespace Magento\Reports\Block\Adminhtml\Review;
 
 class Customer extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
 
     protected function _construct()
     {
-        $this->_controller = 'report_review_customer';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_review_customer';
         $this->_headerText = __('Customers Reviews');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Detail.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
index 49fa91e3e2994697e2cd0a522fe7e2fd057adf33..f8fb2d79dc00c74055ee42c924a5a94f998c48d9 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml report review product blocks content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Review;
+namespace Magento\Reports\Block\Adminhtml\Review;
 
 class Detail extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -59,14 +59,15 @@ class Detail extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_review_detail';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_review_detail';
 
         $product = $this->_productFactory->create()->load($this->getRequest()->getParam('id'));
         $this->_headerText = __('Reviews for %1', $product->getName());
 
         parent::_construct();
         $this->_removeButton('add');
-        $this->setBackUrl($this->getUrl('adminhtml/report_review/product/'));
+        $this->setBackUrl($this->getUrl('reports/report_review/product/'));
         $this->_addBackButton();
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
index c8032a5ff018bead4be1dba521f94c168301aff8..ed52b112651eb9e19ab56e392472d60703d85103 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml report reviews product grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Review\Detail;
+namespace Magento\Reports\Block\Adminhtml\Review\Detail;
 
 class Grid extends \Magento\Adminhtml\Block\Widget\Grid
 {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
index 942cb137f5d77f58e621d46b9e7523bef0526e4a..ec4befe0c00637807a7dbdb4fae2c18259d48d95 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,18 @@
  * Adminhtml report review product blocks content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Review;
+namespace Magento\Reports\Block\Adminhtml\Review;
 
 class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
 
     protected function _construct()
     {
-        $this->_controller = 'report_review_product';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_review_product';
         $this->_headerText = __('Products Reviews');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
index 6bf1712a65c99f10e3fe0adaf498e089f0c78274..7228b5e0c1125c445e16bc771deb46f70f15b557 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml sales report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
 
 class Bestsellers extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -40,7 +40,8 @@ class Bestsellers extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_sales_bestsellers';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_sales_bestsellers';
         $this->_headerText = __('Products Bestsellers Report');
         parent::_construct();
 
@@ -55,6 +56,6 @@ class Bestsellers extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/bestsellers', array('_current' => true));
+        return $this->getUrl('*/*/bestsellers', array('_current' => true));
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
index a8e2d084aa72c7753cdced46088abd5c79f6b156..41b672c432c9fd6b10a23ad457b8f7114fbcb313 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml bestsellers report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Bestsellers;
+namespace Magento\Reports\Block\Adminhtml\Sales\Bestsellers;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     protected $_columnGroupBy = 'period';
 
@@ -55,7 +55,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'index'         => 'period',
             'sortable'      => false,
             'period_type'   => $this->getPeriodType(),
-            'renderer'      => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'      => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'  => __('Total'),
             'html_decorators' => array('nobr'),
             'header_css_class'  => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
index e02617e9355167784dadbb56a0be3d91a6f62819..622b77b1d5a793eb2686f9d8e5aa066dc320ddd6 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml coupons report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
 
 class Coupons extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -40,7 +40,8 @@ class Coupons extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_sales_coupons';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_sales_coupons';
         $this->_headerText = __('Coupons Usage Report');
         parent::_construct();
 
@@ -55,6 +56,6 @@ class Coupons extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/coupons', array('_current' => true));
+        return $this->getUrl('*/*/coupons', array('_current' => true));
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
index d3b003c3b7a8737ab1d2a619239f4d08263e0ab3..b3b6fc61bb521959b6a692e5c661298292394709 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml coupons report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Coupons;
+namespace Magento\Reports\Block\Adminhtml\Sales\Coupons;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     protected $_columnGroupBy = 'period';
 
@@ -60,7 +60,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'index'             => 'period',
             'sortable'          => false,
             'period_type'       => $this->getPeriodType(),
-            'renderer'          => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'          => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'      => __('Total'),
             'subtotals_label'   => __('Subtotal'),
             'html_decorators' => array('nobr'),
@@ -183,7 +183,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
      *
      * @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
      * @param \Magento\Object $filterData
-     * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+     * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
      */
     protected function _addCustomFilter($collection, $filterData)
     {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
index a2099f27cd5db0f5375e42cde230696f83266e09..d58f511254535408f1358fbc25506ec93f9a154b 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,7 +27,7 @@
 /**
  * Adminhtml grid item renderer date
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer;
 
 class Date
     extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Date
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
index e3a3d2c588c7646bad7bb4936c43d8119c53a05a..6b19c1592d093c9c406b7016f7f1855bc7136619 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml invoiced report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
 
 class Invoiced extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -40,7 +40,8 @@ class Invoiced extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_sales_invoiced';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_sales_invoiced';
         $this->_headerText = __('Total Invoiced vs. Paid Report');
         parent::_construct();
 
@@ -55,6 +56,6 @@ class Invoiced extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/invoiced', array('_current' => true));
+        return $this->getUrl('*/*/invoiced', array('_current' => true));
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
index e57fd51c9940a774114af60975f6c7701c565968..e3d9c3b2a90fed2b4ed1b29df59be74c22f324c6 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml invoiced report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Invoiced;
+namespace Magento\Reports\Block\Adminhtml\Sales\Invoiced;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     protected $_columnGroupBy = 'period';
 
@@ -57,7 +57,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'index'         => 'period',
             'sortable'      => false,
             'period_type'   => $this->getPeriodType(),
-            'renderer'      => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'      => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'  => __('Total'),
             'html_decorators' => array('nobr'),
             'header_css_class'  => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
index 79a81c0ecb54d8d32c168b19dedaf20e6ba0ea42..1216cd954a54bb1f30918e965f9817a676018c3d 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml refunded report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
 
 class Refunded extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -40,7 +40,8 @@ class Refunded extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_sales_refunded';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_sales_refunded';
         $this->_headerText = __('Total Refunded Report');
         parent::_construct();
 
@@ -55,6 +56,6 @@ class Refunded extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/refunded', array('_current' => true));
+        return $this->getUrl('*/*/refunded', array('_current' => true));
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
index 8e7d1d36bdcbf47109e1417ad33c680ec9cf6729..f9eedbe590e5385e65622c8b74baa614eede625d 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml refunded report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Refunded;
+namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     protected $_columnGroupBy = 'period';
 
@@ -57,7 +57,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'index'         => 'period',
             'sortable'      => false,
             'period_type'   => $this->getPeriodType(),
-            'renderer'      => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'      => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'  => __('Total'),
             'html_decorators' => array('nobr'),
             'header_css_class'  => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
index 28b260bc3c13cd9537f4f9cf6b1f2dec4f34d036..bf5360ca8c46970c313db56924962cc2b427816c 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml sales report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
 
 class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -40,7 +40,8 @@ class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_sales_sales';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_sales_sales';
         $this->_headerText = __('Total Ordered Report');
         parent::_construct();
 
@@ -55,6 +56,6 @@ class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/sales', array('_current' => true));
+        return $this->getUrl('*/*/sales', array('_current' => true));
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index 2c4828a09a4563a40b3ba443f5d78ed72331f573..38fe5585d8bd0afd1bdef7bb610476bc2c435063 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml sales report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     protected $_columnGroupBy = 'period';
 
@@ -57,7 +57,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'index'         => 'period',
             'sortable'      => false,
             'period_type'   => $this->getPeriodType(),
-            'renderer'      => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'      => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'  => __('Total'),
             'html_decorators' => array('nobr'),
             'header_css_class'  => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
index 670b0e14299aac4585ace12daa8dd952cdc1e3de..1d382b0d0fa87c052ca902657f685989715428cc 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml shipping report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
 
 class Shipping extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -41,7 +41,8 @@ class Shipping extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_sales_shipping';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_sales_shipping';
         $this->_headerText = __('Total Shipped Report');
         parent::_construct();
 
@@ -56,6 +57,6 @@ class Shipping extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/shipping', array('_current' => true));
+        return $this->getUrl('*/*/shipping', array('_current' => true));
     }
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
index 973449259f075c46e566f0889a22867cbb831094..08e48bff4bcf4048f335075679dd5c276a5baa5e 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml shipping report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Shipping;
+namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     protected $_columnGroupBy = 'period';
 
@@ -58,7 +58,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'index'             => 'period',
             'sortable'          => false,
             'period_type'       => $this->getPeriodType(),
-            'renderer'          => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'          => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'      => __('Total'),
             'subtotals_label'   => __('Subtotal'),
             'html_decorators'   => array('nobr'),
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
index b34b879ca8b4b3abfe257de494de9b8c9cd5ad80..358d4ab48f0461a6ff42fb51d45e71ab5cef1ae6 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml tax report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
 
 class Tax extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -41,7 +41,8 @@ class Tax extends \Magento\Adminhtml\Block\Widget\Grid\Container
 
     protected function _construct()
     {
-        $this->_controller = 'report_sales_tax';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_sales_tax';
         $this->_headerText = __('Order Taxes Report Grouped by Tax Rate');
         parent::_construct();
 
@@ -56,7 +57,7 @@ class Tax extends \Magento\Adminhtml\Block\Widget\Grid\Container
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
-        return $this->getUrl('adminhtml/*/tax', array('_current' => true));
+        return $this->getUrl('*/*/tax', array('_current' => true));
     }
 
 }
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index cb23cc1d3b2b9da641f2872a01d5e1db621ed73e..965b745578cebecebc3f8ed68d0a2bfcbb2c872e 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml tax report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Sales\Tax;
+namespace Magento\Reports\Block\Adminhtml\Sales\Tax;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     protected $_columnGroupBy = 'period';
 
@@ -87,7 +87,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
             'index'             => 'period',
             'sortable'          => false,
             'period_type'       => $this->getPeriodType(),
-            'renderer'          => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+            'renderer'          => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
             'totals_label'      => __('Total'),
             'subtotals_label'   => __('Subtotal'),
             'html_decorators' => array('nobr'),
@@ -150,7 +150,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
      * Preparing collection
      * Filter canceled statuses for orders in taxes
      *
-     * @return \Magento\Adminhtml\Block\Report\Sales\Tax\Grid
+     * @return \Magento\Reports\Block\Adminhtml\Sales\Tax\Grid
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/Magento/Adminhtml/Block/Report/Search.php b/app/code/Magento/Reports/Block/Adminhtml/Search.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Report/Search.php
rename to app/code/Magento/Reports/Block/Adminhtml/Search.php
index c085741fb844447fffdd5cbff2938ae68287c2a8..f806c85ac56b846f9c5736f24e13ee057607ce0b 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Search.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Search.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml search report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report;
+namespace Magento\Reports\Block\Adminhtml;
 
 class Search extends \Magento\Backend\Block\Widget\Grid\Container
 {
@@ -42,7 +42,8 @@ class Search extends \Magento\Backend\Block\Widget\Grid\Container
      */
     protected function _construct()
     {
-        $this->_controller = 'report_search';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_search';
         $this->_headerText = __('Search Terms');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
index 355beef23640d279c71756a913157f8c01786f70..a4bd90b7b9256e12247076a7677ec3f6726b2ec4 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,18 @@
  * Adminhtml abandoned shopping cart report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Shopcart;
+namespace Magento\Reports\Block\Adminhtml\Shopcart;
 
 class Abandoned extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
 
     protected function _construct()
     {
-        $this->_controller = 'report_shopcart_abandoned';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_shopcart_abandoned';
         $this->_headerText = __('Abandoned carts');
         parent::_construct();
         $this->_removeButton('add');
@@ -49,7 +50,7 @@ class Abandoned extends \Magento\Adminhtml\Block\Widget\Grid\Container
         $this->setChild('store_switcher',
             $this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
                 ->setUseConfirm(false)
-                ->setSwitchUrl($this->getUrl('adminhtml/*/*', array('store'=>null)))
+                ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
                 ->setTemplate('Magento_Reports::store/switcher.phtml')
         );
 
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index cc77533f1d48ea5e0cb0f12214027af021aa05e1..c2f84aaec913f53bc3b3cc0d3bccedfa3f758889 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml abandoned shopping carts report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Shopcart\Abandoned;
+namespace Magento\Reports\Block\Adminhtml\Shopcart\Abandoned;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
 {
     /**
      * @var \Magento\Reports\Model\Resource\Quote\CollectionFactory
@@ -152,7 +152,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
             'currency_code' => $currencyCode,
             'index'         => 'subtotal',
             'sortable'      => false,
-            'renderer'      => 'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+            'renderer'      => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
             'rate'          => $this->getRate($currencyCode),
             'header_css_class'  => 'col-subtotal',
             'column_css_class'  => 'col-subtotal'
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
index 6693c7db4b2d982916eff615a861311812d03df1..69fa0e4f01c20cd70d675a754f4f381fbe3c36bf 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,18 @@
  * Adminhtml Shopping cart customers report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Report\Shopcart;
+namespace Magento\Reports\Block\Adminhtml\Shopcart;
 
 class Customer extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
     protected function _construct()
     {
-        $this->_controller = 'report_shopcart_customer';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_shopcart_customer';
         $this->_headerText = __('Customers');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
index d167a0e66d989e89c9c5deae4eb113bcffa05e43..8f3fb5280eb882a316b79f4d94cd533f0fac9b4d 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml items in carts report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Shopcart\Customer;
+namespace Magento\Reports\Block\Adminhtml\Shopcart\Customer;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
 {
     /**
      * @var \Magento\Reports\Model\Resource\Customer\CollectionFactory
@@ -117,7 +117,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
             'align'     =>'right',
             'currency_code' => $currencyCode,
             'index'     =>'total',
-            'renderer'  =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+            'renderer'  =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
             'rate'          => $this->getRate($currencyCode),
         ));
 
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
index a753f5f8d5f09074cccd029eb5a06151e927f7b4..3b60e367abae19c72160fdbd6e4f63455169598b 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,18 @@
  * Adminhtml Shopping cart products report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Shopcart;
+namespace Magento\Reports\Block\Adminhtml\Shopcart;
 
 class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
 
     protected function _construct()
     {
-        $this->_controller = 'report_shopcart_product';
+        $this->_blockGroup = 'Magento_Reports';
+        $this->_controller = 'adminhtml_shopcart_product';
         $this->_headerText = __('Products in carts');
         parent::_construct();
         $this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
index fb98870a7e1ba8225f10917a67469c21a12db581..1c55591d983c703f72a50683a508564fd260bc46 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * Adminhtml products in carts report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Shopcart\Product;
+namespace Magento\Reports\Block\Adminhtml\Shopcart\Product;
 
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
 {
     /**
      * @var \Magento\Reports\Model\Resource\Quote\CollectionFactory
@@ -98,7 +98,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
             'type'      =>'currency',
             'currency_code' => $currencyCode,
             'index'     =>'price',
-            'renderer'  =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+            'renderer'  =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
             'rate'          => $this->getRate($currencyCode),
             'header_css_class'  => 'col-price',
             'column_css_class'  => 'col-price'
diff --git a/app/code/Magento/Adminhtml/Block/Report/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Wishlist.php
rename to app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index bb013103362c1bd0789f29a7abdbfed8d92cbf12..2665fc7d45779205ff5064ce658695a1fa9173d8 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml wishlist report page content block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report;
+namespace Magento\Reports\Block\Adminhtml;
 
 class Wishlist extends \Magento\Backend\Block\Template
 {
@@ -72,7 +72,7 @@ class Wishlist extends \Magento\Backend\Block\Template
     {
         $this->setChild(
             'grid',
-            $this->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Wishlist\Grid', 'report.grid')
+            $this->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Wishlist\Grid', 'report.grid')
         );
 
         $collection = $this->_wishlistFactory->create();
diff --git a/app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
index d0a7e08aaa5f20da580834a9f4371b72fbcc7ebb..5862a8a039422a4d642fbe46dc89b44408f541d2 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml wishlist report grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Report\Wishlist;
+namespace Magento\Reports\Block\Adminhtml\Wishlist;
 
 class Grid extends \Magento\Adminhtml\Block\Widget\Grid
 {
diff --git a/app/code/Magento/Adminhtml/Controller/Report.php b/app/code/Magento/Reports/Controller/Adminhtml/Index.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Report.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Index.php
index 45ed4c367ed3493686dfe890b0469d867a1b77d6..debc187addd7e59f36b944359918193f827583a8 100644
--- a/app/code/Magento/Adminhtml/Controller/Report.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Index.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,12 +28,12 @@
  * sales admin controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Reports\Controller\Adminhtml;
 
-class Report extends \Magento\Backend\App\Action
+class Index extends \Magento\Backend\App\Action
 {
     /**
      * @var \Magento\App\Response\Http\FileFactory
diff --git a/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
index 21c7d398f839ac4820a95a07e9be3ce411b84235..54f5276bb4584c5c4c6489bc8ccc41359494dbc6 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,10 +29,10 @@
  * Admin abstract reports controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
 
 abstract class AbstractReport extends \Magento\Backend\App\Action
 {
@@ -84,7 +84,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
     /**
      * Add report breadcrumbs
      *
-     * @return \Magento\Adminhtml\Controller\Report\AbstractReport
+     * @return \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
      */
     public function _initAction()
     {
@@ -97,7 +97,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
      * Report action init operations
      *
      * @param array|\Magento\Object $blocks
-     * @return \Magento\Adminhtml\Controller\Report\AbstractReport
+     * @return \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
      */
     public function _initReportAction($blocks)
     {
@@ -105,7 +105,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
             $blocks = array($blocks);
         }
 
-        $requestData = $this->_objectManager->get('Magento\Adminhtml\Helper\Data')
+        $requestData = $this->_objectManager->get('Magento\Backend\Helper\Data')
             ->prepareFilterString($this->getRequest()->getParam('filter'));
         $inputFilter = new \Zend_Filter_Input(array('from' => $this->_dateFilter, 'to' => $this->_dateFilter),
             array(), $requestData);
@@ -134,7 +134,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
      *
      * @param string $flagCode
      * @param string $refreshCode
-     * @return \Magento\Adminhtml\Controller\Report\AbstractReport
+     * @return \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
      */
     protected function _showLastExecutionTime($flagCode, $refreshCode)
     {
@@ -145,8 +145,8 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
             )
             : 'undefined';
 
-        $refreshStatsLink = $this->getUrl('adminhtml/report_statistics');
-        $directRefreshLink = $this->getUrl('adminhtml/report_statistics/refreshRecent', array('code' => $refreshCode));
+        $refreshStatsLink = $this->getUrl('reports/report_statistics');
+        $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent', array('code' => $refreshCode));
 
         $this->_objectManager->get('Magento\Adminhtml\Model\Session')
             ->addNotice(__('Last updated: %1. To refresh last day\'s <a href="%2">statistics</a>, '
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Controller/Report/Customer.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
index da40a61d283b6cb30b397c8d9698adeb8f50dd9a..153b311c531d38c9bb312ce564382515a7f8b34c 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Customer.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,10 +29,10 @@
  * Customer reports admin controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
 
 class Customer extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Report/Product.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
index 5365f1e4a9f9bf959da53a015ed82e3d1cfb4306..c5ef5ba4f8d532e220a273f8d1865f4e244f2aa9 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Product.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,17 +29,17 @@
  * Product reports admin controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
 
-class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
+class Product extends \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
 {
     /**
      * Add report/products breadcrumbs
      *
-     * @return \Magento\Adminhtml\Controller\Report\Product
+     * @return \Magento\Reports\Controller\Adminhtml\Report\Product
      */
     public function _initAction()
     {
@@ -110,7 +110,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
                 __('Products Most Viewed Report')
             );
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_product_viewed.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_product_viewed.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -128,7 +128,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportViewedCsvAction()
     {
         $fileName   = 'products_mostviewed.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Viewed\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Viewed\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -140,7 +140,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportViewedExcelAction()
     {
         $fileName   = 'products_mostviewed.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Viewed\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Viewed\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
@@ -203,7 +203,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
                 __('Downloads')
             )
             ->_addContent(
-                $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Downloads')
+                $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Downloads')
             );
         $this->_view->renderLayout();
     }
@@ -215,7 +215,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportDownloadsCsvAction()
     {
         $fileName   = 'products_downloads.csv';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Downloads\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Downloads\Grid')
             ->setSaveParametersInSession(true)
             ->getCsv();
 
@@ -229,7 +229,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportDownloadsExcelAction()
     {
         $fileName   = 'products_downloads.xml';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Downloads\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Downloads\Grid')
             ->setSaveParametersInSession(true)
             ->getExcel($fileName);
 
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Review.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Report/Review.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
index 8e4fe66345a5ed13f7285530b78ace90552f21ea..37db4b711258e951d600a6a1efa8f83307db93b6 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Review.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Review reports admin controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
 
 class Review extends \Magento\Backend\App\Action
 {
@@ -146,7 +146,7 @@ class Review extends \Magento\Backend\App\Action
             ->_addBreadcrumb(__('Products Report'), __('Products Report'))
             ->_addBreadcrumb(__('Product Reviews'), __('Product Reviews'))
             ->_addContent(
-                $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Review\Detail')
+                $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Review\Detail')
             );
         $this->_view->renderLayout();
     }
@@ -157,7 +157,7 @@ class Review extends \Magento\Backend\App\Action
     public function exportProductDetailCsvAction()
     {
         $fileName   = 'review_product_detail.csv';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Review\Detail\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Review\Detail\Grid')
             ->getCsv();
 
         return $this->_fileFactory->create($fileName, $content);
@@ -169,7 +169,7 @@ class Review extends \Magento\Backend\App\Action
     public function exportProductDetailExcelAction()
     {
         $fileName   = 'review_product_detail.xml';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Review\Detail\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Review\Detail\Grid')
             ->getExcel($fileName);
 
         return $this->_fileFactory->create($fileName, $content);
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Controller/Report/Sales.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
index 4a02b2853ea1b7903bf752d0be05d4cd1f5fc1f0..ae4f1338e75750dfd29bb3eb34a38873a691750c 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Sales.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,17 +28,17 @@
  * Sales report admin controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
 
-class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
+class Sales extends \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
 {
     /**
      * Add report/sales breadcrumbs
      *
-     * @return \Magento\Adminhtml\Controller\Report\Sales
+     * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
      */
     public function _initAction()
     {
@@ -57,7 +57,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
             ->_setActiveMenu('Magento_Reports::report_salesroot_sales')
             ->_addBreadcrumb(__('Sales Report'), __('Sales Report'));
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_sales_sales.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_sales.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -78,7 +78,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
             ->_setActiveMenu('Magento_Reports::report_products_bestsellers')
             ->_addBreadcrumb(__('Products Bestsellers Report'), __('Products Bestsellers Report'));
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_sales_bestsellers.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_bestsellers.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -95,7 +95,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportBestsellersCsvAction()
     {
         $fileName   = 'bestsellers.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -106,7 +106,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportBestsellersExcelAction()
     {
         $fileName   = 'bestsellers.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
@@ -114,7 +114,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     /**
      * Refresh statistics for last 25 hours
      *
-     * @return \Magento\Adminhtml\Controller\Report\Sales
+     * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
      */
     public function refreshRecentAction()
     {
@@ -124,7 +124,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     /**
      * Refresh statistics for all period
      *
-     * @return \Magento\Adminhtml\Controller\Report\Sales
+     * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
      */
     public function refreshLifetimeAction()
     {
@@ -137,7 +137,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportSalesCsvAction()
     {
         $fileName   = 'sales.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Sales\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -148,7 +148,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportSalesExcelAction()
     {
         $fileName   = 'sales.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Sales\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
@@ -163,7 +163,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
             ->_setActiveMenu('Magento_Reports::report_salesroot_tax')
             ->_addBreadcrumb(__('Tax'), __('Tax'));
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_sales_tax.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_tax.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -180,7 +180,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportTaxCsvAction()
     {
         $fileName   = 'tax.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Tax\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -191,7 +191,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportTaxExcelAction()
     {
         $fileName   = 'tax.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Tax\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
@@ -206,7 +206,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
             ->_setActiveMenu('Magento_Reports::report_salesroot_shipping')
             ->_addBreadcrumb(__('Shipping'), __('Shipping'));
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_sales_shipping.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_shipping.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -223,7 +223,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportShippingCsvAction()
     {
         $fileName   = 'shipping.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Shipping\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -234,7 +234,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportShippingExcelAction()
     {
         $fileName   = 'shipping.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Shipping\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
@@ -249,7 +249,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
             ->_setActiveMenu('Magento_Reports::report_salesroot_invoiced')
             ->_addBreadcrumb(__('Total Invoiced'), __('Total Invoiced'));
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_sales_invoiced.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_invoiced.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -266,7 +266,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportInvoicedCsvAction()
     {
         $fileName   = 'invoiced.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -277,7 +277,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportInvoicedExcelAction()
     {
         $fileName   = 'invoiced.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
@@ -292,7 +292,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
             ->_setActiveMenu('Magento_Reports::report_salesroot_refunded')
             ->_addBreadcrumb(__('Total Refunded'), __('Total Refunded'));
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_sales_refunded.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_refunded.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -309,7 +309,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportRefundedCsvAction()
     {
         $fileName   = 'refunded.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Refunded\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -320,7 +320,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportRefundedExcelAction()
     {
         $fileName   = 'refunded.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Refunded\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
@@ -335,7 +335,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
             ->_setActiveMenu('Magento_Reports::report_salesroot_coupons')
             ->_addBreadcrumb(__('Coupons'), __('Coupons'));
 
-        $gridBlock = $this->_view->getLayout()->getBlock('report_sales_coupons.grid');
+        $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_coupons.grid');
         $filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
 
         $this->_initReportAction(array(
@@ -352,7 +352,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportCouponsCsvAction()
     {
         $fileName   = 'coupons.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Coupons\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getCsvFile());
     }
@@ -363,7 +363,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
     public function exportCouponsExcelAction()
     {
         $fileName   = 'coupons.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Coupons\Grid');
+        $grid       = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid');
         $this->_initReportAction($grid);
         return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
     }
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Controller/Report/Shopcart.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
index 965d125ad6198adb409deb45bde7536cebf7cbc1..0f058e48635a6df157e232f979f030430609be85 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Shopping Cart reports admin controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
 
 class Shopcart extends \Magento\Backend\App\Action
 {
@@ -70,7 +70,7 @@ class Shopcart extends \Magento\Backend\App\Action
             ->_addContent(
                 $this->_view
                     ->getLayout()
-                    ->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Customer')
+                    ->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Customer')
             );
         $this->_view->renderLayout();
     }
@@ -81,7 +81,7 @@ class Shopcart extends \Magento\Backend\App\Action
     public function exportCustomerCsvAction()
     {
         $fileName   = 'shopcart_customer.csv';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Customer\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Customer\Grid')
             ->getCsvFile();
 
         return $this->_fileFactory->create($fileName, $content);
@@ -93,7 +93,7 @@ class Shopcart extends \Magento\Backend\App\Action
     public function exportCustomerExcelAction()
     {
         $fileName   = 'shopcart_customer.xml';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Customer\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Customer\Grid')
             ->getExcelFile($fileName);
 
         return $this->_fileFactory->create($fileName, $content);
@@ -107,7 +107,7 @@ class Shopcart extends \Magento\Backend\App\Action
             ->_setActiveMenu('Magento_Reports::report_shopcart_product')
             ->_addBreadcrumb(__('Products Report'), __('Products Report'))
             ->_addContent(
-                $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Product')
+                $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Product')
             );
         $this->_view->renderLayout();
     }
@@ -118,7 +118,7 @@ class Shopcart extends \Magento\Backend\App\Action
     public function exportProductCsvAction()
     {
         $fileName   = 'shopcart_product.csv';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Product\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Product\Grid')
             ->getCsvFile();
 
         return $this->_fileFactory->create($fileName, $content);
@@ -130,7 +130,7 @@ class Shopcart extends \Magento\Backend\App\Action
     public function exportProductExcelAction()
     {
         $fileName   = 'shopcart_product.xml';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Product\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Product\Grid')
             ->getExcelFile($fileName);
 
         return $this->_fileFactory->create($fileName, $content);
@@ -144,7 +144,7 @@ class Shopcart extends \Magento\Backend\App\Action
             ->_setActiveMenu('Magento_Reports::report_shopcart_abandoned')
             ->_addBreadcrumb(__('Abandoned Carts'), __('Abandoned Carts'))
             ->_addContent(
-                $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Abandoned')
+                $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Abandoned')
             );
         $this->_view->renderLayout();
     }
@@ -155,7 +155,7 @@ class Shopcart extends \Magento\Backend\App\Action
     public function exportAbandonedCsvAction()
     {
         $fileName   = 'shopcart_abandoned.csv';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Abandoned\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid')
             ->getCsvFile();
 
         return $this->_fileFactory->create($fileName, $content);
@@ -167,7 +167,7 @@ class Shopcart extends \Magento\Backend\App\Action
     public function exportAbandonedExcelAction()
     {
         $fileName   = 'shopcart_abandoned.xml';
-        $content    = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Abandoned\Grid')
+        $content    = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid')
             ->getExcelFile($fileName);
 
         return $this->_fileFactory->create($fileName, $content);
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Report/Statistics.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index 50877faea2166cfafb7abdf24a81ff20d46b0b2a..ec274160123f2127e869f005593286c5ca13893c 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Report statistics admin controller
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Reports
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
 
 class Statistics extends \Magento\Backend\App\Action
 {
@@ -71,7 +71,7 @@ class Statistics extends \Magento\Backend\App\Action
             $blocks = array($blocks);
         }
 
-        $requestData = $this->_objectManager->get('Magento\Adminhtml\Helper\Data')
+        $requestData = $this->_objectManager->get('Magento\Backend\Helper\Data')
             ->prepareFilterString($this->getRequest()->getParam('filter'));
         $inputFilter = new \Zend_Filter_Input(array('from' => $this->_dateFilter, 'to' => $this->_dateFilter),
             array(), $requestData);
@@ -133,7 +133,7 @@ class Statistics extends \Magento\Backend\App\Action
     /**
      * Refresh statistics for last 25 hours
      *
-     * @return \Magento\Adminhtml\Controller\Report\Sales
+     * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
      */
     public function refreshRecentAction()
     {
@@ -166,7 +166,7 @@ class Statistics extends \Magento\Backend\App\Action
     /**
      * Refresh statistics for all period
      *
-     * @return \Magento\Adminhtml\Controller\Report\Sales
+     * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
      */
     public function refreshLifetimeAction()
     {
diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
index 63405206a124cb9c906e0ba63e8fe85218fee1e3..fc73d2cc2e65b9d47dd1b4bc46cbad798e015f7a 100644
--- a/app/code/Magento/Reports/Helper/Data.php
+++ b/app/code/Magento/Reports/Helper/Data.php
@@ -36,17 +36,17 @@ class Data extends \Magento\App\Helper\AbstractHelper
     const REPORT_PERIOD_TYPE_YEAR   = 'year';
 
     /**
-     * @var \Magento\Adminhtml\Model\Report\ItemFactory
+     * @var \Magento\Reports\Model\ItemFactory
      */
     protected $_itemFactory;
 
     /**
      * @param \Magento\App\Helper\Context $context
-     * @param \Magento\Adminhtml\Model\Report\ItemFactory $itemFactory
+     * @param \Magento\Reports\Model\ItemFactory $itemFactory
      */
     public function __construct(
         \Magento\App\Helper\Context $context,
-        \Magento\Adminhtml\Model\Report\ItemFactory $itemFactory
+        \Magento\Reports\Model\ItemFactory $itemFactory
     ) {
         parent::__construct($context);
         $this->_itemFactory = $itemFactory;
diff --git a/app/code/Magento/Adminhtml/Model/Report/Item.php b/app/code/Magento/Reports/Model/Item.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Model/Report/Item.php
rename to app/code/Magento/Reports/Model/Item.php
index f1ec3887a332c3f840ad0aa1af13b8c6886a9b60..9dd07b3c4f5c964000b52d4d104d32cd5cf92172 100644
--- a/app/code/Magento/Adminhtml/Model/Report/Item.php
+++ b/app/code/Magento/Reports/Model/Item.php
@@ -19,11 +19,11 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-namespace Magento\Adminhtml\Model\Report;
+namespace Magento\Reports\Model;
 
 class Item extends \Magento\Object
 {
diff --git a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
index c73de9efaee0e53f32f18a6fb44791883cfad19f..537ab80d1ff258ec3b1f2c2207e51c615af27f9c 100644
--- a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
@@ -100,6 +100,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
      * @param \Magento\Object\Copy\Config $fieldsetConfig
      * @param \Magento\Sales\Model\QuoteFactory $quoteFactory
      * @param \Magento\Sales\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory
+     * @param string $modelName
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -115,10 +116,11 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
         \Magento\Validator\UniversalFactory $universalFactory,
         \Magento\Object\Copy\Config $fieldsetConfig,
         \Magento\Sales\Model\QuoteFactory $quoteFactory,
-        \Magento\Sales\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory
+        \Magento\Sales\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory,
+        $modelName = self::CUSTOMER_MODEL_NAME
     ) {
         parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $eavConfig,
-            $resource, $eavEntityFactory, $resourceHelper, $universalFactory, $fieldsetConfig
+            $resource, $eavEntityFactory, $resourceHelper, $universalFactory, $fieldsetConfig, $modelName
         );
         $this->_quoteFactory = $quoteFactory;
         $this->_quoteItemFactory = $quoteItemFactory;
diff --git a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
index 81c49ad55506d0480f33e7547e146fc3a493b4a1..47543894e6c1687e346b6e5b128518a04e628e81 100644
--- a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
@@ -151,8 +151,9 @@ class Collection extends \Magento\Sales\Model\Resource\Quote\Collection
                 array('product_name' => $productAttrNameTable),
                 "product_name.entity_id = e.entity_id
                 AND product_name.attribute_id = {$productAttrNameId}
-                AND product_name.store_id = main_table.store_id",
-                array('name'=>'product_name.value'))
+                AND product_name.store_id = " . \Magento\Core\Model\Store::DEFAULT_STORE_ID,
+                array('name' => 'product_name.value')
+            )
             ->joinInner(
                 array('product_price' => $productAttrPriceTable),
                 "product_price.entity_id = e.entity_id AND product_price.attribute_id = {$productAttrPriceId}",
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
index 59a053cf2bf5088236b76c9583cfc4b177284944..bf48a88423cc53ffd96551dd28c6b3365d70dc92 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
@@ -63,7 +63,7 @@ class Collection
     ) {
         $resource->init(\Magento\Reports\Model\Resource\Report\Product\Viewed::AGGREGATION_DAILY);
         parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $resource);
-        $this->setModel('Magento\Adminhtml\Model\Report\Item');
+        $this->setModel('Magento\Reports\Model\Item');
     }
 
     /**
@@ -197,8 +197,8 @@ class Collection
             $storeIds = array($storeIds);
         }
         $currentStoreIds = $this->_storesIds;
-        if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
-            && $currentStoreIds != array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)) {
+        if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\Store::DEFAULT_STORE_ID
+            && $currentStoreIds != array(\Magento\Core\Model\Store::DEFAULT_STORE_ID)) {
             if (!is_array($currentStoreIds)) {
                 $currentStoreIds = array($currentStoreIds);
             }
diff --git a/app/code/Magento/Reports/etc/adminhtml/di.xml b/app/code/Magento/Reports/etc/adminhtml/di.xml
index 78baa2be87a04860b1af31c363f1b5702405bb50..124f6cbcbc9e050ab9879bf072bb295ea5e914da 100644
--- a/app/code/Magento/Reports/etc/adminhtml/di.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/di.xml
@@ -29,4 +29,9 @@
             <value>adminhtml</value>
         </param>
     </virtualType>
+    <type name="Magento\Reports\Model\Resource\Customer\Collection">
+        <param name="modelName">
+            <value>Magento\Customer\Model\Backend\Customer</value>
+        </param>
+    </type>
 </config>
diff --git a/app/code/Magento/Reports/etc/adminhtml/menu.xml b/app/code/Magento/Reports/etc/adminhtml/menu.xml
index 43adb7bc74799fc5396d5168c91d756036a3daa2..5a4a7ec25e3d75c807c54290223ea50e61036989 100644
--- a/app/code/Magento/Reports/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/menu.xml
@@ -30,25 +30,25 @@
         <add id="Magento_Reports::report" title="Reports" module="Magento_Reports" sortOrder="60" resource="Magento_Reports::report"/>
         <add id="Magento_Reports::report_marketing" title="Marketing" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Reports::report" resource="Magento_Reports::report_marketing"/>
         <add id="Magento_Reports::report_salesroot" title="Sales" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report" resource="Magento_Reports::salesroot"/>
-        <add id="Magento_Reports::report_salesroot_sales" title="Orders" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/sales" resource="Magento_Reports::salesroot_sales"/>
-        <add id="Magento_Reports::report_salesroot_tax" title="Tax" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/tax" resource="Magento_Reports::tax"/>
-        <add id="Magento_Reports::report_salesroot_invoiced" title="Invoiced" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/invoiced" resource="Magento_Reports::invoiced"/>
-        <add id="Magento_Reports::report_salesroot_shipping" title="Shipping" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/shipping" resource="Magento_Reports::shipping"/>
-        <add id="Magento_Reports::report_salesroot_refunded" title="Refunds" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/refunded" resource="Magento_Reports::refunded"/>
-        <add id="Magento_Reports::report_salesroot_coupons" title="Coupons" module="Magento_Reports" sortOrder="60" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/coupons" resource="Magento_Reports::coupons"/>
-        <add id="Magento_Reports::report_shopcart_product" title="Products in Cart" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_marketing" action="adminhtml/report_shopcart/product" resource="Magento_Reports::product"/>
-        <add id="Magento_Reports::report_shopcart_abandoned" title="Abandoned Carts" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_marketing" action="adminhtml/report_shopcart/abandoned" resource="Magento_Reports::abandoned"/>
+        <add id="Magento_Reports::report_salesroot_sales" title="Orders" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_salesroot" action="reports/report_sales/sales" resource="Magento_Reports::salesroot_sales"/>
+        <add id="Magento_Reports::report_salesroot_tax" title="Tax" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_salesroot" action="reports/report_sales/tax" resource="Magento_Reports::tax"/>
+        <add id="Magento_Reports::report_salesroot_invoiced" title="Invoiced" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_salesroot" action="reports/report_sales/invoiced" resource="Magento_Reports::invoiced"/>
+        <add id="Magento_Reports::report_salesroot_shipping" title="Shipping" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_salesroot" action="reports/report_sales/shipping" resource="Magento_Reports::shipping"/>
+        <add id="Magento_Reports::report_salesroot_refunded" title="Refunds" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_salesroot" action="reports/report_sales/refunded" resource="Magento_Reports::refunded"/>
+        <add id="Magento_Reports::report_salesroot_coupons" title="Coupons" module="Magento_Reports" sortOrder="60" parent="Magento_Reports::report_salesroot" action="reports/report_sales/coupons" resource="Magento_Reports::coupons"/>
+        <add id="Magento_Reports::report_shopcart_product" title="Products in Cart" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_marketing" action="reports/report_shopcart/product" resource="Magento_Reports::product"/>
+        <add id="Magento_Reports::report_shopcart_abandoned" title="Abandoned Carts" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_marketing" action="reports/report_shopcart/abandoned" resource="Magento_Reports::abandoned"/>
         <add id="Magento_Reports::report_products" title="Products" module="Magento_Reports" sortOrder="60" parent="Magento_Reports::report" resource="Magento_Reports::report_products"/>
-        <add id="Magento_Reports::report_products_bestsellers" title="Bestsellers" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_products" action="adminhtml/report_sales/bestsellers" resource="Magento_Reports::bestsellers"/>
-        <add id="Magento_Reports::report_products_sold" title="Ordered" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_products" action="adminhtml/report_product/sold" resource="Magento_Reports::sold"/>
-        <add id="Magento_Reports::report_products_viewed" title="Views" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_products" action="adminhtml/report_product/viewed" resource="Magento_Reports::viewed"/>
-        <add id="Magento_Reports::report_products_lowstock" title="Low Stock" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_products" action="adminhtml/report_product/lowstock" resource="Magento_Reports::lowstock"/>
+        <add id="Magento_Reports::report_products_bestsellers" title="Bestsellers" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_products" action="reports/report_sales/bestsellers" resource="Magento_Reports::bestsellers"/>
+        <add id="Magento_Reports::report_products_sold" title="Ordered" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_products" action="reports/report_product/sold" resource="Magento_Reports::sold"/>
+        <add id="Magento_Reports::report_products_viewed" title="Views" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_products" action="reports/report_product/viewed" resource="Magento_Reports::viewed"/>
+        <add id="Magento_Reports::report_products_lowstock" title="Low Stock" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_products" action="reports/report_product/lowstock" resource="Magento_Reports::lowstock"/>
         <add id="Magento_Reports::report_customers" title="Customers" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report" resource="Magento_Reports::customers"/>
-        <add id="Magento_Reports::report_customers_accounts" title="New" sortOrder="30" module="Magento_Reports" parent="Magento_Reports::report_customers" action="adminhtml/report_customer/accounts" resource="Magento_Reports::accounts"/>
-        <add id="Magento_Reports::report_customers_totals" title="Order Total" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_customers" action="adminhtml/report_customer/totals" resource="Magento_Reports::totals"/>
-        <add id="Magento_Reports::report_customers_orders" title="Order Count" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_customers" action="adminhtml/report_customer/orders" resource="Magento_Reports::customers_orders"/>
-        <add id="Magento_Reports::report_search" title="Search Terms" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_marketing" action="adminhtml/report/search" resource="Magento_Reports::report_search"/>
+        <add id="Magento_Reports::report_customers_accounts" title="New" sortOrder="30" module="Magento_Reports" parent="Magento_Reports::report_customers" action="reports/report_customer/accounts" resource="Magento_Reports::accounts"/>
+        <add id="Magento_Reports::report_customers_totals" title="Order Total" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_customers" action="reports/report_customer/totals" resource="Magento_Reports::totals"/>
+        <add id="Magento_Reports::report_customers_orders" title="Order Count" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_customers" action="reports/report_customer/orders" resource="Magento_Reports::customers_orders"/>
+        <add id="Magento_Reports::report_search" title="Search Terms" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_marketing" action="reports/index/search" resource="Magento_Reports::report_search"/>
         <add id="Magento_Reports::report_statistics" title="Statistics" module="Magento_Reports" sortOrder="80" parent="Magento_Reports::report" resource="Magento_Reports::statistics"/>
-        <add id="Magento_Reports::report_statistics_refresh" title="Refresh statistics" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_statistics" action="adminhtml/report_statistics" resource="Magento_Reports::statistics_refresh"/>
+        <add id="Magento_Reports::report_statistics_refresh" title="Refresh statistics" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_statistics" action="reports/report_statistics" resource="Magento_Reports::statistics_refresh"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Reports/etc/adminhtml/routes.xml b/app/code/Magento/Reports/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4dd85fb2d352282f6c76184961c339b62a1a94e2
--- /dev/null
+++ b/app/code/Magento/Reports/etc/adminhtml/routes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+    <router id="admin">
+        <route id="reports" frontName="reports">
+            <module name="Magento_Reports_Adminhtml" before="Magento_Reports" />
+        </route>
+    </router>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Reports/etc/adminhtml/system.xml b/app/code/Magento/Reports/etc/adminhtml/system.xml
index ac1a05f051b4be007da963ba7927b6e2994a8fe4..53355dc120a7dd8a251d8380e80c1464d504f919 100644
--- a/app/code/Magento/Reports/etc/adminhtml/system.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/system.xml
@@ -51,11 +51,11 @@
                 <label>Dashboard</label>
                 <field id="ytd_start" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Year-To-Date Starts</label>
-                    <frontend_model>Magento\Adminhtml\Block\Report\Config\Form\Field\YtdStart</frontend_model>
+                    <frontend_model>Magento\Reports\Block\Adminhtml\Config\Form\Field\YtdStart</frontend_model>
                 </field>
                 <field id="mtd_start" translate="label comment" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Current Month Starts</label>
-                    <frontend_model>Magento\Adminhtml\Block\Report\Config\Form\Field\MtdStart</frontend_model>
+                    <frontend_model>Magento\Reports\Block\Adminhtml\Config\Form\Field\MtdStart</frontend_model>
                     <comment>Select day of the month.</comment>
                 </field>
             </group>
diff --git a/app/code/Magento/Reports/etc/module.xml b/app/code/Magento/Reports/etc/module.xml
index efac588845218ea39621f7daa5c9745c385c5f8b..22077d218384c98d3e1e20220a72a05ce3705c7d 100755
--- a/app/code/Magento/Reports/etc/module.xml
+++ b/app/code/Magento/Reports/etc/module.xml
@@ -46,7 +46,6 @@
             <module name="Magento_Review"/>
             <module name="Magento_Adminhtml"/>
             <module name="Magento_CatalogInventory"/>
-            <module name="Magento_Page"/>
             <module name="Magento_Tax"/>
             <module name="Magento_Rating"/>
         </depends>
diff --git a/app/code/Magento/Reports/view/adminhtml/grid.phtml b/app/code/Magento/Reports/view/adminhtml/grid.phtml
index bfa95d6721d692b4bf469772e068d0c75f482c91..3bdf0fbe691f83ff81ddc59e2dde62e400fbc165 100644
--- a/app/code/Magento/Reports/view/adminhtml/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/grid.phtml
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     default_default
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml
deleted file mode 100644
index 638d334d08a91834bfd805a3bf6625b138d14b79..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_accounts_grid"/>
-    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml
deleted file mode 100644
index 638d334d08a91834bfd805a3bf6625b138d14b79..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_accounts_grid"/>
-    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml
deleted file mode 100644
index 1a1db7893cd61d066730754bc97353168c1b9895..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_orders_grid"/>
-    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml
deleted file mode 100644
index 1a1db7893cd61d066730754bc97353168c1b9895..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_orders_grid"/>
-    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml
deleted file mode 100644
index cf89cfaf073b782b5994809be34807788a88f112..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_product_lowstock_grid"/>
-    <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Product\Lowstock" name="adminhtml.report.grid.container"/>
-    </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml
deleted file mode 100644
index 377453c7d785603b82fd5d3655d577f4e909d339..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_review_customer_grid"/>
-    <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Review\Customer" name="adminhtml.report.grid.container"/>
-    </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml
deleted file mode 100644
index 06f69db37a9a0e6de3314f26f087c51666556a0d..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_review_customer_grid"/>
-    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml
deleted file mode 100644
index 06f69db37a9a0e6de3314f26f087c51666556a0d..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_review_customer_grid"/>
-    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml
index 67af5f3b4679794a3177e9ac5a3428182d724995..5c19589a00d44c20479bbe3976d7d7743d30f80e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_report_search_block"/>
+    <update handle="reports_index_search_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="report.search.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml
index 67af5f3b4679794a3177e9ac5a3428182d724995..5c19589a00d44c20479bbe3976d7d7743d30f80e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml
@@ -25,6 +25,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="formkey"/>
-    <update handle="adminhtml_report_search_block"/>
+    <update handle="reports_index_search_block"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="report.search.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml
similarity index 87%
rename from app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml
index 4ab3b665ee1af5ffbd2262c04904bc0a8bd60928..7d7d8c76d953cf2bf573b810fc8468e7ae058dc1 100644
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml
@@ -24,8 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
+    <update handle="reports_index_search_block"/>
     <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\View" name="sales.order.view"/>
+        <block class="Magento\Reports\Block\Adminhtml\Search" name="report.search.grid.container"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml
index a08d9aa4ab9ac334fa32ea1c4b684fbc7886e967..db9ae6ab8de0a9b25b01b59f86b5c48a997874cb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml
@@ -36,11 +36,11 @@
                 <arguments>
                     <argument name="exportTypes" xsi:type="array">
                         <item name="csv" xsi:type="array">
-                            <item name="urlPath" xsi:type="string">adminhtml/*/exportSearchCsv</item>
+                            <item name="urlPath" xsi:type="string">*/*/exportSearchCsv</item>
                             <item name="label" xsi:type="string" translate="true">CSV</item>
                         </item>
                         <item name="excel" xsi:type="array">
-                            <item name="urlPath" xsi:type="string">adminhtml/*/exportSearchExcel</item>
+                            <item name="urlPath" xsi:type="string">*/*/exportSearchExcel</item>
                             <item name="label" xsi:type="string" translate="true">Excel XML</item>
                         </item>
                     </argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml
index a9e5de0b4dd7caa6294894df491a0cc36a5c351a..d7b880d6bd9cd84d6497a7c738bc824761f863ca 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_accounts_grid"/>
+    <update handle="reports_report_customer_accounts_grid"/>
     <referenceContainer name="content">
         <block class="Magento\Reports\Block\Adminhtml\Customer\Accounts" name="adminhtml.report.grid.container"/>
     </referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
similarity index 98%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
index 216b3d35a6c0aefeb76acf1b54044c708bc6c828..1e8f065b36a0dc657fe8bc1b7a8975d5cccb00ae 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_grid"/>
+    <update handle="reports_report_grid"/>
     <referenceBlock name="adminhtml.report.grid">
         <arguments>
             <argument name="id" xsi:type="string">gridAccounts</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalscsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml
index cdf0b024d0c4f52a889e332c64527e6ce2cbc19d..930b34012ae402e57a0f5fe86a79c4d9148301f2 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalscsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_totals_grid"/>
+    <update handle="reports_report_customer_accounts_grid"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalsexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml
index cdf0b024d0c4f52a889e332c64527e6ce2cbc19d..930b34012ae402e57a0f5fe86a79c4d9148301f2 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalsexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_totals_grid"/>
+    <update handle="reports_report_customer_accounts_grid"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml
index f7f42832ea3968291112d6b0331abf3689c8a734..5095b909291d60456be8e317159feacc41c10eba 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_review_product_grid"/>
+    <update handle="reports_report_customer_orders_grid"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml
index f7f42832ea3968291112d6b0331abf3689c8a734..5095b909291d60456be8e317159feacc41c10eba 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_review_product_grid"/>
+    <update handle="reports_report_customer_orders_grid"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0afcf2b83f8c20fd8597792417a01f0946ad4ed7
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="reports_report_customer_totals_grid"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0afcf2b83f8c20fd8597792417a01f0946ad4ed7
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="reports_report_customer_totals_grid"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml
index cf18ef3f02b1453b72be68c03e13c20a7e2b0695..de217fd70d1dae981037e1e524a8290de27aa489 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_orders_grid"/>
+    <update handle="reports_report_customer_orders_grid"/>
     <referenceContainer name="content">
         <block class="Magento\Reports\Block\Adminhtml\Customer\Orders" name="adminhtml.report.grid.container"/>
     </referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
similarity index 99%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
index d1815960d1c2a13b74beb03a51c010c5907078ea..23d0fbacf4356c9b6bb344e52a015b1a1ab08f49 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_grid"/>
+    <update handle="reports_report_grid"/>
     <referenceBlock name="adminhtml.report.grid">
         <arguments>
             <argument name="id" xsi:type="string">gridOrdersCustomer</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml
index aae9c1bdc9d971f1dc86fe3611f7c9fece6055c4..564f2e2c96608afcce03985bfa0e212688b234c8 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_totals_grid"/>
+    <update handle="reports_report_customer_totals_grid"/>
     <referenceContainer name="content">
         <block class="Magento\Reports\Block\Adminhtml\Customer\Totals" name="adminhtml.report.grid.container"/>
     </referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
similarity index 97%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
index 07765b8c27331f3e5f93564006b57a7ff37ef743..80bb9e98734036aa5e850e7ad9b393183e821ac4 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_customer_orders_grid"/>
+    <update handle="reports_report_customer_orders_grid"/>
     <referenceBlock name="adminhtml.report.grid">
         <arguments>
             <argument name="id" xsi:type="string">gridTotalsCustomer</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml
similarity index 100%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml
similarity index 94%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml
index 83d5b8fb4a7896eac20dac32050c5b5877388b2a..12792ffb601acc8126597426fe36308307e2e386 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_product_lowstock_grid"/>
+    <update handle="reports_report_product_lowstock_grid"/>
     <container name="adminhtml.block.report.product.lowstock.grid.container" label="Export CSV"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml
similarity index 94%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml
index a2c9ed6847f96e9c7e0e85bd76372015a0b3fb67..adcea23d0c08b644881d95f4c5406c2194f0c725 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_product_lowstock_grid"/>
+    <update handle="reports_report_product_lowstock_grid"/>
     <container name="adminhtml.block.report.product.lowstock.grid.container" label="Excel XML"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml
index cb36ceb85ef7ed9d843a726bdfc1e51581d97f8f..ebcaf6124192d4940dea0e0629a86814a655c887 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_product_sold_grid"/>
+    <update handle="reports_report_product_sold_grid"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml
index cb36ceb85ef7ed9d843a726bdfc1e51581d97f8f..ebcaf6124192d4940dea0e0629a86814a655c887 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml
@@ -24,6 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_product_sold_grid"/>
+    <update handle="reports_report_product_sold_grid"/>
     <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4504c012ec0943706e02ab5ed92c298fb28724a1
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="reports_report_product_lowstock_grid"/>
+    <referenceContainer name="content">
+        <block class="Magento\Reports\Block\Adminhtml\Product\Lowstock" name="adminhtml.report.grid.container"/>
+    </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
similarity index 97%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
index 959db28172e3f4fd012e6368e93f4ca7fc8aafa9..3a359a75fd092fab4973ffb5228c8a0a7c2006c4 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
@@ -25,7 +25,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <referenceBlock name="adminhtml.report.grid.container">
-        <block class="Magento\Adminhtml\Block\Report\Product\Lowstock\Grid" name="adminhtml.block.report.product.lowstock.grid" as="grid">
+        <block class="Magento\Reports\Block\Adminhtml\Product\Lowstock\Grid" name="adminhtml.block.report.product.lowstock.grid" as="grid">
             <arguments>
                 <argument name="id" xsi:type="string">gridLowstock</argument>
                 <argument name="use_ajax" xsi:type="string">0</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml
index ca715403e35fc233926588ee9372bdf9c6d12f05..ed14c56d9a7b2f805b1840d5871be008fce76ecc 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_product_sold_grid"/>
+    <update handle="reports_report_product_sold_grid"/>
     <referenceContainer name="content">
         <block class="Magento\Reports\Block\Adminhtml\Product\Sold" name="adminhtml.report.grid.container"/>
     </referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
similarity index 98%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
index 7052f32aadf91e79d9df9f99a070c720f6b57597..09e2e20c5152538a1f627cf581cbeeba28acc46e 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
@@ -24,7 +24,7 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_grid"/>
+    <update handle="reports_report_grid"/>
     <referenceBlock name="adminhtml.report.grid">
         <arguments>
             <argument name="id" xsi:type="string">gridProductsSold</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml
index 028cf9d17c80eb62e9d0ee3f23cef910f1d1048e..cbb813789196aa282ac27c14e7c052331db9991c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml
@@ -30,13 +30,13 @@
         </action>
     </referenceBlock>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Product\Viewed" template="report/grid/container.phtml" name="product.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Product\Viewed" template="report/grid/container.phtml" name="product.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
                 </action>
             </block>
-            <block class="Magento\Adminhtml\Block\Report\Filter\Form" name="grid.filter.form">
+            <block class="Magento\Reports\Block\Adminhtml\Filter\Form" name="grid.filter.form">
                 <action method="setFieldVisibility">
                     <argument name="field" xsi:type="string">report_type</argument>
                     <argument name="visibility" xsi:type="string">0</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml
similarity index 86%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml
index 8a68cd5f0d6b703f83176d5ed4932c41de24cb88..bf19ec48d8f2ce843f35990683883c37f0789fcd 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml
@@ -24,8 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_review_product_grid"/>
+    <update handle="reports_report_review_customer_grid"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Review\Product" name="adminhtml.report.grid.container"/>
+        <block class="Magento\Reports\Block\Adminhtml\Review\Customer" name="adminhtml.report.grid.container"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
similarity index 98%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
index 5214043360a64d0737080327923755c035516a41..99b91464070abf05d710d722f5d7d2df11f9c46d 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
@@ -83,7 +83,7 @@
                         <argument name="filter" xsi:type="string">0</argument>
                         <argument name="sortable" xsi:type="string">0</argument>
                         <argument name="is_system" xsi:type="string">1</argument>
-                        <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Customer</argument>
+                        <argument name="renderer" xsi:type="string">Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Customer</argument>
                         <argument name="id" xsi:type="string">action</argument>
                         <argument name="column_css_class" xsi:type="string">col-actions</argument>
                         <argument name="header_css_class" xsi:type="string">col-actions</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0d24ecbee0eba1551f960bd98165e557b06ba1cd
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="reports_report_review_customer_grid"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0d24ecbee0eba1551f960bd98165e557b06ba1cd
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="reports_report_review_customer_grid"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml
new file mode 100644
index 0000000000000000000000000000000000000000..857012c0c24a002bb0759187b9950c5d81f16c91
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="reports_report_review_product_grid"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml
new file mode 100644
index 0000000000000000000000000000000000000000..857012c0c24a002bb0759187b9950c5d81f16c91
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="reports_report_review_product_grid"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml
similarity index 86%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml
index 4d1e81e94e9d47d5e1434654abc8b9a02ecff754..fc314fb08f9fcb3c88b2381f89be325616a5eb6e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml
@@ -24,8 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="adminhtml_report_search_block"/>
+    <update handle="reports_report_review_product_grid"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Search" name="report.search.grid.container"/>
+        <block class="Magento\Reports\Block\Adminhtml\Review\Product" name="adminhtml.report.grid.container"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
similarity index 99%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
index 74f9de7b8b84db36e19ad41bd02e48868c581086..f58f2bf97eb56f518ff1d71ff8d4aa0435710742 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
@@ -119,7 +119,7 @@
                         <argument name="align" xsi:type="string">center</argument>
                         <argument name="filter" xsi:type="string">0</argument>
                         <argument name="sortable" xsi:type="string">0</argument>
-                        <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Product</argument>
+                        <argument name="renderer" xsi:type="string">Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Product</argument>
                         <argument name="id" xsi:type="string">action</argument>
                         <argument name="is_system" xsi:type="string">1</argument>
                         <argument name="column_css_class" xsi:type="string">col-actions</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml
index 8d6f1a3b598865d15cab4073a8da72fb00a7a00d..5b01304e22ca5678145c412864b206fc710eca4e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml
@@ -24,9 +24,9 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="report_sales"/>
+    <update handle="reports_sales"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Sales\Bestsellers" template="report/grid/container.phtml" name="sales.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Sales\Bestsellers" template="report/grid/container.phtml" name="sales.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml
index 52c3082f98dcdfd97e5b7177cb13c51b047ae2c9..b9a856352a95cbf78ff947d576e2c8a9972207f3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml
@@ -24,9 +24,9 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="report_sales"/>
+    <update handle="reports_sales"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Sales\Coupons" template="report/grid/container.phtml" name="sales.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Sales\Coupons" template="report/grid/container.phtml" name="sales.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml
index 3475feb0aa1a296d50bdbfb45c2f3f2a2b53d550..be0b9912a15a8ea2a42dd2ae656615bd9a78533d 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml
@@ -24,9 +24,9 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="report_sales"/>
+    <update handle="reports_sales"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Sales\Invoiced" template="report/grid/container.phtml" name="sales.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Sales\Invoiced" template="report/grid/container.phtml" name="sales.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml
index c9468108364354d018c264087fee731cf41e6fb1..088d75d8911fcf10b1ede3ee052c21dd121423a4 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml
@@ -24,9 +24,9 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="report_sales"/>
+    <update handle="reports_sales"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Sales\Refunded" template="report/grid/container.phtml" name="sales.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Sales\Refunded" template="report/grid/container.phtml" name="sales.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml
index 6f2cb45d6607fcb6e11fb0067299b61c7a6abc44..efc9e0f4d0ad339ec2ea66cda316bb10f7cdd574 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml
@@ -24,9 +24,9 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="report_sales"/>
+    <update handle="reports_sales"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Sales\Sales" template="report/grid/container.phtml" name="sales.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Sales\Sales" template="report/grid/container.phtml" name="sales.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml
index a53b849601307afdf5aa724c089137d09712dbd2..6f7e101a9cc234cd28848378455e7dbf84580c9c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml
@@ -24,9 +24,9 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="report_sales"/>
+    <update handle="reports_sales"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Sales\Shipping" template="report/grid/container.phtml" name="sales.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Sales\Shipping" template="report/grid/container.phtml" name="sales.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml
index 8be8ee69c4f2825c912f51b9304fdf5c5574ed09..1178a2946974a9079f4d639a084e3cb3ebf30539 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml
@@ -24,9 +24,9 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="report_sales"/>
+    <update handle="reports_sales"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Report\Sales\Tax" template="report/grid/container.phtml" name="sales.report.grid.container">
+        <block class="Magento\Reports\Block\Adminhtml\Sales\Tax" template="report/grid/container.phtml" name="sales.report.grid.container">
             <block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
                 <action method="setStoreVarName">
                     <argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_statistics_index.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
similarity index 100%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_statistics_index.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/report_sales.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/report_sales.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/report/grid/container.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/report/grid/container.phtml
rename to app/code/Magento/Reports/view/adminhtml/report/grid/container.phtml
index 5237b38cac636d551e3994b489b1f5ffe2d221b7..66e0f81e8f8084f704cfb756073600a86ea64ee8 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/report/grid/container.phtml
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     default_default
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/report/refresh/statistics.phtml b/app/code/Magento/Reports/view/adminhtml/report/refresh/statistics.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/report/refresh/statistics.phtml
rename to app/code/Magento/Reports/view/adminhtml/report/refresh/statistics.phtml
index 787cc25ee43a565695618ac6fa5fd42c90565158..9674df336b2f6f0f009a2725d01316bbd234f423 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/report/refresh/statistics.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/report/refresh/statistics.phtml
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     default_default
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/report/wishlist.phtml b/app/code/Magento/Reports/view/adminhtml/report/wishlist.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/report/wishlist.phtml
rename to app/code/Magento/Reports/view/adminhtml/report/wishlist.phtml
index 4921ad4264f460367b1804ba629657c2dff5f828..c9632d7cad9d4bf04945f93fbdf6f29a2603372d 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/report/wishlist.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/report/wishlist.phtml
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     default_default
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Reports/view/adminhtml/store/switcher.phtml b/app/code/Magento/Reports/view/adminhtml/store/switcher.phtml
index e00ed023485b3e466facaadac44853a44e4991ce..2c0112d9c994d4a896c46c23382e12518f7bd769 100644
--- a/app/code/Magento/Reports/view/adminhtml/store/switcher.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/store/switcher.phtml
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     default_default
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Reports/view/adminhtml/store/switcher/enhanced.phtml b/app/code/Magento/Reports/view/adminhtml/store/switcher/enhanced.phtml
index 8e83128ebddc46fa4dc0d8e17e6f9923a3402198..582e5eaba8866f682d9e8317a99e4ecb295f6b61 100644
--- a/app/code/Magento/Reports/view/adminhtml/store/switcher/enhanced.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/store/switcher/enhanced.phtml
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    design
- * @package     default_default
+ * @package     Magento_Reports
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
diff --git a/app/code/Magento/Reports/view/frontend/home_product_compared.phtml b/app/code/Magento/Reports/view/frontend/home_product_compared.phtml
deleted file mode 100644
index 7c1ed6a76e94cdb98f15bcbf842ed720a4cd7402..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/frontend/home_product_compared.phtml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Reports\Block\Product\Compared */
-?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<h2 class="subtitle"><?php echo __('Your Recently Compared') ?></h2>
-<?php $_columnCount = $this->getColumnCount(); ?>
-    <?php $i=0; foreach ($_products as $_product): ?>
-        <?php if ($i++%$_columnCount==0): ?>
-        <ul class="products-grid">
-        <?php endif; ?>
-            <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
-                <a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_product) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                <?php echo $this->getPriceHtml($_product, true, '-home-compared') ?>
-                <div class="actions">
-                    <?php if($_product->isSaleable()): ?>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                    <?php else: ?>
-                        <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                    <?php endif; ?>
-                    <ul class="add-to-links" data-role="add-to-links">
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                            <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-                        <?php endif; ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                            <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-                        <?php endif; ?>
-                    </ul>
-                </div>
-            </li>
-        <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
-        </ul>
-        <?php endif; ?>
-    <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/home_product_viewed.phtml b/app/code/Magento/Reports/view/frontend/home_product_viewed.phtml
deleted file mode 100644
index bb978c067be3583b0021ee8049c4990314fe6682..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/frontend/home_product_viewed.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Reports\Block\Product\Viewed */
-?>
-<?php
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<h2 class="subtitle"><?php echo __('Your Recently Viewed') ?></h2>
-<?php $_columnCount = $this->getColumnCount(); ?>
-    <?php $i=0; foreach ($_products as $_product): ?>
-        <?php if ($i++%$_columnCount==0): ?>
-        <ul class="products-grid">
-        <?php endif; ?>
-            <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
-                <a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_product) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                <?php echo $this->getPriceHtml($_product, true, '-home-viewed') ?>
-                <div class="actions">
-                    <?php if($_product->isSaleable()): ?>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                    <?php else: ?>
-                        <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                    <?php endif; ?>
-                    <ul class="add-to-links" data-role="add-to-links">
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                            <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-                        <?php endif; ?>
-                        <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                            <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-                        <?php endif; ?>
-                    </ul>
-                </div>
-            </li>
-        <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
-        </ul>
-        <?php endif; ?>
-    <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/images/i_widget-list.gif b/app/code/Magento/Reports/view/frontend/images/i_widget-list.gif
deleted file mode 100644
index df990aba0267a24083d299711fe22497b8605c1d..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Reports/view/frontend/images/i_widget-list.gif and /dev/null differ
diff --git a/app/code/Magento/Reports/view/frontend/layout/default.xml b/app/code/Magento/Reports/view/frontend/layout/default.xml
index c1ad3ee5dc699cfdb5c7c3822ed88ecb6bbc9b09..46e55c7076c9cc4d97ec7fbe42f8d409089b2d54 100644
--- a/app/code/Magento/Reports/view/frontend/layout/default.xml
+++ b/app/code/Magento/Reports/view/frontend/layout/default.xml
@@ -24,15 +24,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-reports-widgets-css">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Reports::widgets.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
     <referenceContainer name="right">
-        <block class="Magento\Reports\Block\Product\Viewed" before="right.permanent.callout" name="right.reports.product.viewed" template="product_viewed.phtml"/>
-        <block class="Magento\Reports\Block\Product\Compared" before="right.permanent.callout" name="right.reports.product.compared" template="product_compared.phtml"/>
+        <block class="Magento\Reports\Block\Product\Viewed" name="right.reports.product.viewed" template="product_viewed.phtml"/>
+        <block class="Magento\Reports\Block\Product\Compared" name="right.reports.product.compared" template="product_compared.phtml"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Reports/view/frontend/layout/print.xml b/app/code/Magento/Reports/view/frontend/layout/print.xml
index 01eec5d1b8168911adfc5d3eb3cd39ac78b5941a..bd274919f464d0c72c735de93896d09e031c52f4 100644
--- a/app/code/Magento/Reports/view/frontend/layout/print.xml
+++ b/app/code/Magento/Reports/view/frontend/layout/print.xml
@@ -23,12 +23,4 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-reports-widgets-css">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Reports::widgets.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
diff --git a/app/code/Magento/Reports/view/frontend/product_compared.phtml b/app/code/Magento/Reports/view/frontend/product_compared.phtml
index 61907429dd9281fc010e5d713d89f1e9f80cae22..4ebe8962235296307640df832c9ae92fc43e46c8 100644
--- a/app/code/Magento/Reports/view/frontend/product_compared.phtml
+++ b/app/code/Magento/Reports/view/frontend/product_compared.phtml
@@ -18,27 +18,26 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 /* @var $this \Magento\Reports\Block\Product\Compared */
 ?>
 <?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="block block-list block-compared">
-    <div class="block-title">
-        <strong><span><?php echo __('Recently Compared Products') ?></span></strong>
+    <div class="block compared links">
+        <div class="title">
+            <strong><?php echo __('Recently Compared Products') ?></strong>
+        </div>
+        <div class="content">
+            <ol id="recently-compared-items" class="items compared">
+                <?php foreach ($_products as $_item): ?>
+                    <li class="item">
+                        <strong class="product name">
+                            <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName() , 'name') ?></a>
+                        </strong>
+                    </li>
+                <?php endforeach; ?>
+            </ol>
+        </div>
     </div>
-    <div class="block-content">
-        <ol id="recently-compared-items">
-        <?php foreach ($_products as $_item): ?>
-            <li class="item">
-                <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName() , 'name') ?></a></p>
-            </li>
-        <?php endforeach; ?>
-        </ol>
-        <script type="text/javascript">(function($) {$('#recently-compared-items').decorate('list', false)})(jQuery)</script>
-    </div>
-</div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/product_viewed.phtml b/app/code/Magento/Reports/view/frontend/product_viewed.phtml
index 1eb7e1aff787a2adda8d62fa097c7c334f6a0a62..1de5d43c639074d804e26ca6af83552c85b2d15d 100644
--- a/app/code/Magento/Reports/view/frontend/product_viewed.phtml
+++ b/app/code/Magento/Reports/view/frontend/product_viewed.phtml
@@ -18,29 +18,26 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 /* @var $this \Magento\Reports\Block\Product\Viewed */
 ?>
 <?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="block block-list block-viewed">
-    <div class="block-title">
-        <strong><span><?php echo __('Recently Viewed Products') ?></span></strong>
+    <div class="block viewed links">
+        <div class="title">
+            <strong><?php echo __('Recently Viewed Products') ?></strong>
+        </div>
+        <div class="content">
+            <ol id="recently-viewed-items" class="items viewed">
+                <?php foreach ($_products as $_item): ?>
+                    <li class="item">
+                        <strong class="product name">
+                            <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
+                        </strong>
+                    </li>
+                <?php endforeach; ?>
+            </ol>
+        </div>
     </div>
-    <div class="block-content">
-        <ol id="recently-viewed-items">
-            <?php foreach ($_products as $_item): ?>
-            <li class="item">
-                <p class="product-name"><a
-                    href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
-                </p>
-            </li>
-            <?php endforeach; ?>
-        </ol>
-        <script type="text/javascript">(function($) {$('#recently-viewed-items').decorate('list', false)})(jQuery)</script>
-    </div>
-</div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml
index ddf7ce6b112721eb8a7bc271b78ff7d30b704a33..6b0cdd68e57d3fc1be61e7b6f31b7deb4c256789 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml
@@ -18,38 +18,68 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
-    <div class="block block-products">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Compared') ?></span></strong>
-        </div>
-        <div class="block-content">
-            <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-list" id="widget-compared-<?php echo $suffix; ?>">
-            <?php foreach ($_products as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product); ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                    <div class="product-details">
-                        <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-compared-'.$suffix) ?>
-                        <?php if($_product->isSaleable()): ?>
-                            <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
-                        <?php else: ?>
-                            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
-                    </div>
-                </li>
-            <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
-        </div>
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+    $type = 'widget-compared';
+    $mode = 'list';
+
+    $type = $type . '-' . $mode;
+
+    $class = 'widget viewed' . ' ' . $mode;
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_compared_products_images_names_widget';
+    $title = __('Recently Compared');
+    $items = $exist;
+
+    $showWishlist = false;
+    $showCompare = false;
+    $showCart = false;
+    $rating = false;
+    $description = false;
+}
+?>
+<?php if ($exist): ?>
+<div class="block <?php echo $class; ?>">
+    <div class="title">
+        <strong><?php echo $title; ?></strong>
     </div>
+    <?php $suffix = $this->getNameInLayout(); ?>
+    <ol class="mini products list items" id="widget-compared-<?php echo $suffix; ?>">
+        <?php $iterator = 1; ?>
+        <?php foreach($items as $_product): ?>
+        <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+            <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+               title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+                <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+            </a>
+            <div class="product details">
+                <strong class="product name">
+                    <a href="<?php echo $_product->getProductUrl() ?>"
+                       title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)">
+                        <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                    </a>
+                </strong>
+                <?php echo $this->getPriceHtml($_product, true, '-widget-compared-'.$suffix) ?>
+                <?php if($_product->isSaleable()): ?>
+                    <div class="actions">
+                        <a href="<?php echo $this->getAddToCartUrl($_product) ?>"
+                           class="action tocart"><span><?php echo __('Add to Cart') ?></span></a>
+                    </div>
+                <?php else: ?>
+                    <?php if ($_product->getIsSalable()): ?>
+                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                    <?php else: ?>
+                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                    <?php endif; ?>
+                <?php endif; ?>
+            </div>
+            <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+        <?php endforeach; ?>
+    </ol>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml
index b01d8416687297979911a104e59d15deb42d1597..7258bbcb87bce00ea48bfa16970d6ed69ac9c21f 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml
@@ -18,29 +18,44 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
-    <div class="block block-list">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Compared') ?></span></strong>
-        </div>
-        <div class="block-content">
-            <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-images-list" id="widget-compared-<?php echo $suffix; ?>">
-            <?php $i=0; foreach ($_products as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailUrl($_product); ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                </li>
-            <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
-        </div>
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+    $type = 'widget-compared';
+    $class = 'widget compared mini products images';
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_compared_products_images_only_widget';
+    $title = __('Recently Compared');
+    $items = $exist;
+
+    $showWishlist = false;
+    $showCompare = false;
+    $showCart = false;
+    $rating = false;
+    $description = false;
+}
+?>
+<?php if ($exist): ?>
+<div class="block <?php echo $class; ?>">
+    <div class="title">
+        <strong><?php echo $title; ?></strong>
+    </div>
+    <div class="content">
+        <?php $suffix = $this->getNameInLayout(); ?>
+        <ol class="items" id="widget-compared-<?php echo $suffix; ?>">
+        <?php $i=0; foreach ($items as $_product): ?>
+            <li class="item">
+                <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+                    title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+                    <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+                </a>
+            </li>
+        <?php endforeach; ?>
+        </ol>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml
index d5d184e20e278802b66b4195d1ae91c52b0975bb..ea602575a0614c61f7e3270e98b9bb30f22b5ea1 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml
@@ -18,29 +18,28 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
-    <div class="block block-list">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Compared') ?></span></strong>
-        </div>
-        <div class="block-content">
-            <?php $suffix = $this->getNameInLayout(); ?>
-            <ol id="widget-compared-<?php echo $suffix; ?>">
-            <?php $i=0; foreach ($_products as $_product): ?>
-                <li class="item">
-                    <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
-                </li>
-            <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
-        </div>
+<div class="block widget compared links">
+    <div class="title">
+        <strong><?php echo __('Recently Compared') ?></span></strong>
+    </div>
+    <div class="content">
+        <?php $suffix = $this->getNameInLayout(); ?>
+        <ol id="widget-compared-<?php echo $suffix; ?>" class="items">
+        <?php $i=0; foreach ($_products as $_product): ?>
+            <li class="item">
+                <strong class="product name">
+                    <a href="<?php echo $_product->getProductUrl() ?>">
+                        <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                    </a>
+                </strong>
+            </li>
+        <?php endforeach; ?>
+        </ol>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml
index 1ca956ff571ebe7b5a457ec38cabe2406006af73..223f4a1b7fcb3bb079e823829e46cf7c4db7e0dc 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml
@@ -18,48 +18,104 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
-    <div class="widget-title">
-        <h2><?php echo __('Recently Compared') ?></h2>
-    </div>
-    <div class="widget-products">
-        <?php $_columnCount = $this->getColumnCount(); ?>
-        <?php $i=0; foreach ($_products as $_product): ?>
-        <?php if ($i++%$_columnCount==0): ?>
-            <ul class="products-grid">
-        <?php endif; ?>
-            <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
-                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                <?php echo $this->getPriceHtml($_product, true, '-widget-compared-grid') ?>
-                <div class="actions">
-                    <?php if($_product->isSaleable()): ?>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                    <?php else: ?>
-                            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                    <?php endif; ?>
-                    <ul class="add-to-links" data-role="add-to-links">
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                            <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
-                        <?php endif; ?>
-                        <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                            <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-                        <?php endif; ?>
-                    </ul>
-                </div>
-            </li>
-        <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
-            </ul>
-        <?php endif; ?>
-        <?php endforeach; ?>
+
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+    $type = 'widget-compared';
+    $mode = 'grid';
+
+    $type = $type . '-' . $mode;
+
+    $class = 'widget compared' . ' ' . $mode;
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_compared_products_grid_content_widget';
+    $title = __('Recently Compared');
+    $items = $exist;
+
+    $showWishlist = true;
+    $showCompare = true;
+    $showCart = true;
+    $rating = 'short';
+    $description = ($mode == 'list') ? true : false;
+}
+?>
+
+<?php if ($exist):?>
+    <div class="block <?php echo $class; ?>">
+        <div class="title">
+            <strong><?php echo $title; ?></strong>
+        </div>
+        <div class="content">
+            <?php echo $this->getPagerHtml() ?>
+            <?php echo '<!-- ' . $image . '-->' ?>
+            <ol class="products list items <?php echo $type; ?>">
+                <?php $iterator = 1; ?>
+                <?php foreach($items as $_item): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                    <div class="product">
+                        <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+                            <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+                        </a>
+                        <div class="product details">
+                            <strong class="product name">
+                                <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+                                   href="<?php echo $this->getProductUrl($_item) ?>">
+                                    <?php echo $this->escapeHtml($_item->getName()) ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+                            <?php if ($_item->getRatingSummary() && $rating): ?>
+                                <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
+                            <?php endif; ?>
+                            <?php if($showWishlist || $showCompare || $showCart): ?>
+                                <div class="product actions">
+                                    <?php if($showCart): ?>
+                                        <div class="primary">
+                                            <?php if($_item->isSaleable()): ?>
+                                                <button class="action tocart"
+                                                        data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+                                                        type="button" title="<?php echo __('Add to Cart') ?>">
+                                                    <span><?php echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php if ($_item->getIsSalable()): ?>
+                                                    <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                                <?php else: ?>
+                                                    <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                                <?php endif; ?>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+
+                                    <?php if($showWishlist || $showCompare): ?>
+                                        <div class="secondary addto links">
+                                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+                                                   class="action towishlist"
+                                                   title="<?php echo __('Add to Wishlist') ?>">
+                                                    <span><?php echo __('Add to Wishlist') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                            <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+                                                <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+                                                   class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+                                                    <span><?php echo __('Add to Compare') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
+                            <?php endif; ?>
+                        </div>
+                    </div>
+                    <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+                <?php endforeach ?>
+            </ol>
+        </div>
     </div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml
index 3e7e25a159d193f6db36f9cb9c27ef3b99713e14..3f37b290da62c3320547b44da2d4514d52964122 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml
@@ -18,45 +18,104 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
-    <div class="widget-title">
-        <h2><?php echo __('Recently Compared') ?></h2>
-    </div>
-    <div class="widget-products">
-        <ol class="products-list">
-        <?php $i=0; foreach ($_products as $_product): ?>
-            <li class="item<?php echo (++$i == count($_products))?' last':''; ?>">
-                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                <div class="product-shop">
-                    <div class="f-fix">
-                        <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                        <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-compared-list') ?>
-                        <?php if($_product->isSaleable()): ?>
-                            <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                        <?php else: ?>
-                            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
-                        <ul class="add-to-links" data-role="add-to-links">
-                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                                <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
+
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+    $type = 'widget-compared';
+    $mode = 'list';
+
+    $type = $type . '-' . $mode;
+
+    $class = 'widget compared' . ' ' . $mode;
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_compared_products_list_content_widget';
+    $title = __('Recently Compared');
+    $items = $exist;
+
+    $showWishlist = true;
+    $showCompare = true;
+    $showCart = true;
+    $rating = 'short';
+    $description = ($mode == 'list') ? true : false;
+}
+?>
+
+<?php if ($exist):?>
+    <div class="block <?php echo $class; ?>">
+        <div class="title">
+            <strong><?php echo $title; ?></strong>
+        </div>
+        <div class="content">
+            <?php echo $this->getPagerHtml() ?>
+            <?php echo '<!-- ' . $image . '-->' ?>
+            <ol class="products list items <?php echo $type; ?>">
+                <?php $iterator = 1; ?>
+                <?php foreach($items as $_item): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                    <div class="product">
+                        <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+                            <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+                        </a>
+                        <div class="product details">
+                            <strong class="product name">
+                                <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+                                   href="<?php echo $this->getProductUrl($_item) ?>">
+                                    <?php echo $this->escapeHtml($_item->getName()) ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+                            <?php if ($_item->getRatingSummary() && $rating): ?>
+                                <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
                             <?php endif; ?>
-                            <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                                <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+                            <?php if($showWishlist || $showCompare || $showCart): ?>
+                                <div class="product actions">
+                                    <?php if($showCart): ?>
+                                        <div class="primary">
+                                            <?php if($_item->isSaleable()): ?>
+                                                <button class="action tocart"
+                                                        data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+                                                        type="button" title="<?php echo __('Add to Cart') ?>">
+                                                    <span><?php echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php if ($_item->getIsSalable()): ?>
+                                                    <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                                <?php else: ?>
+                                                    <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                                <?php endif; ?>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+
+                                    <?php if($showWishlist || $showCompare): ?>
+                                        <div class="secondary addto links">
+                                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+                                                   class="action towishlist"
+                                                   title="<?php echo __('Add to Wishlist') ?>">
+                                                    <span><?php echo __('Add to Wishlist') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                            <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+                                                <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+                                                   class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+                                                    <span><?php echo __('Add to Compare') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             <?php endif; ?>
-                        </ul>
+                        </div>
                     </div>
-                </div>
-            </li>
-        <?php endforeach; ?>
-        </ol>
+                    <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+                <?php endforeach ?>
+            </ol>
+        </div>
     </div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml
index 2d80a60471adbaf1ae3f8b0d418c91f2bf2f2a68..f961715703496f8195b8a3a7cba56b437cbbff47 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml
@@ -18,43 +18,78 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
 /**
- * @see \Magento\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
  */
 ?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
-    <div class="block block-products">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Viewed') ?></span></strong>
-        </div>
-        <div class="block-content">
-            <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-list" id="widget-viewed-<?php echo $suffix; ?>">
-            <?php foreach ($_products as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product); ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                    <div class="product-details">
-                        <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+    $type = 'widget-viewed';
+    $mode = 'list';
+
+    $type = $type . '-' . $mode;
+
+    $class = 'widget viewed' . ' ' . $mode;
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_viewed_products_images_names_widget';
+    $title = __('Recently Viewed');
+    $items = $exist;
+
+    $showWishlist = false;
+    $showCompare = false;
+    $showCart = false;
+    $rating = false;
+    $description = false;
+}
+?>
+<?php if ($exist): ?>
+<div class="block <?php echo $class; ?>">
+    <div class="title">
+        <strong><?php echo $title; ?></strong>
+    </div>
+    <div class="content">
+        <?php $suffix = $this->getNameInLayout(); ?>
+        <ol class="mini products list items" id="widget-viewed-<?php echo $suffix; ?>">
+            <?php $iterator = 1; ?>
+            <?php foreach($items as $_product): ?>
+                <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                <div class="product">
+                    <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+                       title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+                        <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+                    </a>
+                    <div class="product details">
+                        <strong class="product name">
+                            <a href="<?php echo $_product->getProductUrl() ?>"
+                               title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+                                <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                            </a>
+                        </strong>
                         <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-'.$suffix) ?>
-                        <?php if($_product->isSaleable()): ?>
-                            <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
-                        <?php else: ?>
-                            <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
+                        <div class="product actions">
+                            <?php if($_product->isSaleable()): ?>
+                            <div class="primary">
+                                <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="action tocart"><span><?php echo __('Add to Cart') ?></span></a>
+                            </div>
+                            <?php else: ?>
+                                <?php if ($_product->getIsSalable()): ?>
+                                    <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                <?php else: ?>
+                                    <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                <?php endif; ?>
+                            <?php endif; ?>
+                        </div>
                     </div>
-                </li>
+                </div>
+                <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
-        </div>
+        </ol>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml
index dd3c4f6ea4e884c71eb0b65c08bd5a002bc92b40..8b0edbe84b2192621b528ed7c38a215e0f59b846 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml
@@ -18,34 +18,49 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
 /**
- * @see \Magento\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
  */
 ?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
-    <div class="block block-list">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Viewed') ?></span></strong>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+    $type = 'widget-viewed';
+    $class = 'widget viewed mini products images';
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_viewed_products_images_only_widget';
+    $title = __('Recently Viewed');
+    $items = $exist;
+
+    $showWishlist = false;
+    $showCompare = false;
+    $showCart = false;
+    $rating = false;
+    $description = false;
+}
+?>
+<?php if ($exist): ?>
+    <div class="block <?php echo $class; ?>">
+        <div class="title">
+            <strong><?php echo $title; ?></strong>
         </div>
-        <div class="block-content">
+        <div class="content">
             <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-images-list" id="widget-viewed-<?php echo $suffix; ?>">
-            <?php foreach ($_products as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailUrl($_product); ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" height="76" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                </li>
+            <ol class="items" id="widget-viewed-<?php echo $suffix; ?>">
+                <?php $iterator = 1; ?>
+                <?php foreach($items as $_product): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                        <a class="product photo" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+                            <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+                        </a>
+                    <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
             </ol>
-            <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
         </div>
     </div>
-</div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml
index 2defa19f20635225d220bf3f1c9b8c660fdb267b..670e9ca03de8c22ebec0b31120b1021f30937d94 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml
@@ -18,34 +18,33 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
 /**
- * @see \Magento\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
  */
 ?>
 <?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
-    <div class="block block-list">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Viewed') ?></span></strong>
-        </div>
-        <div class="block-content">
-            <?php $suffix = $this->getNameInLayout(); ?>
-            <ol id="widget-viewed-<?php echo $suffix; ?>">
-            <?php foreach ($_products as $_product): ?>
-                <li class="item">
-                   <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
-                </li>
-            <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
-        </div>
+<div class="block widget viewed links">
+    <div class="title">
+        <strong><?php echo __('Recently Viewed') ?></strong>
+    </div>
+    <div class="content">
+        <?php $suffix = $this->getNameInLayout(); ?>
+        <ol id="widget-viewed-<?php echo $suffix; ?>" class="items">
+        <?php foreach ($_products as $_product): ?>
+            <li class="item">
+                <strong class="product name">
+                    <a href="<?php echo $_product->getProductUrl() ?>">
+                        <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                    </a>
+                </strong>
+            </li>
+        <?php endforeach; ?>
+        </ol>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml
index 49b87748b7be1a8835d4d28e80ca66c679e761b7..d01eeeee3f71844202903e1a0d11d25be8879b3a 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml
@@ -18,53 +18,104 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
 /**
- * @see \Magento\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
  */
 ?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
-    <div class="widget-title">
-        <h2><?php echo __('Recently Viewed') ?></h2>
-    </div>
-    <div class="widget-products">
-        <?php $_columnCount = $this->getColumnCount(); ?>
-        <?php $i=0; foreach ($_products as $_product): ?>
-        <?php if ($i++%$_columnCount==0): ?>
-            <ul class="products-grid">
-        <?php endif; ?>
-                <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
-                    <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                    <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                    <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                    <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-grid') ?>
-                    <div class="actions">
-                        <?php if($_product->isSaleable()): ?>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                        <?php else: ?>
-                                <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
-                        <ul class="add-to-links" data-role="add-to-links">
-                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                                <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+    $type = 'widget-viewed';
+    $mode = 'grid';
+
+    $type = $type . '-' . $mode;
+
+    $class = 'widget viewed' . ' ' . $mode;
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_viewed_products_grid_content_widget';
+    $title = __('Recently Viewed');
+    $items = $exist;
+
+    $showWishlist = true;
+    $showCompare = true;
+    $showCart = true;
+    $rating = 'short';
+    $description = ($mode == 'list') ? true : false;
+}
+?>
+<?php if ($exist):?>
+    <div class="block <?php echo $class; ?>">
+        <div class="title">
+            <strong><?php echo $title; ?></strong>
+        </div>
+        <div class="content">
+            <?php echo $this->getPagerHtml() ?>
+            <?php echo '<!-- ' . $image . '-->' ?>
+            <ol class="products list items <?php echo $type; ?>">
+                <?php $iterator = 1; ?>
+                <?php foreach($items as $_item): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                    <div class="product">
+                        <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+                            <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+                        </a>
+                        <div class="product details">
+                            <strong class="product name">
+                                <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+                                   href="<?php echo $this->getProductUrl($_item) ?>">
+                                    <?php echo $this->escapeHtml($_item->getName()) ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+                            <?php if ($_item->getRatingSummary() && $rating): ?>
+                                <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
                             <?php endif; ?>
-                            <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                                <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+                            <?php if($showWishlist || $showCompare || $showCart): ?>
+                                <div class="product actions">
+                                    <?php if($showCart): ?>
+                                        <div class="primary">
+                                            <?php if($_item->isSaleable()): ?>
+                                                <button class="action tocart" data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}" type="button" title="<?php echo __('Add to Cart') ?>">
+                                                    <span><?php echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php if ($_item->getIsSalable()): ?>
+                                                    <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                                <?php else: ?>
+                                                    <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                                <?php endif; ?>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if($showWishlist || $showCompare): ?>
+                                        <div class="secondary addto links">
+                                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+                                                   class="action towishlist" data-action="add-to-wishlist"
+                                                   title="<?php echo __('Add to Wishlist') ?>">
+                                                    <span><?php echo __('Add to Wishlist') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                            <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+                                                <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+                                                   class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+                                                    <span><?php echo __('Add to Compare') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             <?php endif; ?>
-                        </ul>
+                        </div>
                     </div>
-                </li>
-        <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
-            </ul>
-        <?php endif; ?>
-        <?php endforeach; ?>
+                    <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+                <?php endforeach ?>
+            </ol>
+        </div>
     </div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml
index 693f5b84ea5e52452d861f810a0affb6f5240dc8..d4ef382ad692ed224482652ecb87121f0c2820c4 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml
@@ -18,50 +18,108 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 ?>
 <?php
 /**
- * @see \Magento\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
  */
 ?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
-    <div class="widget-title">
-        <h2><?php echo __('Recently Viewed') ?></h2>
-    </div>
-    <div class="widget-products">
-        <ol class="products-list">
-        <?php $i=0; foreach ($_products as $_product): ?>
-            <li class="item<?php echo (++$i == count($_products))?' last':''; ?>">
-                <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                <div class="product-shop">
-                    <div class="f-fix">
-                        <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
-                        <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-list') ?>
-                        <?php if($_product->isSaleable()): ?>
-                        <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                        <?php else: ?>
-                                <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
-                        <ul class="add-to-links" data-role="add-to-links">
-                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                                <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+    $type = 'widget-viewed';
+    $mode = 'list';
+
+    $type = $type . '-' . $mode;
+
+    $class = 'widget viewed' . ' ' . $mode;
+
+    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+    $image = 'recently_viewed_products_list_content_widget';
+    $title = __('Recently Viewed');
+    $items = $exist;
+
+    $showWishlist = true;
+    $showCompare = true;
+    $showCart = true;
+    $rating = 'short';
+    $description = ($mode == 'list') ? true : false;
+}
+?>
+
+<?php if ($exist):?>
+    <div class="block <?php echo $class; ?>">
+        <div class="title">
+            <strong><?php echo $title; ?></strong>
+        </div>
+        <div class="content">
+            <?php echo $this->getPagerHtml() ?>
+            <?php echo '<!-- ' . $image . '-->' ?>
+            <ol class="products list items <?php echo $type; ?>">
+                <?php $iterator = 1; ?>
+                <?php foreach($items as $_item): ?>
+                    <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+                    <div class="product">
+                        <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+                            <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+                        </a>
+                        <div class="product details">
+                            <strong class="product name">
+                                <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+                                   href="<?php echo $this->getProductUrl($_item) ?>">
+                                    <?php echo $this->escapeHtml($_item->getName()) ?>
+                                </a>
+                            </strong>
+                            <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+                            <?php if ($_item->getRatingSummary() && $rating): ?>
+                                <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
                             <?php endif; ?>
-                            <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
-                                <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+                            <?php if($showWishlist || $showCompare || $showCart): ?>
+                                <div class="product actions">
+                                    <?php if($showCart): ?>
+                                        <div class="primary">
+                                            <?php if($_item->isSaleable()): ?>
+                                                <button class="action tocart"
+                                                        data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+                                                        type="button" title="<?php echo __('Add to Cart') ?>">
+                                                    <span><?php echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php if ($_item->getIsSalable()): ?>
+                                                    <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+                                                <?php else: ?>
+                                                    <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+                                                <?php endif; ?>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+
+                                    <?php if($showWishlist || $showCompare): ?>
+                                        <div class="secondary addto links">
+                                            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+                                                   class="action towishlist" data-action="add-to-wishlist"
+                                                   title="<?php echo __('Add to Wishlist') ?>">
+                                                    <span><?php echo __('Add to Wishlist') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                            <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+                                                <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+                                                   class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+                                                    <span><?php echo __('Add to Compare') ?></span>
+                                                </a>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             <?php endif; ?>
-                        </ul>
+                        </div>
                     </div>
-                </div>
-            </li>
-        <?php endforeach; ?>
-        </ol>
+                    <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+                <?php endforeach ?>
+            </ol>
+        </div>
     </div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widgets.css b/app/code/Magento/Reports/view/frontend/widgets.css
deleted file mode 100644
index edddb46fdc025f89dcb5eb4a5ea55ab6a983a0fc..0000000000000000000000000000000000000000
--- a/app/code/Magento/Reports/view/frontend/widgets.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* Widget: Recently Viewed Products */
-.widget-viewed { display:block; }
-.col-main .widget-viewed { margin:7px 0; }
-.widget-viewed .products-grid .product-image,
-.widget-viewed .products-list .product-image { width:85px; height:85px; }
-.widget-viewed .products-list .product-shop { margin-left:100px; }
-.sidebar .widget-viewed .block { font-size:11px; line-height:1.25; }
-.sidebar .widget-viewed .block-title strong { background:url(images/i_widget-list.gif) 0 0 no-repeat; padding-left:21px; }
-
-/* Widget: Recently Compared Products */
-.widget-compared { display:block;}
-.col-main .widget-compared { margin:7px 0; }
-.widget-compared .products-grid .product-image,
-.widget-compared .products-list .product-image { width:85px; height:85px; }
-.widget-compared .products-list .product-shop { margin-left:100px; }
-.sidebar .widget-compared .block { font-size:11px; line-height:1.25; }
-.sidebar .widget-compared .block-title strong { background:url(images/i_widget-list.gif) 0 0 no-repeat; padding-left:21px; }
diff --git a/app/code/Magento/Adminhtml/Block/Review/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Review/Add.php
rename to app/code/Magento/Review/Block/Adminhtml/Add.php
index 085fa08ffbe9711b3f0e780b5dbbca40c8923efc..a91ba8ea69ddc65d57d83574ead67cd123eed4b5 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml add Review main block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Review
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
 
 class Add extends \Magento\Adminhtml\Block\Widget\Form\Container
 {
@@ -40,7 +40,8 @@ class Add extends \Magento\Adminhtml\Block\Widget\Form\Container
     {
         parent::_construct();
 
-        $this->_controller = 'review';
+        $this->_blockGroup = 'Magento_Review';
+        $this->_controller = 'adminhtml';
         $this->_mode = 'add';
 
         $this->_updateButton('save', 'label', __('Save Review'));
diff --git a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Review/Add/Form.php
rename to app/code/Magento/Review/Block/Adminhtml/Add/Form.php
index 57ab6ced96f39082eada102baea325d28d230158..b776d41b517ba556fd86035e32a3f5670f63b38a 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml add product review form
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Review
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Review\Add;
+namespace Magento\Review\Block\Adminhtml\Add;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -87,7 +87,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
             'label'     => __('Product Rating'),
             'required'  => true,
             'text'      => '<div id="rating_detail">'
-                . $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Rating\Detailed')->toHtml()
+                . $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Rating\Detailed')->toHtml()
                 . '</div>',
         ));
 
@@ -143,7 +143,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
 
         /*$gridFieldset = $form->addFieldset('add_review_grid', array('legend' => __('Please select a product')));
         $gridFieldset->addField('products_grid', 'note', array(
-            'text' => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Product\Grid')->toHtml(),
+            'text' => $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Product\Grid')->toHtml(),
         ));*/
 
         $form->setMethod('post');
diff --git a/app/code/Magento/Adminhtml/Block/Review/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Edit.php
rename to app/code/Magento/Review/Block/Adminhtml/Edit.php
index 207148434d0c973d5fbce64a65ba509aa254a350..db21dcdecb333bfecd05ff055c73e50147a5a501 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,7 +27,7 @@
 /**
  * Review edit form
  */
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
 
 class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
 {
@@ -77,7 +77,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
         parent::_construct();
 
         $this->_objectId = 'id';
-        $this->_controller = 'review';
+        $this->_blockGroup = 'Magento_Review';
+        $this->_controller = 'adminhtml';
 
         /** @var $actionPager \Magento\Review\Helper\Action\Pager */
         $actionPager = $this->_reviewActionPager;
diff --git a/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Edit/Form.php
rename to app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
index 7867f8a1923cf7002265a8ce3eb091cc889ce7e1..0a0cd2d72f4fccf2a6cbb6bc76ae0a4bc1ce75b3 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,7 +27,7 @@
 /**
  * Adminhtml Review Edit Form
  */
-namespace Magento\Adminhtml\Block\Review\Edit;
+namespace Magento\Review\Block\Adminhtml\Edit;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -132,14 +132,14 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
 
         $fieldset->addField('summary_rating', 'note', array(
             'label'     => __('Summary Rating'),
-            'text'      => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Rating\Summary')->toHtml(),
+            'text'      => $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Rating\Summary')->toHtml(),
         ));
 
         $fieldset->addField('detailed_rating', 'note', array(
             'label'     => __('Detailed Rating'),
             'required'  => true,
             'text'      => '<div id="rating_detail">'
-                           . $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Rating\Detailed')->toHtml()
+                           . $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Rating\Detailed')->toHtml()
                            . '</div>',
         ));
 
diff --git a/app/code/Magento/Adminhtml/Block/Review/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Review/Grid.php
rename to app/code/Magento/Review/Block/Adminhtml/Grid.php
index 34758723c83cfedfd06c2d2b099a8d556c6ef837..3bc06c4618ea942a96913d267c6c8a29b2174e4a 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,16 +28,16 @@
  * Adminhtml reviews grid
  *
  * @method int getProductId() getProductId()
- * @method \Magento\Adminhtml\Block\Review\Grid setProductId() setProductId(int $productId)
+ * @method \Magento\Review\Block\Adminhtml\Grid setProductId() setProductId(int $productId)
  * @method int getCustomerId() getCustomerId()
- * @method \Magento\Adminhtml\Block\Review\Grid setCustomerId() setCustomerId(int $customerId)
- * @method \Magento\Adminhtml\Block\Review\Grid setMassactionIdFieldOnlyIndexValue() setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
+ * @method \Magento\Review\Block\Adminhtml\Grid setCustomerId() setCustomerId(int $customerId)
+ * @method \Magento\Review\Block\Adminhtml\Grid setMassactionIdFieldOnlyIndexValue() setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Review
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
 
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -130,7 +130,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     /**
      * Prepare collection
      *
-     * @return \Magento\Adminhtml\Block\Review\Grid
+     * @return \Magento\Review\Block\Adminhtml\Grid
      */
     protected function _prepareCollection()
     {
@@ -252,8 +252,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
             'header'    => __('Type'),
             'type'      => 'select',
             'index'     => 'type',
-            'filter'    => 'Magento\Adminhtml\Block\Review\Grid\Filter\Type',
-            'renderer'  => 'Magento\Adminhtml\Block\Review\Grid\Renderer\Type'
+            'filter'    => 'Magento\Review\Block\Adminhtml\Grid\Filter\Type',
+            'renderer'  => 'Magento\Review\Block\Adminhtml\Grid\Renderer\Type'
         ));
 
         $this->addColumn('name', array(
diff --git a/app/code/Magento/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Review/Grid/Filter/Type.php
rename to app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
index b4ca6552cd53b46179673b118de22b0ea94fc4f9..8e9c57cf68677a968f94d0397c8193c18d48da97 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Grid/Filter/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml review grid filter by type
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Review
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Review\Grid\Filter;
+namespace Magento\Review\Block\Adminhtml\Grid\Filter;
 
 class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Select
 {
@@ -56,4 +56,4 @@ class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Select
             return 3;
         }
     }
-}// Class \Magento\Adminhtml\Block\Review\Grid\Filter\Type END
+}// Class \Magento\Review\Block\Adminhtml\Grid\Filter\Type END
diff --git a/app/code/Magento/Adminhtml/Block/Review/Grid/Renderer/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
similarity index 84%
rename from app/code/Magento/Adminhtml/Block/Review/Grid/Renderer/Type.php
rename to app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
index ea8fa0c7e312d97322600a7a250e01e3bc851fc6..fb7da5ee709ed3288a3284375fd510b6e08d0d4a 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Grid/Renderer/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,11 +28,11 @@
  * Adminhtml review grid item renderer for item type
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Review
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 
-namespace Magento\Adminhtml\Block\Review\Grid\Renderer;
+namespace Magento\Review\Block\Adminhtml\Grid\Renderer;
 
 class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
@@ -40,7 +40,7 @@ class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abstract
     {
 
         if (is_null($row->getCustomerId())) {
-            if ($row->getStoreId() == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+            if ($row->getStoreId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
                 return __('Administrator');
             } else {
                 return __('Guest');
@@ -50,4 +50,4 @@ class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abstract
         }
 //		return ($row->getCustomerId() ? __('Customer') : __('Guest'));
     }
-}// Class \Magento\Adminhtml\Block\Review\Grid\Renderer\Type END
+}// Class \Magento\Review\Block\Adminhtml\Grid\Renderer\Type END
diff --git a/app/code/Magento/Adminhtml/Block/Review/Main.php b/app/code/Magento/Review/Block/Adminhtml/Main.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Review/Main.php
rename to app/code/Magento/Review/Block/Adminhtml/Main.php
index eac15d1f713171ad3ad32af31f26c964d7164351..5c0c75035b2e644bee44cacde4e750f9a7706210 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Main.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Main.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,7 +27,7 @@
 /**
  * Adminhtml review main block
  */
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
 
 class Main extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -75,7 +75,8 @@ class Main extends \Magento\Adminhtml\Block\Widget\Grid\Container
         $this->_addButtonLabel = __('Add New Review');
         parent::_construct();
 
-        $this->_controller = 'review';
+        $this->_blockGroup = 'Magento_Review';
+        $this->_controller = 'adminhtml';
 
         // lookup customer, if id is specified
         $customerId = $this->getRequest()->getParam('customerId', false);
diff --git a/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Product/Grid.php
rename to app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
index 38038e6d0104617251657de6879467008312206f..ae43818c089e079d40ec9629a4372701e4d04c98 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -28,10 +28,10 @@
  * Adminhtml product grid block
  *
  * @category   Magento
- * @package    Magento_Adminhtml
+ * @package    Magento_Review
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Review\Product;
+namespace Magento\Review\Block\Adminhtml\Product;
 
 class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
 {
diff --git a/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php
rename to app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
index aed4f848991f2461bf62d8eed68e476b0ed34865..2a0ae6edb250555de667ee2183999ff6f3a421ea 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,9 +27,9 @@
 /**
  * Adminhtml detailed rating stars
  */
-namespace Magento\Adminhtml\Block\Review\Rating;
+namespace Magento\Review\Block\Adminhtml\Rating;
 
-class Detailed extends \Magento\Adminhtml\Block\Template
+class Detailed extends \Magento\Backend\Block\Template
 {
     protected $_voteCollection = false;
 
diff --git a/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php
rename to app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
index 9cb9a4fd4713de5a804bdfff4631d59b7c76c45a..e4c98732802b9977b893d58cd9f9dccba8795d2f 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Review
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -27,9 +27,9 @@
 /**
  * Adminhtml summary rating stars
  */
-namespace Magento\Adminhtml\Block\Review\Rating;
+namespace Magento\Review\Block\Adminhtml\Rating;
 
-class Summary extends \Magento\Adminhtml\Block\Template
+class Summary extends \Magento\Backend\Block\Template
 {
     protected $_template = 'Magento_Rating::rating/stars/summary.phtml';
 
diff --git a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
index 2e23cbf34b0efd2354518361f42f0d1b726e681f..64f5023ee049068cde749beed8390474032bc37d 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -96,7 +96,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
      * @param \Magento\Stdlib\DateTime $dateTime
      * @param \Magento\Rating\Model\RatingFactory $ratingFactory
      * @param \Magento\Rating\Model\Rating\Option\VoteFactory $voteFactory
-     * 
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -356,7 +356,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
     }
 
     /**
-     * Retrive all ids for collection
+     * Retrieve all ids for collection
      *
      * @param null|int|string $limit
      * @param null|int|string $offset
@@ -464,7 +464,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
                         $this->_getConditionSql('rdt.customer_id', array('is' => new \Zend_Db_Expr('NULL'))),
                         $this->_getConditionSql(
                             'rdt.store_id',
-                            array('eq' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+                            array('eq' => \Magento\Core\Model\Store::DEFAULT_STORE_ID)
                         )
                     );
                     $conditionSql = implode(' AND ', $conditionParts);
@@ -475,7 +475,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
                         $this->_getConditionSql('rdt.customer_id', array('is' => new \Zend_Db_Expr('NULL'))),
                         $this->_getConditionSql(
                             'rdt.store_id',
-                            array('neq' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+                            array('neq' => \Magento\Core\Model\Store::DEFAULT_STORE_ID)
                         )
                     );
                     $conditionSql = implode(' AND ', $conditionParts);
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 24995635f0e61c269940a5aec246fb1572768fe9..4349ca5f651c23727773ff3a63cfd4a6a946a557 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -29,8 +29,8 @@
     <menu>
         <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" module="Magento_Review" sortOrder="60" parent="Magento_Adminhtml::stores_attributes" action="rating/index/" resource="Magento_Rating::ratings"/>
         <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" module="Magento_Review" parent="Magento_Adminhtml::marketing_user_content" sortOrder="10" action="catalog/product_review/" resource="Magento_Review::reviews_all"/>
-        <add id="Magento_Review::report_review" title="Reviews" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
-        <add id="Magento_Review::report_review_customer" title="By Customers" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="adminhtml/report_review/customer" resource="Magento_Reports::review_customer"/>
-        <add id="Magento_Review::report_review_product" title="By Products" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="adminhtml/report_review/product" resource="Magento_Reports::review_product"/>
+    <add id="Magento_Review::report_review" title="Reviews" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
+        <add id="Magento_Review::report_review_customer" title="By Customers" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/customer" resource="Magento_Reports::review_customer"/>
+        <add id="Magento_Review::report_review_product" title="By Products" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/product" resource="Magento_Reports::review_product"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/review/add.phtml b/app/code/Magento/Review/view/adminhtml/add.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/review/add.phtml
rename to app/code/Magento/Review/view/adminhtml/add.phtml
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index 2144586eb27c262a091cd9bde03b7acfb032edb4..92aa28aaead5cdfdc9a6dcf0a1031e2dc274d451 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -63,7 +63,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
     /**
      * Adminhtml data
      *
-     * @var \Magento\Adminhtml\Helper\Data
+     * @var \Magento\Backend\Helper\Data
      */
     protected $_backendData;
 
@@ -423,7 +423,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
         switch ($this->getAttribute()) {
             case 'sku':
             case 'category_ids':
-                $url = '*/promo_widget/chooser/attribute/' . $this->getAttribute();
+                $url = 'catalog_rule/promo_widget/chooser/attribute/' . $this->getAttribute();
                 if ($this->getJsFormObject()) {
                     $url .= '/form/' . $this->getJsFormObject();
                 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php
index d895eda33bb82d02338f0bcfb0545e36dab288ed..be37385ebdca9fb24f8a8fbb6ad0bba944f74b6f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php
@@ -31,7 +31,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Billing\Agreement\View;
 
-class Form extends \Magento\Adminhtml\Block\Template
+class Form extends \Magento\Backend\Block\Template
 {
     protected $_template = 'billing/agreement/view/form.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
index aad4ddb678c1560f2a9dd7ff5f9df90ef48e11ef..63044d68f96039f90a53a7caeb32dfc9632640e6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
@@ -34,7 +34,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Items\Column;
 
-class DefaultColumn extends \Magento\Adminhtml\Block\Template
+class DefaultColumn extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Catalog\Model\Product\OptionFactory
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
index 210171e8a8838a3288dc7102964da3263dd62a21..8b902908b4c6c9b4a82de28f32f060dc3370a4e0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Comments;
 
-class View extends \Magento\Adminhtml\Block\Template
+class View extends \Magento\Backend\Block\Template
 {
     /**
      * Sales data
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
index 56d2bf809de2307a232a9d35bde33eba65ac86fe..9c5ccadd5efc745a37c9e91ccb41427586169228 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
@@ -37,26 +37,26 @@ namespace Magento\Sales\Block\Adminhtml\Order\Create;
 class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
 {
     /**
-     * @var \Magento\Adminhtml\Model\Giftmessage\Save
+     * @var \Magento\GiftMessage\Model\Save
      */
     protected $_giftMessageSave;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
-     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
-     * @param \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+     * @param \Magento\GiftMessage\Model\Save $giftMessageSave
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
-        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
-        \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+        \Magento\GiftMessage\Model\Save $giftMessageSave,
+        array $data = array()
+    ) {
         $this->_giftMessageSave = $giftMessageSave;
         parent::__construct($context, $coreData, $sessionQuote, $orderCreate, $data);
     }
@@ -77,7 +77,7 @@ class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCr
     }
 
     /**
-     * Retrive items allowed for gift messages.
+     * Retrieve items allowed for gift messages.
      *
      * If no items available return false.
      *
@@ -107,7 +107,7 @@ class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCr
     /**
      * Retrieve gift message save model
      *
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     protected function _getGiftmessageSaveModel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
index 28abeafbe589daefcc5f88ad3d18337ffb709b73..857729fce0df9812f949569620712e24de79df89 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
@@ -58,22 +58,22 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     protected $_sessionQuote;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Core\Model\Registry $registry
-     * @param \Magento\Data\FormFactory $formFactory
-     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Core\Model\Registry $registry
+     * @param \Magento\Data\FormFactory $formFactory
+     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Core\Model\Registry $registry,
-        \Magento\Data\FormFactory $formFactory,
-        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Core\Model\Registry $registry,
+        \Magento\Data\FormFactory $formFactory,
+        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+        array $data = array()
+    ) {
         $this->_sessionQuote = $sessionQuote;
         parent::__construct($context, $coreData, $registry, $formFactory, $data);
     }
@@ -91,7 +91,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     }
 
     /**
-     * Retrive entity for form
+     * Retrieve entity for form
      *
      * @return \Magento\Object
      */
@@ -194,7 +194,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
 
         $this->getMessage()->setType($this->getEntityType());
 
-        // Overriden default data with edited when block reloads througth Ajax
+        // Overridden default data with edited when block reloads througth Ajax
         $this->_applyPostData();
 
         $form->setValues($this->getMessage()->getData());
@@ -282,7 +282,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     }
 
     /**
-     * Retrive gift message for entity
+     * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
      */
@@ -296,7 +296,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     }
 
     /**
-     * Retrive real name for field
+     * Retrieve real name for field
      *
      * @param string $name
      * @return string
@@ -307,7 +307,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     }
 
     /**
-     * Retrive real html id for field
+     * Retrieve real html id for field
      *
      * @param string $name
      * @return string
@@ -318,7 +318,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     }
 
     /**
-     * Retrive field html id prefix
+     * Retrieve field html id prefix
      *
      * @return unknown
      */
@@ -328,7 +328,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     }
 
     /**
-     * Aplies posted data to gift message
+     * Applies posted data to gift message
      *
      * @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 12718d2f4c9b1619c97bae15eb63cf265edbf50c..f2e016968ac06aec763931839acf5b69745653c9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -55,7 +55,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
     protected $_wishlistFactory;
 
     /**
-     * @var \Magento\Adminhtml\Model\Giftmessage\Save
+     * @var \Magento\GiftMessage\Model\Save
      */
     protected $_giftMessageSave;
 
@@ -64,28 +64,28 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      */
     protected $_taxConfig;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
-     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
-     * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
-     * @param \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave
-     * @param \Magento\Tax\Model\Config $taxConfig
-     * @param \Magento\Tax\Helper\Data $taxData
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+     * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
+     * @param \Magento\GiftMessage\Model\Save $giftMessageSave
+     * @param \Magento\Tax\Model\Config $taxConfig
+     * @param \Magento\Tax\Helper\Data $taxData
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
-        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
-        \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
-        \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave,
-        \Magento\Tax\Model\Config $taxConfig,
-        \Magento\Tax\Helper\Data $taxData,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+        \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
+        \Magento\GiftMessage\Model\Save $giftMessageSave,
+        \Magento\Tax\Model\Config $taxConfig,
+        \Magento\Tax\Helper\Data $taxData,
+        array $data = array()
+    ) {
         $this->_wishlistFactory = $wishlistFactory;
         $this->_giftMessageSave = $giftMessageSave;
         $this->_taxConfig = $taxConfig;
@@ -217,7 +217,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
     }
 
     /**
-     * Retrive quote address
+     * Retrieve quote address
      *
      * @return \Magento\Sales\Model\Quote\Address
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
index f786140b08a7c3967178f72992e509dcf750f0e0..25c30ed3d98b1aee3f6701a3d922109fbd3eeadf 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create;
 
-class Messages extends \Magento\Adminhtml\Block\Messages
+class Messages extends \Magento\View\Block\Messages
 {
     /**
      * @var \Magento\Adminhtml\Model\Session\Quote
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
index 6a629fa498b5f4b8eabd6e9198eb12a93bece206..dda12bd9e24face1d5b369f60ec4aed26e96e842 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
@@ -47,22 +47,22 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
      */
     protected $_salesConfig;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
-     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
-     * @param \Magento\Sales\Model\Config $salesConfig
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+     * @param \Magento\Sales\Model\Config $salesConfig
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
-        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
-        \Magento\Sales\Model\Config $salesConfig,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+        \Magento\Sales\Model\Config $salesConfig,
+        array $data = array()
+    ) {
         parent::__construct($context, $coreData, $sessionQuote, $orderCreate, $data);
         $this->_salesConfig = $salesConfig;
     }
@@ -136,7 +136,7 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
     }
 
     /**
-     * Retreive item count
+     * Retrieve item count
      *
      * @return int
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
index 1c38d8b9a4538d19143dccf47d3ccb15bebfa09f..de73dcbd5ce5102fa8113c5aeddcd758058c1ae8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
@@ -34,7 +34,7 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
 
-class Table extends \Magento\Adminhtml\Block\Template
+class Table extends \Magento\Backend\Block\Template
 {
 
     protected $_websiteCollection = null;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index f215f7e58e871b74751a0f9ca96df162e9c5c3cd..88ad92e75617781adeac2634bc999f3c6f7030bc 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -25,7 +25,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create;
 
-class Adjustments extends \Magento\Adminhtml\Block\Template
+class Adjustments extends \Magento\Backend\Block\Template
 {
     protected $_source;
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
index 5f16abe9e7d160585c7aa8d8cf55385a1e8d2ad2..29d7bc5ac48984161612e7f9d0652e74e8fe320e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
@@ -34,7 +34,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\View;
 
-class Comments extends \Magento\Adminhtml\Block\Text\ListText
+class Comments extends \Magento\Backend\Block\Text\ListText
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
index bcda1bf125c856c5dbf0efa838b390f1cf91993a..b585ea2838a7d7b808fd494900dfbc6680176404 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Invoice\Create;
 
-class Tracking extends \Magento\Adminhtml\Block\Template
+class Tracking extends \Magento\Backend\Block\Template
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
index a0025c9c795b271a3d4182b971873877a1a20cd5..a9966598efa10a9ad26badc4d977f422b5415fb5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
@@ -34,7 +34,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Invoice\View;
 
-class Comments extends \Magento\Adminhtml\Block\Text\ListText
+class Comments extends \Magento\Backend\Block\Text\ListText
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
index 6a60a90b2013553516bbf04c2e9c0763b52b781a..f832578c2322969f97ae7a45aba7a428abf204a5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order;
 
-class Payment extends \Magento\Adminhtml\Block\Template
+class Payment extends \Magento\Backend\Block\Template
 {
     /**
      * Payment data
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
index c478ab9c0410d4771d96a771f87a1fba4808e116..e8b8388b1463dfb720dedc25eba1b023110f8665 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Create;
 
-class Tracking extends \Magento\Adminhtml\Block\Template
+class Tracking extends \Magento\Backend\Block\Template
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
index 25d76a88a0b455ada7897ba5b8e9065bc5f1140b..7b52408e48e8fd117ddbfc4389c9e3448544fbb3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
@@ -30,7 +30,7 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\Shipment;
 
-class Packaging extends \Magento\Adminhtml\Block\Template
+class Packaging extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Usa\Model\Shipping\Carrier\Usps\Source\Size
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
index de32d82c1b34a6a48b87f6d6c28736343f64754f..97b53054f98f0b2ab08444d6a744b48191680fac 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging;
 
-class Grid extends \Magento\Adminhtml\Block\Template
+class Grid extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'order/shipment/packaging/grid.phtml';
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
index c50d2cf93e2074cbe9485909c96ecdf3e1ddae98..7d2fd5af28f57ffaa4290a3a03a61c1432978877 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Tracking;
 
-class Info extends \Magento\Adminhtml\Block\Template
+class Info extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'order/shipment/tracking/info.phtml';
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
index 14e62ab052de85fa1af34ba0c38ab4265bffbc9b..e37767f3274cbe865580c8ac62c0209784437636 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
@@ -34,7 +34,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
 
-class Comments extends \Magento\Adminhtml\Block\Text\ListText
+class Comments extends \Magento\Backend\Block\Text\ListText
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
index 4ec01e14e362af3b63d9fdac0a0c20732d9b5e2c..31f7af846c149cdc567ec6caf05802224f90e2fe 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
 
-class Tracking extends \Magento\Adminhtml\Block\Template
+class Tracking extends \Magento\Backend\Block\Template
 {
     /**
      * Core registry
@@ -47,20 +47,20 @@ class Tracking extends \Magento\Adminhtml\Block\Template
      */
     protected $_shippingConfig;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Shipping\Model\Config $shippingConfig
-     * @param \Magento\Core\Model\Registry $registry
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Shipping\Model\Config $shippingConfig
+     * @param \Magento\Core\Model\Registry $registry
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Shipping\Model\Config $shippingConfig,
-        \Magento\Core\Model\Registry $registry,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Shipping\Model\Config $shippingConfig,
+        \Magento\Core\Model\Registry $registry,
+        array $data = array()
+    ) {
         $this->_shippingConfig = $shippingConfig;
         $this->_coreRegistry = $registry;
         parent::__construct($context, $coreData, $data);
@@ -102,7 +102,7 @@ class Tracking extends \Magento\Adminhtml\Block\Template
     }
 
     /**
-     * Retrive save button html
+     * Retrieve save button html
      *
      * @return string
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
index 6f1cc5b17142b3164beb59ee945ffeedee56c3a9..7a9d1770ffdeaa8024a8470eb43e88dd8a4edf2c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
@@ -33,6 +33,7 @@ class Assign extends \Magento\Adminhtml\Block\Widget\Form\Container
     {
         $this->_controller = 'adminhtml_order_status';
         $this->_mode       = 'assign';
+        $this->_blockGroup = 'Magento_Sales';
         parent::_construct();
         $this->_updateButton('save', 'label', __('Save Status Assignment'));
         $this->_removeButton('delete');
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
index e65b3c7d3a27b3cff40ac5ce12692da8539e6431..5868cba363716bcb2d49e10da99287694bfd9ec0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
@@ -32,6 +32,7 @@ class Edit extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus
     {
         parent::_construct();
         $this->_mode = 'edit';
+        $this->_blockGroup = 'Magento_Sales';
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
index 9fee36cbd40c5feed25169dff4dc4e8546988e2d..91bffc6272337e31ccae97596cc45160dc0719f4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
@@ -34,7 +34,7 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\View;
 
-class Form extends \Magento\Adminhtml\Block\Template
+class Form extends \Magento\Backend\Block\Template
 {
     protected $_template = 'order/view/form.phtml';
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
index 48c77b0b1bee69e5b1f2116172d95ebc47b08fb8..c6d9de87ecd6030b944563f03980c79418be4be1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
@@ -54,20 +54,20 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
      */
     protected $_messageFactory;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\GiftMessage\Model\MessageFactory $messageFactory
-     * @param \Magento\Core\Model\Registry $registry
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\GiftMessage\Model\MessageFactory $messageFactory
+     * @param \Magento\Core\Model\Registry $registry
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\GiftMessage\Model\MessageFactory $messageFactory,
-        \Magento\Core\Model\Registry $registry,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\GiftMessage\Model\MessageFactory $messageFactory,
+        \Magento\Core\Model\Registry $registry,
+        array $data = array()
+    ) {
         $this->_coreRegistry = $registry;
         $this->_messageFactory = $messageFactory;
         parent::__construct($context, $coreData, $data);
@@ -114,7 +114,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive save button html
+     * Retrieve save button html
      *
      * @return string
      */
@@ -140,7 +140,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive entity for form
+     * Retrieve entity for form
      *
      * @return \Magento\Object
      */
@@ -154,7 +154,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive default value for giftmessage sender
+     * Retrieve default value for giftmessage sender
      *
      * @return string
      */
@@ -172,7 +172,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive default value for giftmessage recipient
+     * Retrieve default value for giftmessage recipient
      *
      * @return string
      */
@@ -200,7 +200,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive real name for field
+     * Retrieve real name for field
      *
      * @param string $name
      * @return string
@@ -211,7 +211,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive real html id for field
+     * Retrieve real html id for field
      *
      * @param string $name
      * @return string
@@ -222,7 +222,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive field html id prefix
+     * Retrieve field html id prefix
      *
      * @return string
      */
@@ -254,7 +254,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive gift message for entity
+     * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
      */
@@ -279,7 +279,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
     }
 
     /**
-     * Retrive block html id
+     * Retrieve block html id
      *
      * @return string
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
index 95503cd4d96ebf753bc86e54f3647c60a7460f37..218f4cb4313131d1155b0e778b1fde1f84d5b679 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\View;
 
-class History extends \Magento\Adminhtml\Block\Template
+class History extends \Magento\Backend\Block\Template
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
index 72eda211795ff973ab74ae8b33730f7ab9fb029b..4dc20ededf32f75324752335d822ff88f84cb099 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
@@ -79,7 +79,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
     protected $_giftMessage = array();
 
     /**
-     * Retrive default value for giftmessage sender
+     * Retrieve default value for giftmessage sender
      *
      * @return string
      */
@@ -97,7 +97,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
     }
 
     /**
-     * Retrive default value for giftmessage recipient
+     * Retrieve default value for giftmessage recipient
      *
      * @return string
      */
@@ -125,7 +125,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
     }
 
     /**
-     * Retrive real name for field
+     * Retrieve real name for field
      *
      * @param string $name
      * @return string
@@ -157,7 +157,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
     }
 
     /**
-     * Retrive gift message for entity
+     * Retrieve gift message for entity
      *
      * @return \Magento\GiftMessage\Model\Message
      */
@@ -185,7 +185,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
     }
 
     /**
-     * Retrive block html id
+     * Retrieve block html id
      *
      * @return string
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
index 4eb45ad54125b25ab50551182a025ea78ab1615e..43c60ebf14c340cd4c5767ec95b3c85df4910129 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\View;
 
-class Messages extends \Magento\Adminhtml\Block\Messages
+class Messages extends \Magento\View\Block\Messages
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index 5f722420d5dfedc67f30158e0b0f7c3fcda290d7..95b535b3702398a177013011c1b0693cc3a9eb49 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -34,7 +34,7 @@
 namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
 
 class History
-    extends \Magento\Adminhtml\Block\Template
+    extends \Magento\Backend\Block\Template
     implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
 {
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
index 375c72e90adebcbddd2436c2a807508bc263c314..a26592467b2b8fee26a8062e57b2c0e0a40e9aa7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
@@ -68,18 +68,18 @@ class Form extends \Magento\Backend\Block\AbstractBlock
      */
     protected $_recurringProfile;
 
-    /**
-     * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Data\FormFactory $formFactory
-     * @param \Magento\Sales\Model\Recurring\Profile $recurringProfile
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Context $context
+     * @param \Magento\Data\FormFactory $formFactory
+     * @param \Magento\Sales\Model\Recurring\Profile $recurringProfile
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Context $context,
-        \Magento\Data\FormFactory $formFactory,
-        \Magento\Sales\Model\Recurring\Profile $recurringProfile,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Context $context,
+        \Magento\Data\FormFactory $formFactory,
+        \Magento\Sales\Model\Recurring\Profile $recurringProfile,
+        array $data = array()
+    ) {
         $this->_formFactory = $formFactory;
         $this->_profile = $recurringProfile;
         parent::__construct($context, $data);
@@ -142,7 +142,7 @@ class Form extends \Magento\Backend\Block\AbstractBlock
 
         /**
          * if there is a parent element defined, it will be replaced by a hidden element with the same name
-         * and overriden by the form elements
+         * and overridden by the form elements
          * It is needed to maintain HTML consistency of the parent element's form
          */
         if ($this->_parentElement) {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
index cc36ce42c02dc799a458d8f82ddc069735717243..20070d81a9c0dc7439460f020b7d3ab53f9e54fc 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -38,18 +38,18 @@ class View extends \Magento\Backend\Block\Widget\Container
      */
     protected $_coreRegistry = null;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Core\Model\Registry $registry
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Core\Model\Registry $registry
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Core\Model\Registry $registry,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Helper\Data $coreData,
+        \Magento\Core\Model\Registry $registry,
+        array $data = array()
+    ) {
         $this->_coreRegistry = $registry;
         parent::__construct($context, $coreData, $data);
     }
@@ -68,14 +68,14 @@ class View extends \Magento\Backend\Block\Widget\Container
         ));
 
         $profile = $this->_coreRegistry->registry('current_recurring_profile');
-        $comfirmationMessage = __('Are you sure you want to do this?');
+        $confirmationMessage = __('Are you sure you want to do this?');
 
         // cancel
         if ($profile->canCancel()) {
             $url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'cancel'));
             $this->_addButton('cancel', array(
                 'label'     => __('Cancel'),
-                'onclick'   => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+                'onclick'   => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
                 'class'     => 'delete',
             ));
         }
@@ -85,7 +85,7 @@ class View extends \Magento\Backend\Block\Widget\Container
             $url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'suspend'));
             $this->_addButton('suspend', array(
                 'label'     => __('Suspend'),
-                'onclick'   => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+                'onclick'   => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
                 'class'     => 'delete',
             ));
         }
@@ -95,7 +95,7 @@ class View extends \Magento\Backend\Block\Widget\Container
             $url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'activate'));
             $this->_addButton('activate', array(
                 'label'     => __('Activate'),
-                'onclick'   => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+                'onclick'   => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
                 'class'     => 'add',
             ));
         }
@@ -105,7 +105,7 @@ class View extends \Magento\Backend\Block\Widget\Container
             $url = $this->getUrl('adminhtml/*/updateProfile', array('profile' => $profile->getId(),));
             $this->_addButton('update', array(
                 'label'     => __('Get Update'),
-                'onclick'   => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+                'onclick'   => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
                 'class'     => 'add',
             ));
         }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
index 67549195b5355806042a819af6dd8cc94f720214..bfb80743e1fe72fb7deaecb1d64ab8054ab81c34 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
@@ -33,7 +33,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Report\Filter;
 
-class Form extends \Magento\Adminhtml\Block\Report\Filter\Form
+class Form extends \Magento\Reports\Block\Adminhtml\Filter\Form
 {
     /**
      * @var \Magento\Sales\Model\Order\ConfigFactory
diff --git a/app/code/Magento/Sales/Block/Order/Comments.php b/app/code/Magento/Sales/Block/Order/Comments.php
index d16edd3e4bb838e8e804c10181afc8dd56d276e2..c315751642a8921dc8bc78d7b2355e4d4a89fd5f 100644
--- a/app/code/Magento/Sales/Block/Order/Comments.php
+++ b/app/code/Magento/Sales/Block/Order/Comments.php
@@ -51,7 +51,7 @@ class Comments extends \Magento\View\Block\Template
     protected $_entity;
 
     /**
-     * Currect comments collection
+     * Current comments collection
      *
      * @var \Magento\Sales\Model\Resource\Order\Comment\Collection\AbstractCollection
      */
diff --git a/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php b/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
index 9be5e65d40788d0ad15b97b7a3b60a41808d2a31..6914aca5705f062fdfe579213699d9df0a4817a5 100644
--- a/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
@@ -107,7 +107,7 @@ class Invoice extends \Magento\Sales\Block\Items\AbstractItems
     }
 
     /**
-     * Get html of invoice totlas block
+     * Get html of invoice totals block
      *
      * @param   \Magento\Sales\Model\Order\Invoice $invoice
      * @return  string
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 6a427b22c64cfccf3d7842d6d397e3391da5c6db..d62941eb0ffea83720db4f8a772cb7e474026a20 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -84,11 +84,11 @@ class Create extends \Magento\Backend\App\Action
     /**
      * Retrieve gift message save model
      *
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     protected function _getGiftmessageSaveModel()
     {
-        return $this->_objectManager->get('Magento\Adminhtml\Model\Giftmessage\Save');
+        return $this->_objectManager->get('Magento\GiftMessage\Model\Save');
     }
 
     /**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
index 4df921a97042f097273c3701c378bb9c4eb4bc25..0682ce675c25c386f2a41ed830012cf040d7b185 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
@@ -425,7 +425,7 @@ class Shipment extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShip
         }
 
         if (is_object($response)) {
-            $block = $this->_objectManager->create('Magento\Adminhtml\Block\Template');
+            $block = $this->_objectManager->create('Magento\Backend\Block\Template');
             $block->setTemplate('sales/order/shipment/tracking/info.phtml');
             $block->setTrackingInfo($response);
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
index 5a31069c3ff4f39b8604fecff78ef68c2d81bb5e..6a61a0a657055ced09d65047d31f643c23e43b8c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
@@ -62,11 +62,11 @@ class Giftmessage extends \Magento\Backend\App\Action
     /**
      * Retrieve gift message save model
      *
-     * @return \Magento\Adminhtml\Model\Giftmessage\Save
+     * @return \Magento\GiftMessage\Model\Save
      */
     protected function _getGiftmessageSaveModel()
     {
-        return $this->_objectManager->get('Magento\Adminhtml\Model\Giftmessage\Save');
+        return $this->_objectManager->get('Magento\GiftMessage\Model\Save');
     }
 
 }
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 9aebb0b9d6e11c09c3a0e4a77afab7a35a5b9856..a5786283bd72e4721d5a170d72a293a544e39cf6 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1120,7 +1120,7 @@ class Order extends \Magento\Sales\Model\AbstractModel
     /**
      * Order state setter.
      * If status is specified, will add order status history with specified comment
-     * the setData() cannot be overriden because of compatibility issues with resource model
+     * the setData() cannot be overridden because of compatibility issues with resource model
      *
      * @param string $state
      * @param string|bool $status
@@ -1136,7 +1136,7 @@ class Order extends \Magento\Sales\Model\AbstractModel
     /**
      * Order state protected setter.
      * By default allows to set any state. Can also update status to default or specified value
-     * Сomplete and closed states are encapsulated intentionally, see the _checkState()
+     * Complete and closed states are encapsulated intentionally, see the _checkState()
      *
      * @param string $state
      * @param string|bool $status
@@ -1488,7 +1488,7 @@ class Order extends \Magento\Sales\Model\AbstractModel
         // Get the destination email addresses to send copies to
         $copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
         $copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
-        // Check if at least one recepient is found
+        // Check if at least one recipient is found
         if (!$notifyCustomer && !$copyTo) {
             return $this;
         }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 72324f31eefef149536a1501d498d6bc63289807..f43f0d0320a0c1cc5d27608f155d8a279bead910 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -844,7 +844,7 @@ class Creditmemo extends \Magento\Sales\Model\AbstractModel
         // Get the destination email addresses to send copies to
         $copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
         $copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
-        // Check if at least one recepient is found
+        // Check if at least one recipient is found
         if (!$notifyCustomer && !$copyTo) {
             return $this;
         }
@@ -920,7 +920,7 @@ class Creditmemo extends \Magento\Sales\Model\AbstractModel
         // Get the destination email addresses to send copies to
         $copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
         $copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
-        // Check if at least one recepient is found
+        // Check if at least one recipient is found
         if (!$notifyCustomer && !$copyTo) {
             return $this;
         }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
index ed4b8c0f149c3e91fc4f3d64f858b6c66fb7734e..b0d8017add46d7b10b902b1169851ec4869b71bb 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
@@ -269,7 +269,7 @@ class Item extends \Magento\Core\Model\AbstractModel
         $rowTotalInclTax     = $orderItem->getRowTotalInclTax();
         $baseRowTotalInclTax = $orderItem->getBaseRowTotalInclTax();
 
-        if (!$this->isLast()) {
+        if (!$this->isLast() && $orderItemQtyInvoiced > 0) {
             $availableQty = $orderItemQtyInvoiced - $orderItem->getQtyRefunded();
             $rowTotal     = $creditmemo->roundPrice($rowTotal / $availableQty * $this->getQty());
             $baseRowTotal = $creditmemo->roundPrice($baseRowTotal / $availableQty * $this->getQty(), 'base');
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
index d6bf9020773f0d7d793ef2d06198a188c0a57a75..6f27e3cfcf1e5892aecb1ec2e45363aeb2c45ca9 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
@@ -46,9 +46,9 @@ class Tax extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
             if ($orderItem->isDummy()) {
                 continue;
             }
-            $orderItemTax     = $orderItem->getTaxInvoiced();
-            $baseOrderItemTax = $orderItem->getBaseTaxInvoiced();
-            $orderItemQty     = $orderItem->getQtyInvoiced();
+            $orderItemTax     = (float)$orderItem->getTaxInvoiced();
+            $baseOrderItemTax = (float)$orderItem->getBaseTaxInvoiced();
+            $orderItemQty     = (float)$orderItem->getQtyInvoiced();
 
             if ($orderItemTax && $orderItemQty) {
                 /**
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index f94e8af9426624b1cbf622a235ef26e929c0649b..31657ad745b71e5f81d1df078a3740f28e05e075 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -411,7 +411,7 @@ class Invoice extends \Magento\Sales\Model\AbstractModel
     }
 
     /**
-     * Check invice capture action availability
+     * Check invoice capture action availability
      *
      * @return bool
      */
@@ -871,7 +871,7 @@ class Invoice extends \Magento\Sales\Model\AbstractModel
         // Get the destination email addresses to send copies to
         $copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
         $copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
-        // Check if at least one recepient is found
+        // Check if at least one recipient is found
         if (!$notifyCustomer && !$copyTo) {
             return $this;
         }
@@ -946,7 +946,7 @@ class Invoice extends \Magento\Sales\Model\AbstractModel
         // Get the destination email addresses to send copies to
         $copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
         $copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
-        // Check if at least one recepient is found
+        // Check if at least one recipient is found
         if (!$notifyCustomer && !$copyTo) {
             return $this;
         }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
index 0668d634a2747a45f1f1bff8bd51a3ee9225d88a..d1cb3520e06aa2f5c5516a2bec2a13a83567547a 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
@@ -42,14 +42,14 @@ class Discount extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
          * So basically if we have invoice with positive discount and it
          * was not canceled we don't add shipping discount to this one.
          */
-        $addShippingDicount = true;
-        foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) {
-            if ($previusInvoice->getDiscountAmount()) {
-                $addShippingDicount = false;
+        $addShippingDiscount = true;
+        foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
+            if ($previousInvoice->getDiscountAmount()) {
+                $addShippingDiscount = false;
             }
         }
 
-        if ($addShippingDicount) {
+        if ($addShippingDiscount) {
             $totalDiscountAmount     = $totalDiscountAmount + $invoice->getOrder()->getShippingDiscountAmount();
             $baseTotalDiscountAmount = $baseTotalDiscountAmount + $invoice->getOrder()->getBaseShippingDiscountAmount();
         }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
index 3d2de76e96dbf1a31ca17e75c586f3de8c69ebb2..c81f04f5b4f381dfed0944684841ff00710b0fc6 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
@@ -132,8 +132,8 @@ class Tax extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
         /**
          * Check shipping amount in previous invoices
          */
-        foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) {
-            if ($previusInvoice->getShippingAmount() && !$previusInvoice->isCanceled()) {
+        foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
+            if ($previousInvoice->getShippingAmount() && !$previousInvoice->isCanceled()) {
                 $includeShippingTax = false;
             }
         }
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index 432ea182582d5867e2ec507967060a5dd2c1d576..c0ba19ee0bab378d9181d93ce94150fe46199a60 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -645,7 +645,7 @@ class Item extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Return chilgren items of this item
+     * Return children items of this item
      *
      * @return array
      */
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 98308de75bb5d6d5f4ad5912aef85c9dc379e8e3..d459c5e1b54d9dd07f4d0e50b1a3131da5a50fd9 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -178,7 +178,7 @@ class Payment extends \Magento\Payment\Model\Info
     protected $_eventObject = 'payment';
 
     /**
-     * Transaction addditional information container
+     * Transaction additional information container
      *
      * @var array
      */
@@ -1587,9 +1587,9 @@ class Payment extends \Magento\Payment\Model\Info
     }
 
     /**
-     * Additionnal transaction info getter
+     * Additional transaction info getter
      *
-     * @param sting $key
+     * @param string $key
      * @return mixed
      */
     public function getTransactionAdditionalInfo($key = null)
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index c38def57172d35b9747be9d2d8d4d042dee18b32..2dc7022771acb33bcf8720169e16dea34c6f3833 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -98,7 +98,7 @@ class Transaction extends \Magento\Core\Model\AbstractModel
     /**
      * Child transactions, assoc array of txn_id => instance
      * Filled only in case when all child transactions have txn_id
-     * Used for quicker search of child transactions using isset() as oposite to foreaching $_children
+     * Used for quicker search of child transactions using isset() as opposite to foreaching $_children
      * @var array
      */
     protected $_identifiedChildren = null;
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index 8d5a87f4693758b9513a89ad64df611cc183c747..53153d71bcb5d77e49877dc7a872b405a18ee270 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -516,7 +516,7 @@ class Shipment extends \Magento\Sales\Model\AbstractModel
         // Get the destination email addresses to send copies to
         $copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
         $copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
-        // Check if at least one recepient is found
+        // Check if at least one recipient is found
         if (!$notifyCustomer && !$copyTo) {
             return $this;
         }
@@ -593,7 +593,7 @@ class Shipment extends \Magento\Sales\Model\AbstractModel
         // Get the destination email addresses to send copies to
         $copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
         $copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
-        // Check if at least one recepient is found
+        // Check if at least one recipient is found
         if (!$notifyCustomer && !$copyTo) {
             return $this;
         }
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index 9261b707924c45b620257928669d58e6b5ba8e2b..02578047758d9703a0c1a1053f929f42950ba02b 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -131,13 +131,12 @@ class Status extends \Magento\Core\Model\AbstractModel
     public function getStoreLabel($store = null)
     {
         $store = $this->_storeManager->getStore($store);
-        if (!$store->isAdmin()) {
-            $labels = $this->getStoreLabels();
-            if (isset($labels[$store->getId()])) {
-                return $labels[$store->getId()];
-            }
+        $labels = $this->getStoreLabels();
+        if (isset($labels[$store->getId()])) {
+            return $labels[$store->getId()];
+        } else {
+            return __($this->getLabel());
         }
-        return __($this->getLabel());
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
index ed219119323273fa6573dc7c5f16ef766dce2188..42678d50259fdaa5e707ab6c904e1af0c5ecf91f 100644
--- a/app/code/Magento/Sales/Model/Quote.php
+++ b/app/code/Magento/Sales/Model/Quote.php
@@ -1235,7 +1235,7 @@ class Quote extends \Magento\Core\Model\AbstractModel
         if (!$item) {
             $item = $this->_quoteItemFactory->create();
             $item->setQuote($this);
-            if ($this->_storeManager->getStore()->isAdmin()) {
+            if ($this->_appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
                 $item->setStoreId($this->getStore()->getId());
             } else {
                 $item->setStoreId($this->_storeManager->getStore()->getId());
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
index da6985f2b9250b26e77503121682084b2efd522a..b5b7b54e00f8556daa18a88d156b6222ceacf78a 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
@@ -115,7 +115,7 @@ abstract class AbstractTotal
     }
 
     /**
-     * Set address shich can be used inside totals calculation
+     * Set address which can be used inside totals calculation
      *
      * @param   \Magento\Sales\Model\Quote\Address $address
      * @return  \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
@@ -239,7 +239,7 @@ abstract class AbstractTotal
     }
 
     /**
-     * Whether the item row total may be compouded with others
+     * Whether the item row total may be compounded with others
      *
      * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
      * @return bool
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
index 909cc2400b87af75a871c3c2365313ffddd9ffa9..e560f30cb520ec607375d437c8d22574f2b2b7ec 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
@@ -65,7 +65,7 @@ class Subtotal extends \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
         foreach ($items as $item) {
             if ($this->_initItem($address, $item) && $item->getQty() > 0) {
                 /**
-                 * Separatly calculate subtotal only for virtual products
+                 * Separately calculate subtotal only for virtual products
                  */
                 if ($item->getProduct()->isVirtual()) {
                     $virtualAmount += $item->getRowTotal();
diff --git a/app/code/Magento/Sales/Model/Quote/Item.php b/app/code/Magento/Sales/Model/Quote/Item.php
index 74a5d7ea70b1c175c71c32bf0f3fdcc4e2eba504..b0b64fd71eed5ab5d6e76d15b6cfc577ff04ae78 100644
--- a/app/code/Magento/Sales/Model/Quote/Item.php
+++ b/app/code/Magento/Sales/Model/Quote/Item.php
@@ -319,8 +319,8 @@ class Item extends \Magento\Sales\Model\Quote\Item\AbstractItem
         $qty = $this->_prepareQty($qty);
 
         /**
-         * We can't modify quontity of existing items which have parent
-         * This qty declared just once duering add process and is not editable
+         * We can't modify quantity of existing items which have parent
+         * This qty declared just once during add process and is not editable
          */
         if (!$this->getParentItem() || !$this->getId()) {
             $this->setQtyToAdd($qty);
@@ -654,7 +654,7 @@ class Item extends \Magento\Sales\Model\Quote\Item\AbstractItem
 
     /**
      * Can specify specific actions for ability to change given quote options values
-     * Exemple: cataloginventory decimal qty validation may change qty to int,
+     * Example: cataloginventory decimal qty validation may change qty to int,
      * so need to change quote item qty option value.
      *
      * @param \Magento\Object $option
diff --git a/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
index ce9279ba6779d062672b8c6c6bfc6f8cd7685900..39f303bac8ace96080d1c0645ea5aefa614a326a 100644
--- a/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
+++ b/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
@@ -620,7 +620,7 @@ abstract class AbstractItem extends \Magento\Core\Model\AbstractModel
     }
 
     /**
-     * Checking can we ship product separatelly (each child separately)
+     * Checking can we ship product separately (each child separately)
      * or each parent product item can be shipped only like one item
      *
      * @return bool
diff --git a/app/code/Magento/Sales/Model/Recurring/Profile.php b/app/code/Magento/Sales/Model/Recurring/Profile.php
index 40c28f1bc47f2c2793b118b255955b6d59ab8fc0..62465e267248f7d72f7acf7cf6b188ca649d6a50 100644
--- a/app/code/Magento/Sales/Model/Recurring/Profile.php
+++ b/app/code/Magento/Sales/Model/Recurring/Profile.php
@@ -26,7 +26,7 @@
 
 /**
  * Sales implementation of recurring payment profiles
- * Implements saving and manageing profiles
+ * Implements saving and managing profiles
  *
  * @method \Magento\Sales\Model\Resource\Recurring\Profile _getResource()
  * @method \Magento\Sales\Model\Resource\Recurring\Profile getResource()
@@ -422,7 +422,7 @@ class Profile extends \Magento\Payment\Model\Recurring\Profile
     /**
      * Import quote information to the profile
      *
-     * @param \Magento\Sales\Model\Quote\ $quote
+     * @param \Magento\Sales\Model\Quote $quote
      * @return \Magento\Sales\Model\Recurring\Profile
      */
     public function importQuote(\Magento\Sales\Model\Quote $quote)
@@ -812,7 +812,7 @@ class Profile extends \Magento\Payment\Model\Recurring\Profile
     }
 
     /**
-     * Add additional options suboption into itev
+     * Add additional options suboption into item
      *
      * @param \Magento\Sales\Model\Order\Item $item
      * @param array $option
diff --git a/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
index 22797ae8fce19ca92266a2e299bf98364b049c93..5c3858e5547bc402b3f92c4bcb4451dd8e9bcbc1 100644
--- a/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
@@ -135,7 +135,7 @@ abstract class AbstractCollection
     }
 
     /**
-     * Retrive all ids for collection
+     * Retrieve all ids for collection
      * Backward compatibility with EAV collection
      *
      * @param int $limit
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
index d69c0878d71b43309b8672facf961fbdfc4fbff4..b66e787399c5031057ce7459035756bc5652babf 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
@@ -131,7 +131,7 @@ class Collection extends \Magento\Sales\Model\Resource\Collection\AbstractCollec
 
     /**
      * Join table sales_flat_order_address to select for billing and shipping order addresses.
-     * Create corillation map
+     * Create correlation map
      *
      * @return \Magento\Sales\Model\Resource\Order\Collection
      */
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
index 472497ab6f292af9dfabf67380fed45a3908c1d2..a9bc41dc8d8cd744ced17db1bb6855bbb4f30b4b 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
@@ -40,7 +40,7 @@ class Child
     /**
      * Performed before data is saved
      *
-     * @param Varieb_Object $object
+     * @param Varien_Object $object
      * @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      */
     public function beforeSave($object)
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
index 351ae1b313e31a8bec5a3c3c8f1958995a409a76..f11b37215984771d9b7d64a0a18f1e13ad5240a4 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
@@ -26,7 +26,7 @@
 
 
 /**
- * Quote addresses shiping rates collection
+ * Quote addresses shipping rates collection
  *
  * @category    Magento
  * @package     Magento_Sales
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
index b7ec10b886ad74481dbee9c455ab0bff985c6b7f..4a2293c52991c06343883d0de4388693d9f29a5b 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
@@ -235,7 +235,7 @@ class Bestsellers extends \Magento\Sales\Model\Resource\Report\AbstractReport
 
             $columns = array(
                 'period'        => 'period',
-                'store_id'      => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+                'store_id'      => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
                 'product_id'    => 'product_id',
                 'product_name'  => new \Zend_Db_Expr('MIN(product_name)'),
                 'product_price' => new \Zend_Db_Expr('MIN(product_price)'),
@@ -244,7 +244,7 @@ class Bestsellers extends \Magento\Sales\Model\Resource\Report\AbstractReport
 
             $select->reset();
             $select->from($this->getMainTable(), $columns)
-                ->where('store_id <> ?', 0);
+                ->where('store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             if ($subSelect !== null) {
                 $select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
index d6ce3bf58bbf10b8aaf25926ff71171d77aa883b..c5d164aa05642f791565f8d6bff9b78638e3df9e 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
@@ -200,8 +200,8 @@ class Collection
             $storeIds = array($storeIds);
         }
         $currentStoreIds = $this->_storesIds;
-        if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
-            && $currentStoreIds != array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)) {
+        if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\Store::DEFAULT_STORE_ID
+            && $currentStoreIds != array(\Magento\Core\Model\Store::DEFAULT_STORE_ID)) {
             if (!is_array($currentStoreIds)) {
                 $currentStoreIds = array($currentStoreIds);
             }
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
index 54016b5e96e491c9b855c6c098730c73f6be6998..04b2469f226254bb31f7b07d5ebb358dabc120f0 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
@@ -59,7 +59,7 @@ class AbstractCollection
         \Magento\Sales\Model\Resource\Report $resource
     ) {
         parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $resource);
-        $this->setModel('Magento\Adminhtml\Model\Report\Item');
+        $this->setModel('Magento\Reports\Model\Item');
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
index 2006034d8a3d9bb8af4e2d167a21904d2141cc9e..520df2bc412c091d8a57eb3c880295186c53760e 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
@@ -149,7 +149,7 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
 
             $columns = array(
                 'period'                => 'period',
-                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
                 'order_status'          => 'order_status',
                 'orders_count'          => new \Zend_Db_Expr('SUM(orders_count)'),
                 'orders_invoiced'       => new \Zend_Db_Expr('SUM(orders_invoiced)'),
@@ -158,7 +158,8 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
                 'invoiced_not_captured' => new \Zend_Db_Expr('SUM(invoiced_not_captured)')
             );
 
-            $select->from($table, $columns)->where('store_id <> ?', 0);
+            $select->from($table, $columns)
+                ->where('store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             if ($subSelect !== null) {
                 $select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
@@ -251,7 +252,7 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
 
         $columns = array(
             'period'                => 'period',
-            'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+            'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
             'order_status'          => 'order_status',
             'orders_count'          => new \Zend_Db_Expr('SUM(orders_count)'),
             'orders_invoiced'       => new \Zend_Db_Expr('SUM(orders_invoiced)'),
@@ -260,7 +261,7 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
             'invoiced_not_captured' => new \Zend_Db_Expr('SUM(invoiced_not_captured)')
         );
 
-        $select->from($table, $columns)->where('store_id <> ?', 0);
+        $select->from($table, $columns)->where('store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
         if ($subSelect !== null) {
             $select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
index 04c00872d35305b94b8ffb557408bf3e7246bba8..cf3195f7f805f69fda05b3de30d54c6f24ec9463 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
@@ -235,7 +235,7 @@ class Createdat extends \Magento\Sales\Model\Resource\Report\AbstractReport
                 $columns[$k] = new \Zend_Db_Expr('SUM(' . $k . ')');
             }
             $columns['period']         = 'period';
-            $columns['store_id']       = new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+            $columns['store_id']       = new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
             $columns['order_status']   = 'order_status';
 
             $select->reset();
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
index d7e8d4df1963bc2579560c569fb0c4552e2b8ce5..5a8b371bb22b987d545d00f8a83d620b6d64d432 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
@@ -128,7 +128,7 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
 
             $columns = array(
                 'period'                => 'period',
-                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
                 'order_status'          => 'order_status',
                 'shipping_description'  => 'shipping_description',
                 'orders_count'          => new \Zend_Db_Expr('SUM(orders_count)'),
@@ -136,7 +136,8 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
                 'total_shipping_actual' => new \Zend_Db_Expr('SUM(total_shipping_actual)'),
             );
 
-            $select->from($table, $columns)->where('store_id != ?', 0);
+            $select->from($table, $columns)
+                ->where('store_id != ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             if ($subSelect !== null) {
                 $select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
@@ -237,7 +238,7 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
 
             $columns = array(
                 'period'                => 'period',
-                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
                 'order_status'          => 'order_status',
                 'shipping_description'  => 'shipping_description',
                 'orders_count'          => new \Zend_Db_Expr('SUM(orders_count)'),
@@ -245,7 +246,8 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
                 'total_shipping_actual' => new \Zend_Db_Expr('SUM(total_shipping_actual)'),
             );
 
-            $select->from($table, $columns)->where('store_id != ?', 0);
+            $select->from($table, $columns)
+                ->where('store_id != ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
 
             if ($subSelect !== null) {
                 $select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
diff --git a/app/code/Magento/Sales/Model/Resource/Setup.php b/app/code/Magento/Sales/Model/Resource/Setup.php
index 3bcc41506e1aa4f1a6b64483ef45e28ac9191b8e..61302020f7740a54e0da2bc789a3f98eace540c2 100644
--- a/app/code/Magento/Sales/Model/Resource/Setup.php
+++ b/app/code/Magento/Sales/Model/Resource/Setup.php
@@ -118,7 +118,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
     }
 
     /**
-     * Add entity attribute. Overwrited for flat entities support
+     * Add entity attribute. Overwritten for flat entities support
      *
      * @param int|string $entityTypeId
      * @param string $code
diff --git a/app/code/Magento/Sales/Model/Service/Order.php b/app/code/Magento/Sales/Model/Service/Order.php
index b7268081ace48feac8f839ca01f5ab237db23dc3..e14a243f8eab9fb1398d0ff00c5369b74f5a09d2 100644
--- a/app/code/Magento/Sales/Model/Service/Order.php
+++ b/app/code/Magento/Sales/Model/Service/Order.php
@@ -330,7 +330,7 @@ class Order
     }
 
     /**
-     * Check if order item can be invoiced. Dummy item can be invoiced or with his childrens or
+     * Check if order item can be invoiced. Dummy item can be invoiced or with his children or
      * with parent item which is included to invoice
      *
      * @param \Magento\Sales\Model\Order\Item $item
@@ -370,7 +370,7 @@ class Order
     }
 
     /**
-     * Check if order item can be shiped. Dummy item can be shiped or with his childrens or
+     * Check if order item can be shipped. Dummy item can be shipped or with his children or
      * with parent item which is included to shipment
      *
      * @param \Magento\Sales\Model\Order\Item $item
diff --git a/app/code/Magento/Sales/etc/sales.xml b/app/code/Magento/Sales/etc/sales.xml
index 1876c1dabb8b51bd04275552a4bb1029e2ebd770..7aefbb77b38e9c05be2b35a237873dbbb76e21d4 100644
--- a/app/code/Magento/Sales/etc/sales.xml
+++ b/app/code/Magento/Sales/etc/sales.xml
@@ -59,4 +59,10 @@
             <item name="grand_total" instance="Magento\Sales\Model\Order\Creditmemo\Total\Grand" sort_order="400"/>
         </group>
     </section>
+    <order>
+        <available_product_type name="simple"/>
+        <available_product_type name="virtual"/>
+        <available_product_type name="configurable"/>
+        <available_product_type name="grouped"/>
+    </order>
 </config>
diff --git a/app/code/Magento/Sales/i18n/de_DE.csv b/app/code/Magento/Sales/i18n/de_DE.csv
index f907cc1d624d2c280be69a1e164d116a829cffcb..f1aee67e8f71be3f35a2f5ae456270e86aa81557 100644
--- a/app/code/Magento/Sales/i18n/de_DE.csv
+++ b/app/code/Magento/Sales/i18n/de_DE.csv
@@ -465,7 +465,7 @@
 "Orders and Returns","Bestellungen und Retouren"
 "Orders and Returns Search Form","Suchmaske Bestellungen und Rücksendungen"
 "Original Price","Originalpreis"
-"Original order item that recurring payment profile correspondss to.","Ursprünglich bestellter Artikel, der dem Zahlungsprofil entspricht."
+"Original order item that recurring payment profile corresponds to.","Ursprünglich bestellter Artikel, der dem Zahlungsprofil entspricht."
 "PDF Credit Memos","PDF Gutschriften"
 "PDF Invoices","PDF Rechnungen"
 "PDF Packing Slips","PDF Packzettel"
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index b8f1d6296a0979e181b21df840c75169c937b93a..23c0dbb6acd708471f27427724a130ee60c3d665 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -468,7 +468,7 @@
 "Orders and Returns","Orders and Returns"
 "Orders and Returns Search Form","Orders and Returns Search Form"
 "Original Price","Original Price"
-"Original order item that recurring payment profile correspondss to.","Original order item that recurring payment profile correspondss to."
+"Original order item that recurring payment profile corresponds to.","Original order item that recurring payment profile corresponds to."
 "PDF Credit Memos","PDF Credit Memos"
 "PDF Invoices","PDF Invoices"
 "PDF Packing Slips","PDF Packing Slips"
diff --git a/app/code/Magento/Sales/i18n/es_ES.csv b/app/code/Magento/Sales/i18n/es_ES.csv
index bc1d43e119b9d23dbbf00e720afdb6c19d801fd3..56c9423f592c43e368bd544e4e42f9757894ed30 100644
--- a/app/code/Magento/Sales/i18n/es_ES.csv
+++ b/app/code/Magento/Sales/i18n/es_ES.csv
@@ -465,7 +465,7 @@
 "Orders and Returns","Pedidos y devoluciones"
 "Orders and Returns Search Form","Impreso de pedidos y devoluciones"
 "Original Price","Precio original"
-"Original order item that recurring payment profile correspondss to.","Pedido original al que corresponde el perfil de pago periódico."
+"Original order item that recurring payment profile corresponds to.","Pedido original al que corresponde el perfil de pago periódico."
 "PDF Credit Memos","Notas de cŕedito en PDF"
 "PDF Invoices","Facturas en PDF"
 "PDF Packing Slips","Albaranes en PDF"
diff --git a/app/code/Magento/Sales/i18n/fr_FR.csv b/app/code/Magento/Sales/i18n/fr_FR.csv
index 8d1e957d987cc442e38c1f2847cb8c821b7e190e..cf1992a6da10451f84f40012c0f8321d45c5c0ea 100644
--- a/app/code/Magento/Sales/i18n/fr_FR.csv
+++ b/app/code/Magento/Sales/i18n/fr_FR.csv
@@ -465,7 +465,7 @@
 "Orders and Returns","Commandes et Retours"
 "Orders and Returns Search Form","Formulaire de recherche des Commandes et Retours"
 "Original Price","Prix d'origine"
-"Original order item that recurring payment profile correspondss to.","Article de la Commande d'origine qui correspond au profil de paiement récurrent"
+"Original order item that recurring payment profile corresponds to.","Article de la Commande d'origine qui correspond au profil de paiement récurrent"
 "PDF Credit Memos","Notes de crédit PDF"
 "PDF Invoices","Factures PDF"
 "PDF Packing Slips","Bons de livraison PDF"
diff --git a/app/code/Magento/Sales/i18n/nl_NL.csv b/app/code/Magento/Sales/i18n/nl_NL.csv
index 3a3af6ce0188900174033fe5c5c5100ef6fd5cad..80d2178c64749fb3404262886a30b1060b1fd2b7 100644
--- a/app/code/Magento/Sales/i18n/nl_NL.csv
+++ b/app/code/Magento/Sales/i18n/nl_NL.csv
@@ -465,7 +465,7 @@
 "Orders and Returns","Bestellingen en Teruggaven"
 "Orders and Returns Search Form","Bestellingen en Teruggaven Zoekscherm"
 "Original Price","Originele prijs"
-"Original order item that recurring payment profile correspondss to.","Oorspronkelijke volgorde van item waar een terugkerend betalings profiel mee overeenkomt."
+"Original order item that recurring payment profile corresponds to.","Oorspronkelijke volgorde van item waar een terugkerend betalings profiel mee overeenkomt."
 "PDF Credit Memos","PDF Kredietmemo's"
 "PDF Invoices","PDF-facturen"
 "PDF Packing Slips","PDF Packing Slips"
diff --git a/app/code/Magento/Sales/i18n/pt_BR.csv b/app/code/Magento/Sales/i18n/pt_BR.csv
index ce8f5786e1fb4a8ac83327c024233277d3fc7a0f..69e72e45321898dec45fc50d97885d610f4c8dbf 100644
--- a/app/code/Magento/Sales/i18n/pt_BR.csv
+++ b/app/code/Magento/Sales/i18n/pt_BR.csv
@@ -465,7 +465,7 @@
 "Orders and Returns","Pedidos e Devoluções"
 "Orders and Returns Search Form","Busca de Pedidos e Devoluções"
 "Original Price","Preço Original"
-"Original order item that recurring payment profile correspondss to.","Item de pedido original a que corresponde perfil de pagamento recorrente."
+"Original order item that recurring payment profile corresponds to.","Item de pedido original a que corresponde perfil de pagamento recorrente."
 "PDF Credit Memos","Avisos de crédito em PDF"
 "PDF Invoices","Faturas em PDF"
 "PDF Packing Slips","Guias de remessas em PDF"
diff --git a/app/code/Magento/Sales/i18n/zh_CN.csv b/app/code/Magento/Sales/i18n/zh_CN.csv
index c74f9e5d29c100a6a0c9deffc6bd018088497107..e582a6d5df15b3e0233021e2986659a39604051a 100644
--- a/app/code/Magento/Sales/i18n/zh_CN.csv
+++ b/app/code/Magento/Sales/i18n/zh_CN.csv
@@ -465,7 +465,7 @@
 "Orders and Returns","订单与退货"
 "Orders and Returns Search Form","订单与退货搜索表单"
 "Original Price","原始价格"
-"Original order item that recurring payment profile correspondss to.","循环支付配置文件所对应的原始订单项。"
+"Original order item that recurring payment profile corresponds to.","循环支付配置文件所对应的原始订单项。"
 "PDF Credit Memos","PDF版信用记录"
 "PDF Invoices","PDF版发票"
 "PDF Packing Slips","PDF版包裹清单"
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
index e172280e9d985f84b7c0ee8c2cbef1051d151742..15387546d38c5d3e96d391907035e302dcecfb18 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -56,7 +56,7 @@
                 <argument name="file" xsi:type="string">Magento_Sales::order/giftoptions_tooltip.js</argument>
             </arguments>
         </block>
-        <block class="Magento\Adminhtml\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
+        <block class="Magento\Backend\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
         <block class="Magento\Page\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
             <arguments>
                 <argument name="file" xsi:type="string">Magento_Core::prototype/magento.css</argument>
@@ -64,7 +64,7 @@
         </block>
     </referenceBlock>
     <referenceContainer name="js">
-        <block class="Magento\Adminhtml\Block\Template" template="Magento_Sales::order/create/js.phtml" name="create"/>
+        <block class="Magento\Backend\Block\Template" template="Magento_Sales::order/create/js.phtml" name="create"/>
     </referenceContainer>
     <referenceBlock name="root">
         <block class="Magento\Sales\Block\Adminhtml\Order\Create" name="content">
@@ -108,7 +108,7 @@
                     </block>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Comment" template="order/create/comment.phtml" name="comment"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Totals" template="order/create/totals.phtml" name="totals"/>
-                    <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
+                    <block class="Magento\Backend\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage" template="order/create/giftmessage.phtml" name="giftmessage"/>
                     </block>
                     <block class="Magento\View\Block\Text\ListText" name="order_item_extra_info"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
index fe3896f2619edb138f5cccb9baee43ba06671a7c..98a29816a8d0276423faeb71d8e317dd646ce1ae 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -59,7 +59,7 @@
             </block>
             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Comment" template="order/create/comment.phtml" name="comment"/>
             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Totals" template="order/create/totals.phtml" name="totals"/>
-            <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
+            <block class="Magento\Backend\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage" template="order/create/giftmessage.phtml" name="giftmessage"/>
             </block>
             <block class="Magento\View\Block\Text\ListText" name="order_item_extra_info"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
index 39abf257ae98f5ff3d6f12ded47b1952437bbad6..a647250ad8a22fd10b15b5c472ca45e0ecb2a55c 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
@@ -37,7 +37,7 @@
                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="sales_order_status.grid.columnSet">
                     <arguments>
                         <argument name="rowUrl" xsi:type="array">
-                            <item name="path" xsi:type="string">adminhtml/sales_order_status/edit</item>
+                            <item name="path" xsi:type="string">sales/order_status/edit</item>
                             <item name="extraParamsTemplate" xsi:type="array">
                                 <item name="status" xsi:type="string">getStatus</item>
                             </item>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index 641aa08275ab0002567e8ca81b18446b7ddb6521..2d4c4618e1a20e6e1eb8c7cb9be6d244da036ee8 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -53,7 +53,7 @@
                 </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
                 <block class="Magento\Sales\Block\Adminhtml\Order\View\History" name="order_history" template="order/view/history.phtml"/>
-                <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
+                <block class="Magento\Backend\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Giftmessage" name="order_giftmessage" template="order/view/giftmessage.phtml"/>
                 </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Totals" name="order_totals" template="order/totals.phtml">
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
index b0e2330e902a595ab96db9c4d1ee09f2984ae738..129c35fe533f8d1d3c7a65c9b575053a6b5a44ea 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
@@ -34,7 +34,7 @@
 namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab;
 
 class Coupons
-    extends \Magento\Adminhtml\Block\Text\ListText
+    extends \Magento\Backend\Block\Text\ListText
     implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
 {
     /**
diff --git a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml
index 18d9e36951a4dcdeff40b4fc340635a4e7423b3d..efd14d846a604d42bbf1e8aeeb2aa286ea75b96c 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml
+++ b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml
@@ -63,7 +63,7 @@
                 <argument name="block" xsi:type="string">promo_quote_edit_tab_coupons</argument>
             </action>
         </block>
-        <block class="Magento\Adminhtml\Block\Template" template="Magento_SalesRule::promo/salesrulejs.phtml" name="promo_quote_edit_jsinit"/>
+        <block class="Magento\Backend\Block\Template" template="Magento_SalesRule::promo/salesrulejs.phtml" name="promo_quote_edit_jsinit"/>
     </referenceContainer>
     <referenceContainer name="content">
         <block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit" name="promo_quote_edit"/>
diff --git a/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml b/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml
index 6f44077195efa39ff3fe651bea3135114f422b56..8fca208b2b1a9adc8402c569e8de37c2498451db 100644
--- a/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml
+++ b/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml
@@ -24,12 +24,10 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-right.phtml</argument>
+    <update handle="page_one_column"/>
+    <referenceBlock name="page.main.title">
+        <action method="setPageTitle">
+            <argument name="title" translate="true" xsi:type="string">Email to a Friend</argument>
         </action>
     </referenceBlock>
     <referenceContainer name="content">
diff --git a/app/code/Magento/Sendfriend/view/frontend/send.phtml b/app/code/Magento/Sendfriend/view/frontend/send.phtml
index e429a397b44c7b4efab36d85fe6253001534312b..6ef0ffc2d20cbbab3b282785a8f4d8d3a8b7e552 100644
--- a/app/code/Magento/Sendfriend/view/frontend/send.phtml
+++ b/app/code/Magento/Sendfriend/view/frontend/send.phtml
@@ -18,105 +18,113 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
- * @category    design
- * @package     base_default
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-/* @var $this \Magento\Sendfriend\Block\Send */
 /**
  * Send to friend form
  *
- * @see \Magento\Sendfriend\Block\Send
+ * @var $this \Magento\Sendfriend\Block\Send
  */
 ?>
 <script id="add-recipient-tmpl" type="text/x-jQuery-tmpl">
-    <p id="btn-remove${_index_}">
-        <a href="delete_email" class="btn-remove" title="<?php echo $this->escapeJsQuote(__('Remove Email')) ?>"><?php echo $this->escapeJsQuote(__('Remove Email')) ?>"</a>
-    </p>
-    <div class="field">
-        <label for="recipients-name${_index_}" class="required"><em>*</em> <?php echo __('Name:')?></label>
-        <div class="input-box">
-            <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name:')?>" class="input-text" id="recipients-name${_index_}" data-validate="{required:true}"/>
+    <a href="delete_email" id="btn-remove${_index_}" class="action delete"
+       title="<?php echo $this->escapeJsQuote(__('Remove Email')) ?>"><span><?php echo $this->escapeJsQuote(__('Remove Email')) ?></span></a>
+
+    <div class="field name required">
+        <label for="recipients-name${_index_}" class="label"><span><?php echo __('Name:')?></span></label>
+        <div class="control">
+            <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name:') ?>" class="input-text"
+                   id="recipients-name${_index_}" data-validate="{required:true}"/>
         </div>
     </div>
-    <div class="field">
-        <label for="recipients-email${_index_}" class="required"><em>*</em> <?php echo __('Email Address:') ?></label>
-        <div class="input-box">
-            <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address:') ?>" id="recipients-email${_index_}" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
+
+    <div class="field email required">
+        <label for="recipients-email${_index_}" class="label"><span><?php echo __('Email Address:') ?></span></label>
+        <div class="control">
+            <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address:') ?>"
+                   id="recipients-email${_index_}" type="text" class="input-text"
+                   data-validate="{required:true, 'validate-email':true}"/>
         </div>
     </div>
 </script>
-<div class="send-friend">
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <div class="page-title">
-        <h1><?php echo __('Email to a Friend') ?></h1>
-    </div>
-    <form action="<?php echo $this->getSendUrl() ?>" method="post" id="product-sendtofriend-form">
-        <div class="fieldset">
-            <?php echo $this->getBlockHtml('formkey')?>
-            <h2 class="legend"><?php echo __('Sender:') ?></h2>
-            <ul class="form-list" id="sender_options">
-                <li class="fields">
-                    <div class="field">
-                        <label for="sender-name" class="required"><em>*</em><?php echo __('Name:') ?></label>
-                        <div class="input-box">
-                            <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text" data-validate="{required:true}"/>
-                        </div>
-                    </div>
-                    <div class="field">
-                       <label for="sender-email" class="required"><em>*</em><?php echo __('Email:') ?></label>
-                       <div class="input-box">
-                           <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo __('Email Address') ?>" id="sender-email" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
-                       </div>
-                    </div>
-                </li>
-                <li class="wide">
-                    <label for="sender-message" class="required"><em>*</em><?php echo __('Message:') ?></label>
-                    <div class="input-box">
-                        <textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($this->getMessage())?></textarea>
-                    </div>
-                </li>
-            </ul>
+
+<form action="<?php echo $this->getSendUrl() ?>" method="post" id="product-sendtofriend-form" class="form send friend" data-hasRequired="<?php echo __('* Required Fields') ?>">
+    <fieldset class="fieldset sender" id="sender_options">
+        <?php echo $this->getBlockHtml('formkey')?>
+        <legend class="legend"><span><?php echo __('Sender:') ?></span></legend>
+        <br>
+        <div class="field sender required">
+            <label for="sender-name" class="label"><span><?php echo __('Name:') ?></span></label>
+            <div class="control">
+                <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>"
+                       title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text"
+                       data-validate="{required:true}"/>
+            </div>
+        </div>
+
+        <div class="field email required">
+            <label for="sender-email" class="label"><span><?php echo __('Email:') ?></span></label>
+            <div class="control">
+                <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>"
+                       title="<?php echo __('Email Address') ?>" id="sender-email" type="text" class="input-text"
+                       data-validate="{required:true, 'validate-email':true}"/>
+            </div>
         </div>
-        <div class="fieldset">
-            <h2 class="legend"><?php echo __('Recipient:') ?></h2>
-            <ul class="form-list" id="recipients-options">
-                <li class="no-display">&nbsp;</li>
-            </ul>
+
+        <div class="field text required">
+            <label for="sender-message" class="label"><span><?php echo __('Message:') ?></span></label>
+            <div class="control">
+                <textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3"
+                          data-validate="{required:true}"><?php echo $this->escapeHtml($this->getMessage()) ?></textarea>
+            </div>
         </div>
-        <div class="buttons-set">
-            <p class="back-link"><a href="#" role="back"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-            <button type="submit" class="button<?php if (!$this->canSend()):?> disabled<?php endif ?>"<?php if (!$this->canSend()):?> disabled="disabled"<?php endif ?>><span><span><?php echo __('Send Email') ?></span></span></button>
-            <div id="max-recipient-message" style="display:none;">
+    </fieldset>
+
+    <fieldset class="fieldset recipients" id="recipients-options">
+        <?php echo $this->getBlockHtml('formkey')?>
+        <legend class="legend"><span><?php echo __('Recipient:') ?></span></legend><br />
+    </fieldset>
+    <div class="actions">
+        <div class="primary">
+            <button type="submit"
+                    class="action submit"<?php if (!$this->canSend()): ?> disabled="disabled"<?php endif ?>>
+                <span><?php echo __('Send Email') ?></span></button>
+            <div id="max-recipient-message" style="display: none;" class="message notice limit">
                 <?php if ($this->getMaxRecipients()): ?>
-                  <p class="limit"><?php echo __('Maximum %1 email addresses allowed', $this->getMaxRecipients()) ?></p>
+                <span><?php echo __('Maximum %1 email addresses allowed.', $this->getMaxRecipients()) ?></span>
                 <?php endif; ?>
             </div>
             <?php if (1 < $this->getMaxRecipients()): ?>
-                <p>
-                    <button type="button" id="add-recipient-button" class="button"><span><span><?php echo __('Add Recipient') ?></span></span></button>
-                </p>
+                <button type="button" id="add-recipient-button" class="action add">
+                    <span><?php echo __('Add Recipient') ?></span></button>
             <?php endif; ?>
         </div>
-    </form>
-    <script type="text/javascript">
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('Magento_Page::js/row-builder.js')?>", function() {
-                    $('#product-sendtofriend-form').rowBuilder({
-                        rowTemplate: '#add-recipient-tmpl',
-                        rowContainer: '#recipients-options',
-                        maxRows: '<?php echo $this->getMaxRecipients() ?>',
-                        maxRowsMsg: '#max-recipient-message',
-                        addRowBtn: '#add-recipient-button',
-                        additionalRowClass: 'additional-row'
-                    }).validation();
-                    $('p.back-link a[role="back"]').on('click', function() { history.back(); return false; });
-                })
-        })(jQuery);
-    </script>
-</div>
+        <div class="secondary">
+            <a class="action back" href="#" role="back"><span><?php echo __('Back') ?></span></a>
+        </div>
+    </div>
+</form>
+<script type="text/javascript">
+    //<![CDATA[
+    (function($) {
+        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+            "<?php echo $this->getViewFileUrl('Magento_Page::js/row-builder.js')?>", function() {
+                $('#product-sendtofriend-form').rowBuilder({
+                    rowTemplate: '#add-recipient-tmpl',
+                    rowContainer: '#recipients-options',
+                    rowParentElem: '<div></div>',
+                    btnRemoveSelector: '.action.delete',
+                    maxRows: '<?php echo $this->getMaxRecipients() ?>',
+                    maxRowsMsg: '#max-recipient-message',
+                    addRowBtn: '#add-recipient-button',
+                    additionalRowClass: 'additional'
+                }).validation();
+                $('a[role="back"]').on('click', function() { history.back(); return false; });
+            })
+    })(jQuery);
+    //]]>
+</script>
diff --git a/app/code/Magento/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php
rename to app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
index 6798661931b8f2ce6a67ba13c98f52a18903e619..be1c1dda5715c4015eb781d78363e1d4d1c0f3b9 100644
--- a/app/code/Magento/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
@@ -19,7 +19,7 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Shipping
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
@@ -29,10 +29,10 @@
  * WARNING: This grid used for export table rates
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Shipping
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Shipping\Carrier\Tablerate;
+namespace Magento\Shipping\Block\Adminhtml\Carrier\Tablerate;
 
 class Grid extends \Magento\Adminhtml\Block\Widget\Grid
 {
@@ -97,7 +97,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
      * Set current website
      *
      * @param int $websiteId
-     * @return \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid
+     * @return \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid
      */
     public function setWebsiteId($websiteId)
     {
@@ -122,7 +122,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
      * Set current website
      *
      * @param int $websiteId
-     * @return \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid
+     * @return \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid
      */
     public function setConditionName($name)
     {
@@ -143,7 +143,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
     /**
      * Prepare shipping table rate collection
      *
-     * @return \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid
+     * @return \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index 4fec3925601079f0f8f89c714b0272d39f57924a..d88c2d0b6bee4a713c4cdbeb1dd696ee48cab04f 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -77,11 +77,6 @@ class Shipping
      */
     protected $_shippingConfig;
 
-    /**
-     * @var \Magento\Backend\Model\Auth\Session
-     */
-    protected $_authSession;
-
     /**
      * @var \Magento\Shipping\Model\Carrier\Factory
      */
@@ -111,7 +106,6 @@ class Shipping
      * @param \Magento\Core\Model\Store\Config $coreStoreConfig
      * @param \Magento\Shipping\Model\Config $shippingConfig
      * @param \Magento\Core\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Shipping\Model\Carrier\Factory $carrierFactory
      * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
      * @param \Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory
@@ -122,7 +116,6 @@ class Shipping
         \Magento\Core\Model\Store\Config $coreStoreConfig,
         \Magento\Shipping\Model\Config $shippingConfig,
         \Magento\Core\Model\StoreManagerInterface $storeManager,
-        \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Shipping\Model\Carrier\Factory $carrierFactory,
         \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
         \Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory,
@@ -132,7 +125,6 @@ class Shipping
         $this->_coreStoreConfig = $coreStoreConfig;
         $this->_shippingConfig = $shippingConfig;
         $this->_storeManager = $storeManager;
-        $this->_authSession = $authSession;
         $this->_carrierFactory = $carrierFactory;
         $this->_rateResultFactory = $rateResultFactory;
         $this->_rateRequestFactory = $rateRequestFactory;
@@ -499,83 +491,4 @@ class Shipping
 
         return $this->_carrierFactory->create($carrierCode, $storeId);
     }
-
-    /**
-     * Prepare and do request to shipment
-     *
-     * @param \Magento\Sales\Model\Order\Shipment $orderShipment
-     * @return \Magento\Object
-     * @throws \Magento\Core\Exception
-     */
-    public function requestToShipment(\Magento\Sales\Model\Order\Shipment $orderShipment)
-    {
-        $admin = $this->_authSession->getUser();
-        $order = $orderShipment->getOrder();
-        $address = $order->getShippingAddress();
-        $shippingMethod = $order->getShippingMethod(true);
-        $shipmentStoreId = $orderShipment->getStoreId();
-        $shipmentCarrier = $order->getShippingCarrier();
-        $baseCurrencyCode = $this->_storeManager->getStore($shipmentStoreId)->getBaseCurrencyCode();
-        if (!$shipmentCarrier) {
-            throw new \Magento\Core\Exception('Invalid carrier: ' . $shippingMethod->getCarrierCode());
-        }
-        $shipperRegionCode = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_REGION_ID, $shipmentStoreId);
-        if (is_numeric($shipperRegionCode)) {
-            $shipperRegionCode = $this->_regionFactory->create()->load($shipperRegionCode)->getCode();
-        }
-
-        $recipientRegionCode = $this->_regionFactory->create()->load($address->getRegionId())->getCode();
-
-        $originStreet1 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS1, $shipmentStoreId);
-        $originStreet2 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS2, $shipmentStoreId);
-        $storeInfo = new \Magento\Object($this->_coreStoreConfig->getConfig('general/store_information', $shipmentStoreId));
-
-        if (!$admin->getFirstname() || !$admin->getLastname() || !$storeInfo->getName() || !$storeInfo->getPhone()
-            || !$originStreet1 || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId)
-            || !$shipperRegionCode || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId)
-            || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId)
-        ) {
-            throw new \Magento\Core\Exception(
-                __('We don\'t have enough information to create shipping labels. Please make sure your store information and settings are complete.')
-            );
-        }
-
-        /** @var $request \Magento\Shipping\Model\Shipment\Request */
-        $request = $this->_rateRequestFactory->create();
-        $request->setOrderShipment($orderShipment);
-        $request->setShipperContactPersonName($admin->getName());
-        $request->setShipperContactPersonFirstName($admin->getFirstname());
-        $request->setShipperContactPersonLastName($admin->getLastname());
-        $request->setShipperContactCompanyName($storeInfo->getName());
-        $request->setShipperContactPhoneNumber($storeInfo->getPhone());
-        $request->setShipperEmail($admin->getEmail());
-        $request->setShipperAddressStreet(trim($originStreet1 . ' ' . $originStreet2));
-        $request->setShipperAddressStreet1($originStreet1);
-        $request->setShipperAddressStreet2($originStreet2);
-        $request->setShipperAddressCity($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId));
-        $request->setShipperAddressStateOrProvinceCode($shipperRegionCode);
-        $request->setShipperAddressPostalCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId));
-        $request->setShipperAddressCountryCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId));
-        $request->setRecipientContactPersonName(trim($address->getFirstname() . ' ' . $address->getLastname()));
-        $request->setRecipientContactPersonFirstName($address->getFirstname());
-        $request->setRecipientContactPersonLastName($address->getLastname());
-        $request->setRecipientContactCompanyName($address->getCompany());
-        $request->setRecipientContactPhoneNumber($address->getTelephone());
-        $request->setRecipientEmail($address->getEmail());
-        $request->setRecipientAddressStreet(trim($address->getStreet1() . ' ' . $address->getStreet2()));
-        $request->setRecipientAddressStreet1($address->getStreet1());
-        $request->setRecipientAddressStreet2($address->getStreet2());
-        $request->setRecipientAddressCity($address->getCity());
-        $request->setRecipientAddressStateOrProvinceCode($address->getRegionCode());
-        $request->setRecipientAddressRegionCode($recipientRegionCode);
-        $request->setRecipientAddressPostalCode($address->getPostcode());
-        $request->setRecipientAddressCountryCode($address->getCountryId());
-        $request->setShippingMethod($shippingMethod->getMethod());
-        $request->setPackageWeight($order->getWeight());
-        $request->setPackages($orderShipment->getPackages());
-        $request->setBaseCurrencyCode($baseCurrencyCode);
-        $request->setStoreId($shipmentStoreId);
-
-        return $shipmentCarrier->requestToShipment($request);
-    }
 }
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
new file mode 100644
index 0000000000000000000000000000000000000000..61f6c4e97283a6cab367bba9fbc7e4db28efdf23
--- /dev/null
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Shipping
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+
+namespace Magento\Shipping\Model\Shipping;
+
+/**
+ * Shipping labels model
+ */
+class Labels extends \Magento\Shipping\Model\Shipping
+{
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    protected $_authSession;
+
+    /**
+     * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+     * @param \Magento\Shipping\Model\Config $shippingConfig
+     * @param \Magento\Core\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Backend\Model\Auth\Session $authSession
+     * @param \Magento\Shipping\Model\Carrier\Factory $carrierFactory
+     * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
+     * @param \Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory
+     * @param \Magento\Directory\Model\RegionFactory $regionFactory
+     * @param \Magento\Math\Division $mathDivision
+     */
+    public function __construct(
+        \Magento\Core\Model\Store\Config $coreStoreConfig,
+        \Magento\Shipping\Model\Config $shippingConfig,
+        \Magento\Core\Model\StoreManagerInterface $storeManager,
+        \Magento\Backend\Model\Auth\Session $authSession,
+        \Magento\Shipping\Model\Carrier\Factory $carrierFactory,
+        \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
+        \Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory,
+        \Magento\Directory\Model\RegionFactory $regionFactory,
+        \Magento\Math\Division $mathDivision
+    ) {
+        $this->_authSession = $authSession;
+        parent::__construct(
+            $coreStoreConfig,
+            $shippingConfig,
+            $storeManager,
+            $carrierFactory,
+            $rateResultFactory,
+            $rateRequestFactory,
+            $regionFactory,
+            $mathDivision
+        );
+    }
+
+    /**
+     * Prepare and do request to shipment
+     *
+     * @param \Magento\Sales\Model\Order\Shipment $orderShipment
+     * @return \Magento\Object
+     * @throws \Magento\Core\Exception
+     */
+    public function requestToShipment(\Magento\Sales\Model\Order\Shipment $orderShipment)
+    {
+        $admin = $this->_authSession->getUser();
+        $order = $orderShipment->getOrder();
+        $address = $order->getShippingAddress();
+        $shippingMethod = $order->getShippingMethod(true);
+        $shipmentStoreId = $orderShipment->getStoreId();
+        $shipmentCarrier = $order->getShippingCarrier();
+        $baseCurrencyCode = $this->_storeManager->getStore($shipmentStoreId)->getBaseCurrencyCode();
+        if (!$shipmentCarrier) {
+            throw new \Magento\Core\Exception('Invalid carrier: ' . $shippingMethod->getCarrierCode());
+        }
+        $shipperRegionCode = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_REGION_ID, $shipmentStoreId);
+        if (is_numeric($shipperRegionCode)) {
+            $shipperRegionCode = $this->_regionFactory->create()->load($shipperRegionCode)->getCode();
+        }
+
+        $recipientRegionCode = $this->_regionFactory->create()->load($address->getRegionId())->getCode();
+
+        $originStreet1 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS1, $shipmentStoreId);
+        $originStreet2 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS2, $shipmentStoreId);
+        $storeInfo = new \Magento\Object($this->_coreStoreConfig->getConfig('general/store_information', $shipmentStoreId));
+
+        if (!$admin->getFirstname() || !$admin->getLastname() || !$storeInfo->getName() || !$storeInfo->getPhone()
+            || !$originStreet1 || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId)
+            || !$shipperRegionCode || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId)
+            || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId)
+        ) {
+            throw new \Magento\Core\Exception(
+                __('We don\'t have enough information to create shipping labels. Please make sure your store information and settings are complete.')
+            );
+        }
+
+        /** @var $request \Magento\Shipping\Model\Shipment\Request */
+        $request = $this->_rateRequestFactory->create();
+        $request->setOrderShipment($orderShipment);
+        $request->setShipperContactPersonName($admin->getName());
+        $request->setShipperContactPersonFirstName($admin->getFirstname());
+        $request->setShipperContactPersonLastName($admin->getLastname());
+        $request->setShipperContactCompanyName($storeInfo->getName());
+        $request->setShipperContactPhoneNumber($storeInfo->getPhone());
+        $request->setShipperEmail($admin->getEmail());
+        $request->setShipperAddressStreet(trim($originStreet1 . ' ' . $originStreet2));
+        $request->setShipperAddressStreet1($originStreet1);
+        $request->setShipperAddressStreet2($originStreet2);
+        $request->setShipperAddressCity($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId));
+        $request->setShipperAddressStateOrProvinceCode($shipperRegionCode);
+        $request->setShipperAddressPostalCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId));
+        $request->setShipperAddressCountryCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId));
+        $request->setRecipientContactPersonName(trim($address->getFirstname() . ' ' . $address->getLastname()));
+        $request->setRecipientContactPersonFirstName($address->getFirstname());
+        $request->setRecipientContactPersonLastName($address->getLastname());
+        $request->setRecipientContactCompanyName($address->getCompany());
+        $request->setRecipientContactPhoneNumber($address->getTelephone());
+        $request->setRecipientEmail($address->getEmail());
+        $request->setRecipientAddressStreet(trim($address->getStreet1() . ' ' . $address->getStreet2()));
+        $request->setRecipientAddressStreet1($address->getStreet1());
+        $request->setRecipientAddressStreet2($address->getStreet2());
+        $request->setRecipientAddressCity($address->getCity());
+        $request->setRecipientAddressStateOrProvinceCode($address->getRegionCode());
+        $request->setRecipientAddressRegionCode($recipientRegionCode);
+        $request->setRecipientAddressPostalCode($address->getPostcode());
+        $request->setRecipientAddressCountryCode($address->getCountryId());
+        $request->setShippingMethod($shippingMethod->getMethod());
+        $request->setPackageWeight($order->getWeight());
+        $request->setPackages($orderShipment->getPackages());
+        $request->setBaseCurrencyCode($baseCurrencyCode);
+        $request->setStoreId($shipmentStoreId);
+
+        return $shipmentCarrier->requestToShipment($request);
+    }
+}
diff --git a/app/design/adminhtml/magento_basic/theme.xml b/app/code/Magento/Shipping/etc/adminhtml/di.xml
similarity index 84%
rename from app/design/adminhtml/magento_basic/theme.xml
rename to app/code/Magento/Shipping/etc/adminhtml/di.xml
index da74ec55b06716c64bb5df3acd8abb8292357621..ee26b6a78ce059203b6a81ffd6ddcd35ff15e250 100644
--- a/app/design/adminhtml/magento_basic/theme.xml
+++ b/app/code/Magento/Shipping/etc/adminhtml/di.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 /**
  * Magento
@@ -19,12 +20,11 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Design
+ * @package     Magento_Shipping
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<theme>
-    <title>Magento Basic</title>
-    <version>2.0.0.0</version>
-</theme>
+<config>
+    <preference for="Magento\Shipping\Model\Shipping" type="Magento\Shipping\Model\Shipping\Labels" />
+</config>
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Edit.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Edit.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
index c9d7920924779f10ebc41e36feca692227f546ae..88be189127e39784ddd6c9d907022944e525f5ab 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Edit.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
@@ -31,7 +31,7 @@
  * @package    Magento_Adminhtml
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Sitemap;
+namespace Magento\Sitemap\Block\Adminhtml;
 
 class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
 {
@@ -64,7 +64,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
     protected function _construct()
     {
         $this->_objectId = 'sitemap_id';
-        $this->_controller = 'sitemap';
+        $this->_controller = 'adminhtml';
+        $this->_blockGroup = 'Magento_Sitemap';
 
         parent::_construct();
 
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Edit/Form.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
index 5122754073dbe186f568d9e8702ffd770f05b55e..d79872cb9baa5001ea5cf85ff98e5420893e81a0 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Edit/Form.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
@@ -31,7 +31,7 @@
  * @package    Magento_Adminhtml
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Adminhtml\Block\Sitemap\Edit;
+namespace Magento\Sitemap\Block\Adminhtml\Edit;
 
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
index 754750d651e3a944e92aa5a6d8a27bcfa82d5227..a1e4ad55a8baf7dabe6ba64e7298071b5ce0436d 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
@@ -30,7 +30,7 @@
  * @category   Magento
  * @package    Magento_Sitemap
  */
-namespace Magento\Adminhtml\Block\Sitemap\Grid\Renderer;
+namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
 
 class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
 {
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
index 3baf481abd6919cf426c9f857250a9874d14d905..b6bdada067f4246ac2844a2d4e727b53d23b0aa5 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -30,7 +30,7 @@
  * @category   Magento
  * @package    Magento_Sitemap
  */
-namespace Magento\Adminhtml\Block\Sitemap\Grid\Renderer;
+namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
 
 class Link extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
index 414d0bc23c7958aebb88f91fca926152c5e5f9b7..afbb63daa664f811355cd5639a33669bd8682c97 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
@@ -30,7 +30,7 @@
  * @category   Magento
  * @package    Magento_Sitemap
  */
-namespace Magento\Adminhtml\Block\Sitemap\Grid\Renderer;
+namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
 
 class Time extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap.php b/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sitemap.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
index 36be7601ca570b3e4db404d6b80c886256718ed9..4343064b5797fc886599a7420cfb62b6fc6c34e7 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
@@ -30,7 +30,7 @@
  * @category   Magento
  * @package    Magento_Sitemap
  */
-namespace Magento\Adminhtml\Block;
+namespace Magento\Sitemap\Block\Adminhtml;
 
 class Sitemap extends \Magento\Adminhtml\Block\Widget\Grid\Container
 {
@@ -40,7 +40,8 @@ class Sitemap extends \Magento\Adminhtml\Block\Widget\Grid\Container
      */
     protected function _construct()
     {
-        $this->_controller = 'sitemap';
+        $this->_controller = 'adminhtml_sitemap';
+        $this->_blockGroup = 'Magento_Sitemap';
         $this->_headerText = __('XML Sitemap');
         $this->_addButtonLabel = __('Add Sitemap');
         parent::_construct();
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
index faf3fc143532de0dd5fe5621cfc168abb242fb01..e3e67a4baf54d7bd991f3c6139e632ca95d1b7c4 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
@@ -131,7 +131,7 @@ class Sitemap extends  \Magento\Backend\App\Action
                 $id ? __('Edit Sitemap') : __('New Sitemap'),
                 $id ? __('Edit Sitemap') : __('New Sitemap')
             )
-            ->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Sitemap\Edit'));
+            ->_addContent($this->_view->getLayout()->createBlock('Magento\Sitemap\Block\Adminhtml\Edit'));
         $this->_view->renderLayout();
     }
 
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
index 184f77343be96d6a608e3987aca8cbc293f0ef92..e7b3c4cfad2708982805a79666c110a35071ed86 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
@@ -188,7 +188,8 @@ class Product extends \Magento\Core\Model\Resource\Db\AbstractDb
             ->joinLeft(
                 array('t1_' . $attributeCode => $attribute['table']),
                 'e.entity_id = t1_' . $attributeCode . '.entity_id AND '
-                . $adapter->quoteInto(' t1_' . $attributeCode . '.store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+                . $adapter->quoteInto(' t1_' . $attributeCode . '.store_id = ?',
+                    \Magento\Core\Model\Store::DEFAULT_STORE_ID)
                 . $adapter->quoteInto(' AND t1_'.$attributeCode . '.attribute_id = ?', $attribute['attribute_id']),
                 array());
 
diff --git a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml
index 3c8548e8360364966af581c8bd033dd78290eb9e..6a507c454aa01582572e46667db9086829e43579 100644
--- a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml
+++ b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml
@@ -26,6 +26,6 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <update handle="adminhtml_sitemap_index_grid_block"/>
     <referenceContainer name="content">
-        <block class="Magento\Adminhtml\Block\Sitemap" name="adminhtml.sitemap.container"/>
+        <block class="Magento\Sitemap\Block\Adminhtml\Sitemap" name="adminhtml.sitemap.container"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
index 572fedd35a0a2c31b543cf9b777d8b0f72bd0fac..58d47266c973b444eacc7d37c6927ad79933020e 100644
--- a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
+++ b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
@@ -63,7 +63,7 @@
                 <block class="Magento\Backend\Block\Widget\Grid\Column" as="link">
                     <arguments>
                         <argument name="header" xsi:type="string" translate="true">Link for Google</argument>
-                        <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Sitemap\Grid\Renderer\Link</argument>
+                        <argument name="renderer" xsi:type="string">Magento\Sitemap\Block\Adminhtml\Grid\Renderer\Link</argument>
                     </arguments>
                 </block>
                 <block class="Magento\Backend\Block\Widget\Grid\Column" as="sitemap_time">
@@ -89,7 +89,7 @@
                         <argument name="filter" xsi:type="string">0</argument>
                         <argument name="sortable" xsi:type="string">0</argument>
                         <argument name="width" xsi:type="string">100px</argument>
-                        <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Sitemap\Grid\Renderer\Action</argument>
+                        <argument name="renderer" xsi:type="string">Magento\Sitemap\Block\Adminhtml\Grid\Renderer\Action</argument>
                     </arguments>
                 </block>
             </block>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index 8452d1ca86a192031cdb9c0e8a00be119969567b..18e8d64a5291fd6a6d6166b37f27ebe9f959b14a 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -34,7 +34,7 @@
 
 namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
 
-class Add extends \Magento\Adminhtml\Block\Template
+class Add extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'toolbar/rate/add.phtml';
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 6183d11988b9ca21b3656588d636cf2fc99cf68e..84c6b308e49d902ae17781949d123926bd24d14f 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -34,7 +34,7 @@
 
 namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
 
-class Save extends \Magento\Adminhtml\Block\Template
+class Save extends \Magento\Backend\Block\Template
 {
 
     protected $_template = 'toolbar/rate/save.phtml';
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index cc4dd9bb9247c0f15e3621fa8b54eabd615b648d..ffb56b0c1e880f0c820b87adb326d710fcd4cbb6 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -714,7 +714,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
                 $$rateVariable = '';
                 foreach ($$rateArray as $classId => $rate) {
                     if ($rate) {
-                        $$rateVariable .= sprintf("WHEN %d THEN %12.4f ", $classId, $rate/100);
+                        $$rateVariable .= sprintf("WHEN %d THEN %12.4F ", $classId, $rate / 100);
                     }
                 }
                 if ($$rateVariable) {
@@ -829,7 +829,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
      * @param   null|int|string|\Magento\Core\Model\Store $store
      * @return  string
      */
-    public function getCalculationSequence($store=null)
+    public function getCalculationSequence($store = null)
     {
         return $this->_config->getCalculationSequence($store);
     }
@@ -840,7 +840,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
      * @param   null|int $store
      * @return  string
      */
-    public function getCalculationAgorithm($store=null)
+    public function getCalculationAgorithm($store = null)
     {
         return $this->_config->getAlgorithm($store);
     }
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index f786d9076afc5ebb951ca06822e1932684fc4319..fa8d1755eb7eba51b891dd51b65a002210f19ce7 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -24,11 +24,11 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Tax\Model;
+
 /**
  * Tax Calculation Model
  */
-namespace Magento\Tax\Model;
-
 class Calculation extends \Magento\Core\Model\AbstractModel
 {
     const CALC_TAX_BEFORE_DISCOUNT_ON_EXCL      = '0_0';
@@ -245,7 +245,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
         $value = $this->getRateValue();
         $id = $this->getRateId();
 
-        $rate = array('code'=>$title, 'title'=>$title, 'percent'=>$value, 'position'=>1, 'priority'=>1);
+        $rate = array('code' => $title, 'title' => $title, 'percent' => $value, 'position' => 1, 'priority' => 1);
 
         $process = array();
         $process['percent'] = $value;
@@ -295,7 +295,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
     protected function _getRequestCacheKey($request)
     {
         $key = $request->getStore() ? $request->getStore()->getId() . '|' : '';
-        $key.= $request->getProductClassId() . '|' . $request->getCustomerClassId() . '|'
+        $key .= $request->getProductClassId() . '|' . $request->getCustomerClassId() . '|'
             . $request->getCountryId() . '|'. $request->getRegionId() . '|' . $request->getPostcode();
         return $key;
     }
@@ -309,7 +309,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
      * @param null|string|bool|int|\Magento\Core\Model\Store $store
      * @return float
      */
-    public function getStoreRate($request, $store=null)
+    public function getStoreRate($request, $store = null)
     {
         $storeRequest = $this->getRateOriginRequest($store)
             ->setProductClassId($request->getProductClassId());
@@ -325,9 +325,18 @@ class Calculation extends \Magento\Core\Model\AbstractModel
     public function getRateOriginRequest($store = null)
     {
         $request = new \Magento\Object();
-        $request->setCountryId($this->_coreStoreConfig->getConfig(\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_COUNTRY_ID, $store))
-            ->setRegionId($this->_coreStoreConfig->getConfig(\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_REGION_ID, $store))
-            ->setPostcode($this->_coreStoreConfig->getConfig(\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_POSTCODE, $store))
+        $request->setCountryId($this->_coreStoreConfig->getConfig(
+                \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_COUNTRY_ID,
+                $store
+            ))
+            ->setRegionId($this->_coreStoreConfig->getConfig(
+                \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_REGION_ID,
+                $store
+            ))
+            ->setPostcode($this->_coreStoreConfig->getConfig(
+                \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_POSTCODE,
+                $store
+            ))
             ->setCustomerClassId($this->getDefaultCustomerTaxClass($store))
             ->setStore($store);
         return $request;
@@ -335,6 +344,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
 
     /**
      * Get request object with information necessary for getting tax rate
+     *
      * Request object contain:
      *  country_id (->getCountryId())
      *  region_id (->getRegionId())
@@ -376,7 +386,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
 
                     if ($basedOn == 'billing' && $defBilling && $defBilling->getCountryId()) {
                         $billingAddress = $defBilling;
-                    } else if ($basedOn == 'shipping' && $defShipping && $defShipping->getCountryId()) {
+                    } elseif ($basedOn == 'shipping' && $defShipping && $defShipping->getCountryId()) {
                         $shippingAddress = $defShipping;
                     } else {
                         $basedOn = 'default';
@@ -402,7 +412,9 @@ class Calculation extends \Magento\Core\Model\AbstractModel
                     ->setCountryId($this->_coreStoreConfig->getConfig(
                         \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
                         $store))
-                    ->setRegionId($this->_coreStoreConfig->getConfig(\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION, $store))
+                    ->setRegionId($this->_coreStoreConfig->getConfig(
+                        \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
+                        $store))
                     ->setPostcode($this->_coreStoreConfig->getConfig(
                         \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
                         $store));
@@ -505,6 +517,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
     {
         return $this->_getRates($request, 'product_class_id', \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT);
     }
+
     public function getRatesForAllCustomerTaxClasses($request)
     {
         return $this->_getRates($request, 'customer_class_id', \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_CUSTOMER);
@@ -552,7 +565,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
      */
     public function calcTaxAmount($price, $taxRate, $priceIncludeTax = false, $round = true)
     {
-        $taxRate = $taxRate/100;
+        $taxRate = $taxRate / 100;
 
         if ($priceIncludeTax) {
             $amount = $price * (1 - 1 / (1 + $taxRate));
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index 6ad3732a3b2584d98d14853811e24cf0bfe7522f..828a4e7152b6a71db68e0e8abfdde15b167eb91d 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * Configuration pathes storage
+ * Configuration paths storage
  *
  * @category   Magento
  * @package    Magento_Tax
@@ -267,7 +267,7 @@ class Config
     }
 
     /**
-     * Check if shiping prices include tax
+     * Check if shipping prices include tax
      *
      * @param   store $store
      * @return  bool
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation.php b/app/code/Magento/Tax/Model/Resource/Calculation.php
index 1f5cd8bcd9b451b1689761509d29834e7b3ebd32..d158480e2f522050971c54fd76aec3f6dbbca045 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation.php
@@ -100,7 +100,7 @@ class Calculation extends \Magento\Core\Model\Resource\Db\AbstractDb
     }
 
     /**
-     * Retreive distinct calculation
+     * Retrieve distinct calculation
      *
      * @param  string $field
      * @param  int $ruleId
diff --git a/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php b/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php
index 776915a011f50ad4982ab3f670e7c26061e09173..5550bb48e58914f5128a596ebbd3877e96228ef0 100644
--- a/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php
+++ b/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php
@@ -128,7 +128,7 @@ class Createdat extends \Magento\Reports\Model\Resource\Report\AbstractReport
 
             $columns = array(
                 'period'                => 'period',
-                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+                'store_id'              => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
                 'code'                  => 'code',
                 'order_status'          => 'order_status',
                 'percent'               => 'MAX(' . $writeAdapter->quoteIdentifier('percent') . ')',
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
index 30a0c7ec7ca36694472a6886f43e454adf2a1012..5ca7025b884afc0330c169898396d4fd55321f33 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
@@ -31,7 +31,7 @@ namespace Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content;
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
+class Uploader extends \Magento\Backend\Block\Media\Uploader
 {
     /**
      * Path to uploader template
@@ -43,7 +43,7 @@ class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
     /**
      * Prepare layout
      *
-     * @return \Magento\Adminhtml\Block\Media\Uploader
+     * @return \Magento\Backend\Block\Media\Uploader
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php
index 8dc452b343fb43bf938fad21ca74025b4bc916d1..fd811e79562ba0cf7c63962055fccaab9dda7678 100644
--- a/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php
+++ b/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php
@@ -1057,10 +1057,10 @@ class International
     /**
      * Add rate to DHL rates array
      *
-     * @param \Magento\Usa\Model\Simplexml\Element $shipmentDetails
+     * @param \SimpleXMLElement $shipmentDetails
      * @return \Magento\Usa\Model\Shipping\Carrier\Dhl\International
      */
-    protected function _addRate(\Magento\Usa\Model\Simplexml\Element $shipmentDetails)
+    protected function _addRate(\SimpleXMLElement $shipmentDetails)
     {
         if (isset($shipmentDetails->ProductShortName)
             && isset($shipmentDetails->ShippingCharge)
diff --git a/app/code/Magento/User/Helper/Data.php b/app/code/Magento/User/Helper/Data.php
index 8c8cb7a768f55e8f72ac3336179cc3f921da77bc..e481111ec6c169e4687a40f3df217721bb8818cd 100644
--- a/app/code/Magento/User/Helper/Data.php
+++ b/app/code/Magento/User/Helper/Data.php
@@ -42,9 +42,9 @@ class Data extends \Magento\App\Helper\AbstractHelper
         = 'admin/emails/password_reset_link_expiration_period';
 
     /**
-     * @var \Magento\Core\Model\Config
+     * @var \Magento\Backend\App\ConfigInterface
      */
-    protected $_coreConfig;
+    protected $_config;
 
     /**
      * @var \Magento\Math\Random
@@ -53,15 +53,15 @@ class Data extends \Magento\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\App\Helper\Context $context
-     * @param \Magento\Core\Model\Config $coreConfig
+     * @param \Magento\Backend\App\ConfigInterface $config
      * @param \Magento\Math\Random $mathRandom
      */
     public function __construct(
         \Magento\App\Helper\Context $context,
-        \Magento\Core\Model\Config $coreConfig,
+        \Magento\Backend\App\ConfigInterface $config,
         \Magento\Math\Random $mathRandom
     ) {
-        $this->_coreConfig = $coreConfig;
+        $this->_config = $config;
         $this->mathRandom = $mathRandom;
         parent::__construct($context);
     }
@@ -83,9 +83,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
      */
     public function getResetPasswordLinkExpirationPeriod()
     {
-        return (int)$this->_coreConfig->getValue(
-            self::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD,
-            'default'
-        );
+        return (int)$this->_config->getValue(self::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD);
     }
 }
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 74c6062aca71e90e109942f2c37088102a0b3f00..b7ab9dd27a7acb1d4254d2178a0fef5d9a44ccb2 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -115,9 +115,9 @@ class User
     /**
      * Core store config
      *
-     * @var \Magento\Core\Model\Store\Config
+     * @var \Magento\Backend\App\ConfigInterface
      */
-    protected $_coreStoreConfig;
+    protected $_config;
 
     /**
      * Factory for validator composite object
@@ -155,7 +155,7 @@ class User
      * @param \Magento\Core\Model\Registry $registry
      * @param \Magento\User\Helper\Data $userData
      * @param \Magento\Email\Model\Sender $sender
-     * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+     * @param \Magento\Backend\App\ConfigInterface $config
      * @param \Magento\Validator\Composite\VarienObjectFactory $validatorCompositeFactory
      * @param \Magento\User\Model\RoleFactory $roleFactory
      * @param \Magento\Email\Model\InfoFactory $emailInfoFactory
@@ -173,7 +173,7 @@ class User
         \Magento\Core\Model\Registry $registry,
         \Magento\User\Helper\Data $userData,
         \Magento\Email\Model\Sender $sender,
-        \Magento\Core\Model\Store\Config $coreStoreConfig,
+        \Magento\Backend\App\ConfigInterface $config,
         \Magento\Validator\Composite\VarienObjectFactory $validatorCompositeFactory,
         \Magento\User\Model\RoleFactory $roleFactory,
         \Magento\Email\Model\InfoFactory $emailInfoFactory,
@@ -189,7 +189,7 @@ class User
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->_userData = $userData;
         $this->_sender = $sender;
-        $this->_coreStoreConfig = $coreStoreConfig;
+        $this->_config = $config;
         $this->_validatorComposite = $validatorCompositeFactory;
         $this->_roleFactory = $roleFactory;
         $this->_emailInfoFactory = $emailInfoFactory;
@@ -211,7 +211,7 @@ class User
             '_eventManager',
             '_sender',
             '_userData',
-            '_coreStoreConfig',
+            '_config',
             '_validatorComposite',
             '_roleFactory',
             '_emailInfoFactory',
@@ -227,7 +227,7 @@ class User
         $this->_eventManager    = $objectManager->get('Magento\Event\ManagerInterface');
         $this->_sender          = $objectManager->get('Magento\Email\Model\Sender');
         $this->_userData        = $objectManager->get('Magento\User\Helper\Data');
-        $this->_coreStoreConfig = $objectManager->get('Magento\Core\Model\Store\Config');
+        $this->_config = $objectManager->get('Magento\Backend\App\ConfigInterface');
         $this->_coreRegistry    = $objectManager->get('Magento\Core\Model\Registry');
         $this->_validatorComposite = $objectManager->get('Magento\Validator\Composite\VarienObjectFactory');
         $this->_roleFactory = $objectManager->get('Magento\User\Model\RoleFactory');
@@ -461,9 +461,9 @@ class User
         $this->_mailer->addEmailInfo($emailInfo);
 
         // Set all required params and send emails
-        $this->_mailer->setSender($this->_coreStoreConfig->getConfig(self::XML_PATH_FORGOT_EMAIL_IDENTITY));
+        $this->_mailer->setSender($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY));
         $this->_mailer->setStoreId(0);
-        $this->_mailer->setTemplateId($this->_coreStoreConfig->getConfig(self::XML_PATH_FORGOT_EMAIL_TEMPLATE));
+        $this->_mailer->setTemplateId($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE));
         $this->_mailer->setTemplateParams(array(
             'user' => $this
         ));
@@ -533,7 +533,7 @@ class User
      */
     public function authenticate($username, $password)
     {
-        $config = $this->_coreStoreConfig->getConfigFlag('admin/security/use_case_sensitive_login');
+        $config = $this->_config->getFlag('admin/security/use_case_sensitive_login');
         $result = false;
 
         try {
diff --git a/app/code/Magento/Webhook/etc/module.xml b/app/code/Magento/Webhook/etc/module.xml
index d935fd4b674ac0ce3fb6a350135456d73833387a..dea459d845594aa1f00a58cb1429ec77276988d6 100755
--- a/app/code/Magento/Webhook/etc/module.xml
+++ b/app/code/Magento/Webhook/etc/module.xml
@@ -34,7 +34,6 @@
             <module name="Magento_Webapi"/>
             <module name="Magento_Backend"/>
             <module name="Magento_Page"/>
-            <module name="Magento_Adminhtml"/>
         </depends>
     </module>
 </config>
diff --git a/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php b/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php
index 9f5df2589907ec940bfe9910f657b619956a512f..5f261019d989074a5a616d3c0adadc6095fb3bd5 100644
--- a/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php
+++ b/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php
@@ -54,7 +54,7 @@ $subscriptionTable = $connection->newTable($this->getTable('webhook_subscription
         array('nullable' => true,'default'  => NULL,'unsigned' => true),
         'Subscription Endpoint')
     ->addForeignKey(
-        'FK_WEBHOOK_SUBSCRIPTION_ENDPOINT_ID',
+        $this->getFkName('webhook_subscription', 'endpoint_id', 'outbound_endpoint', 'endpoint_id'),
         'endpoint_id',
         $this->getTable('outbound_endpoint'),
         'endpoint_id',
@@ -92,7 +92,7 @@ $hookTable = $connection->newTable($this->getTable('webhook_subscription_hook'))
         $this->getIdxName('webhook_subscription_hook', array('topic')),
         array('topic'))
     ->addForeignKey(
-        'FK_WEBHOOK_SUBSCRIPTION_SUBSCRIPTION_ID',
+        $this->getFkName('webhook_subscription_hook', 'subscription_id', 'webhook_subscription', 'subscription_id'),
         'subscription_id',
         $this->getTable('webhook_subscription'),
         'subscription_id',
@@ -159,7 +159,7 @@ $dispatchJobTable = $connection->newTable($this->getTable('webhook_dispatch_job'
         array('default' => '0000-00-00 00:00:00', 'nullable' => false),
         'Retry At')
     ->addForeignKey(
-        'FK_WEBHOOK_SERVICE_DISPATCHER_ID',
+        $this->getFkName('webhook_dispatch_job', 'subscription_id', 'webhook_subscription', 'subscription_id'),
         'subscription_id',
         $this->getTable('webhook_subscription'),
         'subscription_id',
@@ -167,7 +167,7 @@ $dispatchJobTable = $connection->newTable($this->getTable('webhook_dispatch_job'
         \Magento\DB\Ddl\Table::ACTION_CASCADE
     )
     ->addForeignKey(
-        'FK_WEBHOOK_MESSAGE_DISPATCHER_ID',
+        $this->getFkName('webhook_dispatch_job', 'event_id', 'webhook_event', 'event_id'),
         'event_id',
         $this->getTable('webhook_event'),
         'event_id',
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml
index 69d6df3232a968eb7aeaa5e15a4bd858c8d8f4e6..955fa49477950c6eb5419129b21942fcd586af50 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml
@@ -25,7 +25,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
-        <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+        <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
             <block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
                 <arguments>
                     <argument name="file" xsi:type="string">mui/reset.css</argument>
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml
index 4374451c97dec2a2e8b499f9853dcd35fc4aac5b..9fe59844735c249e19d24eb109c371c8ba5e36a4 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml
@@ -25,7 +25,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
-        <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+        <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
             <block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
                 <arguments>
                     <argument name="file" xsi:type="string">mui/reset.css</argument>
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml
index 7243d45dbd98518e0a52db251f387b1ca40015b0..6fc417e3d6888ab31f98d80fe5276d0882c12c5a 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml
@@ -25,7 +25,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
-        <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+        <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
             <block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
                 <arguments>
                     <argument name="file" xsi:type="string">mui/reset.css</argument>
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml
index 8768da57ef60eda93aac6902b74de98c62fd359a..b97b78f07b88c69d971154e015fec011e6322543 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml
@@ -25,7 +25,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
-        <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+        <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
             <block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
                 <arguments>
                     <argument name="file" xsi:type="string">mui/reset.css</argument>
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 3642fc7437625632dbca9f24903282ef2c51829a..26352ca9a7cbfac499837fcdbce9b87a4b7c5d3e 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -32,7 +32,7 @@
 namespace Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main;
 
 class Layout
-    extends \Magento\Adminhtml\Block\Template implements \Magento\Data\Form\Element\Renderer\RendererInterface
+    extends \Magento\Backend\Block\Template implements \Magento\Data\Form\Element\Renderer\RendererInterface
 {
     /**
      * @var \Magento\Data\Form\Element\AbstractElement
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
index 428755b839108500b70a301581ec2d403491676a..af49a12c94aa91550e7e0b321c06837d1497a286 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
@@ -181,7 +181,7 @@ class Instance extends \Magento\Backend\App\Action
      * @param string $body
      * @return null
      */
-    private function setBody($body)
+    protected function setBody($body)
     {
         $this->_translator->processResponseBody($body);
 
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
index aef3b7e056b206c98f2b6ed7ed51ade60b1c34b3..0e60abfb1be617f1b92edde82189a5982ede22b1 100644
--- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
+++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
@@ -72,6 +72,6 @@
         </block>
     </referenceContainer>
     <referenceContainer name="js">
-        <block class="Magento\Adminhtml\Block\Template" template="Magento_Widget::instance/js.phtml" name="widget_instance_js"/>
+        <block class="Magento\Backend\Block\Template" template="Magento_Widget::instance/js.phtml" name="widget_instance_js"/>
     </referenceContainer>
 </layout>
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
index a7eedbbe2a6751dc91a776e55effd40ef83c0581..6414151dd8944bac297c360d062aec0588680e96 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
@@ -36,7 +36,7 @@ namespace Magento\Wishlist\Block\Customer\Wishlist;
 class Items extends \Magento\View\Block\Template
 {
     /**
-     * Retreive table column object list
+     * Retrieve table column object list
      *
      * @return array
      */
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index 50ab2fcfab72135007ad5927979b7c63dc122980..ea27f3a4f2bea715000d54e6347c6730cc3345be 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -151,6 +151,11 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
      */
     protected $_catalogAttrFactory;
 
+    /**
+     * @var \Magento\App\State
+     */
+    protected $_appState;
+
     /**
      * @param \Magento\CatalogInventory\Helper\Data $catalogInventoryData
      * @param \Magento\Sales\Helper\Admin $adminhtmlSales
@@ -168,6 +173,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
      * @param \Magento\Catalog\Model\Resource\ConfigFactory $catalogConfFactory
      * @param \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory
      * @param \Magento\Wishlist\Model\Resource\Item $resource
+     * @param \Magento\App\State $appState
      */
     public function __construct(
         \Magento\CatalogInventory\Helper\Data $catalogInventoryData,
@@ -185,7 +191,8 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
         \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollFactory,
         \Magento\Catalog\Model\Resource\ConfigFactory $catalogConfFactory,
         \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory,
-        \Magento\Wishlist\Model\Resource\Item $resource
+        \Magento\Wishlist\Model\Resource\Item $resource,
+        \Magento\App\State $appState
     ) {
         $this->_inventoryData = $catalogInventoryData;
         $this->_adminhtmlSales = $adminhtmlSales;
@@ -198,6 +205,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
         $this->_productCollFactory = $productCollFactory;
         $this->_catalogConfFactory = $catalogConfFactory;
         $this->_catalogAttrFactory = $catalogAttrFactory;
+        $this->_appState = $appState;
         parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $resource);
     }
 
@@ -265,16 +273,16 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
         \Magento\Profiler::start('WISHLIST:'.__METHOD__, array('group' => 'WISHLIST', 'method' => __METHOD__));
         $productIds = array();
 
-        $isStoreAdmin = $this->_storeManager->getStore()->isAdmin();
+        $isBackendArea = $this->_appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
 
         $storeIds = array();
         foreach ($this as $item) {
             $productIds[$item->getProductId()] = 1;
-            if ($isStoreAdmin && !in_array($item->getStoreId(), $storeIds)) {
+            if ($isBackendArea && !in_array($item->getStoreId(), $storeIds)) {
                 $storeIds[] = $item->getStoreId();
             }
         }
-        if (!$isStoreAdmin) {
+        if (!$isBackendArea) {
             $storeIds = $this->_storeIds;
         }
 
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
index 206653a3a35bcf5f86564031194a838c969c05d8..424c18bf64708a7581e88582753e6681e7b1aa06 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -54,6 +54,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
      * @param \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory
      * @param \Magento\Core\Model\Registry $registry
      * @param \Magento\Wishlist\Model\Resource\Item $resource
+     * @param \Magento\App\State $appState
      */
     public function __construct(
         \Magento\CatalogInventory\Helper\Data $catalogInventoryData,
@@ -72,12 +73,13 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
         \Magento\Catalog\Model\Resource\ConfigFactory $catalogConfFactory,
         \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory,
         \Magento\Core\Model\Registry $registry,
-        \Magento\Wishlist\Model\Resource\Item $resource
+        \Magento\Wishlist\Model\Resource\Item $resource,
+        \Magento\App\State $appState
     ) {
         $this->_registryManager = $registry;
         parent::__construct($catalogInventoryData, $adminhtmlSales, $eventManager, $logger, $fetchStrategy,
             $entityFactory, $storeManager, $date, $wishlistConfig, $productVisibility, $coreResource,
-            $optionCollFactory, $productCollFactory, $catalogConfFactory, $catalogAttrFactory, $resource);
+            $optionCollFactory, $productCollFactory, $catalogConfFactory, $catalogAttrFactory, $resource, $appState);
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 25643cbc47936b478037d5d4f176817bf35955be..b8ec3dcfaeb50d8a192773b0e4be5959477672bf 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -116,6 +116,11 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
      */
     protected $dateTime;
 
+    /**
+     * @var bool
+     */
+    protected $_useCurrentWebsite;
+
     /**
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param \Magento\Wishlist\Helper\Data $wishlistData
@@ -130,6 +135,7 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Math\Random $mathRandom
      * @param \Magento\Stdlib\DateTime $dateTime
+     * @param bool $useCurrentWebsite
      * @param array $data
      */
     public function __construct(
@@ -146,8 +152,10 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\Math\Random $mathRandom,
         \Magento\Stdlib\DateTime $dateTime,
+        $useCurrentWebsite = true,
         array $data = array()
     ) {
+        $this->_useCurrentWebsite = $useCurrentWebsite;
         $this->_catalogProduct = $catalogProduct;
         $this->_wishlistData = $wishlistData;
         $this->_storeManager = $storeManager;
@@ -315,11 +323,9 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
     public function getItemCollection()
     {
         if (is_null($this->_itemCollection)) {
-            /** @var $currentWebsiteOnly boolean */
-            $currentWebsiteOnly = !$this->_storeManager->getStore()->isAdmin();
             $this->_itemCollection = $this->_wishlistCollFactory->create()
                 ->addWishlistFilter($this)
-                ->addStoreFilter($this->getSharedStoreIds($currentWebsiteOnly))
+                ->addStoreFilter($this->getSharedStoreIds())
                 ->setVisibilityFilter();
         }
 
@@ -479,13 +485,12 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
     /**
      * Retrieve shared store ids for current website or all stores if $current is false
      *
-     * @param bool $current Use current website or not
      * @return array
      */
-    public function getSharedStoreIds($current = true)
+    public function getSharedStoreIds()
     {
         if (is_null($this->_storeIds) || !is_array($this->_storeIds)) {
-            if ($current) {
+            if ($this->_useCurrentWebsite) {
                 $this->_storeIds = $this->getStore()->getWebsite()->getStoreIds();
             } else {
                 $_storeIds = array();
diff --git a/app/code/Magento/Wishlist/etc/adminhtml/di.xml b/app/code/Magento/Wishlist/etc/adminhtml/di.xml
index 135b6aff7a59e586d2384d8c3b18d8b9bdf98ce4..7d7328db7c54c11b935dfb0979e723f893cfb8af 100644
--- a/app/code/Magento/Wishlist/etc/adminhtml/di.xml
+++ b/app/code/Magento/Wishlist/etc/adminhtml/di.xml
@@ -24,6 +24,11 @@
  */
 -->
 <config>
+    <type name="Magento\Wishlist\Model\Wishlist">
+        <param name="useCurrentWebsite">
+            <value type="bool">false</value>
+        </param>
+    </type>
     <virtualType name="Magento\Wishlist\Model\Session" type="Magento\Core\Model\Session\Generic">
         <param name="sessionNamespace">
             <value>wishlist</value>
diff --git a/app/design/adminhtml/magento_backend/css/styles.css b/app/design/adminhtml/magento_backend/css/styles.css
index 74aebf26d94b17dce2716f43056a437add0bd7eb..09afe07811ffb72fce88b3f0fa17356d9eb99398 100644
--- a/app/design/adminhtml/magento_backend/css/styles.css
+++ b/app/design/adminhtml/magento_backend/css/styles.css
@@ -140,7 +140,7 @@ button.primary,
 .catalog-rule-promo-catalog-index .page-actions .add,
 .sales-rule-promo-quote-index .page-actions .add,
 .adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
 .adminhtml-system-email-template-index .page-actions .add,
 .adminhtml-sitemap-index .page-actions .add,
 .adminhtml-googleshopping-types-index .page-actions .add,
@@ -272,9 +272,9 @@ button.primary:active,
 .adminhtml-reminder-index .page-actions .add:hover,
 .adminhtml-reminder-index .page-actions .add:focus,
 .adminhtml-reminder-index .page-actions .add:active,
-.adminhtml-newsletter-template-index .page-actions .add:hover,
-.adminhtml-newsletter-template-index .page-actions .add:focus,
-.adminhtml-newsletter-template-index .page-actions .add:active,
+.newsletter-template-index .page-actions .add:hover,
+.newsletter-template-index .page-actions .add:focus,
+.newsletter-template-index .page-actions .add:active,
 .adminhtml-system-email-template-index .page-actions .add:hover,
 .adminhtml-system-email-template-index .page-actions .add:focus,
 .adminhtml-system-email-template-index .page-actions .add:active,
@@ -409,7 +409,7 @@ button.primary:active,
 .catalog-rule-promo-catalog-index .page-actions .add:active,
 .sales-rule-promo-quote-index .page-actions .add:active,
 .adminhtml-reminder-index .page-actions .add:active,
-.adminhtml-newsletter-template-index .page-actions .add:active,
+.newsletter-template-index .page-actions .add:active,
 .adminhtml-system-email-template-index .page-actions .add:active,
 .adminhtml-sitemap-index .page-actions .add:active,
 .adminhtml-googleshopping-types-index .page-actions .add:active,
@@ -473,7 +473,7 @@ button.primary:visited,
 .catalog-rule-promo-catalog-index .page-actions .add:visited,
 .sales-rule-promo-quote-index .page-actions .add:visited,
 .adminhtml-reminder-index .page-actions .add:visited,
-.adminhtml-newsletter-template-index .page-actions .add:visited,
+.newsletter-template-index .page-actions .add:visited,
 .adminhtml-system-email-template-index .page-actions .add:visited,
 .adminhtml-sitemap-index .page-actions .add:visited,
 .adminhtml-googleshopping-types-index .page-actions .add:visited,
@@ -563,8 +563,8 @@ button.primary.disabled,
 .sales-rule-promo-quote-index .page-actions .add.disabled,
 .adminhtml-reminder-index .page-actions .add[disabled],
 .adminhtml-reminder-index .page-actions .add.disabled,
-.adminhtml-newsletter-template-index .page-actions .add[disabled],
-.adminhtml-newsletter-template-index .page-actions .add.disabled,
+.newsletter-template-index .page-actions .add[disabled],
+.newsletter-template-index .page-actions .add.disabled,
 .adminhtml-system-email-template-index .page-actions .add[disabled],
 .adminhtml-system-email-template-index .page-actions .add.disabled,
 .adminhtml-sitemap-index .page-actions .add[disabled],
@@ -743,10 +743,10 @@ button.primary.disabled:active,
 .adminhtml-reminder-index .page-actions .add.disabled:hover,
 .adminhtml-reminder-index .page-actions .add[disabled]:active,
 .adminhtml-reminder-index .page-actions .add.disabled:active,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:hover,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:hover,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:active,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:active,
+.newsletter-template-index .page-actions .add[disabled]:hover,
+.newsletter-template-index .page-actions .add.disabled:hover,
+.newsletter-template-index .page-actions .add[disabled]:active,
+.newsletter-template-index .page-actions .add.disabled:active,
 .adminhtml-system-email-template-index .page-actions .add[disabled]:hover,
 .adminhtml-system-email-template-index .page-actions .add.disabled:hover,
 .adminhtml-system-email-template-index .page-actions .add[disabled]:active,
@@ -910,7 +910,7 @@ button.primary,
 .catalog-rule-promo-catalog-index .page-actions .add,
 .sales-rule-promo-quote-index .page-actions .add,
 .adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
 .adminhtml-system-email-template-index .page-actions .add,
 .adminhtml-sitemap-index .page-actions .add,
 .adminhtml-googleshopping-types-index .page-actions .add,
@@ -964,7 +964,7 @@ button.primary,
 .catalog-rule-promo-catalog-index .page-actions .add,
 .sales-rule-promo-quote-index .page-actions .add,
 .adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
 .adminhtml-system-email-template-index .page-actions .add,
 .adminhtml-sitemap-index .page-actions .add,
 .adminhtml-googleshopping-types-index .page-actions .add,
@@ -1042,8 +1042,8 @@ button.primary:hover,
 .sales-rule-promo-quote-index .page-actions .add:hover,
 .adminhtml-reminder-index .page-actions .add:focus,
 .adminhtml-reminder-index .page-actions .add:hover,
-.adminhtml-newsletter-template-index .page-actions .add:focus,
-.adminhtml-newsletter-template-index .page-actions .add:hover,
+.newsletter-template-index .page-actions .add:focus,
+.newsletter-template-index .page-actions .add:hover,
 .adminhtml-system-email-template-index .page-actions .add:focus,
 .adminhtml-system-email-template-index .page-actions .add:hover,
 .adminhtml-sitemap-index .page-actions .add:focus,
@@ -1137,7 +1137,7 @@ button.primary:active,
 .catalog-rule-promo-catalog-index .page-actions .add:active,
 .sales-rule-promo-quote-index .page-actions .add:active,
 .adminhtml-reminder-index .page-actions .add:active,
-.adminhtml-newsletter-template-index .page-actions .add:active,
+.newsletter-template-index .page-actions .add:active,
 .adminhtml-system-email-template-index .page-actions .add:active,
 .adminhtml-sitemap-index .page-actions .add:active,
 .adminhtml-googleshopping-types-index .page-actions .add:active,
@@ -1196,7 +1196,7 @@ button.primary:visited,
 .catalog-rule-promo-catalog-index .page-actions .add:visited,
 .sales-rule-promo-quote-index .page-actions .add:visited,
 .adminhtml-reminder-index .page-actions .add:visited,
-.adminhtml-newsletter-template-index .page-actions .add:visited,
+.newsletter-template-index .page-actions .add:visited,
 .adminhtml-system-email-template-index .page-actions .add:visited,
 .adminhtml-sitemap-index .page-actions .add:visited,
 .adminhtml-googleshopping-types-index .page-actions .add:visited,
@@ -1310,10 +1310,10 @@ button.primary.disabled:active,
 .adminhtml-reminder-index .page-actions .add.disabled:hover,
 .adminhtml-reminder-index .page-actions .add[disabled]:active,
 .adminhtml-reminder-index .page-actions .add.disabled:active,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:hover,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:hover,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:active,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:active,
+.newsletter-template-index .page-actions .add[disabled]:hover,
+.newsletter-template-index .page-actions .add.disabled:hover,
+.newsletter-template-index .page-actions .add[disabled]:active,
+.newsletter-template-index .page-actions .add.disabled:active,
 .adminhtml-system-email-template-index .page-actions .add[disabled]:hover,
 .adminhtml-system-email-template-index .page-actions .add.disabled:hover,
 .adminhtml-system-email-template-index .page-actions .add[disabled]:active,
@@ -1469,7 +1469,7 @@ button.primary.disabled:active,
 .catalog-rule-promo-catalog-index .page-actions .add,
 .sales-rule-promo-quote-index .page-actions .add,
 .adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
 .adminhtml-system-email-template-index .page-actions .add,
 .adminhtml-sitemap-index .page-actions .add,
 .adminhtml-googleshopping-types-index .page-actions .add,
@@ -1512,7 +1512,7 @@ button.primary.disabled:active,
 .catalog-rule-promo-catalog-index .page-actions .add,
 .sales-rule-promo-quote-index .page-actions .add,
 .adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
 .adminhtml-system-email-template-index .page-actions .add,
 .adminhtml-sitemap-index .page-actions .add,
 .adminhtml-googleshopping-types-index .page-actions .add,
@@ -1563,7 +1563,7 @@ button.primary.disabled:active,
 .catalog-rule-promo-catalog-index .page-actions .add:focus,
 .sales-rule-promo-quote-index .page-actions .add:focus,
 .adminhtml-reminder-index .page-actions .add:focus,
-.adminhtml-newsletter-template-index .page-actions .add:focus,
+.newsletter-template-index .page-actions .add:focus,
 .adminhtml-system-email-template-index .page-actions .add:focus,
 .adminhtml-sitemap-index .page-actions .add:focus,
 .adminhtml-googleshopping-types-index .page-actions .add:focus,
@@ -1609,7 +1609,7 @@ button.primary.disabled:active,
 .catalog-rule-promo-catalog-index .page-actions .add > span,
 .sales-rule-promo-quote-index .page-actions .add > span,
 .adminhtml-reminder-index .page-actions .add > span,
-.adminhtml-newsletter-template-index .page-actions .add > span,
+.newsletter-template-index .page-actions .add > span,
 .adminhtml-system-email-template-index .page-actions .add > span,
 .adminhtml-sitemap-index .page-actions .add > span,
 .adminhtml-googleshopping-types-index .page-actions .add > span,
@@ -1658,7 +1658,7 @@ button.primary.disabled:active,
 .catalog-rule-promo-catalog-index .page-actions .add > span:before,
 .sales-rule-promo-quote-index .page-actions .add > span:before,
 .adminhtml-reminder-index .page-actions .add > span:before,
-.adminhtml-newsletter-template-index .page-actions .add > span:before,
+.newsletter-template-index .page-actions .add > span:before,
 .adminhtml-system-email-template-index .page-actions .add > span:before,
 .adminhtml-sitemap-index .page-actions .add > span:before,
 .adminhtml-googleshopping-types-index .page-actions .add > span:before,
@@ -1718,7 +1718,7 @@ button.primary.disabled:active,
 .eq-ie9 .catalog-rule-promo-catalog-index .page-actions .add > span:before,
 .eq-ie9 .sales-rule-promo-quote-index .page-actions .add > span:before,
 .eq-ie9 .adminhtml-reminder-index .page-actions .add > span:before,
-.eq-ie9 .adminhtml-newsletter-template-index .page-actions .add > span:before,
+.eq-ie9 .newsletter-template-index .page-actions .add > span:before,
 .eq-ie9 .adminhtml-system-email-template-index .page-actions .add > span:before,
 .eq-ie9 .adminhtml-sitemap-index .page-actions .add > span:before,
 .eq-ie9 .adminhtml-googleshopping-types-index .page-actions .add > span:before,
@@ -2092,11 +2092,11 @@ button.primary.disabled:active,
 [class^=" catalog-product-"] .page-actions .action-back:active,
 [class^=" catalog-product-"] .page-actions .action-back.active,
 [class^=" catalog-product-"] .page-actions .action-back[disabled],
-[class^=" adminhtml-newsletter-"] .page-actions .action-back,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back[disabled],
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active,
+[class^=" newsletter-"] .page-actions .action-back.active,
+[class^=" newsletter-"] .page-actions .action-back[disabled],
 .notifications [class^="action-"],
 .notifications [class^="action-"]:hover,
 .notifications [class^="action-"]:active,
@@ -6667,7 +6667,7 @@ table .col-draggable .draggable-handle {
 .catalog-rule-promo-catalog-index .col-1-layout,
 .sales-rule-promo-quote-index .col-1-layout,
 .adminhtml-reminder-index .col-1-layout,
-.adminhtml-newsletter-template-index .col-1-layout,
+.newsletter-template-index .col-1-layout,
 .adminhtml-system-email-template-index .col-1-layout,
 .adminhtml-sitemap-index .col-1-layout,
 .adminhtml-googleshopping-types-index .col-1-layout,
@@ -6706,8 +6706,8 @@ table .col-draggable .draggable-handle {
 .sales-recurring-profile-index .col-1-layout,
 .adminhtml-googleshopping-items-index .col-1-layout,
 .customer-online-index .col-1-layout,
-.adminhtml-newsletter-queue-index .col-1-layout,
-.adminhtml-newsletter-subscriber-index .col-1-layout,
+.newsletter-queue-index .col-1-layout,
+.newsletter-subscriber-index .col-1-layout,
 .adminhtml-report-shopcart-product .col-1-layout,
 .adminhtml-report-shopcart-abandoned .adminhtml-report-product-downloads .col-1-layout,
 .adminhtml-report-product-sold .col-1-layout,
@@ -6720,7 +6720,7 @@ table .col-draggable .draggable-handle {
 .adminhtml-report-review-product .col-1-layout,
 .adminhtml-report-search .col-1-layout,
 .adminhtml-report-statistics-index .col-1-layout,
-.adminhtml-newsletter-problem-index .col-1-layout,
+.newsletter-problem-index .col-1-layout,
 .adminhtml-system-store-index .col-1-layout,
 .sales-order-status-index .col-1-layout,
 .adminhtml-system-currency-index .col-1-layout,
@@ -6751,7 +6751,7 @@ table .col-draggable .draggable-handle {
 .catalog-rule-promo-catalog-index .grid-actions,
 .sales-rule-promo-quote-index .grid-actions,
 .adminhtml-reminder-index .grid-actions,
-.adminhtml-newsletter-template-index .grid-actions,
+.newsletter-template-index .grid-actions,
 .adminhtml-system-email-template-index .grid-actions,
 .adminhtml-sitemap-index .grid-actions,
 .adminhtml-googleshopping-types-index .grid-actions,
@@ -6796,7 +6796,7 @@ table .col-draggable .draggable-handle {
 .catalog-rule-promo-catalog-index .page-actions.fixed,
 .sales-rule-promo-quote-index .page-actions.fixed,
 .adminhtml-reminder-index .page-actions.fixed,
-.adminhtml-newsletter-template-index .page-actions.fixed,
+.newsletter-template-index .page-actions.fixed,
 .adminhtml-system-email-template-index .page-actions.fixed,
 .adminhtml-sitemap-index .page-actions.fixed,
 .adminhtml-googleshopping-types-index .page-actions.fixed,
@@ -6842,7 +6842,7 @@ table .col-draggable .draggable-handle {
 .catalog-rule-promo-catalog-index .page-actions,
 .sales-rule-promo-quote-index .page-actions,
 .adminhtml-reminder-index .page-actions,
-.adminhtml-newsletter-template-index .page-actions,
+.newsletter-template-index .page-actions,
 .adminhtml-system-email-template-index .page-actions,
 .adminhtml-sitemap-index .page-actions,
 .adminhtml-googleshopping-types-index .page-actions,
@@ -7771,9 +7771,9 @@ table .col-draggable .draggable-handle {
 [class^=" catalog-product-"] .page-actions .action-back,
 [class^=" catalog-product-"] .page-actions .action-back:hover,
 [class^=" catalog-product-"] .page-actions .action-back:active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:active {
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active {
   overflow: hidden;
   padding: 5px 6px 3px;
   margin-left: 12px;
@@ -7782,9 +7782,9 @@ table .col-draggable .draggable-handle {
 .eq-ie8 [class^=" catalog-product-"] .page-actions .action-back,
 .eq-ie8 [class^=" catalog-product-"] .page-actions .action-back:hover,
 .eq-ie8 [class^=" catalog-product-"] .page-actions .action-back:active,
-.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back,
-.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back:active,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back:hover,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back:active,
 .sales-order-create-index .page-actions-inner .cancel,
 .sales-order-create-index .page-actions-inner .cancel:hover,
 .sales-order-create-index .page-actions-inner .cancel:active {
@@ -7792,16 +7792,16 @@ table .col-draggable .draggable-handle {
   border: 0;
 }
 [class^=" catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:hover,
 .sales-order-create-index .page-actions-inner .cancel:hover {
   color: #000;
 }
 [class^=" catalog-product-"] .page-actions .action-back.mage-error,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
+[class^=" newsletter-"] .page-actions .action-back.mage-error {
   color: #b57c72;
 }
 [class^=" catalog-product-"] .page-actions .action-back:before,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:before,
+[class^=" newsletter-"] .page-actions .action-back:before,
 .sales-order-create-index .page-actions-inner .cancel:before {
   display: inline-block;
   font-family: 'MUI-Icons';
@@ -7815,7 +7815,7 @@ table .col-draggable .draggable-handle {
   font-size: 16px;
 }
 [class^=" catalog-product-"] .page-actions .action-back span,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back span,
+[class^=" newsletter-"] .page-actions .action-back span,
 .sales-order-create-index .page-actions-inner .cancel span {
   display: inline-block;
   overflow: hidden;
@@ -8494,80 +8494,80 @@ table .col-draggable .draggable-handle {
 /*
     Newsletter
 -------------------------------------- */
-[class^=" adminhtml-newsletter-"] .page-actions .action-back {
+[class^=" newsletter-"] .page-actions .action-back {
   float: right;
 }
 /*
     Newsletter Templates
 -------------------------------------- */
-.adminhtml-newsletter-template-index .col-id {
+.newsletter-template-index .col-id {
   width: 35px;
 }
-.adminhtml-newsletter-template-index .col-actions {
+.newsletter-template-index .col-actions {
   width: 80px;
 }
-.adminhtml-newsletter-template-index .col-type {
+.newsletter-template-index .col-type {
   width: 100px;
 }
-.adminhtml-newsletter-template-index .col-added,
-.adminhtml-newsletter-template-index .col-updated {
+.newsletter-template-index .col-added,
+.newsletter-template-index .col-updated {
   width: 140px;
 }
-[class^=' adminhtml-newsletter-'] .buttons-set {
+[class^=' newsletter-'] .buttons-set {
   margin: 0 0 15px;
 }
-[class^=" adminhtml-newsletter-"] .buttons-set button {
+[class^=" newsletter-"] .buttons-set button {
   margin-right: 4px;
 }
 /*
     Newsletter - Queue
 -------------------------------------- */
-.adminhtml-newsletter-queue-index .col-id {
+.newsletter-queue-index .col-id {
   width: 35px;
 }
-.adminhtml-newsletter-queue-index .col-finish,
-.adminhtml-newsletter-queue-index .col-start {
+.newsletter-queue-index .col-finish,
+.newsletter-queue-index .col-start {
   width: 130px;
 }
-.adminhtml-newsletter-queue-index .col-status,
-.adminhtml-newsletter-queue-index .col-processed,
-.adminhtml-newsletter-queue-index .col-recipients {
+.newsletter-queue-index .col-status,
+.newsletter-queue-index .col-processed,
+.newsletter-queue-index .col-recipients {
   white-space: nowrap;
   width: 85px;
 }
-.adminhtml-newsletter-queue-index td.col-processed,
-.adminhtml-newsletter-queue-index td.col-recipients {
+.newsletter-queue-index td.col-processed,
+.newsletter-queue-index td.col-recipients {
   text-align: right;
 }
-.adminhtml-newsletter-queue-index .col-actions {
+.newsletter-queue-index .col-actions {
   width: 80px;
 }
 /*
     Newsletter - Subscribers
 -------------------------------------- */
-.adminhtml-newsletter-subscriber-index .col-id {
+.newsletter-subscriber-index .col-id {
   width: 35px;
 }
-.adminhtml-newsletter-subscriber-index .col-type {
+.newsletter-subscriber-index .col-type {
   width: 75px;
 }
-.adminhtml-newsletter-subscriber-index .col-status {
+.newsletter-subscriber-index .col-status {
   white-space: nowrap;
   width: 85px;
 }
 /*
     Newsletter - Problems
 -------------------------------------- */
-.adminhtml-newsletter-problem-index .col-select {
+.newsletter-problem-index .col-select {
   width: 25px;
 }
-.adminhtml-newsletter-problem-index .col-id {
+.newsletter-problem-index .col-id {
   width: 35px;
 }
-.adminhtml-newsletter-problem-index .col-start {
+.newsletter-problem-index .col-start {
   width: 130px;
 }
-.adminhtml-newsletter-problem-index .col-error-code {
+.newsletter-problem-index .col-error-code {
   width: 150px;
 }
 .table-fieldset-alt,
diff --git a/app/design/adminhtml/magento_basic/i18n/en_US.csv b/app/design/adminhtml/magento_backend/i18n/en_US.csv
similarity index 99%
rename from app/design/adminhtml/magento_basic/i18n/en_US.csv
rename to app/design/adminhtml/magento_backend/i18n/en_US.csv
index 05cf00128407bf1e8cb340adb7693b94aad2e945..88faa919186a764100fed3346011c6d3b41d33ed 100644
--- a/app/design/adminhtml/magento_basic/i18n/en_US.csv
+++ b/app/design/adminhtml/magento_backend/i18n/en_US.csv
@@ -47,7 +47,7 @@
 "Expiration Date","Expiration Date"
 "Add New Class","Add New Class"
 "Super product attributes configuration","Super product attributes configuration"
-"Previus page","Previus page"
+"Previous page","Previous page"
 "Something went wrong...","Something went wrong..."
 "Lifetime Sales","Lifetime Sales"
 "SKU","SKU"
diff --git a/app/design/adminhtml/magento_backend/less/styles/admin.less b/app/design/adminhtml/magento_backend/less/styles/admin.less
index 9201fb7567f1a23172ccd336598641634ee66fc3..8a46c3163a15f4e8288196dc9140d053072e3360 100644
--- a/app/design/adminhtml/magento_backend/less/styles/admin.less
+++ b/app/design/adminhtml/magento_backend/less/styles/admin.less
@@ -282,11 +282,11 @@
 [class^=" catalog-product-"] .page-actions .action-back:active,
 [class^=" catalog-product-"] .page-actions .action-back.active,
 [class^=" catalog-product-"] .page-actions .action-back[disabled],
-[class^=" adminhtml-newsletter-"] .page-actions .action-back,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back[disabled],
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active,
+[class^=" newsletter-"] .page-actions .action-back.active,
+[class^=" newsletter-"] .page-actions .action-back[disabled],
 .notifications [class^="action-"],
 .notifications [class^="action-"]:hover,
 .notifications [class^="action-"]:active,
@@ -5558,7 +5558,7 @@ button,
 .catalog-rule-promo-catalog-index,
 .sales-rule-promo-quote-index,
 .adminhtml-reminder-index,
-.adminhtml-newsletter-template-index,
+.newsletter-template-index,
 .adminhtml-system-email-template-index,
 .adminhtml-sitemap-index,
 // products
@@ -5630,8 +5630,8 @@ button,
 // customer
 .customer-online-index,
 // marketing
-.adminhtml-newsletter-queue-index,
-.adminhtml-newsletter-subscriber-index,
+.newsletter-queue-index,
+.newsletter-subscriber-index,
 // reports
 .adminhtml-report-shopcart-product,
 .adminhtml-report-shopcart-abandoned
@@ -5646,7 +5646,7 @@ button,
 .adminhtml-report-review-product,
 .adminhtml-report-search,
 .adminhtml-report-statistics-index,
-.adminhtml-newsletter-problem-index,
+.newsletter-problem-index,
 //store
 .adminhtml-system-store-index,
 .sales-order-status-index,
diff --git a/app/design/adminhtml/magento_backend/less/styles/pages.less b/app/design/adminhtml/magento_backend/less/styles/pages.less
index 8e3cf0933e5bea74e23a2ffd2589a7eac7d0e1b5..8ba6964fc103247d87631d9b0225d5918606ffff 100644
--- a/app/design/adminhtml/magento_backend/less/styles/pages.less
+++ b/app/design/adminhtml/magento_backend/less/styles/pages.less
@@ -29,9 +29,9 @@
 [class^=" catalog-product-"] .page-actions .action-back,
 [class^=" catalog-product-"] .page-actions .action-back:hover,
 [class^=" catalog-product-"] .page-actions .action-back:active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:active {
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active {
     overflow: hidden;
     padding: 5px 6px 3px;
     margin-left: 12px;
@@ -41,9 +41,9 @@
 .eq-ie8 [class^=" catalog-product-"] .page-actions .action-back,
 .eq-ie8 [class^=" catalog-product-"] .page-actions .action-back:hover,
 .eq-ie8 [class^=" catalog-product-"] .page-actions .action-back:active,
-.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back,
-.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back:active,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back:hover,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back:active,
 .sales-order-create-index .page-actions-inner .cancel,
 .sales-order-create-index .page-actions-inner .cancel:hover,
 .sales-order-create-index .page-actions-inner .cancel:active {
@@ -52,18 +52,18 @@
 }
 
 [class^=" catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:hover,
 .sales-order-create-index .page-actions-inner .cancel:hover {
     color: #000;
 }
 
 [class^=" catalog-product-"] .page-actions .action-back.mage-error,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
+[class^=" newsletter-"] .page-actions .action-back.mage-error {
     color: #b57c72;
 }
 
 [class^=" catalog-product-"] .page-actions .action-back:before,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:before,
+[class^=" newsletter-"] .page-actions .action-back:before,
 .sales-order-create-index .page-actions-inner .cancel:before {
     display: inline-block;
     font-family: 'MUI-Icons';
@@ -76,7 +76,7 @@
 }
 
 [class^=" catalog-product-"] .page-actions .action-back span,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back span,
+[class^=" newsletter-"] .page-actions .action-back span,
 .sales-order-create-index .page-actions-inner .cancel span {
     display: inline-block;
     overflow: hidden;
@@ -499,8 +499,8 @@
 /*
     Reports - Customer Reviews
 -------------------------------------- */
-.adminhtml-report-review-customer .col-qty,
-.adminhtml-report-review-customer .col-actions {
+.reports-report-review-customer .col-qty,
+.reports-report-review-customer .col-actions {
     width: 85px;
 }
 
@@ -508,23 +508,23 @@
     Reports - Product Reviews
 -------------------------------------- */
 
-.adminhtml-report-review-product .col-id {
+.reports-report-review-product .col-id {
     width: 35px;
 }
 
-.adminhtml-report-review-product .col-qty,
-.adminhtml-report-review-product .col-rating,
-.adminhtml-report-review-product .col-avg-rating,
-.adminhtml-report-review-product .col-actions {
+.reports-report-review-product .col-qty,
+.reports-report-review-product .col-rating,
+.reports-report-review-product .col-avg-rating,
+.reports-report-review-product .col-actions {
     text-align: right;
     width: 85px;
 }
 
-.adminhtml-report-review-product .col-date {
+.reports-report-review-product .col-date {
     width: 140px;
 }
 
-.adminhtml-report-review-product .col-rating {
+.reports-report-review-product .col-rating {
     width: 104px;
 }
 
@@ -532,7 +532,7 @@
     Reports - New Accounts
 -------------------------------------- */
 
-.adminhtml-report-customer-accounts .col-period {
+.reports-report-customer-accounts .col-period {
     white-space: nowrap;
     width: 70px;
 }
@@ -541,76 +541,76 @@
     Reports - Refresh Statistics
 -------------------------------------- */
 
-.adminhtml-report-statistics-index .col-period {
+.reports-report-statistics-index .col-period {
     white-space: nowrap;
     width: 140px;
 }
 
-.adminhtml-report-statistics-index .col-select {
+.reports-report-statistics-index .col-select {
     width: 25px;
 }
 
 /*
     Reports - Products Ordered
 -------------------------------------- */
-.adminhtml-report-product-sold .col-period {
+.reports-report-product-sold .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-product-sold .col-qty {
+.reports-report-product-sold .col-qty {
     width: 110px;
 }
 
 /*
     Reports - Customers by Orders Total
 -------------------------------------- */
-.adminhtml-report-customer-totals .col-period {
+.reports-report-customer-totals .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-customer-totals .col-qty {
+.reports-report-customer-totals .col-qty {
     width: 65px;
 }
 
-.adminhtml-report-customer-totals .col-rating {
+.reports-report-customer-totals .col-rating {
     width: 100px;
 }
 
 /*
     Reports - Tag by popular
 -------------------------------------- */
-.adminhtml-report-tag-popular .col-qty,
-.adminhtml-report-tag-popular .col-actions {
+.reports-report-tag-popular .col-qty,
+.reports-report-tag-popular .col-actions {
     width: 80px;
 }
 
 /*
     Reports - Tag by customer
 -------------------------------------- */
-.adminhtml-report-tag-customer .col-id {
+.reports-report-tag-customer .col-id {
     width: 35px;
 }
 
-.adminhtml-report-tag-customer .col-qty,
-.adminhtml-report-tag-customer .col-actions {
+.reports-report-tag-customer .col-qty,
+.reports-report-tag-customer .col-actions {
     width: 80px;
 }
 
 /*
     Reports - Tag by product
 -------------------------------------- */
-.adminhtml-report-tag-product .col-id {
+.reports-report-tag-product .col-id {
     width: 35px;
 }
 
-.adminhtml-report-tag-product .col-actions {
+.reports-report-tag-product .col-actions {
     width: 70px;
 }
 
-.adminhtml-report-tag-product .col-unique-numbers,
-.adminhtml-report-tag-product .col-total-numbers {
+.reports-report-tag-product .col-unique-numbers,
+.reports-report-tag-product .col-total-numbers {
     text-align: right;
     width: 95px
 }
@@ -618,28 +618,28 @@
 /*
     Reports - Customers by Number of Orders
 -------------------------------------- */
-.adminhtml-report-customer-orders .col-period {
+.reports-report-customer-orders .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-customer-orders .col-qty,
-.adminhtml-report-customer-orders .col-average,
-.adminhtml-report-customer-orders .col-total {
+.reports-report-customer-orders .col-qty,
+.reports-report-customer-orders .col-average,
+.reports-report-customer-orders .col-total {
     width: 105px;
 }
 
 /*
    Reports - Customers by Orders Total
 -------------------------------------- */
-.adminhtml-report-customer-totals .col-period {
+.reports-report-customer-totals .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-customer-totals .col-qty,
-.adminhtml-report-customer-totals .col-average,
-.adminhtml-report-customer-totals .col-total {
+.reports-report-customer-totals .col-qty,
+.reports-report-customer-totals .col-average,
+.reports-report-customer-totals .col-total {
     width: 105px;
 }
 
@@ -664,13 +664,13 @@
 /*
     Reports - Most Viewed
 -------------------------------------- */
-.adminhtml-report-product-viewed .col-period {
+.reports-report-product-viewed .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-product-viewed .col-qty,
-.adminhtml-report-product-viewed .col-price {
+.reports-report-product-viewed .col-qty,
+.reports-report-product-viewed .col-price {
     white-space: nowrap;
     width: 80px;
 }
@@ -678,24 +678,24 @@
 /*
     Reports - Search Terms
 -------------------------------------- */
-.adminhtml-report-search .col-id {
+.reports-index-search .col-id {
     width: 35px;
 }
 
-.adminhtml-report-search th.col-results,
-.adminhtml-report-search th.col-hits {
+.reports-index-search th.col-results,
+.reports-index-search th.col-hits {
     text-align: left;
     width: 117px;
 }
 
-.adminhtml-report-search td.col-results,
-.adminhtml-report-search td.col-hits {
+.reports-index-search td.col-results,
+.reports-index-search td.col-hits {
     text-align: right;
     width: 117px;
 }
 
-.adminhtml-report-search .col-results .range-line:first-child,
-.adminhtml-report-search .col-hits .range-line:first-child {
+.reports-index-search .col-results .range-line:first-child,
+.reports-index-search .col-hits .range-line:first-child {
     float: left;
     margin-right: 3px;
 }
@@ -704,21 +704,21 @@
     Reports - Bestsellers
 -------------------------------------- */
 
-.adminhtml-report-sales-bestsellers .col-period {
+.reports-report-sales-bestsellers .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-sales-bestsellers .col-qty,
-.adminhtml-report-sales-bestsellers .col-price {
+.reports-report-sales-bestsellers .col-qty,
+.reports-report-sales-bestsellers .col-price {
     width: 80px;
 }
 
 /*
     Reports - Downloads
 -------------------------------------- */
-.adminhtml-report-product-downloads .col-qty,
-.adminhtml-report-product-downloads .col-price {
+.reports-report-product-downloads .col-qty,
+.reports-report-product-downloads .col-price {
     width: 80px;
 }
 
@@ -726,31 +726,31 @@
     Reports - Abandoned Carts
 -------------------------------------- */
 
-.adminhtml-report-shopcart-abandoned .col-ip,
-.adminhtml-report-shopcart-abandoned .col-subtotal,
-.adminhtml-report-shopcart-abandoned .col-number,
-.adminhtml-report-shopcart-abandoned .col-coupon {
+.reports-report-shopcart-abandoned .col-ip,
+.reports-report-shopcart-abandoned .col-subtotal,
+.reports-report-shopcart-abandoned .col-number,
+.reports-report-shopcart-abandoned .col-coupon {
     text-align: right;
 }
 
-.adminhtml-report-shopcart-abandoned .col-ip {
+.reports-report-shopcart-abandoned .col-ip {
     width: 105px;
 }
 
-.adminhtml-report-shopcart-abandoned .col-subtotal {
+.reports-report-shopcart-abandoned .col-subtotal {
     width: 65px;
 }
 
 /*
     Reports - Products in Carts
 -------------------------------------- */
-.adminhtml-report-shopcart-product .col-id {
+.reports-report-shopcart-product .col-id {
     width: 35px;
 }
 
-.adminhtml-report-shopcart-product .col-carts,
-.adminhtml-report-shopcart-product .col-qty,
-.adminhtml-report-shopcart-product .col-price {
+.reports-report-shopcart-product .col-carts,
+.reports-report-shopcart-product .col-qty,
+.reports-report-shopcart-product .col-price {
     text-align: right;
     width: 80px;
 }
@@ -759,14 +759,14 @@
     Reports - Refunds
 -------------------------------------- */
 
-.adminhtml-report-sales-refunded .col-period {
+.reports-report-sales-refunded .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-sales-refunded .col-ref-total,
-.adminhtml-report-sales-refunded .col-ref-online,
-.adminhtml-report-sales-refunded .col-ref-offline {
+.reports-report-sales-refunded .col-ref-total,
+.reports-report-sales-refunded .col-ref-online,
+.reports-report-sales-refunded .col-ref-offline {
     text-align: right;
     width: 23%;
 }
@@ -775,14 +775,14 @@
     Reports - Shipping
 -------------------------------------- */
 
-.adminhtml-report-sales-shipping .col-period {
+.reports-report-sales-shipping .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-sales-shipping .col-qty,
-.adminhtml-report-sales-shipping .col-total-sales-shipping,
-.adminhtml-report-sales-shipping .col-total-shipping {
+.reports-report-sales-shipping .col-qty,
+.reports-report-sales-shipping .col-total-sales-shipping,
+.reports-report-sales-shipping .col-total-shipping {
     text-align: right;
     width: 115px;
 }
@@ -791,16 +791,16 @@
     Reports - Invoiced
 -------------------------------------- */
 
-.adminhtml-report-sales-invoiced .col-period {
+.reports-report-sales-invoiced .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-sales-invoiced .col-qty,
-.adminhtml-report-sales-invoiced .col-invoiced,
-.adminhtml-report-sales-invoiced .col-total-invoiced,
-.adminhtml-report-sales-invoiced .col-total-invoiced-paid,
-.adminhtml-report-sales-invoiced .col-total-invoiced-not-paid {
+.reports-report-sales-invoiced .col-qty,
+.reports-report-sales-invoiced .col-invoiced,
+.reports-report-sales-invoiced .col-total-invoiced,
+.reports-report-sales-invoiced .col-total-invoiced-paid,
+.reports-report-sales-invoiced .col-total-invoiced-not-paid {
     text-align: right;
     width: 19%;
 }
@@ -809,14 +809,14 @@
     Reports - Tax
 -------------------------------------- */
 
-.adminhtml-report-sales-tax .col-period {
+.reports-report-sales-tax .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-sales-tax .col-rate,
-.adminhtml-report-sales-tax .col-qty,
-.adminhtml-report-sales-tax .col-tax-amount {
+.reports-report-sales-tax .col-rate,
+.reports-report-sales-tax .col-qty,
+.reports-report-sales-tax .col-tax-amount {
     text-align: right;
     width: 105px;
 }
@@ -824,20 +824,20 @@
 /*
     Reports - Orders
 -------------------------------------- */
-.adminhtml-report-sales-sales .col-period {
+.reports-report-sales-sales .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-sales-sales .col-orders,
-.adminhtml-report-sales-sales .col-sales-items,
-.adminhtml-report-sales-sales .col-sales-total,
-.adminhtml-report-sales-sales .col-invoiced,
-.adminhtml-report-sales-sales .col-refunded,
-.adminhtml-report-sales-sales .col-sales-tax,
-.adminhtml-report-sales-sales .col-sales-shipping,
-.adminhtml-report-sales-sales .col-sales-discount,
-.adminhtml-report-sales-sales .col-canceled {
+.reports-report-sales-sales .col-orders,
+.reports-report-sales-sales .col-sales-items,
+.reports-report-sales-sales .col-sales-total,
+.reports-report-sales-sales .col-invoiced,
+.reports-report-sales-sales .col-refunded,
+.reports-report-sales-sales .col-sales-tax,
+.reports-report-sales-sales .col-sales-shipping,
+.reports-report-sales-sales .col-sales-discount,
+.reports-report-sales-sales .col-canceled {
     text-align: right;
     width: 10.5%;
 }
@@ -846,18 +846,18 @@
     Reports - Coupons
 -------------------------------------- */
 /* TODO: re-check styles for coupons table after coupons functionality will have been repaired */
-.adminhtml-report-sales-coupons .col-period {
+.reports-report-sales-coupons .col-period {
     white-space: nowrap;
     width: 70px;
 }
 
-.adminhtml-report-sales-coupons .col-sales,
-.adminhtml-report-sales-coupons .col-users,
-.adminhtml-report-sales-coupons .col-sales-discount,
-.adminhtml-report-sales-coupons .col-total-amount,
-.adminhtml-report-sales-coupons .col-subtotal,
-.adminhtml-report-sales-coupons .col-discount,
-.adminhtml-report-sales-coupons .col-total {
+.reports-report-sales-coupons .col-sales,
+.reports-report-sales-coupons .col-users,
+.reports-report-sales-coupons .col-sales-discount,
+.reports-report-sales-coupons .col-total-amount,
+.reports-report-sales-coupons .col-subtotal,
+.reports-report-sales-coupons .col-discount,
+.reports-report-sales-coupons .col-total {
     text-align: right;
 }
 
@@ -865,19 +865,19 @@
     Reports - Low Stock
 -------------------------------------- */
 
-.adminhtml-report-product-lowstock .col-qty {
+.reports-report-product-lowstock .col-qty {
     width: 10%;
 }
 
-.adminhtml-report-product-lowstock .range-line {
+.reports-report-product-lowstock .range-line {
     display: inline-block;
 }
 
-.adminhtml-report-product-lowstock .col-product {
+.reports-report-product-lowstock .col-product {
     width: 65%;
 }
 
-.adminhtml-report-product-lowstock .col-sku {
+.reports-report-product-lowstock .col-sku {
     width: 25%;
 }
 
@@ -901,78 +901,78 @@
 /*
     Newsletter
 -------------------------------------- */
-[class^=" adminhtml-newsletter-"] .page-actions .action-back {
+[class^=" newsletter-"] .page-actions .action-back {
     float: right;
 }
 
 /*
     Newsletter Templates
 -------------------------------------- */
-.adminhtml-newsletter-template-index .col-id {
+.newsletter-template-index .col-id {
     width: 35px;
 }
 
-.adminhtml-newsletter-template-index .col-actions {
+.newsletter-template-index .col-actions {
     width: 80px;
 }
 
-.adminhtml-newsletter-template-index .col-type {
+.newsletter-template-index .col-type {
     width: 100px;
 }
 
-.adminhtml-newsletter-template-index .col-added,
-.adminhtml-newsletter-template-index .col-updated {
+.newsletter-template-index .col-added,
+.newsletter-template-index .col-updated {
     width: 140px;
 }
 
-[class^=' adminhtml-newsletter-'] .buttons-set {
+[class^=' newsletter-'] .buttons-set {
     margin: 0 0 15px;
 }
 
-[class^=" adminhtml-newsletter-"] .buttons-set button {
+[class^=" newsletter-"] .buttons-set button {
     margin-right: 4px;
 }
 
 /*
     Newsletter - Queue
 -------------------------------------- */
-.adminhtml-newsletter-queue-index .col-id {
+.newsletter-queue-index .col-id {
     width: 35px;
 }
 
-.adminhtml-newsletter-queue-index .col-finish,
-.adminhtml-newsletter-queue-index .col-start {
+.newsletter-queue-index .col-finish,
+.newsletter-queue-index .col-start {
     width: 130px;
 }
 
-.adminhtml-newsletter-queue-index .col-status,
-.adminhtml-newsletter-queue-index .col-processed,
-.adminhtml-newsletter-queue-index .col-recipients {
+.newsletter-queue-index .col-status,
+.newsletter-queue-index .col-processed,
+.newsletter-queue-index .col-recipients {
     white-space: nowrap;
     width: 85px;
 }
 
-.adminhtml-newsletter-queue-index td.col-processed,
-.adminhtml-newsletter-queue-index td.col-recipients {
+.newsletter-queue-index td.col-processed,
+.newsletter-queue-index td.col-recipients {
     text-align: right;
 }
 
-.adminhtml-newsletter-queue-index .col-actions {
+.newsletter-queue-index .col-actions {
     width: 80px;
 }
 
 /*
     Newsletter - Subscribers
 -------------------------------------- */
-.adminhtml-newsletter-subscriber-index .col-id {
+.newsletter-subscriber-index .col-id {
     width: 35px;
 }
 
-.adminhtml-newsletter-subscriber-index .col-type {
+.newsletter-subscriber-index .col-type {
     width: 75px;
 }
 
-.adminhtml-newsletter-subscriber-index .col-status {
+.newsletter-subscriber-index .col-status {
     white-space: nowrap;
     width: 85px;
 }
@@ -980,19 +980,19 @@
 /*
     Newsletter - Problems
 -------------------------------------- */
-.adminhtml-newsletter-problem-index .col-select {
+.newsletter-problem-index .col-select {
     width: 25px;
 }
 
-.adminhtml-newsletter-problem-index .col-id {
+.newsletter-problem-index .col-id {
     width: 35px;
 }
 
-.adminhtml-newsletter-problem-index .col-start {
+.newsletter-problem-index .col-start {
     width: 130px;
 }
 
-.adminhtml-newsletter-problem-index .col-error-code {
+.newsletter-problem-index .col-error-code {
     width: 150px;
 }
 
diff --git a/app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml b/app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml
deleted file mode 100644
index cd9b8a867a14b4124b0777db34048d1cea323c1d..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="reset-css">
-            <arguments>
-                <argument name="file" xsi:type="string">reset.css</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="boxes-css">
-            <arguments>
-                <argument name="file" xsi:type="string">boxes.css</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="custom-css">
-            <arguments>
-                <argument name="file" xsi:type="string">custom.css</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="iestyles-css">
-            <arguments>
-                <argument name="file" xsi:type="string">iestyles.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string"/>
-                    <item name="ie_condition" xsi:type="string">lt IE 8</item>
-                </argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="below-ie-css">
-            <arguments>
-                <argument name="file" xsi:type="string">below_ie7.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string"/>
-                    <item name="ie_condition" xsi:type="string">lt IE 7</item>
-                </argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="ie-css">
-            <arguments>
-                <argument name="file" xsi:type="string">ie7.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string"/>
-                    <item name="ie_condition" xsi:type="string">IE 7</item>
-                </argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="menu-css">
-            <arguments>
-                <argument name="file" xsi:type="string">menu.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string">media="screen, projection"</item>
-                </argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="print-css">
-            <arguments>
-                <argument name="file" xsi:type="string">print.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string">media="print"</item>
-                </argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/adminhtml/magento_basic/below_ie7.css b/app/design/adminhtml/magento_basic/below_ie7.css
deleted file mode 100644
index c76d1eec0de5ca5bffff6e9947f4ec6a934faaca..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/below_ie7.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* Set min-width */
-.wrapper { width:expression(document.body.clientWidth<1004?'1003px':'auto'); zoom:1; }
-.wrapper-popup { width:expression(document.body.clientWidth<751?'750px':'auto'); }
-.grid tr.filter .range div.date { width:121px; }
-
-/* Set min-height */
-.middle { height:450px; }
-.icon-head { height:18px ;}
-.footer .powered-by { height:19px; }
-.simple-container { height:350px; }
-.messages li { height:23px; }
-#widget_window .magento_content { height:450px !important; overflow:visible !important; }
-
-.main-col { height:450px; zoom:1; }
-
-#nav ul li { background:none !important; padding:0 !important; float:none; width:auto; border-left:1px solid #b6b6b6; border-right:1px solid #b6b6b6; vertical-align:top; }
-#nav ul li.active { float:none; width:auto; }
-#nav ul { border-bottom:2px solid #b6b6b6; padding-top:0 !important; padding-bottom:0 !important; }
-#nav ul ul { border-top:1px solid #b6b6b6; background-image:none; }
-#nav ul li a { background-color:#e5edef; }
-#nav ul li a:hover  { background-color:#d0dfe2; }
-#nav ul,
-#nav ul li,
-#nav ul a,
-#nav ul a span { zoom:1; }
-
-#message-popup-window-mask .flash-window { position:absolute; top:350px; }
-#popup-window-mask,
-.popup-window-mask { padding:0 27px; }
-.product-configure-popup { position:absolute; }
-
-.product-options .options-list li { zoom:1; }
-
-/* Hover Fix */
-iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
\ No newline at end of file
diff --git a/app/design/adminhtml/magento_basic/boxes.css b/app/design/adminhtml/magento_basic/boxes.css
deleted file mode 100644
index 2011a323673439f790f9b7ee536f4ceba78d255e..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/boxes.css
+++ /dev/null
@@ -1,1858 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/***************** WIDGETS ******************
-    Loading Indicator
-    Tables
-    Grid ( ubiquitous, massaction and dynamic)
-    Accordion
-    Tabs ( vertical and horizontal )
-    Messages
-    Forms ( setter and elements)
-    Switcher
-    Space
-    Boxes
-    Scroller
-*/
-
-/**************** STRUCTURE *****************
-    Layout
-    Header & Footer
-    Columns
-    Headings
-*/
-
-/************** PAGE-SPECIFIC ***************
-    Login
-    Sales
-    Catalog
-    Customers
-    Newsletter
-    System
-*/
-
-/********** ALIGNMENT AND CLEARS ***********/
-
-
-/******************************************************************/
-/**************************** WIDGETS *****************************/
-/******************************************************************/
-
-
-/* LOADING INDICATOR
-*******************************************************************/
-#loading-process {
-    position:absolute;
-    top:45%;
-    left:50%;
-    margin-left:-60px;
-    border:2px solid #f1af73;
-    padding:15px 60px;
-    background:#fff4e9;
-    color:#d85909;
-    font-size:1.1em;
-    font-weight:bold;
-    text-align:center;
-    z-index:501;
-    }
-#loading-mask,
-.loading-mask {
-    background:background:url(images/blank.gif) repeat;
-    position:absolute;
-    color:#d85909;
-    font-size:1.1em;
-    font-weight:bold;
-    text-align:center;
-    opacity:0.80;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; /* IE8 */
-    z-index:500;
-    }
-#loading-mask .loader,
-.loading-mask .loader {
-    position:fixed;
-    top:45%;
-    left:50%;
-    width:150px;
-    margin-left:-105px;
-    padding:15px 30px;
-    background:#fff4e9;
-    border:2px solid #f1af73;
-    color:#d85909;
-    font-weight:bold;
-    text-align:center;
-    z-index:1000;
-    }
-.loading-mask .loader {
-    position:absolute;
-    }
-.loading-mask {
-    *filter:alpha(opacity=60);
-    -moz-opacity:.6;
-    opacity:.6;
-    -webkit-opacity:.6;
-    background: #ffffff;
-    }
-#message-popup-window-mask { position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:980; background-color:#efefef; opacity:.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";/*IE8*/ }
-.message-popup { position:absolute; z-index:990; width:407px; top:-9999em; left:50%; margin:0 0 0 -203px; background:#f3bf8f; padding:0 4px 4px; }
-.message-popup.show { top:280px; }
-.message-popup .message-popup-head { padding:1px 0; }
-.message-popup .message-popup-head h2 { padding:0 10px; margin:0; font:bold 12px/19px Arial, Helvetica, sans-serif; color:#644f3b; }
-.message-popup .message-popup-head a { float:right; border:1px solid #ea7601; padding:0 12px 0 7px; background:url(images/bkg_btn-close.gif) 0 50% repeat-x !important; font:normal 12px/17px Arial, Helvetica, sans-serif; color:#fff; text-decoration:none !important; cursor:pointer; }
-.message-popup .message-popup-head a span { float:left; background:url(images/bkg_btn-close2.gif) 0 50% no-repeat; padding-left:19px; }
-.message-popup .message-popup-content { background:#fdf4eb; padding:21px 21px 10px; }
-.message-popup .message-popup-content .message-icon { float:left; width:50px; padding:47px 0 0; background-position:50% 0; background-repeat:no-repeat; font-size:10px; line-height:12px; text-transform:uppercase; text-align:center; overflow:hidden; }
-.message-popup .message-popup-content .message-critical { color:#e41101; }
-.message-popup .message-popup-content .message-major { color:#f55600; }
-.message-popup .message-popup-content .message-minor { color:#ff9e22; }
-.message-popup .message-popup-content .message-notice { color:#659601; }
-.message-popup .message-popup-content .message-text { float:right; width:295px; min-height:4.5em; overflow:hidden; color:#644f3b; }
-.message-popup .message-popup-content .read-more { margin:7px 0 0; text-align:right; }
-.message-popup .message-popup-content .read-more a { background:url(images/more_arrow.gif) 0 50% no-repeat; padding-left:14px; text-decoration:underline; }
-.message-popup .message-popup-content .read-more a:hover { text-decoration:none; }
-
-/* TABLES
-*******************************************************************************/
-
-/* Grid - General */
-.grid                           { border-bottom:0; padding-bottom:.5em; }
-.grid table                     { width:100%; border:1px solid #cbd3d4; border-bottom:none; }
-.grid table.border              { border:1px solid #cbd3d4; }
-.grid tbody                     { background:#fff; }    /* Zebra odd-row */
-.grid tr.even, .grid tr.even tr { background:#f6f6f6; } /* Zebra even-row */
-.grid tr.on-mouse               { background:#fcf5dd; cursor:pointer; } /* Rows mouse-over */
-.grid tr.invalid                { background-color:#f5d6c7; }
-.grid th, .grid td              { padding:2px 4px 2px 4px; }
-.grid th                        { white-space:nowrap; }
-.grid td.editable input.input-text { width:50px !important; margin-left:4px !important; }
-.grid td input.input-text       { width:86%; }
-.grid td input.input-text-export-filter { width:272px; }
-.grid td input.input-text-range { width:104px; }
-.grid td input.input-text-range-date { width:87px; }
-.grid td input.input-inactive   { background:#eee; }
-.grid table td                  { border-width:0 1px 1px 0; border-color:#dadfe0; border-style:solid; }
-.grid table.border td           { background:#fff !important; }
-.grid table td.first,
-.grid table td.last             { border-right:0; }
-.grid table td.product          { text-align:right; }
-.grid table td.empty-text       { padding:15px; }
-.grid table td .action-select   { width:100%; }
-.grid .separator                { padding:0 4px; color:#b9b9b9; }
-
-.grid tbody.odd tr              { background:#fff !important; }
-.grid tbody.even tr             { background:#f6f6f6 !important; }
-.grid tbody.odd tr td,
-.grid tbody.even tr td          { border-bottom:0; }
-.grid tbody.odd tr.border td,
-.grid tbody.even tr.border td   { border-bottom:1px solid #dadfe0; }
-
-
-/* Grid - Pager and Buttons row */
-table.actions                   { width:100%; margin:.5em 0; }
-table.actions td                { vertical-align:top; }
-.pager select                   { width:4em!important; margin:0 4px; }
-.pager input.page               { width:2em !important; }
-.pager .arrow                   { margin:0 3px; vertical-align:middle; }
-
-
-/* Grid - Headings */
-.grid tr.headings { background:url(images/sort_row_bg.gif) 0 50% repeat-x; }
-.grid tr.headings th { border-width:1px; border-color:#f9f9f9 #d1cfcf #f9f9f9 #f9f9f9; border-style:solid; padding-top:1px; padding-bottom:0; font-size:.9em; }
-.grid tr.headings th.last { border-right:0; }
-.grid tr.headings th.no-link { /* Grid th with no sorting functionality */ padding-top:2px; padding-bottom:1px; color:#67767e; }
-.grid tr.headings th span.nobr { display:block; /* FF3 fix */ }
-.grid tr.headings th a { display:block; padding:2px 4px 1px 0; color:#2d444f; text-decoration:none; }
-.grid tr.headings th a:hover { color:#d85909; text-decoration:none; }
-.grid tr.headings th a.sort-arrow-desc,
-.grid tr.headings th a.sort-arrow-asc { background:url(images/sort_on_bg.gif) 0 0 no-repeat; border-bottom:1px solid #fff; border-right:1px solid #fff; padding-bottom:2px; }
-.grid tr.headings th span.sort-title { display:block; padding:3px 12px 4px 0; line-height:1; }
-.grid tr.headings th a.sort-arrow-desc span.sort-title,
-.grid tr.headings th a.sort-arrow-asc span.sort-title { background-position:right 50%; background-repeat:no-repeat; padding:3px 12px 2px 8px; }
-.grid tr.headings th a.sort-arrow-desc span.sort-title { background-image:url(images/grid_sort_desc.gif); }
-.grid tr.headings th a.sort-arrow-asc span.sort-title { background-image:url(images/grid_sort_asc.gif); }
-
-
-/* Grid - Mass Action */
-.massaction { width:100%; height:26px; border:1px solid #d1cfcf; border-bottom:none; background:url(images/massaction_bg.gif) repeat-x 0 100% #ebebeb; font-size:.9em; }
-.massaction td                              { width:50%; border-top:1px solid #fff; padding:1px 8px; vertical-align:middle; }
-.massaction .entry-edit fieldset .select    { width:auto; /*width:120px;*/ display:inline; }
-.massaction .entry-edit fieldset select.validation-failed { border:1px dashed #eb340a !important; background:#faebe7 !important }
-.massaction .entry-edit fieldset            { margin:0; padding:0; background:none; border:none; }
-.massaction .entry-edit fieldset .field-row { display:inline; }
-.massaction .entry-edit .field-row label    { float:none; width:auto; margin-left:13px; }
-.massaction .entry-edit                     { margin:0 !important; padding:0; }
-.massaction .entry-edit .validation-advice  { display:none !important; }
-.massaction a { text-decoration:none; }
-.massaction .entry-edit fieldset span.form_row,
-.massaction .entry-edit fieldset span.field-row { clear:none !important; display:inline; float:left !important; margin:0; padding:0 5px 0 0; }
-
-.massaction .entry-edit .outer-span { float:left; }
-
-/* Grid - Filter */
-.grid tr.filter                  { background:url(images/filter_row_bg.gif) repeat-x #e3eff1; cursor:default; }
-.grid tr.filter th               { padding-top:5px; padding-bottom:5px; border:1px solid #bdbdbd; border-width:0 1px 1px 0; white-space:normal; }
-.grid tr.filter th.last          { border-right:0; }
-.grid tr.filter input.input-text { width:85%; }
-.grid tr.filter select           { width:100%; }
-.grid tr.filter .range .range-line { margin-bottom:3px; width:100px; }
-.grid tr.filter .range div.date  { min-width:121px; }
-.grid tr.filter .range input     { float:right; width:50px !important; margin-top:0; }
-.grid tr.filter .range select    { float:right; width:56px !important; margin-top:0; }
-.grid tr.filter .range .label    { display:block; width:36px; float:left; padding-left:2px; }
-.grid tr.filter .date img        { width:15px; height:15px; cursor:pointer; vertical-align:middle; }
-.grid .head-massaction select    { width:auto !important; max-width:90px; }
-.grid select.select-export-filter,
-.grid select.multiselect-export-filter { width:278px; }
-
-/* Grid Footer */
-.grid table tfoot tr            { background:#D7E5EF; }
-.grid table tfoot tr td         { border-top:1px solid #9babb9; background:#e5ecf2; line-height:1.7em; }
-.grid table.border tfoot tr td  { background:#D7E5EF !important; }
-
-
-/* Dynamic Grid */ /* Used in pages like Catalog -> Attributes */
-.dynamic-grid th                { padding:2px;width:100px; }
-.dynamic-grid td                { padding:2px; }
-.dynamic-grid td input          { width:94px; }
-tr.dynamic-grid td,
-tr.dynamic-grid th { padding:2px 10px 2px 0; width:auto; }
-tr.dynamic-grid input.input-text { width:154px; }
-.available { color:#080; font-weight:bold; }
-.not-available { color:#800; }
-
-
-/* ACCORDION
-*******************************************************************************/
-dl.accordion .grid      { margin-bottom:0; }
-dl.accordion dt,
-.entry-edit .entry-edit-head { background:#6f8992; padding:2px 10px; }
-dl.accordion dt, div.collapseable { margin-top:1px; }
-dl.accordion dt a, div.collapseable a { background:url(images/entry_edit_head_arrow_down.gif) 100% 50% no-repeat; color:#fff; display:block; font-weight:bold; text-decoration:none; }
-div.disabled { background:#c6cbc9 !important; }
-div.disabled a { background-image:url(images/entry_edit_head_arrow_down2.gif) !important; color:#f6f6f6 !important; }
-
-.entry-edit fieldset.collapseable { margin-bottom:10px; }
-
-dl.accordion dt a:hover, div.collapseable a:hover { color:#fff; text-decoration:none; }
-dl.accordion dt.open a, div.collapseable a.open  { background:url(images/entry_edit_head_arrow_up.gif) 100% 50% no-repeat; }
-dl.accordion dd         { display:none; }
-dl.accordion dd.open    { display:block; }
-img.accordion-btn       { float:right; margin-top:1px; margin-right:5px; }
-
-/* TABS
-*******************************************************************************/
-
-/* Vertical  Tabs */
-ul.tabs                         { border-top:1px solid #bebebe; background-color:#e7efef; }
-ul.tabs a, ul.tabs span         { display:block; }
-ul.tabs a, ul.tabs a:hover      { text-decoration:none; }
-/* ul.tabs a.notloaded             { color:#999; } */
-ul.tabs a, ul.tabs a:hover      { color:#000; }
-ul.tabs, ul.tabs a              { background:url(images/tabs_link_bg.gif) repeat-y 100% #E7EFEF; }
-ul.tabs a:hover                 { background-color:#D8E6E6; background-image:url(images/tabs_link_over_bg.gif); }
-ul.tabs a.active,
-ul.tabs .ui-state-active a      { padding:0; border-bottom:1px solid #bebebe; background:none; }
-ul.tabs a:hover.active,
-ul.tabs .ui-state-active a:hover { padding:0; }
-ul.tabs span                    { background:url(images/tabs_span_bg.gif) repeat-x 0 100%; padding:.3em 0.5em .28em 1.5em; cursor:pointer; }
-ul.tabs span em                 { float:right; }
-ul.tabs a.active span,
-ul.tabs a:hover.active span,
-ul.tabs .ui-state-active a span,
-ul.tabs .ui-state-active a:hover span { background:#fff; font-weight:bold; }
-ul.tabs a.subitem               { padding-left:2.2em; }
-ul.tabs span.changed,
-ul.tabs span.error,
-ul.tabs span.loading            { float:right; background:0; padding:0; }
-ul.tabs a.changed span.changed  { background:url(images/fam_bullet_disk.gif) 0 0 no-repeat !important; width:16px; height:16px; }
-ul.tabs a.error span.error      { background:url(Magento_Adminhtml::images/fam_bullet_error.gif) 0 0 no-repeat !important; width:16px; height:16px; }
-ul.tabs a.ui-tabs-loading span.loading { background:url(images/loader-small.gif) 0 0 no-repeat !important; width:16px; height:16px; }
-ul.tabs a.changed               { font-style:italic; }
-
-/* Horizontal Tabs */
-ul.tabs-horiz                   { margin:0 0 18px 0; background:url(images/horiz_tabs_ul_bg.gif) repeat-x 0 100% #f8f8f8; padding:8px 0 0 5px; }
-ul.tabs-horiz li                { float:left; margin:0 4px; }
-ul.tabs-horiz li a              { display:block; background:#e2e2e2; border:1px solid #ccc; padding:2px 10px; color:#333 !important; text-decoration:none !important; }
-ul.tabs-horiz li a.notloaded    { /* not used for now */ }
-ul.tabs-horiz li a.active,
-ul.tabs-horiz .ui-state-active a { border-bottom:1px solid #fff; background:#fff; }
-
-
-/* MESSAGES
-*******************************************************************************/
-.notification-global { padding:5px 27px 5px 47px; background:#fff9e9 url(Magento_Adminhtml::images/error_msg_icon.gif) 27px 5px no-repeat; border-bottom:1px solid #eee2be; border-top:1px solid #eee2be; font-size:11px; line-height:16px; margin:0 0 -3px; color:#444; position:relative; }
-.notification-global-notice { background-image:url(Magento_Adminhtml::images/note_msg_icon.gif); }
-.notification-global .label { color:#eb5e00; }
-.notification-global .clickable { cursor:pointer; }
-.notification-global span.critical { color:#d20000; }
-.notification-global a:hover { text-decoration:none; }
-
-.error,
-a.error span,
-.required,
-.validation-advice,
-label.mage-error { color:#D40707 !important; font-weight:bold !important; }
-label.mage-error {width: auto !important; display: block;}
-.notice { color:#ea7601}
-.messages ul { border:0 !important; }
-.messages li { min-height:23px !important; margin-bottom:11px !important; padding:8px 8px 2px 32px !important; font-size:.95em !important; font-weight:bold !important; }
-.messages ul li { margin:0 0 3px 0 !important; border:0 !important; padding:0 !important; }
-.error-msg { border:1px solid #f16048 !important; color:#df280a !important; background:#faebe7 url(Magento_Adminhtml::images/error_msg_icon.gif) no-repeat 10px 10px !important; }
-.success-msg { border:1px solid #95a486 !important; color:#3d6611 !important; background:#eff5ea url(Magento_Adminhtml::images/success_msg_icon.gif) no-repeat 10px 10px !important; }
-.notice-msg { border:1px solid #ffd967 !important; background:#fffbf0 url(Magento_Adminhtml::images/note_msg_icon.gif) no-repeat 10px 10px !important; color:#3d6611 !important; }
-.warning-msg { border:1px solid #666e73 !important; background:#e6e6e6 url(Magento_Adminhtml::images/warning_msg_icon.gif) no-repeat 10px 10px !important; color:#000000 !important; }
-.validation-advice,
-label.mage-error { clear:both; min-height:15px; margin:3px 0 0 9px; background:url(images/validation_advice_bg.gif) no-repeat 2px 1px; padding-left:16px; font-size:.95em; font-weight:bold; line-height:1.25em; }
-input.validation-failed, textarea.validation-failed { background:#fef0ed; border:1px dashed #d6340e; }
-
-/* Noscript Notice */
-.noscript { border:1px solid #000; border-width:0 0 1px; background:#ffff90; font-size:12px; line-height:1.25; text-align:center; color:#2f2f2f; }
-.noscript .noscript-inner { width:900px; margin:0 auto; padding:12px 0 12px; background:url(images/i_notice.gif) 20px 50% no-repeat; }
-.noscript p { margin:0; }
-
-/* For Demo store only */
-.demo-notice { margin:0; background:#d75f07; padding:5px 10px 6px 10px; color:#fff; line-height:1em; text-align:center; }
-
-
-/* FORMS
-*******************************************************************************/
-select.countries option         { background-repeat:no-repeat; }
-.entry-edit .fieldset .tree li,
-.entry-edit .tree li            { margin:0; }
-
-
-/* Entry Edit  */ /* Site-wide form fieldset */
-table.form-edit                         { width:100%; }
-.box,
-.entry-edit fieldset,
-.entry-edit .fieldset                   { padding:10px 15px; margin-bottom:15px; }
-.entry-edit .entry-edit-head h4         { float:left; padding:0; background:none; margin:0; color:#fff; font-size:1em; line-height:18px; min-height:0; }
-.entry-edit .entry-edit-head .tools     { float:right;}
-.entry-edit .entry-edit-head strong,
-.entry-edit .entry-edit-head a          { color:#fff; font-size:1em; line-height:18px; min-height:0; font-weight:bold}
-.entry-edit .entry-edit-head .entry-edit-head-link {height:41px; margin:-41px 0 0; position: absolute; visibility: hidden;}
-.entry-edit .content                    { margin-left:0 !important; padding:10px 15px; }
-.entry-edit fieldset li,
-.entry-edit .fieldset li                { margin:4px 0; }
-.entry-edit fieldset span.form_row,
-.entry-edit .fieldset span.form_row,
-.entry-edit fieldset .field-row .hint,
-.entry-edit .fieldset .field-row .hint  { float:left; color:#999; padding-left:12em; }
-.entry-edit .form-buttons               { float:right; margin:2px -3px 2px 0pt; }
-label.inline                            { float:none !important; width:auto !important; }
-.nested-content .entry-edit             { margin-left:2em; }
-.nested-content .entry-edit .entry-edit { margin-left:0; }
-#coupon_container .entry-edit { min-width:310px; }
-
-/* Form Elements */
-input.input-text,textarea,select { border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; background:#fff; font:12px arial, helvetica, sans-serif; }
-select { min-height:17px; /* to set the height for empty selects */ }
-input.input-text,textarea       { padding:2px; }
-input.qty                       { width:40px !important; }
-input.item-qty                  { width:22px !important; }
-input.price                     { width:50px !important; text-align:right; }
-input[type=text].disabled       { background:#eee; }
-select optgroup                 { font-style:normal; }
-select optgroup option          { padding-left:10px; }
-select optgroup option.even     { background:#f6f6f6; } /* Zebra even-row */
-select.multiselect option       { padding:3px 4px; border-bottom:1px solid #ddd; }
-.checkboxes li                  { margin:0 0 5px !important; }
-.field-100 { background-color:#fff; border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; padding:2px; }
-.field-100 textarea,
-.field-100 input.input-text { float:left; width:100% !important; border:0 !important; padding:0 !important; }
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-    select option:disabled,
-    select:disabled option { color:#c9c9c9!important;color:#cacaca!important; text-shadow:2px 2px 2px #000; }
-}
-
-/* Form List */ /* Table for default form data */
-.form-list                      { width:auto; border:0 !important; }
-.form-list td.label,
-.form-list td.value,
-.form-list td.value2,
-.form-list td.note,
-.form-list td.scope-label,
-.form-list td.use-default       { border:0 !important; padding-top:5px !important; padding-bottom:5px !important; padding-left:5px !important; background:0 !important; }
-.form-list td.hidden            { border:0 !important; padding:0 !important; background:0 !important; }
-.form-list td.label             { width:200px; }
-.form-list td.label label       { display:block; width:185px; padding-right:15px; }
-.form-list td.value input.input-text,
-.form-list td.value textarea    { width:274px; }
-.form-list td.value textarea    { height:15em; }
-.form-list td.value select      { width:280px; }
-.form-list td.value select.select-date { width:87px; }
-.form-list td.note              { background:url(images/note_cell_bg.gif) 6px 10px no-repeat !important; padding-left:18px; }
-.form-list td.scope-label       { padding-left:5px; color:#6f8992; font-size:.9em; }
-.form-list p.note               { margin:0; padding:0 0 0 13px; background:url(images/note_bg.gif) 1px 6px no-repeat; font-size:11px; }
-
-.columns .form-list             { width:auto; }
-.columns .form-list td.value    { width:280px; padding-right:5px !important; }
-.columns .form-list td.value .next-toinput { width:75px; display:inline; margin-right:5px; }
-.columns .form-list td.value .next-toselect input.input-text { width:195px!important; display:inline; }
-
-.fieldset-wide .form-list { width:100% !important; }
-.fieldset-wide .form-list td.value { width:auto !important; }
-.fieldset-wide .form-list td.value input.input-text,
-.fieldset-wide .form-list td.value textarea { width:98% !important; }
-#weight {width: 110px !important; }
-/*.fieldset-wide .form-list td.value select { display:block; }*/
-.fieldset-wide .form-list td.scope-label { white-space:nowrap; width:1px; }
-.fieldset-wide .form-list td.note { width:120px; }
-
-.multi-input                    { margin-bottom:8px; } /* Example: Address fields with 2 input lines */
-.grid tr .form-list tr          { background:#fff !important; } /* Follows grid row background-color */
-.grid tr.even .form-list tr     { background:#f6f6f6 !important; } /* Follows grid row background-color */
-.grid tr.on-mouse .form-list tr { background:#fcf5dd !important; } /* Follows grid row background-color */
-.grid tr .form-list             { margin:8px 0; }
-.field-row                      { display:block; margin-bottom:5px; }
-span.delete-image,
-span.delete-file                { display:block; white-space:nowrap; padding-left:25px; }
-span.delete-file                { padding:0; }
-
-/* Back compatibility with span forms */
-.entry-edit .field-row          { display:block; }
-.entry-edit .field-row label    { float:left; width:150px; }
-
-/* Form Button */
-.content-buttons.form-buttons,
-.content-header .form-buttons   { text-align:right; margin-bottom:0; }
-.content-header .content-buttons-placeholder { display:inline !important; }
-.content-header .form-buttons   { float:right; }
-.content-header td.form-buttons   { float:none; }
-.content-header .form-buttons button { margin-bottom:3px; }
-.sub-btn-set { border:1px solid #ddd; border-width:0 1px; background:url(images/sub_button_bg.gif) repeat; padding:3px 10px; text-align:right; }
-button,
-.form-button { vertical-align:middle; border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; padding:0 7px 1px 7px; background:#ffac47 url(Magento_Adminhtml::images/btn_bg.gif) repeat-x 0 100%; color:#fff; font:bold 12px arial, helvetica, sans-serif; cursor:pointer; text-align:center !important; white-space:nowrap; }
-button:hover                    { background:#f77c16 url(Magento_Adminhtml::images/btn_over_bg.gif) repeat-x 0 0; }
-button:active                   { background:#f77c16 url(Magento_Adminhtml::images/btn_on_bg.gif) repeat-x 0 0; }
-button span                     { line-height:1.35em; background-repeat:no-repeat; background-position:0 50%; }
-button span span                { background:none !important; padding:0 !important; margin:0 !important; display:inline !important; }
-button.delete,
-button.save,
-button.add                      { padding-left:6px; }
-button.cancel span,
-button.delete span,
-button.save span,
-button.add span,
-button.back span,
-button.add-image span,
-button.add-widget span { padding-left:20px; }
-/* Google Chrome specific fix for empty buttons */
-button.add span:after,
-button.delete span:after { display:inline-block; clear:both; content:"."; font-size:0; line-height:0; height:0; overflow:hidden; }
-button.back { border-color:#ccc #aaa #aaa #ccc; background-color:#fff; background-image:url(images/btn_back_bg.gif); color:#555; }
-button.back span { background-image:url(images/icon_btn_back.gif); }
-button.fail,
-button.cancel,
-button.delete { border-color:#d24403 #a92000 #a92000 #d24403; background-image:url(images/cancel_btn_bg.gif); background-color:#fcaf81; color:#fff; }
-button.fail:hover,
-button.cancel:hover,
-button.delete:hover { background-image:url(images/cancel_btn_over_bg.gif); }
-button.fail:active,
-button.cancel:active,
-button.delete:active { background-image:url(images/cancel_btn_active_bg.gif); background-color:#e0612f; }
-button.cancel span,
-button.delete span { background-image:url(images/cancel_btn_icon.gif); }
-button.add span     { background-image:url(images/add_btn_icon.gif); }
-button.save span    { background-image:url(images/save_btn_icon.gif); }
-button.show-hide span { background-image:url(images/btn_show-hide_icon.gif); padding-left:26px; }
-button.add-image span { background-image:url(images/btn_add-image_icon.gif); }
-button.add-widget span { background-image:url(images/btn_add-widget_icon2.gif); padding-left:24px; }
-button.add-variable span { background-image:url(images/btn_add-variable_icon.gif); padding-left:26px; }
-button.go span { background-image:url(images/btn_go.gif); padding-left:16px; }
-button.btn-chooser { display:block; margin:0 0 10px; }
-button.success { background-image:url(images/btn_gr_bg.gif); border-color:#46745E; }
-button.success:hover { background:url(images/btn_gr_over.gif) #6cac46; }
-button.success:active { background:url(images/btn_gr_on.gif) repeat-x 0 0 #3fa05e; }
-
-button.disabled,
-button.disabled:hover,
-button.disabled:active { border-color:#777 #505050 #505050 #777; background:#919191 url(images/btn_bg-disabled.gif) 0 0 repeat-x; color:#fff; cursor:default; opacity:.8; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=20)"; }
-button.add.disabled span { background-image:url(images/add_btn_icon-disabled.gif); }
-
-button.loading > span { padding-left:20px; background-image: url(images/btn_loading-icon.gif) !important;}
-
-button.icon-btn { width:32px !important; }
-button.icon-btn span { text-indent:-999em; display:block; width:16px; padding:0; overflow:hidden; }
-
-.buttons-set { margin:0 0 10px; }
-.buttons-set button { margin-right:5px; }
-
-
-/* Buttons group */
-
-.btn-add { padding-left:6px; }
-.btn-add span {
-    background-image:url(images/add_btn_icon.gif);
-    padding-left:20px;
-}
-div.button {
-    border-width:1px;
-    border-style:solid;
-    order-color:#ed6502 #a04300 #a04300 #ed6502;
-    padding:1px 7px 3px 7px;
-    background:#ffac47 url(Magento_Adminhtml::images/btn_bg.gif) repeat-x 0 100%;
-    color:#fff;
-    font:bold 12px arial, helvetica, sans-serif;
-    cursor:pointer;
-    text-align:center !important;
-    white-space:nowrap;
-}
-div.button:hover {
-    background:#f77c16 url(Magento_Adminhtml::images/btn_over_bg.gif) repeat-x 0 0;
-}
-div.button:active {
-    background:#f77c16 url(Magento_Adminhtml::images/btn_on_bg.gif) repeat-x 0 0;
-}
-div.button span {
-    line-height:1.25em;
-    background-repeat:no-repeat;
-    background-position:0 50%;
-}
-div.button {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-.buttons-group {
-    position: relative;
-    display:inline-block;
-    vertical-align:middle;
-}
-.buttons-group:before,
-.buttons-group:after {
-    display: table;
-    content: "";
-}
-.buttons-group:after {
-    clear: both;
-}
-.buttons-group > .button {
-    position:relative;
-    float:left;
-    margin-left:-1px;
-    border-radius:0;
-}
-.buttons-group > .button:first-child {
-    margin-left:0;
-}
-.buttons-group > .button:last-child,
-.buttons-group > [data-toggle="dropdown"] {
-}
-
-/* Button toggle (with dropdown menu) */
-.dropdown-menu {
-    position:absolute;
-    display:none;
-    list-style:none;
-    margin:1px 0 0 0;
-    padding:0;
-    right:0;
-    top:100%;
-    min-width: 100%;
-    border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502;
-    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.2);
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-    white-space: nowrap;
-}
-.dropdown-menu li {
-    background:#ffac47;
-    background:rgba(255, 172, 71, .95);
-    text-align: left;color:#fff; font:bold 12px arial, helvetica, sans-serif; cursor:pointer;
-    padding:0;
-    position: relative;
-    z-index: 1;
-}
-.dropdown-menu li .item {
-    display: block;
-    padding:4px 25px 4px 8px;
-}
-.dropdown-menu li > .tooltip {
-    position: absolute; top:5px; right:3px;
-}
-.dropdown-menu li.selected {
-}
-.dropdown-menu li:hover {
-    background:#f77c16;
-    z-index: 2;
-}
-.dropdown-menu li:active {
-    background:#f77c16;
-}
-.dropdown-menu li:last-child {
-
-}
-.dropdown-menu-top {
-    margin:0 0 3px 0;
-    top:auto;
-    bottom:100%;
-}
-.buttons-group.active {
-    z-index:20;
-}
-.buttons-group.active .dropdown-menu {
-    display:block;
-}
-.btn-toggle span {
-    width:6px; overflow: hidden; display: block;
-}
-.active .btn-toggle {
-    background:#f77c16 url(Magento_Adminhtml::images/btn_on_bg.gif) repeat-x 0 0;
-}
-.btn-toggle span:before {
-    display: inline-block;
-    content:'';
-    margin-left:100px;
-    /*position: absolute;*/
-    text-indent: 0;
-    margin-left:0;
-    width: 0;
-    height: 0;
-    border-right:3px solid transparent;
-    border-left:3px solid transparent;
-    border-top: 6px solid #fff;
-}
-
-/* =============================================================================
-   Tooltip
-   ========================================================================== */
-
-/* Styles for simple "css" tooltip */
-.tooltip {
-    display:inline-block;
-    vertical-align:middle;
-    line-height:1.1;
-}
-.tooltip > .help {
-    width:15px;
-    height: 15px;
-    line-height: 15px;
-    text-indent: -999em;
-    overflow: hidden;
-    display: block;
-    background: url(images/icon-tooltip.png) no-repeat 0 0;
-    position: relative; z-index: 111;
-    cursor:help;
-}
-.tooltip-content {
-    display:none;
-    position:absolute;
-    max-width:200px;
-    margin-top:5px;
-    margin-left:-18px;
-    padding:8px;
-    border-radius:3px;
-    background:#000;
-    background:rgba(0,0,0,.8);
-    color:#fff;
-    text-shadow:none;
-    z-index:20;
-    font-weight: normal;
-    font-size: 11px;
-}
-.tooltip-content:before {
-    content:'';
-    position:absolute;
-    width:0;
-    height:0;
-    top:-5px;
-    left:20px;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-    border-bottom: 5px solid #000;
-    opacity:.8;
-}
-.tooltip:hover {
-    z-index:20;
-}
-.tooltip:hover > .help {
-    background-position: 0 -15px;
-}
-.tooltip > .help:hover + .tooltip-content {
-    display:block;
-}
-
-
-/* SWITCHER
-*******************************************************************************/
-.switcher { margin-bottom:10px; border:1px solid #cddddd; background:#e7efef; padding:10px; }
-.side-col .switcher { padding-right:26px; }
-.side-col .switcher label { display:block; }
-.side-col .switcher .link-store-scope { float:right; margin-right:-19px; margin-left:3px; }
-.side-col .switcher select { width:100%; float:left; }
-/*.side-col .switcher     { margin-right:20px; margin-bottom:20px; }*/
-.catalog-categories .side-col .switcher { margin-right:0; margin-bottom:15px; }
-.link-store-scope { display:inline-block; vertical-align:middle; margin:0 0 1px; width:16px; height:16px; background:url(images/i_question-mark.png) 0 0 no-repeat; text-decoration:none !important; text-indent:-999em; overflow:hidden; }
-.store-scope .link-store-scope { float:left; margin-right:10px; }
-.store-scope .tree-store-scope { float:left; padding:7px 10px; border:1px dotted #dedede; }
-.store-scope table.stores-tree { float:left; width:auto !important; }
-.form-list td.value .store-scope { white-space:nowrap; }
-.form-list td.value .link-store-scope { float:none; margin-right:0; vertical-align:top; margin-top:6px; }
-
-
-/* SPACE
-*******************************************************************************/
-.box-left, .box-right   { width:48.5%; }
-.box-left               { float:left; }
-.box-right              { float:right; }
-.box-left .content,
-.box-right .content     { padding:6px 14px; }
-.separator, .pipe       { padding:0 6px; font-size:.9em; } /* vertical pipe */
-.divider                { display:block; height:1px; margin:8px 0; background:#ddd; overflow:hidden; }  /* horizontal pipe */
-td.divider              { font-size:1px; line-height:0; }
-.box,
-.entry-edit fieldset,
-.entry-edit .fieldset { border:1px solid #d6d6d6; background:#fafafa; }
-
-
-/* SCOLLER */ /* Used primarily in Sales -> Order -> Create Order */ /*
-*******************************************************************************/
-.scroll-cont {
-    position:absolute;
-    top:-25px;
-    left:503px;
-    width:16px;
-    height:265px;
-    background:transparent url(images/db-scroll-bg.gif) no-repeat top;
-    z-index:10000;
-    }
-.auto-scroll                { overflow:auto; height:11em; }
-.root                       { position:relative; height:260px; margin:0; width:1px; }
-.thumb                      { position:absolute; height:40px; width:16px; margin-top:-28px; z-index:11000; }
-.up                         { margin-top:254px; height:16px; }
-.dn                         { margin-top:0; padding:0; height:15px; }
-.up a, .up a img,
-.dn a, .dn a img,
-.thumb a ,
-.thumb a img                { border:0; }
-.up a:active, .dn a:active  { outline:none; }
-.scrollContainer {
-    position:absolute;
-    left:0;
-    top:19px;
-    clip:rect(0 467px 200px 0);
-    overflow:auto;
-    border:0;
-    }
-.scrollContent              { position:absolute; left:0; top:0; }
-
-/* Horizontal scroll */
-.hor-scroll                 { width:100%; padding-bottom:4px; margin-bottom:-4px; } /* IE has personal style, see iestyles.css */
-
-
-/**/
-.note-list { width:100%; overflow:hidden; }
-.note-list li { border-top:1px solid #e3e3e3; margin-top:9px !important; background:url(images/icon_note_list.gif) no-repeat 0 4px; padding-bottom:9px; padding-left:18px; }
-
-
-
-/******************************************************************************/
-/********************************** STRUCTURE *********************************/
-/******************************************************************************/
-
-/* LAYOUT
-*******************************************************************************/
-.wrapper { min-width:960px; }
-.wrapper-popup { min-width:750px; }
-.header { background:url(images/header_top_bg.gif) repeat-x #425e66; text-align:right; }
-.middle { min-height:450px; background:url(images/simple_container_bg.gif) repeat-x #fff; padding:23px 27px 0 27px; }
-.middle-popup { border-bottom:3px solid #fff; background:url(images/middle_bg.gif) repeat-x 0 100% #fff; padding:0 0 0 0; background:yellow; }
-.container-collapsed { padding:1.8em 2.2em 1.8em 2em; padding-top:0; }
-.columns {background:url(images/side_col_bg.gif) repeat-y 217px 0; }
-
-div.side-col { float:left; width:220px; margin-right:-220px; padding-bottom:25px; }
-div.main-col { margin-left:220px; min-height:450px; padding:0 0 25px 25px; }
-div.main-col-inner { float:left; /* Fixes some inner clears in the liquid main-col */ width:100%; }
-
-.footer { clear:both; background:url(images/footer_bg.gif) repeat-x #e6e6e6; padding:105px 2.8em 2.8em 2.8em; font-size:.95em; text-align:center; }
-.simple-container-popup { min-height:50px !important; padding:1.8em 2.3em 6em 2.3em; background:url(images/simple_container_bg.gif) repeat-x; }
-
-.page-popup { background:#fff; }
-
-
-/******************************************************************************/
-/************************************* BOXES **********************************/
-/******************************************************************************/
-
-/* HEADER & FOOTER
-*******************************************************************************/
-
-.logo                                   { float:left; margin:5px 20px 5px 27px; height:43px; }
-.header-top                             { border-bottom:1px solid #5F767F; }
-
-/* Header right */
-.header-right                           { padding:10px 25px 0 15px; font-size:.95em; color:#fff; }
-.header-right a, .header-right a:hover  { color:#fcce77; }
-.header-right .separator                { color:#999; }
-.header-right fieldset                  { display:inline; padding-left:10px; }
-.header-right fieldset input.input-text { width:18em; }
-.header-right .super {
-    float:right;
-    line-height:1.8em;
-    margin-bottom:14px;
-    margin-left:1.3em;
-    }
-
-/* Search autocomplete */
-div.autocomplete {
-    z-index:10000;
-    position:absolute;
-    width:250px;
-    background-color:white;
-    border:1px solid #888;
-    margin:0;
-    padding:0;
-    }
-div.autocomplete ul { margin:0; padding:0; }
-div.autocomplete ul li.selected { background-color:#dcebf0; }
-div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; text-align:left; color:#2f2f2f; line-height:1.3em; }
-
-/* Mage suggest */
-/*.mage-suggest { position:relative; display: inline-block; background: #fff; border-radius: 5px; box-shadow: 1px 0 2px #ddd; }
-.mage-suggest .input-text { border-radius: 5px; margin: 7px; border: 1px solid #ddd; height: 20px; padding: 3px 25px 3px 10px; line-height: 26px; background: url(images/bkg_search-magnifier.png) 98% 50% no-repeat; }
-.mage-suggest-dropdown { overflow-x: hidden; position: absolute; top: 100%; margin-top:-4px; left: 0; min-width: 100%; background: #fff; border: solid #ddd; border-width: 0 1px 1px; padding: 10px 0; box-sizing: border-box; border-radius: 0 0 5px 5px; box-shadow: 1px 1px 2px #ddd; }
-.mage-suggest-dropdown.overflow-y { overflow-y: scroll; }
-.mage-suggest-dropdown .ui-menu-item a { display:block; padding: 0 10px; text-decoration: none; font:normal 12px/26px Arial, sans-serif; text-align: left; border-bottom: 1px solid #f2f2f2; color:#2d2d2d; }
-.mage-suggest-dropdown .ui-state-active,
-.mage-suggest-dropdown .ui-state-focus { background: #f2f2f2; color:#000; }*/
-.mage-suggest-inner {padding: 5px 0;}
-.mage-suggest {position: relative;}
-.mage-suggest-inner {position: absolute; background: #fff; top:0px; left:0px; border: 1px solid #ddd; border-radius: 5px; box-shadow: 1px 1px 2px #ddd;}
-.mage-suggest-inner > input {
-    height: 22px;
-    margin: 0 5px;
-}
-.mage-suggest-dropdown > h2 {
-    font-size:0.8em;
-    text-transform: uppercase;
-    font-family:Arial, Helvetica, sans-serif;
-    color: #555555;
-    font-weight: normal;
-    padding: 0 8px;
-}
-.mage-suggest-dropdown .ui-menu-item a { display:block; padding: 0 10px; text-decoration: none; font:normal 12px/26px Arial, sans-serif; text-align: left; border-bottom: 1px solid #f2f2f2; color:#2d2d2d; }
-.mage-suggest-dropdown .ui-state-active,
-.mage-suggest-dropdown .ui-state-focus { background: #f2f2f2; color:#000; }
-.mage-suggest-dropdown .ui-corner-all {
-    border-radius: 0px;
-}
-.mage-suggest-dropdown .ui-widget-content, .mage-suggest-dropdown .ui-menu .ui-menu-item a, .mage-suggest-dropdown .ui-menu .ui-menu-item a.ui-state-focus {
-    background: #ffffff;
-    border: none;
-    color: #000000;
-}
-.mage-suggest-dropdown .ui-menu .ui-menu-item a, .mage-suggest-dropdown .ui-menu .ui-menu-item a.ui-state-focus {
-    border-top: 1px solid #efefef;
-    margin: 0;
-    padding: 3px 8px;
-}
-.mage-suggest-dropdown .ui-menu {
-    padding: 0px;
-    width: 100%;
-}
-.mage-suggest-dropdown .ui-menu .ui-menu-item a.ui-state-focus {
-    background: #ebebeb;
-}
-.mage-suggest-dropdown .show-all {
-    padding: 5px 8px;
-    color: #555555;
-    font-family:Arial, Helvetica, sans-serif;
-    font-size: 0.8em;
-}
-.mage-suggest-dropdown {
-    overflow: auto;
-    max-height: 500px;
-    z-index: 1;
-}
-.mage-suggest.category-select .mage-suggest-inner {background: transparent; position: static; border: none; border-radius: 0px; box-shadow: none;}
-.mage-suggest.category-select .mage-suggest-choices {background: #fff; border: 1px solid #ddd; border-radius: 5px; box-shadow: none; overflow: hidden;}
-.mage-suggest.category-select .mage-suggest-choices li {float: left; margin: 5px 0 5px 7px;}
-.mage-suggest.category-select .mage-suggest-search-field input {
-    background: none repeat scroll 0 0 transparent !important;
-    border: 0 none;
-    box-shadow: none;
-    font-family: sans-serif;
-    font-size: 100%;
-    height: 22px;
-    margin: 1px 0;
-    outline: 0 none;
-    padding: 0 5;
-}
-.mage-suggest.category-select .mage-suggest-dropdown {
-    position: absolute;
-    width: 100%;
-    background: #fff; border: 1px solid #ddd; border-radius: 5px;
-    margin-top: 2px;
-}
-.mage-suggest-dropdown .jstree-default.jstree-focused {
-    background: #ffffff;
-}
-.mage-suggest-dropdown .jstree li {
-    margin-left: 18px;
-}
-.mage-suggest-dropdown .jstree > ul > li {
-    margin-left: 0px;
-}
-.mage-suggest-dropdown .jstree a {
-    padding: 2px 3px;
-}
-.mage-suggest-dropdown .jstree .jstree-hovered {
-    border: none;
-    background: #efefef;
-}
-.mage-suggest-dropdown .jstree .jstree-clicked {
-    border: none;
-    background: #e5e5e5;
-}
-.mage-suggest-dropdown .category-path {
-    color: #777777;
-    margin-left: 7px;
-    font-size: 11px;
-}
-.mage-suggest-dropdown .ui-menu {
-    float: none;
-}
-.mage-suggest-dropdown .ui-menu .ui-menu-item{
-    margin: 0px;
-}
-
-/* Footer */
-.footer .bug-report                     { float:left; width:35%; text-align:left; }
-.footer .legality                       { float:right; width:35%; min-height:19px; padding-left:22px; text-align:right; }
-
-/* COLUMNS
-********************************************************************************************/
-
-.catalog-categories .side-col   { width:25em; padding-right:25px; }  /* Catalog/Categories */
-.catalog-categories .main-col   { padding-left:25px; margin-left:25em; }              /* Catalog/Categories */
-.order-summary .side-col        { padding-right:25px; }             /* Order/Create */
-.order-summary .main-col        { padding-left:25px; }              /* Order/Create */
-
-
-/* HEADINGS
-********************************************************************************************/
-
-/* Content Header */
-.content-header { margin-bottom:18px; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box; border-bottom:4px solid #dfdfdf; padding-bottom:.25em; padding-top: 6px; }
-.content-header table           { width:100%; }
-.content-header h3              { float:left; margin:.3em .5em 0 0; color:#eb5e00; font-size:1.25em; line-height:1.2em; }
-.content-header .head h3        { float:none; }
-.content-header .button-set     { white-space:nowrap; text-align:right; }
-.content-header .content-buttons  { white-space:nowrap!important; margin:0; }
-.content-header td.content-buttons  { width:13%;white-space:nowrap!important; margin:0; }
-.content-buttons button,
-.content-header button,
-.filter-actions button          { margin:0 0 0 5px; }
-.side-col .content-header       { border-bottom:0; margin-right:12px; margin-bottom:.6em; }
-.catalog-categories .side-col .content-header { margin-right:0; }  /* Catalog/Categories */
-
-.left-col-block { width:200px; }
-
-.content-header.fixed { padding:6px 8px; margin-bottom:0; border:0; position:fixed; left:0; top:0; width:100%; border-bottom:solid 1px #988753; z-index:100; z-index:auto\9; background:#fdfaa4; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=85)"; opacity:.85; z-index: 100; }
-.content-header.fixed button { margin-top:3px; }
-.content-header.fixed .content-buttons { float:right; }
-.content-buttons { margin-bottom:5px; float:right; display:inline; white-space:nowrap; }
-.content-header.fixed .form-buttons { padding-right:20px; }
-.content-header.fixed h3 { margin: 0 0 0 20px; display:inline; }
-
-
-/* Box Head */
-.box-head       { margin-bottom:.6em; text-align:right; }
-.box-head h4    { float:left; margin-bottom:0; }
-
-
-/* Icon Head */ /* Headings with icon preceding text*/
-.icon-head                      { min-height:18px; background-repeat:no-repeat; background-position:0 0; padding-left:22px; }
-.head-customer-address-list     { background-image:url(images/fam_house.gif); }
-.head-edit-form                 { background-image:url(images/fam_page_white.gif); }
-.head-customer-view             { background-image:url(images/fam_status_online.gif); padding-left:18px; }
-.head-customer,
-.head-customer-groups           { background-image:url(images/fam_group.gif); }
-.head-user                      { background-image:url(images/fam_user.gif); }
-.head-user-edit                 { background-image:url(images/fam_user_edit.gif); }
-.head-user-comment              { background-image:url(images/fam_user_comment.gif); }
-.head-comment                   { background-image:url(images/fam_comment.gif); }
-.head-cart                      { background-image:url(images/fam_cart.gif); }
-.head-account                   { background-image:url(images/fam_account.gif); }
-.head-online-visitors           { background-image:url(images/fam_monitor.gif); }
-.head-products                  { background-image:url(images/fam_package.gif); }
-.head-catalog-product           { background-image:url(images/fam_package.gif); }
-.head-newsletter-queue          { background-image:url(images/fam_newspaper_go.gif); }
-.head-newsletter-list           { background-image:url(images/fam_newspaper.gif); }
-.head-newsletter-report         { background-image:url(images/fam_newspaper_error.gif); }
-.head-tag, .head-tag-product    { background-image:url(images/fam_tag_orange.gif); }
-.head-sales-order,
-.head-sales-invoice             { background-image:url(images/fam_folder_table.gif); }
-.head-categories                { background-image:url(images/fam_folder_database.gif); padding-left:20px; color:#253033 !important; }
-.head-catalog-product-attribute { background-image:url(images/fam_rainbow.gif); padding-left:24px; }
-.head-product-attribute-sets    { background-image:url(images/fam_folder_palette.gif); padding-left:23px; }
-.head-tax                       { background-image:url(images/fam_money_add.gif); }
-.head-cms-page, .head-cms-block { background-image:url(images/application_view_tile.gif); }
-.head-backups-control           { background-image:url(images/fam_server_database.gif); }
-.head-money, .head-promo-quote  { background-image:url(images/fam_money.gif); }
-.head-shipping-address,
-.head-billing-address           { background-image:url(images/fam_house.gif); }
-.head-shipping-method           { background-image:url(images/fam_lorry.gif); }
-.head-payment-method            { background-image:url(images/fam_creditcards.gif); }
-.head-order-date                { background-image:url(images/fam_calendar.gif); }
-.head-customer-sales-statistics { background-image:url(images/fam_money.gif); }
-.head-notification              { background-image:url(images/fam_folder_table.gif); }
-.head-compilation               { background-image:url(images/fam_package_go.gif); }
-
-
-
-/******************************************************************************/
-/********************************* PAGE SPECIFIC ******************************/
-/******************************************************************************/
-
-
-/* LOGIN
-*******************************************************************************/
-#page-login                             { background:#f8f8f8; text-align:center; }
-.login-container                        { width:581px; margin:170px auto; padding-left:32px; background:url(images/login_logo.gif) no-repeat; }
-.login-form                             { padding:27px 57px 35px 57px; background:url(images/login_box_bg.jpg) no-repeat; text-align:left; }
-.login-form .input-left                 { float:left; }
-.login-form .input-right                { float:right; }
-.login-form .input-box input.input-text { width:224px; }
-.login-form h2                          { font-size:1.7em; font-weight:normal; }
-.login-form label                       { font-weight:bold; }
-.login-form .form-buttons               { margin:12px 0 0 0; clear:both; text-align:right; }
-.login-box .bottom                      { width:581px; height:5px; background:url(images/login_box_bottom.jpg) no-repeat; overflow:hidden; }
-.login-container .legal                 { margin:0; background:url(images/login_box_legal_bg.gif) no-repeat; padding:8px 8px 5px 8px; font-size:.95em; }
-.login-form .validation-advice,
-.login-form label.mage-error            { margin:3px 0 0 0; }
-.login-form .forgot-link                { margin:0 17px 0 0; text-align:right; }
-.login-form .captcha                    { padding:10px 0 0; }
-.login-form .captcha-image              { border:1px solid #aaa; margin:1.5em 0 0; position:relative; }
-.login-form .captcha-image img          { vertical-align:bottom; }
-.login-form .captcha-reload             { cursor:pointer; position: absolute; top:2px; right:2px; }
-.login-form .captcha-reload.refreshing  { animation:rotate 1.5s infinite linear; -webkit-animation:rotate 1.5s infinite linear; -moz-animation:rotate 1.5s infinite linear; }
-
-@-webkit-keyframes rotate {
-    0% { -webkit-transform:rotate(0); }
-    0% { -webkit-transform:rotate(360deg); }
-}
-@-moz-keyframes rotate {
-    0% { -moz-transform:rotate(0); }
-    0% { -moz-transform:rotate(360deg); }
-}
-@keyframes rotate {
-    0% { transform:rotate(0); }
-    0% { transform:rotate(360deg); }
-}
-
-
-/* DASHBOARD
-*******************************************************************************/
-.dashboard-container                    { border:1px solid #ccc; }
-.dashboard-container .switcher          { margin-bottom:0;  border:0; }
-
-/* STORE MANAGEMENT
-*******************************************************************************/
-.adminhtml-system-store-deletestore .content-footer .content-buttons,
-.adminhtml-system-store-deletegroup .content-footer .content-buttons,
-.adminhtml-system-store-deletewebsite .content-footer .content-buttons { float:left; }
-
-
-/* SALES
-*******************************************************************************/
-
-/* Disabled block */
-.overlay span { display:block; width:100%; text-align:center; position:absolute; top:50%; margin:-5px 0 0; color:#000; }
-
-/* Prices */
-.price { white-space:nowrap !important; }
-
-/* Incl tax (for order tables) */
-.price-incl-tax { display:block; }
-.price-incl-tax .label { display:block; white-space:nowrap; }
-.price-incl-tax .price { /*display:block;*/ font-weight:bold; }
-
-/* Excl tax (for order tables) */
-.price-excl-tax  { display:block; }
-.price-excl-tax .label { display:block; white-space:nowrap; }
-.price-excl-tax .price { /*display:block;*/ font-weight:bold; }
-
-/* Orders / Invoices / Shipments / Credit Memos Table */
-.order-tables td h5.title { font-size:1em; font-weight:bold; }
-.order-tables td .option-label { font-weight:bold; font-style:italic; }
-.order-tables td .option-value { padding-left:10px; }
-.order-tables td .qty-table { border:0 !important; width:100% }
-.order-tables td .qty-table td { border:0 !important; padding:0 4px !important; }
-
-dl.item-options dt { font-weight:bold; font-style:italic; }
-dl.item-options dd { padding-left:10px; }
-
-ul.item-options li { padding-left:.7em; }
-
-
-/* Create Order */
-.page-create-order .side-col            { width:260px; background:none; padding:0; }
-.page-create-order .main-col            { padding-left:28px; }
-.page-create-order .switcher            { margin-bottom:25px; }
-.create-order-sidebar-container         { border:1px solid #d6d6d6; background:#fafafa; }
-.create-order-sidebar-block .content    { margin:0 !important; padding:4px 6px; }
-.create-order-sidebar-block .head       { border-top:1px solid #ddd; background:#ececec; padding:2px 6px 1px; font-size:.9em; text-align:right; }
-.create-order-sidebar-block .head h5    { float:left; margin:0; color:#2c464f; text-align:left; }
-.create-order-sidebar-block .content table td,
-.create-order-sidebar-block table th    { padding:0 3px 0 0; }
-.create-order-sidebar-block select      { width:170px; }
-.create-order-sidebar-block ul          { margin-left:20px; }
-.order-choose-address                   { margin:0 0 10px 0;padding:8px 15px;background:#e7efef; } /*Address Selector */
-.order-save-in-address-book             { margin:0 0 0 0;padding:8px 15px;background:#e7efef; } /* Save in Address Book Checkbox */
-.entry-edit .content .form-list         { width:100%; }
-
-.entry-edit .order-address td.label label { width:100px; }
-.entry-edit .order-address input.input-text,
-.entry-edit .order-address .textarea     { width:95% !important; }
-.entry-edit .order-address .select       { width:96.5%; }
-.entry-edit .order-address .validate-vat { text-align:right; padding:10px 0 0; width:96%; }
-.order-search-items .entry-edit .grid    { height:610px; overflow:auto; }
-.order-search-items .entry-edit .grid table { width:99.9%; }
-/* .create-order-totals                 { background:url(images/bg_create_order_totals.gif) repeat-y 50% 0 !important; } */
-
-/* Product Configuration Popup */
-#popup-window-mask,
-.popup-window-mask { background:url(images/bg_window_mask.png) repeat 0 0; background:rgba(239, 239, 239, 0.5); position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:399; }
-.product-configure-popup { background:#fafafa; border:1px solid #d6d6d6; left:50%; margin:0 0 0 -271px; position:fixed; top:50%; width:540px; z-index:400; }
-.product-configure-popup .validation-advice,
-.product-configure-popup label.mage-error { margin-left:0; }
-#product_composite_configure_messages { margin-left:0 !important; padding:10px 15px; }
-.product-configure-popup .content { max-height:400px; overflow:auto; }
-.product-configure-popup .content .grid { padding:0; }
-.product-configure-popup .content .grid table { border-bottom:1px solid #CBD3D4; }
-.product-configure-popup .product-options { border-bottom:1px solid #e7e7e7; margin:0 0 15px; padding:0 0 12px; }
-.product-configure-popup .product-options .required { color:#333 !important; font-weight:normal !important; }
-.product-configure-popup .product-options .required em { color:#d40707; }
-.product-configure-popup .last-fieldset .product-options { border:0 none; margin-bottom:0; padding-bottom:0; }
-.product-configure-popup .buttons-set { margin:0; padding:10px; }
-.product-configure-popup .buttons-set button { margin:0 0 0 5px; }
-
-/* Gift Card Product */
-.giftcard-form .availability { font-weight:bold; margin-bottom:1em; }
-.giftcard-form .in-stock { color:#1b6800; }
-.giftcard-form .out-of-stock { color:#cf3a00; }
-.giftcard-form .price-box { margin:1em 0; }
-.giftcard-form label { float:left; width:25%; }
-
-.giftcard-amount-form { margin:0 0 10px; }
-.giftcard-amount-form li { overflow:hidden; width:100%; }
-.giftcard-amount-form .field { overflow:hidden; margin-bottom:10px; width:100%; }
-.giftcard-amount-form .form-list .input-text { width:70px; }
-.giftcard-amount-form .form-list select { width:150px; }
-.giftcard-amount-form .form-list .input-box { float:left; width:75%; }
-.giftcard-amount-form .form-list .input-box .v-fix { white-space:nowrap; }
-.giftcard-amount-form .form-list .input-box p.notice { margin:5px 0 0; font-size:11px; white-space:nowrap; }
-.giftcard-amount-form .form-list .input-box p.notice span { display:block; margin-right:5px; }
-
-.giftcard-send-form .field { overflow:hidden; margin-bottom:10px; width:100%; }
-.giftcard-send-form .field .input-text { width:98%; }
-.giftcard-send-form .form-list .input-box { float:left; width:75%; }
-.giftcard-send-form .form-list textarea { height:100px; width:98%; }
-
-/* Product Options */
-.product-options { margin:10px 0 0; }
-.product-options dt label { font-weight:bold; font-size:12px; }
-.product-options dt .qty-holder { float:right; }
-.product-options dt .qty-holder label { vertical-align:middle; }
-.product-options dt .qty-disabled { background:none; border:0; padding:3px; color:#000; }
-.product-options dd { margin:5px 0 15px; padding:0 0 12px; border-bottom:1px solid #e7e7e7; }
-.product-options dd.last { border-bottom:0; margin-bottom:0; padding-bottom:0; }
-.product-options dd .input-box { display:block; }
-.product-options dd input.input-text { width:98%; }
-.product-options dd input.datetime-picker { width:150px; }
-.product-options dd .time-picker { display:-moz-inline-box; display:inline-block; padding:2px 0; vertical-align:middle; }
-.product-options dd .time-picker select { vertical-align:middle; }
-.product-options dd textarea { width:98%; height:8em; }
-.product-options dd select { width:100%; }
-.product-options .options-list {}
-.product-options .options-list li { vertical-align:middle; margin:0; padding:2px 0; line-height:1.315; }
-.product-options .options-list input.radio { float:left; margin:2px -18px 0 0; }
-.product-options .options-list input.checkbox { float:left; margin:2px -20px 0 0; }
-.product-options .options-list .label { display:block; margin-left:20px; }
-.product-options li { margin:3px 0; }
-
-/* Wishlist Bundle Product Options */
-.bundle-product-options { padding:5px 0 0 13px; }
-.bundle-product-options dl { padding:5px 0 0 15px; }
-.bundle-product-options dt { color:#111; }
-.bundle-product-options dd { color:#5b5b5b; margin-bottom:10px; }
-
-/* Order Totals */
-.order-totals                           { margin-left:auto; border:1px solid #d7c699 !important; padding:12px 0; background:#fcfac9; text-align:right; }
-.order-totals table                     { border:none; background:none; margin-left:auto; }
-.order-totals table td                  { padding:3px 20px 3px 10px; }
-.order-totals table td.label            { white-space:normal; padding:3px 10px 3px 20px; }
-.order-totals table td.last             { padding:2px 6px; }
-.order-totals-bottom                    { padding:0 20px; }
-.order-totals table .validation-advice,
-.order-totals table label.mage-error    { text-align:right; white-space:nowrap; background-position:100% 1px; padding-right:14px; padding-left:0; }
-.grand-total, .grand_total              { font-size:1.2em; font-weight:bold; color:#eb4d00 !important; }
-
-/* Shopping cart total summary row expandable to details */
-.summary-total { cursor:pointer; }
-.summary-total td { padding-top:5px !important; padding-bottom:5px !important; }
-.summary-total .summary-collapse { float:right; padding-left:20px; background:url(images/bg_collapse.gif) 0 4px no-repeat; text-align:right; cursor:pointer; }
-.show-details .summary-collapse { background-position:0 -52px; }
-.show-details td { border-top:1px solid #eae1b2; }
-.summary-details td { font-size:11px; background-color:#fdfcdf; }
-.summary-details-first td { border-top:1px solid #eae1b2; }
-
-/* Order Constants */
-.payment-methods dt                     { margin-bottom:3px; }
-.payment-methods dd                     { margin-left:20px; }
-.payment-methods .validation-advice,
-.payment-methods label.mage-error       { margin-left:2px; }
-
-/* Cards List */
-.cards-list .offset { margin-left:10px; }
-.cards-list .info-table td { padding:2px 7px 2px 0; text-align:left; vertical-align:top; }
-
-.release-amounts { margin:0.5em 0; }
-
-/* Centinel */
-.centinel .authentication { background:#fff; }
-.centinel .authentication iframe { width:99%; height:400px; background:transparent !important; margin:0 0 7px !important; padding:0 !important; border:1px solid #ddd !important; }
-
-/* Gift Messages */
-.giftmessage-order-create .entire-order,
-.giftmessage-order-create .each-order-item { background-color:#eee; padding:6px 14px; height:275px;  }
-.giftmessage-order-create .entire-order .entry-edit,
-.giftmessage-order-create .each-order-item .scroll { height:250px; overflow:auto; }
-.giftmessage-order-create .single { width:100%; float:left; padding:1.2em 1.5em; }
-.giftmessage-order-create h5 { font-size:12px; font-weight:normal; line-height:1.5; margin-bottom:10px; }
-.giftmessage-order-create h6 { font-size:11px; font-weight:normal; line-height:1.55; background-color:#cfcfcf; margin-bottom:10px; padding:2px 6px; width:95%; }
-.giftmessage-order-create .fieldset { padding:0; }
-.giftmessage-order-create .form-list { width:100%; }
-.giftmessage-order-create .form-list td.label label { width:100px; }
-.giftmessage-order-create .form-list td.value input.input-text,
-.giftmessage-order-create .form-list td.value textarea { width:95%; }
-
-.giftmessage-single-item                            { padding:0 !important; }
-.giftmessage-single-item .item-container            { cursor:auto; }
-.giftmessage-single-item .item-text                 { padding:2px 4px; }
-.giftmessage-single-item .gift-form                 { margin-top:3px; background:#f7f6f4 url(images/gift-message-grid-column-bg.gif) 0 0 repeat-x; }
-.giftmessage-single-item .gift-form .entry-edit fieldset { border:none !important; margin-bottom:0; background:none !important; padding:15px; }
-.giftmessage-single-item .gift-form .entry-edit fieldset .last { margin-bottom:0; }
-.giftmessage-single-item .gift-form .entry-edit input.input-text { width:75% !important; }
-.giftmessage-single-item .gift-form .entry-edit textarea { width:96% !important; }
-.giftmessage-single-item .action-link-holder        {}
-.giftmessage-single-item .action-link { padding-right:10px; background:url(images/gift-message-expand.gif) 100% 50% no-repeat; cursor:pointer; }
-.giftmessage-single-item .open { background:url(images/gift-message-collapse.gif) 100% 50% no-repeat; }
-
-.giftmessage-whole-order-container .entry-edit input.input-text { width:280px !important; }
-.giftmessage-whole-order-container .entry-edit textarea { width:99% !important; padding:2px 3px; }
-.giftmessage-whole-order-container .entry-edit label { width:121px; }
-
-/* PayPal */
-ul.tabs a.paypal-section,
-ul.tabs a.paypal-section:hover { background:url(images/tabs_span_bg.gif) repeat-x 0 100%; border-bottom:none; padding:0.5em 0.5em 0.28em 1.5em; }
-
-/* Packaging for Shipping Popup */
-#popup-window-mask,
-.popup-window-mask { background:url(images/bg_window_mask.png) repeat 0 0; background:rgba(239, 239, 239, 0.5); position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:399; }
-.packaging-window,
-.packed-window { background:#fafafa; border:1px solid #d6d6d6; left:50%; margin:-200px 0 0 -471px; position:fixed; top:50%; width:1100px; z-index:400; -webkit-box-shadow: 0px 3px 5px #ccc; -moz-box-shadow:0px 3px 5px #ccc; box-shadow:0px 3px 5px #ccc; z-index:400; }
-.packaging-window .entry-edit-head { padding:3px 5px; }
-.packaging-window .entry-edit-head button { float:right; }
-.packaging-window .messages { border:1px solid #f16048; color:#df280a; background:#faebe7 url(Magento_Adminhtml::images/error_msg_icon.gif) no-repeat 10px 10px; font-weight:bold; margin-bottom:10px; padding:10px 10px 10px 35px; }
-.packaging-window .validation-failed { background:#fef0eD; border:1px dashed #D6340E; }
-.packaging-window .packaging-content { overflow:auto; height:400px; height:auto !important; max-height:400px; margin:0 0 10px; padding:10px 10px 0; }
-.packaging-window .package-block { background:#f6f6f6; border:2px solid #d4d4d4; margin:0 0 10px; padding:10px; }
-.packaging-window .package-options { width:100%; border-top:1px solid #ccc; padding:10px 0 0; margin:3px 0 0; }
-.packaging-window .package-options td { vertical-align:middle; }
-.packaging-window .package-options select { width:130px; }
-.packaging-window .package-options .input-text { width:50px; }
-.packaging-window .package_prapare { margin-bottom:15px; }
-.packaging-window .package-options .customs-value { width:80px; }
-.packaging-window .package-options .options-weight { width:75px; }
-.packaging-window .package-options .options-units-weight { width:45px; }
-.packaging-window .package-options .options-units-dimensions { width:45px; }
-.packaging-window .package-options .options-content-type { width:120px; }
-.packaging-window .package-options input[type=text].disabled { background:#eee; }
-.packaging-window .package-options select.disabled { background:#eee; }
-.packaging-window .package-options-contents { border-top:0; }
-.packaging-window .package-add-products { border-top:1px solid #ccc; padding:10px 0 0; margin:10px 0 0; }
-.packaging-window .package-add-products .grid { padding:0; }
-.packaging-window .package-add-products .grid button { vertical-align:middle; }
-.packaging-window .package-number {font-weight: bold;}
-.packaging-window .package-number span {margin-left: 5px;}
-
-.packed-window .entry-edit-head { padding:3px 5px; }
-.packed-window .packed-content { padding:10px 10px 0; overflow:auto; max-height:400px; }
-.packed-window .package { background:#fefefe; border:7px solid #d5d5d5; margin-bottom:10px; padding:10px; }
-.packed-window .package h4 { background:#fefefe; border:solid #ccc; border-width:0 0 1px 1px; float:right; color:#222; font-size:12px; margin:-10px -10px 0 0; padding:5px 10px; position:relative; z-index:100; }
-.packed-window .package strong{ display:block; padding:0 0 3px; }
-.packed-window .package .grid { padding:0; }
-.packed-window .package-info { background:#f3f3f3; border-bottom:1px solid #ccc; margin:-10px -10px 10px; padding:5px 10px; position:relative; }
-.packed-window .package-options { width:60%; }
-.packed-window .package-options td,
-.packed-window .package-options th { padding:1px 0; }
-.packed-window .buttons-set { padding-right:5px; }
-
-
-/* CATALOG
-*******************************************************************************/
-
-/* Category */
-.categories-side-col .content-header { padding:0; }
-.categories-side-col .content-header h3 { float:none; }
-.categories-side-col .content-header button { margin:5px 0 0; }
-.categories-side-col .switcher { margin:10px 20px 0 0; }
-.categories-side-col .tree-actions { text-align:center; margin:10px 20px 10px 0; }
-.categories-side-col .tree-holder { margin-right:20px; }
-
-.no-active-category a span                  { color:#aaa !important; }
-
-#tree-div { overflow:auto!important; padding-bottom:15px; width:200px; }
-
-.x-tree-node { margin:0 !important; }
-.x-tree-node .leaf .x-tree-node-icon        { background-image:url(images/fam_leaf.png); }
-.x-tree-node .system-leaf .x-tree-node-icon { background-image:url(images/fam_application_form_delete.png); }
-.x-tree-node-ct { overflow:hidden; }
-
-/* Product - Websites */
-.website-name .checkbox                 { vertical-align:top; margin-top:2px; }
-.webiste-groups                         { padding:10px 20px; }
-.group-stores                           { padding:2px 10px; }
-
-/* Products - Bundles */
-.bundle-option-row table tbody td       { white-space:nowrap; }
-.bundle-option-row table tbody td label { float:left; }
-.bundle-option-row input.option-label   { width:50% !important; }
-.bundle-option-row input.option-position{ width:70px !important; }
-.catalog-categories .side-col           { width:240px; }
-
-/* Products - Tier Price */
-.tier-price-input                       { margin-bottom:8px; }
-.tier-price-input input.price           { width:80px; margin-right:10px; }
-.tier-price-input input.qty             { width:80px; }
-.tier-price-input .tier-container       { position:relative; clear:both; }
-.tier-price-input .tier-container div   { float:left; }
-.tier-price-input .tier-container label { width:30px; margin:0; padding:0; }
-.tier-price-input .validation-advice,
-.tier-price-input label.mage-error      { margin:0; height:25px; }
-.tier-price-input .custgroup-div select { width:auto; padding:0; }
-.tier-price-input .qty-div              { padding-left:20px; }
-.tier-price-input .price-div            { padding-left:20px; }
-.tier-price-input .price-div .validation-advice,
-.tier-price-input .price-div label.mage-error { margin:0; }
-.btn-remove-tier-group                  { float:right; right:24px; top:5px; }
-
-/* Product - Gallery */
-.image-preview                          { position:absolute; cursor:pointer; }
-
-/* Attributes */
-.edit-attribute-set .form-list td.label { width:105px; }
-.edit-attribute-set  .form-list td.label label { width:105px; }
-.edit-attribute-set .entry-edit fieldset input.input-text { width:200px; }
-/* Review & Ratings */
-.ratings                        { margin:0; }
-.rating-box {
-    float:left;
-    position:relative;
-    width:69px;
-    height:16px;
-    margin:0 5px 3px 0;
-    background:url(images/product_rating_blank_star.gif) repeat-x;
-    }
-.rating-box .rating {
-    position:absolute;
-    top:0;
-    left:0;
-    height:16px;
-    background:url(images/product_rating_full_star.gif) repeat-x;
-    }
-.field-row .ratings             { width:120px; float:left; clear:right; }
-.field-row .ratings-container   { width:250px; float:left; }
-.product-review-box             { width:450px; }
-.product-review-box table       { width:100%; }
-.product-review-box td,
-.product-review-box th          { text-align:center; padding-right:5px; }
-.product-review-box td.label    { width:100px; text-align:left; }
-
-
-/* Price Rules */
-.rule-tree ul                   { padding-left:16px !important; border-left:dotted 1px #888; }
-.rule-tree .x-tree ul           { padding-left:0 !important; border-left:none !important; }
-.rule-param .label              { font-weight:bold; color:black; }
-.rule-param .label:hover        { font-weight:bold; color:blue; }
-.rule-param .label-disabled     { color:black; cursor:default; text-decoration:none; }
-.rule-param .label-disabled:hover { color:black;}
-.rule-param .element            { display:none; }
-.rule-param input,
-.rule-param select              { width:auto !important; min-width:170px; }
-.rule-param select.multiselect  { vertical-align:top; }
-.rule-param-edit .label         { display:none; }
-.rule-param-edit .element       { display:inline; }
-.rule-param-add                 { font-weight:normal; color:green; text-decoration:none; }
-.rule-param-add:hover           { font-weight:normal; color:blue; text-decoration:none; }
-.rule-param-apply               { font-weight:normal; color:green; text-decoration:none; }
-.rule-param-apply:hover         { font-weight:normal; color:blue; text-decoration:none; }
-.rule-param-remove              { font-weight:normal; color:red; text-decoration:none; }
-.rule-param-remove:hover        { font-weight:normal; color:blue; text-decoration:none; }
-.rule-chooser                   { border:solid 1px #CCC; margin:5px; padding:5px; display:none; }
-.rule-param-wait                { padding-left:20px; background-image:url(images/rule-ajax-loader.gif); background-repeat:no-repeat; background-position:0 50%; }
-
-/* Product Customer Defined options */
-.custom-options  .box {padding:0 1.5em; }
-.custom-options  .option-box {border:1px solid #cddddd; padding:1em;  background:#e7efef; margin:1.5em 0; }
-
-.custom-options  .option-header {border:0; width:100%; background:#e7efef; border-bottom:1em solid #e7efef; }
-.custom-options  .option-header .input-text,
-.custom-options  .option-header .select {width:95%; }
-.custom-options  .option-header th {padding:2px; }
-.custom-options  .option-header td {padding:5px 2px; }
-
-.custom-options .opt-title {width:175px; }
-.custom-options .opt-type {width:150px; }
-.custom-options .opt-req {width:80px; }
-.custom-options .opt-order {width:60px; }
-
-.custom-options  .option-box  .border {width:615px; }
-
-.custom-options th {white-space:nowrap; }
-.custom-options  .type-title  {width:auto; }
-.custom-options  .type-price  {width:60px; }
-.custom-options  .type-type  {width:80px; }
-.custom-options  .type-uqty  {width:100px; }
-.custom-options  .type-sku  {width:150px; }
-.custom-options  .type-order  {width:60px; }
-.custom-options  .type-butt  {width:33px; }
-.custom-options  .type-last  {width:auto; }
-
-.custom-options .option-box .border input.input-text,
-.custom-options .option-box .border select.select { width:90% !important; }
-
-.custom-options .option-box .border .type-last input.input-text { width:60px !important; }
-.custom-options .option-box .border input.type-sku  {width:150px !important; }
-
-/* Bundle product */
-.bundle .option-box  {padding-bottom:2em; }
-.bundle .option-box .border {width:100%; border-bottom:0; }
-.bundle .option-box .border td {border-bottom:1px solid #dce5e6!important; }
-.bundle .option-title {padding:0 0 10px; border-bottom:1px solid #cddddd; }
-.bundle .option-title button {float:right; }
-.bundle .option-title label {font-weight:bold; line-height:21px; padding-right:1em; float:left; }
-.bundle .option-title .input-text {float:left; width:260px; vertical-align:middle; }
-.bundle .option-header {clear:both; margin-top:5px; }
-
-.bundle .border .last {width:33px; }
-
-/* Downloadable Product */
-.files { width:195px; }
-.files input.input-text { float:left; width:134px !important; }
-.files-wide { width:355px; }
-.files-wide input.input-text { float:left; width:294px !important; }
-.files label,
-.files-wide label { float:left; width:55px; }
-.files .row,
-.files-wide .row { margin-bottom:5px; }
-/* Files Uploader */
-.files .flex,
-.files-wide .flex { float:right !important; position:static !important; }
-.files .uploader,
-.files-wide .uploader { float:left; overflow:hidden; }
-.files .uploader { width:100px; }
-.files-wide .uploader { width:260px; }
-.files .uploader .file-row-info,
-.files-wide .uploader .file-row-info,
-.files .uploader .file-row-narrow,
-.files-wide .uploader .file-row-narrow { margin:0 !important; }
-.progressbar { height: 20px; }
-.upload-progress { background-color: #fcffac; }
-.upload-success { background-color: #E4FFB1; }
-.upload-failure { background-color: #FF7E77; }
-
-td.input-price { white-space:nowrap; }
-td.input-price .validation-advice,
-td.input-price label.mage-error { white-space:normal; }
-td.input-price input.input-text { width:4em !important; }
-
-input.sort { width:4em !important; }
-input.downloads { width:6.5em !important; }
-
-/* CUSTOMER
-*******************************************************************************/
-
-/* Addresses */
-.address-list                           { width:28em; padding-right:22px; }
-.address-list address                   { width:100%; overflow:hidden; }
-.address-list .btn-edit-address,
-.address-list .btn-remove-address       { position:absolute; top:8px; }
-.address-list .btn-edit-address         { right:8px; }
-.address-list .btn-remove-address       { right:27px; }
-.address-list li                        { position:relative; padding:12px 14px; cursor:pointer; border-top:1px solid #e6e6e6; background:url(images/address_list_li.gif) repeat; }
-.address-list li.on                     { background:#e7efef; }
-.address-list li.over                   { background-color:#fcf5dd; }
-.address-list li table                  { width:100%; }
-.delete-address                         { float:right; margin:0 0 10px 10px; }
-.address-type .address-type-line        { display:block; margin:2px 0; }
-.address-type .address-type-line input  { margin-right:3px; }
-
-
-
-/* NEWSLETTER
-*******************************************************************************/
-.template-preview           { width:100%; height:200px; background-color:#fff; }
-
-
-/* SYSTEM
-*******************************************************************************/
-.stores-tree td { padding-top:3px !important; padding-bottom:3px !important; }
-.stores-tree td.label label { display:inline; width:auto; padding-right:10px; }
-.stores-tree td.website-label label { font-weight:bold; }
-.stores-tree td.store-group-label label { font-weight:bold; padding-left:15px; }
-.stores-tree td.store-label label { padding-left:30px; }
-.stores-tree .buttons-set { margin:10px 0; }
-
-.log-details { border:1px solid #d6d6d6; padding:15px; background:#fafafa; margin:0 0 15px; }
-.log-details table { width:100%; }
-.log-details table th,
-.log-details table td { padding-top:4px; padding-bottom:4px; vertical-align:middle; }
-.log-details table th { font-weight:bold; padding-right:30px; white-space:nowrap; }
-
-.sync-indicator { margin-left:5px; margin-right:5px; position:absolute; white-space:nowrap; }
-.sync-indicator img,
-.sync-indicator span { vertical-align:middle; }
-
-/* Configuration */
-/*fieldset.config td          { padding-top:5px; padding-bottom:5px; }
-fieldset.config input.input-text { width:250px; }
-fieldset.config select.select { width:256px; }*/
-div.tree_item,
-div.tree_item_last          { background-position:left; background-repeat:no-repeat; padding-left:20px; }
-div.tree_item               { background-image:url(images/tree_icons/join.gif); }
-div.tree_item_last          { background-image:url(images/tree_icons/joinbottom.gif); }
-div.tree_line               { position:absolute; left:0; background-image:url(images/tree_icons/line.gif); }
-img.attribute-global        { width:16px; height:16px; vertical-align:middle; }
-
-ul.config-tabs              { border-top:none; }
-ul.config-tabs dt {
-    border-top:1px solid #849ba3;
-    background:#d1dedf url(images/config_tab_dt_bg.gif) no-repeat 0 50%;
-    padding:2px 0 2px 1.5em;
-    font-weight:bold;
-    text-transform:uppercase;
-    color:#306375;
-    }
-ul.config-tabs dl           { margin-bottom:16px; }
-ul.config-tabs a.last span  { background-image:none; }
-
-.inline-table { border:0 !important; }
-.inline-table td { border:0 !important; padding:0 5px 5px !important; }
-
-.system-fieldset-sub-head td { padding:20px 5px 5px 5px; }
-.system-fieldset-sub-head h4 { border-bottom:1px solid #ccc; margin:0; }
-
-.system-tooltip-wrap { float:left; }
-.system-tooltip-box { border-left:1px solid #ccc; float:left; line-height:16px; margin-left:5px; padding-left:5px; width:180px; }
-.system-tooltip-small { clear:both; border:none; margin:0; padding:5px; width:100%; }
-
-.comment { padding:5px; }
-
-/* Import/export */
-
-#profile-generator select { width:207px; }
-#profile-generator input.input-text { width:200px; }
-.field-row .with-tip {display:block; margin-left:150px; }
-.field-row .with-tip input {float:none; }
-.field-row .with-tip small {display:block;padding-top:2px; }
-
-#profile-generator .field-row  button.delete {vertical-align:middle; }
-#profile-generator fieldset button.add {display:inline; margin:0; }
-
-/** Product mass attribute update **/
-
-.attribute-change-checkbox { white-space:nowrap; clear:none; margin-left:5px; }
-
-.attribute-change-checkbox label{ margin-left:5px; float:none !important; }
-
-/* PopUp Calendar */
-.calendar { z-index:105; }
-
-/** Order view **/
-.order-history { width:70%; margin-right:27px; }
-
-ul.super-product-attributes { padding-left:15px; }
-
-/** Media Library **/
-.uploader .file-row { width:600px; padding:0.5em 0.6em; margin:0.5em 0.6em; border:1px solid #ccc; background-color:#f9f9f9; /*vertical-align:middle;*/ }
-.uploader .file-row-narrow { width: auto; margin: 0 0 2px 40px; }
-.uploader .file-row .file-info { float:left; }
-/*.uploader .file-row .file-info-name { with: 80%; overflow: hidden; }
-.uploader .file-row .file-info-size { width: 20%; }*/
-.uploader .file-row-info { margin: 0 0 0 10px; }
-.uploader .file-row-info .file-info-name  { font-weight:bold; }
-.uploader .file-row .progress-text { float:right; font-weight:bold; }
-.uploader .file-row .delete-button { float:right; }
-.uploader .buttons { float:left; }
-.uploader .flex { float:right; }
-.uploader .progress { border:1px solid #f0e6b7; background-color:#feffcc; }
-.uploader .error { border:1px solid #aa1717; background-color:#ffe6de; }
-.uploader .error .progress-text { padding-right:10px; }
-.uploader .complete { border:1px solid #90c898; background-color:#e5ffed; }
-
-.grid tr.read { background:#fff !important; }
-.grid tr.unread { background:#fcf6f5 !important; }
-.grid-row-title { color:#444; font-weight:bold; }
-
-.grid-severity-critical,
-.grid-severity-critical span,
-.grid-severity-major,
-.grid-severity-major span,
-.grid-severity-minor,
-.grid-severity-minor span,
-.grid-severity-notice,
-.grid-severity-notice span { display:block; height:16px; background-image:url(images/bg_notifications.gif); background-repeat:no-repeat; font:bold 10px/16px Arial, Helvetica, sans-serif; text-transform:uppercase; text-align:center; padding:0 0 0 7px; margin:1px 0; white-space:nowrap; color:#fff; }
-.grid-severity-critical { background-position:0 0; }
-.grid-severity-critical span { background-position:100% 0; padding:0 7px 0 0; }
-.grid-severity-major { background-position:0 -16px; }
-.grid-severity-major span { background-position:100% -16px; padding:0 7px 0 0; }
-.grid-severity-minor { background-position:0 -32px; }
-.grid-severity-minor span { background-position:100% -32px; padding:0 7px 0 0; }
-.grid-severity-notice { background-position:0 -48px; }
-.grid-severity-notice span { background-position:100% -48px; padding:0 7px 0 0; }
-
-.super-attributes                       { margin:0; padding:0; }
-.super-attributes li.attribute          { border:1px solid #dfdfdf; background-color:#ededed; margin:1px 0; }
-.super-attributes li.attribute ul.attribute-values { margin:0; padding:0; }
-.super-attributes li.attribute div.values-container { width:80%; margin-top:2px; margin-bottom:2px; }
-.super-attributes li.attribute-value  { display:block; margin:1px 0; }
-.super-attributes li.attribute-value .validation-advice,
-.super-attributes li.attribute-value label.mage-error { margin:0; white-space:normal; }
-.super-attributes li.attribute-value .attribute-value-label-container { width:200px; }
-
-.super-attributes div.attribute-name-container,
-.super-attributes li.attribute div.values-container,
-.configurable-simple-product div.values-container,
-.super-attributes li.attribute-value .attribute-values-container,
-.configurable-simple-product  .attribute-values-container,
-.super-attributes li.attribute-value .attribute-values-container-main,
-.configurable-simple-product  .attribute-values-container-main,
-.super-attributes li.attribute-value .attribute-value-label-container {  display:block;  }
-
-.super-attributes li.attribute-value .attribute-price,
-.configurable-simple-product .attribute-price { width:70px !important; }
-
-.super-attributes li.attribute-value .attribute-price-type,
-.configurable-simple-product .attribute-price-type {  width:70px !important; }
-
-.super-attributes  div.attribute-name-container {
-    cursor:move;
-    background-image:url(images/arrow_sort_move.gif);
-    background-repeat:no-repeat;
-    background-position:4px 50%;
-    font-weight:bold;
-    padding-left:15px;
-    margin-top:2px;
-    margin-bottom:2px;
-    }
-
-
-/** Product Gallery Image Previews **/
-.preview .cell-image .place-holder { border:1px solid #AEAEAE; width:100px; height:100px; text-align:center; }
-.preview .cell-image .place-holder span { margin-top:30px;display:block; }
-.preview .cell-position input.input-text { width:90% !important; }
-.fieldset-wide .data .preview .cell-position input.input-text  { width:90% !important; }
-
-.tier .data             { width:465px; }
-.tier .data select      { width:99%; }
-.tier .data input.qty   { width:20px !important; }
-
-.weee .data             { width:465px; }
-.weee .data select      { width:99%; }
-
-.giftcard-amounts .data { width:465px; }
-.giftcard-amounts .data select { width:99%; }
-
-/* Links */
-.link-feed { background:url(images/icon_feed.gif) no-repeat left 2px; padding-left:18px; }
-
-#page-help-link {
-    line-height:26px;
-    padding-left:20px;
-    color:#ebebff;
-    background:url(images/fam_help.gif) no-repeat 0 50%;
-    }
-#page-help-link:link, #page-help-link:visited { text-decoration:none; }
-#page-help-link:hover { color:white; }
-
-/* Magento Connect Package Extensions */
-.table-editable { border:solid 1px #ccc; background:#fafafa; padding:5px; margin-bottom:5px; }
-.table-editable th { border-bottom:solid 1px #ccc; text-align:center; }
-.table-editable th, .table-editable td { padding:1px 3px; vertical-align:middle; }
-.table-editable select { height:19px; }
-
-
-/* CMS
-*******************************************************************************/
-.breadcrumbs { margin: 0 0 10px; }
-.breadcrumbs li { display:inline; }
-.breadcrumbs li span { margin:0 2px; }
-
-/*table.mceLayout { width:100% !important; }*/
-
-.cms-revision-preview { height:100%; }
-.cms-revision-preview iframe { width:100%; height:91%; border:0; }
-
-/* CMS Widgets Instance */
-.options-box .option-box { border:1px solid #cddddd; padding:1em; background:#e7efef; margin:1.5em 0; }
-.options-box .option-title { padding:0 0 10px; border-bottom:1px solid #cddddd; }
-.options-box .option-title button { float:right; }
-.options-box .option-title label {font-weight:bold; line-height:21px; padding-right:1em; float:left; }
-.options-box .option-title select { float:left; width:260px; vertical-align:middle; }
-.options-box .option-header { margin:5px 0 0; width:100%; border:0; background:#e7efef; border-bottom:1em solid #e7efef; }
-.options-box .option-header .input-text,
-.options-box .option-header select { width:95%; }
-.options-box .option-header th { padding:2px; }
-.options-box .option-header td { padding:5px 2px; }
-.options-box .option-header .tree { margin:5px 0 0; }
-
-/* CMS Popup Window */
-.popup-window .magento_message { padding:0 18px; }
-.popup-window .content-header { font-family:Arial, Helvetica, sans-serif; padding-top:9px; }
-.popup-window .content-header h3 { color:#eb5e00; padding:0; }
-.popup-window { height:auto !important; }
-.popup-window .grid { position:static; }
-.popup-window .table_window td.value2 .grid td,
-.popup-window .table_window td.value2 .grid th { padding:2px 4px !important; }
-.popup-window .table_window td.value2 .grid tr.headings th { padding:1px 4px 2px !important; }
-.popup-window .columns { background-image:none; }
-.popup-window .middle { background:none; padding:10px 0; }
-
-.popup-window .uploader .file-row { margin:16px 0; width:auto; }
-.popup-window #contents-uploader { margin-bottom:10px; background:#d7e5ef; padding:5px 10px; }
-.popup-window #contents-uploader .flex { font-size:0; line-height:0; height:20px; }
-.popup-window #contents { margin-left:-3px; height:400px; overflow:auto; position:relative; }
-.popup-window #contents .filecnt { float:left; border:1px solid #ccc; cursor:pointer; padding:3px; display:inline; margin:0 0 15px 4px; overflow:hidden; position:relative; width:100px; }
-.popup-window #contents .selected { border:1px solid #f1af73; background:#f0f0f0; cursor:default; }
-.popup-window #contents .nm { text-align:center; }
-.popup-window #contents .nm img { vertical-align:bottom; }
-
-/* Widget Insert */
-#widget_window .magento_content { height:auto !important; min-height:450px; }
-
-/* CMS Widget Chooser */
-#widget-chooser .columns { background-image:none; }
-#widget-chooser .magento_message { padding:10px 18px; }
-#widget-chooser .grid th,
-#widget-chooser .grid td { padding:2px 4px 2px 4px; }
-#widget-chooser .grid tr.filter th { padding-top:5px; padding-bottom:5px; }
-#widget-chooser .side-col { padding-top:0.5em; }
-#widget-chooser .main-col { padding-right:4px; }
-
-/* CMS Variables Popup */
-#variables-chooser .magento_message { padding:10px 18px; }
-
-/* Product description WYSIWYG editor */
-#catalog-wysiwyg-editor .buttons-set { margin-top:10px; }
-#catalog-wysiwyg-editor .magento_content { height:auto !important; overflow:hidden; }
-#catalog-wysiwyg-editor .textarea { width:930px !important; }
-#catalog-wysiwyg-editor .magento_message { padding:0 7px; }
-#catalog-wysiwyg-editor .magento_buttons { padding-left:7px; padding-right:7px; }
-
-/* Backups */
-.backup-dialog { background-color:#6f8992; background:rgba(111, 137, 146, 0.5); cursor:default; left:50%; margin:0 0 0 -271px; position:fixed; top:50%; width:470px; padding:8px; z-index:400; -moz-box-shadow:0 0 100px #ccc; -webkit-box-shadow:0 0 100px #ccc; box-shadow:0 0 100px #ccc; }
-.backup-dialog .entry-edit { border:1px solid #6f8992; }
-.backup-dialog .content { background:#fff; border-bottom:1px solid #ccc; max-height:400px; overflow:auto; }
-.backup-dialog .question {margin-top: 15px;}
-.backup-dialog .buttons-set { border-top:1px solid #ddd; background:#eee; margin:0; overflow:hidden; padding:7px 10px 8px; width:448px; }
-.backup-dialog .buttons-set button { margin:0 0 0 5px; }
-.backup-dialog #ftp-credentials-container {margin-top: 25px;}
-.backup-dialog .password-box-container {margin-top: 15px;}
-.backup-dialog #ftp-credentials-container fieldset {margin-bottom: 0;}
-.backup-dialog input[type=text], .backup-dialog input[type=password] {width: 180px}
-.backup-dialog .exclude-media-checkbox-container {margin-top: 15px;}
-.backup-dialog td.maintenance-checkbox-container {margin-top: 0; padding-top: 4px;}
-
-/*****************************************/
-/******** ALIGNMENTS AND CLEARS **********/
-/*****************************************/
-
-/* Directional and spacial */
-.f-left, .left      { float:left; }
-.f-right, .right    { float:right; }
-.v-top              { vertical-align:top; }
-.v-middle           { vertical-align:middle !important; }
-.v-bottom           { vertical-align:bottom; }
-.a-left             { text-align:left !important; }
-.a-center           { text-align:center !important; }
-.a-right            { text-align:right !important; }
-.nm                 { margin:0 !important; }
-.np                 { padding:0 !important; }
-.no-display         { display:none; }
-.no-show            { display:none; }
-.nowrap, .nobr      { white-space:nowrap; }
-.wrap               { white-space:normal !important; }
-.no-float           { float:none !important; }
-.pointer            { cursor:pointer; }
-
-/* Color */
-.emph, .accent      { color:#eb5e00 !important; }
-.subdue             { color:#306375; }
-
-/* Font */
-.bold               { font-weight:bold !important; }
-.normal             { font-weight:normal !important; }
-
-/* Clear */ /* This keeps our HTML free of buncha clearing elements */
-.side-col .switcher:after,
-.message-popup .message-popup-head:after,
-.message-popup .message-popup-content .message:after,
-.login-form .form-buttons:after,
-.wrapper:after,
-.option-title:after,
-.columns:after,
-.main-col:after,
-.content-header-floating:after,
-.entry-edit .entry-edit-head:after,
-.content-header:after,
-.login-box .button-set:after,
-ul.tabs-horiz:after,
-.header-top:after,
-dl.accordion dt:after,
-.field-100:after,
-.entry-edit fieldset li:after,
-.entry-edit fieldset span.field-row:after,
-.content:after,
-#topnav:after,
-.main:after,
-.container:after,
-.footer:after,
-.middle:after,
-.header:after,
-.box-head:after,
-div.actions:after,
-.tier-container:after,
-.clear:after,
-.notification-global:after,
-.files .row:after,
-.files-wide .row:after,
-.grid tr.filter .range .range-line:after,
-.store-scope:after { display:block; clear:both; content:"."; font-size:0; line-height:0; height:0; overflow:hidden; }
diff --git a/app/design/adminhtml/magento_basic/custom.css b/app/design/adminhtml/magento_basic/custom.css
deleted file mode 100644
index 734128e887d03133675a6d2ff2489c325012b437..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/custom.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
diff --git a/app/design/adminhtml/magento_basic/ie7.css b/app/design/adminhtml/magento_basic/ie7.css
deleted file mode 100644
index 81034a34b552d8fdca98a2e77887011364449049..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/ie7.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-.db-menu ul li a { background:transparent url(images/db-menu-bg-up.gif) repeat-x 0px 3px; height:26px; }
-.db-menu ul li a:hover, .db-menu ul li a.hover { background:transparent url(images/db-menu-bg-hov.gif) repeat-x 0px 3px; }
-.graph-block { height:auto; }
-.db-menu { width:947px; }
\ No newline at end of file
diff --git a/app/design/adminhtml/magento_basic/iestyles.css b/app/design/adminhtml/magento_basic/iestyles.css
deleted file mode 100644
index 68d51d7e92ebe812dd437264b03fc73b0b6fc914..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/iestyles.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* Clearing */
-.message-popup .message-popup-head,
-.message-popup .message-popup-content,
-.message-popup .message-popup-content .message,
-.login-form .form-buttons,
-.wrapper,
-.footer,
-.option-title,
-.columns,
-.main-col,
-.field-row,
-.nav-bar,
-ul.tabs-horiz,
-dl.accordion dt,
-.field-100,
-.entry-edit fieldset li,
-#nav,
-.main,
-.middle,
-.clear,
-.container,
-dl.accordion dt,
-.grid thead th a,
-.content,
-.box-head,
-.header-top,
-ul.tabs,
-ul.tabs li,
-ul.tabs li span,
-ul.tabs li a,
-.address-list li,
-.entry-edit .entry-edit-head,
-.notification-global,
-.files .row,
-.files-wide .row,
-.uploader .file-row,
-.grid tr.filter .range .range-line,
-.centinel .authentication,
-.paypal-payment-notice,
-.product-options .options-list li,
-.store-scope { zoom:1; }
-
-.clear { display:block; clear:both; height:0; font-size:0; line-height:0; overflow:hidden; }
-
-input.input-file { padding:2px; }
-input.checkbox,
-input.radio { width:13px; height:13px; }
-button.disabled,
-button.disabled:hover,
-button.disabled:active { filter:alpha(opacity=80); }
-
-/* Opacity fix */
-#loading-mask { filter:alpha(opacity=80); }
-#message-popup-window-mask { filter:alpha(opacity=20); }
-.content-header-floating { filter:alpha(opacity=85); }
-
-.message-popup .message-popup-content .message { _height:4.5em; }
-
-#popup-window-mask,
-.popup-window-mask { background:#efefef; filter:alpha(opacity=50); }
-
-/* Scalable Button Override */
-button, .form-button            { width:auto; margin-left:5px; overflow:visible; }
-.massaction button              { width:auto; height: 20px; margin-left:0; overflow:hidden; }
-
-.hor-scroll { overflow-y:hidden; padding-bottom:20px; /*margin-bottom:-16px;*/ }
-
-/* Grid Filter Override */
-.grid tr.filter th              { padding-top:3px; padding-bottom:3px; }
-.grid tr.filter th input        { margin-right: -10px; }
-.grid tr.filter th .range input { margin-right: 2px; }
-button.icon-btn                 { width:31px; }
-
-.nested-content .content-header { position:relative; zoom:1; }
-dl.accordion dt a,
-div.collapseable a               { width:100%; }
-.product-image-gallery .grid tbody td { padding: 4px !important; }
-.massaction .entry-edit fieldset{ float: right;}
-.massaction .entry-edit fieldset  button.scalable {text-align:center !important; padding-left:0;padding-right:0; margin-top:1px;}
-.content-header {zoom:1;}
-
-#tree-div {overflow-x:auto !important; height:auto !important; overflow-y:hidden !important; padding-bottom:30px; }
-
-#nav ul li,
-#nav ul li.active { float:left; clear:left; width:185px; }
-#nav ul a span { zoom:1; }
-
-.grid-severity-critical,
-.grid-severity-major,
-.grid-severity-minor { margin:3px 0; }
-button.add span,
-button.delete span { display:inline-block; height:16px;}
diff --git a/app/design/adminhtml/magento_basic/images/accordion_close.gif b/app/design/adminhtml/magento_basic/images/accordion_close.gif
deleted file mode 100644
index 7463cfd06c6b55c8d4e5735ed22f75beb1e00012..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/accordion_close.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/accordion_close.png b/app/design/adminhtml/magento_basic/images/accordion_close.png
deleted file mode 100644
index 17f2f42358d6432528e189f467be7a9c18716e21..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/accordion_close.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/accordion_open.gif b/app/design/adminhtml/magento_basic/images/accordion_open.gif
deleted file mode 100644
index aaea5003490e3638d202f679caaa10f1797b1747..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/accordion_open.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/accordion_open.png b/app/design/adminhtml/magento_basic/images/accordion_open.png
deleted file mode 100644
index 9d5259955e9201c195eb4f2270fbad52688c1837..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/accordion_open.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/add_btn_icon-disabled.gif b/app/design/adminhtml/magento_basic/images/add_btn_icon-disabled.gif
deleted file mode 100644
index 213541cabff77b9f7fff02f77c0233097382e1c6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/add_btn_icon-disabled.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/add_btn_icon.gif b/app/design/adminhtml/magento_basic/images/add_btn_icon.gif
deleted file mode 100644
index 0c7645a983d3a86c2c625aa65fc58573c07180dc..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/add_btn_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/address_list_li.gif b/app/design/adminhtml/magento_basic/images/address_list_li.gif
deleted file mode 100644
index 58776764860191f435315f9873db3a2389285102..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/address_list_li.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/address_list_on_arrow.gif b/app/design/adminhtml/magento_basic/images/address_list_on_arrow.gif
deleted file mode 100644
index a0afc67cfb248f90e64df258eb7b099a1c71e541..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/address_list_on_arrow.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/address_list_over_arrow.gif b/app/design/adminhtml/magento_basic/images/address_list_over_arrow.gif
deleted file mode 100644
index c7728c62082204672c45268fcdc1be0af9d37837..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/address_list_over_arrow.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/address_list_over_bg.gif b/app/design/adminhtml/magento_basic/images/address_list_over_bg.gif
deleted file mode 100644
index d72815959aa3ade84e8c15a9f10931b36a4e27c3..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/address_list_over_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/ajax-loader-tr.gif b/app/design/adminhtml/magento_basic/images/ajax-loader-tr.gif
deleted file mode 100644
index efb7ba77049448a34cd45c8509e5c63f8ac5fb5b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/ajax-loader-tr.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/ajax-loader.gif b/app/design/adminhtml/magento_basic/images/ajax-loader.gif
deleted file mode 100644
index b525a23bdbb3fecbfac17c7d498decfa5b45f18b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/ajax-loader.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/application_view_tile.gif b/app/design/adminhtml/magento_basic/images/application_view_tile.gif
deleted file mode 100644
index 8965c0e108e084cdf2b8e69d7fc854acb9368317..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/application_view_tile.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/arrow_sort_move.gif b/app/design/adminhtml/magento_basic/images/arrow_sort_move.gif
deleted file mode 100644
index 9dcb050136e8cf86e8a015525a88f6dcec6055d9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/arrow_sort_move.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/bg_collapse.gif b/app/design/adminhtml/magento_basic/images/bg_collapse.gif
deleted file mode 100644
index 5d21686469609c21366b9fdf80e6bc92c65279fe..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/bg_collapse.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/bg_create_order_totals.gif b/app/design/adminhtml/magento_basic/images/bg_create_order_totals.gif
deleted file mode 100644
index 3852cfcd1ee3f0ec61782b7f5a57022ab9e0e909..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/bg_create_order_totals.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/bg_notifications.gif b/app/design/adminhtml/magento_basic/images/bg_notifications.gif
deleted file mode 100644
index fb47f6ea7a71bdba54e06b1f26cc5cf688d32cd6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/bg_notifications.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/bg_window_mask.png b/app/design/adminhtml/magento_basic/images/bg_window_mask.png
deleted file mode 100644
index 1824283aa64469e44d7104aa9ccc2c244635f0be..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/bg_window_mask.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/bkg_btn-close.gif b/app/design/adminhtml/magento_basic/images/bkg_btn-close.gif
deleted file mode 100644
index 11299fabad2143ea57c17ee0c9669245681ddaac..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/bkg_btn-close.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/bkg_btn-close2.gif b/app/design/adminhtml/magento_basic/images/bkg_btn-close2.gif
deleted file mode 100644
index 24f6252a98ecae743f826b0eb6ddc9b800c909a2..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/bkg_btn-close2.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/bkg_search-magnifier.png b/app/design/adminhtml/magento_basic/images/bkg_search-magnifier.png
deleted file mode 100644
index cc7a26f8b8f7bf643a8ae437686ca8e96ded9f25..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/bkg_search-magnifier.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/blank.gif b/app/design/adminhtml/magento_basic/images/blank.gif
deleted file mode 100644
index d6e9b014cef6741099e49b0427b487030f3d224a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/blank.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/box_bg.gif b/app/design/adminhtml/magento_basic/images/box_bg.gif
deleted file mode 100644
index 8b51ee0882f8cb89a38f9b5493d4ae64ba61b185..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/box_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/breadcrumb_bg.gif b/app/design/adminhtml/magento_basic/images/breadcrumb_bg.gif
deleted file mode 100644
index 9e82a9099c0e63154a22f34d5bd7bcab71265737..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/breadcrumb_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-image_icon.gif b/app/design/adminhtml/magento_basic/images/btn_add-image_icon.gif
deleted file mode 100644
index 85d971ade82a568d8d93d10f5d367a10be8be94d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_add-image_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-variable_icon.gif b/app/design/adminhtml/magento_basic/images/btn_add-variable_icon.gif
deleted file mode 100644
index 7f50e6fd7731a2350159d96688cd973211780cfe..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_add-variable_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-widget_icon.gif b/app/design/adminhtml/magento_basic/images/btn_add-widget_icon.gif
deleted file mode 100644
index 2c06933eebbc0db35ff3a6b2bfc5aea563e7e252..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_add-widget_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-widget_icon2.gif b/app/design/adminhtml/magento_basic/images/btn_add-widget_icon2.gif
deleted file mode 100644
index 75055bb71450923311468f9384d57385c2a6e778..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_add-widget_icon2.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_back_bg.gif b/app/design/adminhtml/magento_basic/images/btn_back_bg.gif
deleted file mode 100644
index 0824ca688214ff331a7bee26a4e9694b81de487a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_back_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_bare_bg.gif b/app/design/adminhtml/magento_basic/images/btn_bare_bg.gif
deleted file mode 100644
index 24fc5ba5a63031e8feba479d1dc9d8fc5c48e699..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_bare_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_bg-disabled.gif b/app/design/adminhtml/magento_basic/images/btn_bg-disabled.gif
deleted file mode 100644
index 3ec0b3154e91aa06087ec36eecd180e03af0d54d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_bg-disabled.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_bg.png b/app/design/adminhtml/magento_basic/images/btn_bg.png
deleted file mode 100644
index 09448f4ab3b0cb2f2b87d0c31fd883a99fa0c490..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_cancel_bg.gif b/app/design/adminhtml/magento_basic/images/btn_cancel_bg.gif
deleted file mode 100644
index a3d92e461f740967cc32aab47fb157ad0b0a5756..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_cancel_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_delete_bg.gif b/app/design/adminhtml/magento_basic/images/btn_delete_bg.gif
deleted file mode 100644
index b0cbd8337dba2f9d4f77169872ee13800895a8f7..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_delete_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_go.gif b/app/design/adminhtml/magento_basic/images/btn_go.gif
deleted file mode 100644
index 30f87d685dd3e9dc8bd02c619026c49200649d7e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_go.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_gr_bg.gif b/app/design/adminhtml/magento_basic/images/btn_gr_bg.gif
deleted file mode 100644
index d91a78b537f489ee43baeef28397625dace4b425..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_gr_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_gr_on.gif b/app/design/adminhtml/magento_basic/images/btn_gr_on.gif
deleted file mode 100644
index b9f7bdeedbf052964092bed39af7ceca9ed05e05..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_gr_on.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_gr_over.gif b/app/design/adminhtml/magento_basic/images/btn_gr_over.gif
deleted file mode 100644
index 73afeb6200c4dd4752393730b631114da01382a0..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_gr_over.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_loading-icon.gif b/app/design/adminhtml/magento_basic/images/btn_loading-icon.gif
deleted file mode 100644
index 7735ef6e5798b95dff4bb9620eaf72c326b5037b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_loading-icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_login.gif b/app/design/adminhtml/magento_basic/images/btn_login.gif
deleted file mode 100644
index 93ed65b587745368989f298dc3720f56b2cfee97..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_login.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_show-hide_icon.gif b/app/design/adminhtml/magento_basic/images/btn_show-hide_icon.gif
deleted file mode 100644
index 6670833a4102376c32b151e2eccff5a32903e1b5..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_show-hide_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/btn_task_bg.gif b/app/design/adminhtml/magento_basic/images/btn_task_bg.gif
deleted file mode 100644
index 87280126cb087ad7bb2bd3a0c3d88bc86a49b78d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/btn_task_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/button-close.png b/app/design/adminhtml/magento_basic/images/button-close.png
deleted file mode 100644
index b02bc1d33bbb753badbf7399d20462dd1fe685c8..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/button-close.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_active_bg.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_active_bg.gif
deleted file mode 100644
index add491809bafe88cf98604dc059328c7c1b3552c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/cancel_btn_active_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_bg.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_bg.gif
deleted file mode 100644
index d52fb2562c179f483538b59f0433a257946b48ee..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/cancel_btn_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_icon.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_icon.gif
deleted file mode 100644
index 976481765e1d64550717dd6ce8cdbadcddfdeeb6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/cancel_btn_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_over_bg.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_over_bg.gif
deleted file mode 100644
index d24eb118385de13c4b91f7c0f362b6b01e7267eb..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/cancel_btn_over_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/cancel_icon.gif b/app/design/adminhtml/magento_basic/images/cancel_icon.gif
deleted file mode 100644
index 1fd7cfd6a23b77660711f95400ae18e9495bf9d3..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/cancel_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/config_tab_dt_bg.gif b/app/design/adminhtml/magento_basic/images/config_tab_dt_bg.gif
deleted file mode 100644
index 376d898333859ae80ed830551245c8ffb64ccd65..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/config_tab_dt_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/dashboard-close.gif b/app/design/adminhtml/magento_basic/images/dashboard-close.gif
deleted file mode 100644
index c4b6bbc9f7fa4fda2c9fd2c98799fce3c5011a66..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/dashboard-close.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-bg.gif
deleted file mode 100644
index 5781f67e63c0fb4991fe8df7349e22e8a7fd1847..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-graph-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-bottom-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-bottom-bg.gif
deleted file mode 100644
index fca47802095681aacb2dbbeb9dec5f9b914bea8f..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-graph-bottom-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-line-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-line-bg.gif
deleted file mode 100644
index 17b2e7b23fb16fffaace705471bc25a40a0e68eb..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-graph-line-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-line2-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-line2-bg.gif
deleted file mode 100644
index c10bde98dba48117836d15a93b08e165930d6e37..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-graph-line2-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-x-bg.png b/app/design/adminhtml/magento_basic/images/db-graph-x-bg.png
deleted file mode 100644
index 1f983cd9f0786ba2b296ee512be51cd7fb8478a3..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-graph-x-bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-header-bg.png b/app/design/adminhtml/magento_basic/images/db-header-bg.png
deleted file mode 100644
index 1dd4993fd49bc5732a2cd3ee8fd691a0392dea6e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-header-bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-bg-hov.gif b/app/design/adminhtml/magento_basic/images/db-menu-bg-hov.gif
deleted file mode 100644
index ea7b7bd2d7a02287a4e7192ab654015d9b5d7c1f..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-menu-bg-hov.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-bg-up.gif b/app/design/adminhtml/magento_basic/images/db-menu-bg-up.gif
deleted file mode 100644
index 59ca66db0b856aebb294a0a075616c75185efd50..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-menu-bg-up.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-bg.gif b/app/design/adminhtml/magento_basic/images/db-menu-bg.gif
deleted file mode 100644
index 5bba621a810b9c03e7d66acf5a082ffb786a1882..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-menu-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-sep-last.gif b/app/design/adminhtml/magento_basic/images/db-menu-sep-last.gif
deleted file mode 100644
index 998916da9c8c4cea36fee440cecd5253103e842d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-menu-sep-last.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-sep.gif b/app/design/adminhtml/magento_basic/images/db-menu-sep.gif
deleted file mode 100644
index c8974d8ca4db39e972f0ec5e788090ecbcc6f893..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-menu-sep.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-start.gif b/app/design/adminhtml/magento_basic/images/db-menu-start.gif
deleted file mode 100644
index 11ef78430b8197e0d5307a42870b86b6f6cd22f5..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-menu-start.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-bg.gif b/app/design/adminhtml/magento_basic/images/db-scroll-bg.gif
deleted file mode 100644
index 2208140ec50f887a585949f72bea0755ed7a4687..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-scroll-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-bot-roll.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-bot-roll.png
deleted file mode 100644
index b52d7868e4b375b1f5ae7cec5559a0306ca3b1db..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-scroll-but-bot-roll.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-bot.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-bot.png
deleted file mode 100644
index 25f9da7ac20273a378fd48b0a10c4cbfc8816b54..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-scroll-but-bot.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-top-roll.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-top-roll.png
deleted file mode 100644
index f3e5f229b82f9cf69f4a670dfb2782ea1dfca596..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-scroll-but-top-roll.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-top.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-top.png
deleted file mode 100644
index 51a1bcabcc0baeb84616ecae61b53e0d9a451c6a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-scroll-but-top.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-roller.png b/app/design/adminhtml/magento_basic/images/db-scroll-roller.png
deleted file mode 100644
index 55d53b9225b76eb64508979a85e19630635f22cb..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-scroll-roller.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-bottom-left-bg.gif b/app/design/adminhtml/magento_basic/images/db-tab-bottom-left-bg.gif
deleted file mode 100644
index e8725966d7d2e8fe38580bd0a26ae92512b5b3df..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-bottom-left-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-bottom-mid-bg.gif b/app/design/adminhtml/magento_basic/images/db-tab-bottom-mid-bg.gif
deleted file mode 100644
index 8464f9a18272673469b17dac2827319751f2d931..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-bottom-mid-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-bottom-right-bg.gif b/app/design/adminhtml/magento_basic/images/db-tab-bottom-right-bg.gif
deleted file mode 100644
index d4cca0057dd7a01f3b31a6541098dbd22ef98431..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-bottom-right-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-footer.gif b/app/design/adminhtml/magento_basic/images/db-tab-footer.gif
deleted file mode 100644
index 615cb2ca21bd9197364cb534d9f91ec6c3a2ad86..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-footer.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-header-sep.gif b/app/design/adminhtml/magento_basic/images/db-tab-header-sep.gif
deleted file mode 100644
index 038f92c4a48190fd8cb039cf442ebd4ef22b325b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-header-sep.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-header.gif b/app/design/adminhtml/magento_basic/images/db-tab-header.gif
deleted file mode 100644
index 572aa19741ad550b3a0fbaf432a8dae9a3959d7f..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-header.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-left.gif b/app/design/adminhtml/magento_basic/images/db-tab-left.gif
deleted file mode 100644
index cf39fda5a86ffb37bae798266e924fcb892ef2a6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-left.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-right.gif b/app/design/adminhtml/magento_basic/images/db-tab-right.gif
deleted file mode 100644
index 435a9e572b4783114932a72de12d309062d7fbd9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/db-tab-right.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/dotted_divider_dark.gif b/app/design/adminhtml/magento_basic/images/dotted_divider_dark.gif
deleted file mode 100644
index b4f6c700caf1bc98066c5dc1cbdb4839c0e1a9ca..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/dotted_divider_dark.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/dotted_divider_light.gif b/app/design/adminhtml/magento_basic/images/dotted_divider_light.gif
deleted file mode 100644
index 538a9262ae8dd234af9e6f086985fe6a110c1f8c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/dotted_divider_light.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/edit_icon.gif b/app/design/adminhtml/magento_basic/images/edit_icon.gif
deleted file mode 100644
index 8b277aa621877b1cd10e1dddb8d57244334f60f1..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/edit_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down.gif
deleted file mode 100644
index ea3aba2a2c61869a2b69f2cae7c8c01fe210a9fa..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down2.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down2.gif
deleted file mode 100644
index 47ff52de0c6bb3025d972fe99ba16be82bca7a43..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down2.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_up.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_up.gif
deleted file mode 100644
index 4f0f11cf45bd67e43b595c1f1a1a2114e06f6e20..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_up.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_bg.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_bg.gif
deleted file mode 100644
index 1f6d083278fbfe22c9c885eb7f20685fe41e6486..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/entry_edit_head_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/error-msg.png b/app/design/adminhtml/magento_basic/images/error-msg.png
deleted file mode 100644
index d9607f0e83875deb0dad0f93bea6301677960790..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/error-msg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_account.gif b/app/design/adminhtml/magento_basic/images/fam_account.gif
deleted file mode 100644
index 5ec10006ff2053cd14b81fc3ec169685801c0ae0..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_account.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_application_form_delete.png b/app/design/adminhtml/magento_basic/images/fam_application_form_delete.png
deleted file mode 100644
index cd305ec83b6a7560de21a287fa7a780bad893efe..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_application_form_delete.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_application_view_tile.gif b/app/design/adminhtml/magento_basic/images/fam_application_view_tile.gif
deleted file mode 100644
index 8965c0e108e084cdf2b8e69d7fc854acb9368317..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_application_view_tile.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_asterisk_orange.gif b/app/design/adminhtml/magento_basic/images/fam_asterisk_orange.gif
deleted file mode 100644
index 46d8baecbcc17c8899d6545c1779d367bee92167..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_asterisk_orange.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_bin.gif b/app/design/adminhtml/magento_basic/images/fam_bin.gif
deleted file mode 100644
index 3cf0aaf9be82f283fef99812ef18ac6ecb6555e9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_bin.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_bullet_disk.gif b/app/design/adminhtml/magento_basic/images/fam_bullet_disk.gif
deleted file mode 100644
index d72c413e8ef9454af8bb2fbf526bc9a8161979db..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_bullet_disk.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_calendar.gif b/app/design/adminhtml/magento_basic/images/fam_calendar.gif
deleted file mode 100644
index 3721980f9effac8fab7d947f5f324324776bfa6c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_calendar.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_cart.gif b/app/design/adminhtml/magento_basic/images/fam_cart.gif
deleted file mode 100644
index 7612ea22cd3f66e09b17d706dfa1d260acff4e53..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_cart.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_comment.gif b/app/design/adminhtml/magento_basic/images/fam_comment.gif
deleted file mode 100644
index b2013a17f06ca25400f71973d6d25a190b1ac8b7..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_comment.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_creditcards.gif b/app/design/adminhtml/magento_basic/images/fam_creditcards.gif
deleted file mode 100644
index 86996b7b20425c48c7bff5feb24c25c85ad8cd30..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_creditcards.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_folder_database.gif b/app/design/adminhtml/magento_basic/images/fam_folder_database.gif
deleted file mode 100644
index 0d78a5a0cad0331b2c8719ccb4a4e61ca104fbef..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_folder_database.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_folder_palette.gif b/app/design/adminhtml/magento_basic/images/fam_folder_palette.gif
deleted file mode 100644
index 9f170d1467acd993539cf9f6c16cf23f8d0c196a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_folder_palette.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_folder_table.gif b/app/design/adminhtml/magento_basic/images/fam_folder_table.gif
deleted file mode 100644
index 13acdab3371e5bde473b3297358eb2ccf7491f31..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_folder_table.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_group.gif b/app/design/adminhtml/magento_basic/images/fam_group.gif
deleted file mode 100644
index bef3d22b9c7909ec88fd9b1b339dcff38481763a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_group.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_help.gif b/app/design/adminhtml/magento_basic/images/fam_help.gif
deleted file mode 100644
index b57481ff1bb85202f9653fb6a454471d34ea43de..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_help.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_house.gif b/app/design/adminhtml/magento_basic/images/fam_house.gif
deleted file mode 100644
index 3f9d5fc055343d146587cd8330862d5356ae660b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_house.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_layout.gif b/app/design/adminhtml/magento_basic/images/fam_layout.gif
deleted file mode 100644
index c2172ded0e10cc6e00c208c90acd2bdf9dc67366..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_layout.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_leaf.png b/app/design/adminhtml/magento_basic/images/fam_leaf.png
deleted file mode 100644
index 9cd988dfb177b2f344368a0a2c8a0e2b551f1cda..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_leaf.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_link.gif b/app/design/adminhtml/magento_basic/images/fam_link.gif
deleted file mode 100644
index 42467ac442ae26f1401e423e8e033c04b5b65dbe..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_link.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_lorry.gif b/app/design/adminhtml/magento_basic/images/fam_lorry.gif
deleted file mode 100644
index b902ce12c782b0bbb77844a736da011a98b9079d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_lorry.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_money.gif b/app/design/adminhtml/magento_basic/images/fam_money.gif
deleted file mode 100644
index ab0babcbfe58ca586a82f70ffb47099c63b78420..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_money.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_money_add.gif b/app/design/adminhtml/magento_basic/images/fam_money_add.gif
deleted file mode 100644
index 1f9dc6bf223a5510a25b134227bb699ab4798efa..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_money_add.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_monitor.gif b/app/design/adminhtml/magento_basic/images/fam_monitor.gif
deleted file mode 100644
index 299ec4fb3c47d7e5692cb45721ca36522d8759b6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_monitor.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper.gif
deleted file mode 100644
index a0d25bb53601a303a26be755fef08ea991f3a685..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_newspaper.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper_delete.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper_delete.gif
deleted file mode 100644
index dd1fce9c454f3347c43aae563eb90db3f233677e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_newspaper_delete.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper_error.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper_error.gif
deleted file mode 100644
index 5a48a701cca2aa7427f9055c2bc646a07f4c7f60..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_newspaper_error.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper_go.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper_go.gif
deleted file mode 100644
index db3b7e32bdafe3ab6af710826489543215a625c7..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_newspaper_go.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_package.gif b/app/design/adminhtml/magento_basic/images/fam_package.gif
deleted file mode 100644
index b5d50708d8e80fa17ae19dfdad7e9ddb84ac18a8..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_package.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_package_go.gif b/app/design/adminhtml/magento_basic/images/fam_package_go.gif
deleted file mode 100644
index 70f05046d8d74b31d50afb52024fdc9d786d930d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_package_go.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_page_white.gif b/app/design/adminhtml/magento_basic/images/fam_page_white.gif
deleted file mode 100644
index a572f4589cee4941173e80c4481dd436e8def9de..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_page_white.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_page_white_edit.gif b/app/design/adminhtml/magento_basic/images/fam_page_white_edit.gif
deleted file mode 100644
index be24b456bc8122f6acfe0d6009403ac5d848e310..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_page_white_edit.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_rainbow.gif b/app/design/adminhtml/magento_basic/images/fam_rainbow.gif
deleted file mode 100644
index a0b0a53a48495543f808a0d17545655253936cd9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_rainbow.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_refresh.gif b/app/design/adminhtml/magento_basic/images/fam_refresh.gif
deleted file mode 100644
index 14b878b452a210e9fce59948ae9714c24aa66928..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_refresh.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_server_database.gif b/app/design/adminhtml/magento_basic/images/fam_server_database.gif
deleted file mode 100644
index 6f4f4c7c04e259beec1482a2631137d870215ff4..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_server_database.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_status_online.gif b/app/design/adminhtml/magento_basic/images/fam_status_online.gif
deleted file mode 100644
index c77eb38b267f05d7281ce611c4b02c14ab19f2c6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_status_online.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_tag_orange.gif b/app/design/adminhtml/magento_basic/images/fam_tag_orange.gif
deleted file mode 100644
index e039fd2535cd66ad9074f119aa2e46ab0b46e53b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_tag_orange.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_user.gif b/app/design/adminhtml/magento_basic/images/fam_user.gif
deleted file mode 100644
index 3ff9b77784d71faf5e41d3f41487c4c8de0c9282..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_user.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_user_comment.gif b/app/design/adminhtml/magento_basic/images/fam_user_comment.gif
deleted file mode 100644
index eb244381421b04bac7d1963f6c6353a37437c557..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_user_comment.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/fam_user_edit.gif b/app/design/adminhtml/magento_basic/images/fam_user_edit.gif
deleted file mode 100644
index 338eed2173c6221d82f65ab99e2cedbf34f5103b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/fam_user_edit.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/filter_row_bg.gif b/app/design/adminhtml/magento_basic/images/filter_row_bg.gif
deleted file mode 100644
index d284f0f0a776a56a6e78b3cda0333f74e31e394b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/filter_row_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/footer_bg.gif b/app/design/adminhtml/magento_basic/images/footer_bg.gif
deleted file mode 100644
index d5b9d37c2d0d513ab5e1c8a518d479d408991e82..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/footer_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/gift-message-collapse.gif b/app/design/adminhtml/magento_basic/images/gift-message-collapse.gif
deleted file mode 100644
index 8270754504773d094fe4dd89003b375821f70ae5..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/gift-message-collapse.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/gift-message-expand.gif b/app/design/adminhtml/magento_basic/images/gift-message-expand.gif
deleted file mode 100644
index 888fde5f5ee7f54db215d8ff0e86baf5532cef1b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/gift-message-expand.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/gift-message-grid-column-bg.gif b/app/design/adminhtml/magento_basic/images/gift-message-grid-column-bg.gif
deleted file mode 100644
index 7edcc8bb1a3937c6303cb4522bb749071b62803a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/gift-message-grid-column-bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/grid-cal.gif b/app/design/adminhtml/magento_basic/images/grid-cal.gif
deleted file mode 100644
index d0235c7e023cab8100e0916375dabeca2f4b478c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/grid-cal.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/grid_sort_asc.gif b/app/design/adminhtml/magento_basic/images/grid_sort_asc.gif
deleted file mode 100644
index 1136ddcfd69a98e88efe098c82e437b8428e6bf7..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/grid_sort_asc.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/grid_sort_desc.gif b/app/design/adminhtml/magento_basic/images/grid_sort_desc.gif
deleted file mode 100644
index d6349fefe91c4c245e930d8d938375975cefcda9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/grid_sort_desc.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/grid_th_bg.gif b/app/design/adminhtml/magento_basic/images/grid_th_bg.gif
deleted file mode 100644
index 8ccc66e7ba9e92789d5d6fcc3fcb3cc32ba11a60..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/grid_th_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/grid_th_onclick_bg.gif b/app/design/adminhtml/magento_basic/images/grid_th_onclick_bg.gif
deleted file mode 100644
index 3bf5e263bdbfc5fbd858543ef93858101ec0d4f5..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/grid_th_onclick_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/grouped_to_order_icon.png b/app/design/adminhtml/magento_basic/images/grouped_to_order_icon.png
deleted file mode 100644
index d7e92ab9935186870f484411e687d8802baae010..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/grouped_to_order_icon.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/header_bg.gif b/app/design/adminhtml/magento_basic/images/header_bg.gif
deleted file mode 100644
index 591ae51eee22207354caee6cccc661cab3982a09..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/header_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/header_top_bg.gif b/app/design/adminhtml/magento_basic/images/header_top_bg.gif
deleted file mode 100644
index 47e9a5762994c991dbac829d337d7399a16dc8ad..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/header_top_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/horiz_tabs_ul_bg.gif b/app/design/adminhtml/magento_basic/images/horiz_tabs_ul_bg.gif
deleted file mode 100644
index 672fbfb34d24c16daef66c64920e91f06cc4c4e5..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/horiz_tabs_ul_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/i_notice.gif b/app/design/adminhtml/magento_basic/images/i_notice.gif
deleted file mode 100644
index 17733eff3fa73171ffbce8254fa0b368d940b74d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/i_notice.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/i_question-mark.png b/app/design/adminhtml/magento_basic/images/i_question-mark.png
deleted file mode 100644
index 889bf696e2fdac4c51300a90ef6a5dec6b09d7cd..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/i_question-mark.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/ico_success.gif b/app/design/adminhtml/magento_basic/images/ico_success.gif
deleted file mode 100644
index f1bce8e97421cf082c0db06da3c9567fdf34c29f..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/ico_success.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon-tooltip.png b/app/design/adminhtml/magento_basic/images/icon-tooltip.png
deleted file mode 100644
index c9b1ce706b28e091341268307c7102206790f9a3..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon-tooltip.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_add.gif b/app/design/adminhtml/magento_basic/images/icon_btn_add.gif
deleted file mode 100644
index 0c7645a983d3a86c2c625aa65fc58573c07180dc..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_btn_add.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_back.gif b/app/design/adminhtml/magento_basic/images/icon_btn_back.gif
deleted file mode 100644
index a59ed3984560b0b31b9cca8191f363cbfc808b7d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_btn_back.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_delete.gif b/app/design/adminhtml/magento_basic/images/icon_btn_delete.gif
deleted file mode 100644
index 458068dfaa73d48ebb73040317b1e74e399edafd..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_btn_delete.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_save.gif b/app/design/adminhtml/magento_basic/images/icon_btn_save.gif
deleted file mode 100644
index 87a9815b4975e0ddea63c6e57705e5196528fec8..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_btn_save.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_edit_address.gif b/app/design/adminhtml/magento_basic/images/icon_edit_address.gif
deleted file mode 100644
index 78e7bbb1e50713fe0ef63ff626b7f8955707b86f..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_edit_address.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_export.gif b/app/design/adminhtml/magento_basic/images/icon_export.gif
deleted file mode 100644
index e9fcf7cc93e0b1d7a036fa58f452b4b8c56d2f8b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_export.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_export.png b/app/design/adminhtml/magento_basic/images/icon_export.png
deleted file mode 100644
index 34a736f70261338c9bca98c38b78193740fa83a0..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_export.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_feed.gif b/app/design/adminhtml/magento_basic/images/icon_feed.gif
deleted file mode 100644
index 6ed34f093bbf7caf0a5d37a7e914a392cd7cf494..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_feed.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_feed.png b/app/design/adminhtml/magento_basic/images/icon_feed.png
deleted file mode 100644
index c20804da936c01478d75e4b7a1031941ff420d66..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_feed.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_note_list.gif b/app/design/adminhtml/magento_basic/images/icon_note_list.gif
deleted file mode 100644
index 5327e200559188c20ab46c2489f76c60088eb5a4..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_note_list.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/icon_remove_address.gif b/app/design/adminhtml/magento_basic/images/icon_remove_address.gif
deleted file mode 100644
index e9e3b92c2eaf9ec4fd75c53853101db300d946ea..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/icon_remove_address.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/loader-small.gif b/app/design/adminhtml/magento_basic/images/loader-small.gif
deleted file mode 100644
index 62feaa6c3c85d98a0d6f81d9a75fe837d6243bbb..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/loader-small.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bg.gif b/app/design/adminhtml/magento_basic/images/login_box_bg.gif
deleted file mode 100644
index b15f180d93b760d4640d0f960cac0fe1c0e1772c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/login_box_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bg.jpg b/app/design/adminhtml/magento_basic/images/login_box_bg.jpg
deleted file mode 100644
index 3ad1f5d0928955529d285278f259f8435444bb0b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/login_box_bg.jpg and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bg_auth.jpg b/app/design/adminhtml/magento_basic/images/login_box_bg_auth.jpg
deleted file mode 100644
index 8f7f13689d0914ef2aa95b2de791e53308d76b0a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/login_box_bg_auth.jpg and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bottom.jpg b/app/design/adminhtml/magento_basic/images/login_box_bottom.jpg
deleted file mode 100644
index 9db375bbe6d402e5a4d809964287804f33aa4170..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/login_box_bottom.jpg and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/login_box_legal_bg.gif b/app/design/adminhtml/magento_basic/images/login_box_legal_bg.gif
deleted file mode 100644
index 79b1ad4f0e626f7aaf3d6e750e17b0beb80b83dd..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/login_box_legal_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/login_logo.gif b/app/design/adminhtml/magento_basic/images/login_logo.gif
deleted file mode 100644
index 3141a687bc46c60891cd553e46655548e7061fd9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/login_logo.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/logo-large.gif b/app/design/adminhtml/magento_basic/images/logo-large.gif
deleted file mode 100644
index 1aefe01b5bb6038cba4b740d17495ade777309ad..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/logo-large.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/logo.gif b/app/design/adminhtml/magento_basic/images/logo.gif
deleted file mode 100644
index 822079d8fc66b8aead86e7ad90c74b1005d063ed..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/logo.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/massaction_bg.gif b/app/design/adminhtml/magento_basic/images/massaction_bg.gif
deleted file mode 100644
index 3c29ce38edbc950edccd668edcde3f52a8c52287..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/massaction_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/massaction_button_bg.gif b/app/design/adminhtml/magento_basic/images/massaction_button_bg.gif
deleted file mode 100644
index b45618a99a2dbd04722f71f256b3282a65d57367..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/massaction_button_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/massaction_links_delimiter.gif b/app/design/adminhtml/magento_basic/images/massaction_links_delimiter.gif
deleted file mode 100644
index 489fce6932f9444d07e179105f4875840a8a2e9e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/massaction_links_delimiter.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/middle_bg.gif b/app/design/adminhtml/magento_basic/images/middle_bg.gif
deleted file mode 100644
index f44ad896d43909b91aa8b89ea8487d444faaa7de..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/middle_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/more_arrow.gif b/app/design/adminhtml/magento_basic/images/more_arrow.gif
deleted file mode 100644
index 38274038067bcc9939437f77351cca250ab0597f..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/more_arrow.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav1_active.gif b/app/design/adminhtml/magento_basic/images/nav1_active.gif
deleted file mode 100644
index cda58c6b3fdad22a1e1bb85af444013c29820b8b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav1_active.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav1_bg.gif b/app/design/adminhtml/magento_basic/images/nav1_bg.gif
deleted file mode 100644
index f04614925d0d42c6d481d31c5260325e7374f44d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav1_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav1_off.gif b/app/design/adminhtml/magento_basic/images/nav1_off.gif
deleted file mode 100644
index 2284d977a6a1d115775932c639ca9b0f9becc08b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav1_off.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav1_on.gif b/app/design/adminhtml/magento_basic/images/nav1_on.gif
deleted file mode 100644
index cda58c6b3fdad22a1e1bb85af444013c29820b8b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav1_on.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav1_over.gif b/app/design/adminhtml/magento_basic/images/nav1_over.gif
deleted file mode 100644
index 2878e7fb750a2577234a4225d60230ce4fa22b63..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav1_over.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav1_sep.gif b/app/design/adminhtml/magento_basic/images/nav1_sep.gif
deleted file mode 100644
index 2284d977a6a1d115775932c639ca9b0f9becc08b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav1_sep.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav2_last_li_bg.png b/app/design/adminhtml/magento_basic/images/nav2_last_li_bg.png
deleted file mode 100644
index 9d116872d15b83ee9adee54d4a96bbd088d168e8..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav2_last_li_bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav2_last_li_over_bg.png b/app/design/adminhtml/magento_basic/images/nav2_last_li_over_bg.png
deleted file mode 100644
index 7103bc834431337e59447137823ebbcf6eb65cca..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav2_last_li_over_bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav2_li_bg.gif b/app/design/adminhtml/magento_basic/images/nav2_li_bg.gif
deleted file mode 100644
index 7d89746e9679208d8a53813028d15b221eafe3fb..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav2_li_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav2_li_bg.png b/app/design/adminhtml/magento_basic/images/nav2_li_bg.png
deleted file mode 100644
index c943091ad941751a5381c89ba603c2683877e04d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav2_li_bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav2_li_over_bg.png b/app/design/adminhtml/magento_basic/images/nav2_li_over_bg.png
deleted file mode 100644
index 06822f953b3c9e131caf5ee4e934c5ecd8704edd..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav2_li_over_bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav2_link_bg.gif b/app/design/adminhtml/magento_basic/images/nav2_link_bg.gif
deleted file mode 100644
index 0af1f607e58017178caf50977560620be4f1499b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav2_link_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav2_parent_arrow.gif b/app/design/adminhtml/magento_basic/images/nav2_parent_arrow.gif
deleted file mode 100644
index 591c49a3036bb7a33747437cac05dd376bca739b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav2_parent_arrow.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav3_bg.png b/app/design/adminhtml/magento_basic/images/nav3_bg.png
deleted file mode 100644
index 96793a4007eb26a0da3e0165d09035c843dd656e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav3_bg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav_bg.gif b/app/design/adminhtml/magento_basic/images/nav_bg.gif
deleted file mode 100644
index e013b09f3bf4802513500b8a252818dbea14886b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav_list_bg.gif b/app/design/adminhtml/magento_basic/images/nav_list_bg.gif
deleted file mode 100644
index cf42c6543d5e51b0ff9f019dde08fdfd8095650b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav_list_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav_nest_link_bg.gif b/app/design/adminhtml/magento_basic/images/nav_nest_link_bg.gif
deleted file mode 100644
index 7dac4f1ff7307b937fe91404215668dd379fe450..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav_nest_link_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav_nest_link_over_bg.gif b/app/design/adminhtml/magento_basic/images/nav_nest_link_over_bg.gif
deleted file mode 100644
index 8d808d18d56f41495ca7371e62ffef04d641a93c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav_nest_link_over_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav_on_bg.gif b/app/design/adminhtml/magento_basic/images/nav_on_bg.gif
deleted file mode 100644
index 1ba0ba779557bea2861c1b8c315665f92b34d910..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav_on_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/nav_parent_arrow.gif b/app/design/adminhtml/magento_basic/images/nav_parent_arrow.gif
deleted file mode 100644
index f790175fb94643ebedfde1f830594949038f5e79..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/nav_parent_arrow.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/note_bg.gif b/app/design/adminhtml/magento_basic/images/note_bg.gif
deleted file mode 100644
index 9b2d91ad9c5602859247271f013a565fac485834..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/note_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/note_cell_bg.gif b/app/design/adminhtml/magento_basic/images/note_cell_bg.gif
deleted file mode 100644
index b8786a7b9d6a4010a946b6b5b4b44cffa5aef1e6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/note_cell_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/notice-msg.png b/app/design/adminhtml/magento_basic/images/notice-msg.png
deleted file mode 100644
index 0bf433b7e7c1433f10e66992372799f8a126feba..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/notice-msg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_left.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_left.gif
deleted file mode 100644
index c0bb54f39b37b842bfb92ab8cb914fc45119d197..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/pager_arrow_left.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_left_off.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_left_off.gif
deleted file mode 100644
index e057ce0e30cc45efc60e72ea4c53453e4854de8d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/pager_arrow_left_off.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_right.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_right.gif
deleted file mode 100644
index f464481ba14c88214a0c72a6d2b1daf7948279fa..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/pager_arrow_right.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_right_off.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_right_off.gif
deleted file mode 100644
index 95f17d5face7d7d8c00a9c56a00b8b1c4857b934..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/pager_arrow_right_off.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/process_spinner.gif b/app/design/adminhtml/magento_basic/images/process_spinner.gif
deleted file mode 100644
index 0ebe4d8430c58416a60a055eaf8ff7ec318ab653..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/process_spinner.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/product_rating_blank_star.gif b/app/design/adminhtml/magento_basic/images/product_rating_blank_star.gif
deleted file mode 100644
index 72d763388e2359238762f43000e74862cf460e3e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/product_rating_blank_star.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/product_rating_full_star.gif b/app/design/adminhtml/magento_basic/images/product_rating_full_star.gif
deleted file mode 100644
index ab252f8890a191fbcb3b977b5e62c955cd809340..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/product_rating_full_star.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/rule-ajax-loader.gif b/app/design/adminhtml/magento_basic/images/rule-ajax-loader.gif
deleted file mode 100644
index f077a0b27947e17af8fc5ab7bb53f28909622d8b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/rule-ajax-loader.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/rule_chooser_trigger.gif b/app/design/adminhtml/magento_basic/images/rule_chooser_trigger.gif
deleted file mode 100644
index 673d31ad5e03cb1627797ec84ff47a23bed086ff..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/rule_chooser_trigger.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/rule_component_add.gif b/app/design/adminhtml/magento_basic/images/rule_component_add.gif
deleted file mode 100644
index 4032f76a2027f42b04aa0137bd904673092bf4fe..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/rule_component_add.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/rule_component_apply.gif b/app/design/adminhtml/magento_basic/images/rule_component_apply.gif
deleted file mode 100644
index 45c61c3247ae622451c924660b5e0cd19dea1ef8..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/rule_component_apply.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/rule_component_remove.gif b/app/design/adminhtml/magento_basic/images/rule_component_remove.gif
deleted file mode 100644
index 9f2f4edf9ced7be6d4acc662d8730f3612623ffb..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/rule_component_remove.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/save_btn_icon.gif b/app/design/adminhtml/magento_basic/images/save_btn_icon.gif
deleted file mode 100644
index 87a9815b4975e0ddea63c6e57705e5196528fec8..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/save_btn_icon.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sec_nav_bg.gif b/app/design/adminhtml/magento_basic/images/sec_nav_bg.gif
deleted file mode 100644
index d1d4535534e1090d8e0cece56d225733fa131dcf..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sec_nav_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_bg.gif
deleted file mode 100644
index 53ac32a24706c9650b66bc0cd8c46be3d5e5d2e6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/section_menu_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_bottom.gif b/app/design/adminhtml/magento_basic/images/section_menu_bottom.gif
deleted file mode 100644
index 640214713f5dd983abc157642dceb45dbe53e92d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/section_menu_bottom.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_link_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_link_bg.gif
deleted file mode 100644
index 4f5b1e1f4305b9a03628943016cd5a398f300b50..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/section_menu_link_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_link_over_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_link_over_bg.gif
deleted file mode 100644
index be6bc4eefa3476282d9fdfd48e8400fb53ca59b6..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/section_menu_link_over_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_over_span_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_over_span_bg.gif
deleted file mode 100644
index 9f06882b424f433bac8f6d3f1dde2c276467b1f8..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/section_menu_over_span_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_span_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_span_bg.gif
deleted file mode 100644
index 627e9ec35ea28069e2c145439730643903065c3e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/section_menu_span_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_ul_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_ul_bg.gif
deleted file mode 100644
index d1b4d718bd9043805ad8fb6a854838cd7d784ef1..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/section_menu_ul_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/side_col_bg.gif b/app/design/adminhtml/magento_basic/images/side_col_bg.gif
deleted file mode 100644
index 33801a6aec488b94f6e9443a1f85d8b2f3d5d633..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/side_col_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/simple_container_bg.gif b/app/design/adminhtml/magento_basic/images/simple_container_bg.gif
deleted file mode 100644
index 933999856de941409869a654365812bd7695a20e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/simple_container_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-down.gif b/app/design/adminhtml/magento_basic/images/sort-arrow-down.gif
deleted file mode 100644
index 825e492e761b368a980bb35e27d8e11c6971ba34..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sort-arrow-down.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-down.png b/app/design/adminhtml/magento_basic/images/sort-arrow-down.png
deleted file mode 100644
index 74288ad241171966d184847de65e3dfac4a1d7ca..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sort-arrow-down.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-up.gif b/app/design/adminhtml/magento_basic/images/sort-arrow-up.gif
deleted file mode 100644
index ea2ee5ef595016fd77f88d70b259995531c366b9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sort-arrow-up.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-up.png b/app/design/adminhtml/magento_basic/images/sort-arrow-up.png
deleted file mode 100644
index 2863a05111d4aac943777bbd30c5b7fb07d5821f..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sort-arrow-up.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sort_heading_bg.gif b/app/design/adminhtml/magento_basic/images/sort_heading_bg.gif
deleted file mode 100644
index c9642dfdaa9bcc634c18d60612f92b492f99c04e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sort_heading_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sort_on_bg.gif b/app/design/adminhtml/magento_basic/images/sort_on_bg.gif
deleted file mode 100644
index be9ef00458c5c5b7f8bc864128e0b2026739d816..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sort_on_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sort_row_bg.gif b/app/design/adminhtml/magento_basic/images/sort_row_bg.gif
deleted file mode 100644
index a02c2c0205be6131ce43f1663568e2f08d0e9242..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sort_row_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/spacer.gif b/app/design/adminhtml/magento_basic/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/spacer.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/sub_button_bg.gif b/app/design/adminhtml/magento_basic/images/sub_button_bg.gif
deleted file mode 100644
index 17d1bf74d4a3efaf233face6d1507eb236f48bf7..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/sub_button_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/success-msg.png b/app/design/adminhtml/magento_basic/images/success-msg.png
deleted file mode 100644
index 24bfc750a218f5b78a8c3bff6ecb0459db63593d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/success-msg.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tabs_link_bg.gif b/app/design/adminhtml/magento_basic/images/tabs_link_bg.gif
deleted file mode 100644
index 94506909fef67d0cae48ac0a1790836e04ad271a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tabs_link_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tabs_link_over_bg.gif b/app/design/adminhtml/magento_basic/images/tabs_link_over_bg.gif
deleted file mode 100644
index 185af722bb46dfc396892708afdd024b6c2a2354..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tabs_link_over_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tabs_span_bg.gif b/app/design/adminhtml/magento_basic/images/tabs_span_bg.gif
deleted file mode 100644
index 4f5b1e1f4305b9a03628943016cd5a398f300b50..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tabs_span_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tag_blue_edit.gif b/app/design/adminhtml/magento_basic/images/tag_blue_edit.gif
deleted file mode 100644
index 6a9d3700b71250c23501f0c03c71a7f9009de31c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tag_blue_edit.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tn_cancel_bg.gif b/app/design/adminhtml/magento_basic/images/tn_cancel_bg.gif
deleted file mode 100644
index a3d92e461f740967cc32aab47fb157ad0b0a5756..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tn_cancel_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tooltip_bg.gif b/app/design/adminhtml/magento_basic/images/tooltip_bg.gif
deleted file mode 100644
index e4d9e99348ea72d4105793b9702701c1e6a7263a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tooltip_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tooltip_corner.gif b/app/design/adminhtml/magento_basic/images/tooltip_corner.gif
deleted file mode 100644
index f49f64f7fa41b9505fa2699681f04110e85b7e5a..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tooltip_corner.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tooltip_top.gif b/app/design/adminhtml/magento_basic/images/tooltip_top.gif
deleted file mode 100644
index 0e7fd0fa283bff6d0feeaf9a0a3ffd8890788e60..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tooltip_top.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/join.gif b/app/design/adminhtml/magento_basic/images/tree_icons/join.gif
deleted file mode 100644
index 34dd47610a5d7c3580dedc342683559bf77abce2..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tree_icons/join.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/joinbottom.gif b/app/design/adminhtml/magento_basic/images/tree_icons/joinbottom.gif
deleted file mode 100644
index 48b81c80a9e25f6f29e2614aaa33bdf4a4d2881b..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tree_icons/joinbottom.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/line.gif b/app/design/adminhtml/magento_basic/images/tree_icons/line.gif
deleted file mode 100644
index 1a259eea00c330eee85fb18aa64e2e232d5410b1..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tree_icons/line.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/minus.gif b/app/design/adminhtml/magento_basic/images/tree_icons/minus.gif
deleted file mode 100644
index 3d212a97ae0d8f83aa39836c5a85d442f8602553..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tree_icons/minus.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/minusbottom.gif b/app/design/adminhtml/magento_basic/images/tree_icons/minusbottom.gif
deleted file mode 100644
index dc3198be275d3da71011a6cb4fa59b8b94656c8d..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tree_icons/minusbottom.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/nolines_minus.gif b/app/design/adminhtml/magento_basic/images/tree_icons/nolines_minus.gif
deleted file mode 100644
index 2592ac20f3f4c28e38f789309ec52f08505bdf6e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tree_icons/nolines_minus.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/nolines_plus.gif b/app/design/adminhtml/magento_basic/images/tree_icons/nolines_plus.gif
deleted file mode 100644
index f258ce211a0a19c2ecbcb11170b9a8b35ae2436c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/tree_icons/nolines_plus.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/validation_advice_bg.gif b/app/design/adminhtml/magento_basic/images/validation_advice_bg.gif
deleted file mode 100644
index 46b1a2267ba5ad31f59a9c6cd8eaac9ee3b0f8ce..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/validation_advice_bg.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/varien_logo.gif b/app/design/adminhtml/magento_basic/images/varien_logo.gif
deleted file mode 100644
index f24f00c36ddf0018d827dd4b5735987fa2a7b67e..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/varien_logo.gif and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/window_close.png b/app/design/adminhtml/magento_basic/images/window_close.png
deleted file mode 100644
index 6e2b6dfb1d098287e6f7f87f1d2acefcd4a074ec..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/window_close.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/window_content.png b/app/design/adminhtml/magento_basic/images/window_content.png
deleted file mode 100644
index db3c448660b828cfba275f9536f4abb80ab68e03..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/window_content.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/images/window_top.png b/app/design/adminhtml/magento_basic/images/window_top.png
deleted file mode 100644
index d30bc1c89e0827a2873a8804144f648a2cedf883..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/images/window_top.png and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/media/editor.swf b/app/design/adminhtml/magento_basic/media/editor.swf
deleted file mode 100644
index cfb41be837eeda8be10f6c43cb8ed93d05b42625..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/media/editor.swf and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/media/flex.swf b/app/design/adminhtml/magento_basic/media/flex.swf
deleted file mode 100644
index a8ecaa083fbb8b2809da535392eef7ff20b361b4..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/media/flex.swf and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/media/uploader.swf b/app/design/adminhtml/magento_basic/media/uploader.swf
deleted file mode 100644
index 9d176a75f67162985262ba3b178eeb879960596c..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/media/uploader.swf and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/media/uploaderSingle.swf b/app/design/adminhtml/magento_basic/media/uploaderSingle.swf
deleted file mode 100644
index 1d3a0bb9935a0455879958e33ddb06fe47cf3e78..0000000000000000000000000000000000000000
Binary files a/app/design/adminhtml/magento_basic/media/uploaderSingle.swf and /dev/null differ
diff --git a/app/design/adminhtml/magento_basic/menu.css b/app/design/adminhtml/magento_basic/menu.css
deleted file mode 100644
index 19eb0cbbc73876104771e08b4df345b3e85cbc7b..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/menu.css
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-.nav-bar { border-top:1px solid #2d444f; border-bottom:1px solid #2d444f; background:url(images/nav1_bg.gif) repeat-x 0 100% #666e73; padding:0 30px;  }
-
-#nav { float:left; }
-
-/************** ALL LEVELS  *************/ /* Style consistent throughout all nav levels */
-#nav li { position:relative; text-align:left; }
-#nav li.over { z-index:99; }
-#nav li.active { z-index:100; } /* to prevent the li separator from showing through on mouseover on li */
-#nav a,
-#nav a:hover { display:block; text-decoration:none; }
-#nav span { display:block; /*cursor:pointer;*/ }
-#nav a { line-height:1.3em; }
-
-
-/************ 1ST LEVEL  ***************/
-#nav li { float:left; background:url(images/nav1_sep.gif) no-repeat 100% 0;  }
-#nav li.active { margin-left:-1px; background:url(images/nav1_active.gif) no-repeat; color:#fff; font-weight:bold;  }
-#nav li.active em { display:block; position:absolute; top:0; right:-1px; width:3px; height:27px; background:url(images/nav1_active.gif) no-repeat 100% 0; }
-#nav a { float:left; padding:0 14px; color:#fff; line-height:27px; }
-#nav li.over a { color:#d6e2e5; }
-
-
-/************ 1ST LEVEL RESET ************/
-#nav ul li,
-#nav ul li.active { float:none; height:auto; background:none; margin:0; }
-#nav ul a,
-#nav ul a:hover { float:none; padding:0; line-height:1.3em; }
-#nav ul li.over a,
-#nav ul li.over a:hover,
-#nav ul a,
-#nav li.active li { font-weight:normal; }
-
-
-/************ 2ND LEVEL ************/
-#nav ul { position:absolute; width:189px; top:27px; left:-10000px; padding-bottom:3px; border-top:1px solid #2d444f; }
-#nav ul ul  { border-top:0; background:url(images/nav3_bg.png) 0 0 no-repeat; padding-top:2px; left:100px; top:13px; }
-
-/* Show menu */
-#nav li.over ul { left:-1px; }
-#nav li.over ul ul { left:-10000px; }
-#nav li.over ul li.over ul { left:100px; }
-
-#nav ul li { background:url(images/nav2_li_bg.png) repeat-y; padding:0 2px; }
-#nav ul li a { background:#e3ecee; }
-#nav ul li a:hover { background:#d0dfe2; }
-#nav li.over ul a,
-#nav ul li.active a,
-#nav ul li a,
-#nav ul li a:hover { color:#2f2f2f; }
-#nav ul span,
-#nav ul li.last li span { padding:5px 15px; background:url(images/nav2_link_bg.gif) repeat-x 0 100%; }
-#nav ul li.last span,
-#nav ul li.last li.last span { background:none; }
-#nav ul li.last { background:url(images/nav2_last_li_bg.png) no-repeat 0 100%; padding-bottom:3px; }
-
-#nav ul li.parent a,
-#nav ul li.parent li.parent a { background-image:url(images/nav2_parent_arrow.gif); background-position:100% 100%; background-repeat:no-repeat; }
-#nav ul li.parent li a,
-#nav ul li.parent li.parent li a { background-image:none; }
-
-/************ 3RD+ LEVEL ************/
-/* Cursors */
-#nav li.parent a,
-#nav li.parent li.parent a,
-#nav li.parent li.parent li.parent a { cursor:default; }
-
-#nav li.parent li a,
-#nav li.parent li.parent li a,
-#nav li.parent li.parent li.parent li a { cursor:pointer; }
-
-/* Show menu */
-#nav ul ul ul { left:-10000px; }
-#nav li.over ul li.over ul ul { left:-10000px;}
-#nav li.over ul li.over ul li.over ul { left:100px; }
-
-.nav-bar:after { content:"."; display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden;  }
\ No newline at end of file
diff --git a/app/design/adminhtml/magento_basic/print.css b/app/design/adminhtml/magento_basic/print.css
deleted file mode 100644
index 00bb0bad4e1f022999664a3cf6d9f01f02c61a94..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/print.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     default_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-*     { background:none !important; text-align:left !important; }
-html  { margin:0 !important; padding:0 !important; }
-body  { background:#fff !important; font-size:9pt !important; padding:0 !important; margin:0 !important; }
-a     { color:#2976c9 !important; }
-th,td { color:#333 !important;  border-color:#ccc !important; }
-
-.middle { padding:0; }
-
-.header,
-.notification-global,
-.actions,
-.massaction,
-#sales_order_grid_massaction,
-.content-header-floating,
-.content-header .form-buttons,
-.footer { display:none !important; }
diff --git a/app/design/adminhtml/magento_basic/reset.css b/app/design/adminhtml/magento_basic/reset.css
deleted file mode 100644
index 236d9bed19a02ea6d6202f011946a6a171c19dd5..0000000000000000000000000000000000000000
--- a/app/design/adminhtml/magento_basic/reset.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/******************************************/
-/***************** BASE *******************/
-/******************************************/
-
-*                       { margin:0; padding:0; }
-
-body                    { background:#e6e6e6; color:#2f2f2f; font:12px/1.5em Arial, Helvetica, sans-serif;  }
-
-a                       { color:#ea7601; text-decoration:underline; }
-a:hover                 { color:#ea7601; text-decoration:underline; }
-a img                   { border:0; }
-:focus                  { outline:0; }
-
-/* Heading */
-h1, h2, h3, h4          { margin-bottom:.5em; line-height:1.4em; }
-h2                      { font-size:1.7em; }
-h3                      { margin-bottom:.5em; color:#253033; font-size:1.25em; }
-h4                      { margin-bottom:.6em; color:#494848; font-size:1.05em; }
-h5                      { font-size:1.05em; }
-h6                      { font-size:1em; }
-h1 a, h1 a:hover, 
-h2 a, h2 a:hover, 
-h3 a, h3 a:hover,
-h4 a, h4 a:hover        { font-weight:normal; }
-
-/* Table */
-th                      { padding:0; text-align:left; vertical-align:top; }
-td                      { padding:0; vertical-align:top; }
-
-/* Paragraph */
-p, address              { margin-bottom:.5em; }
-address                 { font-style:normal; }
-cite                    { font-style:normal; font-size:10px; }
-q:before, 
-q:after                 { content:'';}
-
-/* Form */
-form                    { display:inline; }
-fieldset                { border:0; }
-legend                  { display:none; display:block !important; height:0; line-height:0; margin:0; overflow:hidden; padding:0; width:0; visibility:hidden; }
-label                   { color:#333; }
-input, select           { vertical-align:middle; }
-textarea                { overflow:auto; }
-
-/* Lists */
-ul,ol                   { list-style:none; }
-dt                      { display:block; }
-
-/* Size */
-small                   { font-size:.9em; }
-big                     { font-size:1.25em; }
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/captcha.js b/app/design/frontend/magento_backup/Magento_Captcha/captcha.js
deleted file mode 100644
index 2f43f664a69f475e715b57f3ecb390bad1bd9cce..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/captcha.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage
- * @package     captcha
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($, undefined) {
-    "use strict";
-    $.widget('mage.captcha', {
-        options: {
-            refreshClass: 'refreshing',
-            reloadSelector: '.captcha-reload',
-            imageSelector: '.captcha-img'
-        },
-
-        /**
-         * Method binds click event to reload image
-         * @private
-         */
-        _create: function() {
-            this.element.on('click', this.options.reloadSelector, $.proxy(this.refresh, this));
-        },
-
-        /**
-         * Method triggeres an AJAX request to refresh the CAPTCHA image
-         * @param e - Event
-         */
-        refresh: function(e) {
-            var reloadImage = $(e.currentTarget);
-            reloadImage.addClass(this.options.refreshClass);
-            $.ajax({
-                url: this.options.url,
-                type: 'post',
-                async:false,
-                dataType: 'json',
-                context: this,
-                data: {
-                    'formId': this.options.type
-                },
-                success: function (response) {
-                    if (response.imgSrc) {
-                        this.element.find(this.options.imageSelector).attr('src', response.imgSrc);
-                    }
-                },
-                complete: function() {
-                    reloadImage.removeClass(this.options.refreshClass);
-                }
-            });
-        }
-    });
-})(jQuery);
-
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/default.phtml b/app/design/frontend/magento_backup/Magento_Captcha/default.phtml
deleted file mode 100644
index 88467e786b48442399d9ca00f7425484b8c12702..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/default.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Captcha
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Captcha\Block\Captcha\DefaultCaptcha */ ?>
-
-<?php /* @var $captcha \Magento\Captcha\Model\ModelInterface */ ?>
-<?php $captcha = $this->getCaptchaModel() ?>
-<li role="<?php echo $this->getFormId()?>">
-    <label for="captcha_<?php echo $this->getFormId() ?>" class="required"><em>*</em><?php echo __('Please enter the letters below')?></label>
-    <div class="input-box captcha">
-        <input name="<?php echo \Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE ?>[<?php echo $this->getFormId()?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?php echo $this->getFormId() ?>" />
-    </div>
-</li>
-<li data-captcha="<?php echo $this->getFormId()?>" id="captcha-container-<?php echo $this->getFormId()?>">
-    <div class="captcha-image">
-        <img class="captcha-reload" src="<?php echo $this->getViewFileUrl('Magento_Captcha::reload.png') ?>" alt="<?php echo __('Reload captcha') ?>">
-        <img class="captcha-img" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>
-        <?php if ($captcha->isCaseSensitive()) :?>
-        <div class="captcha-note">
-            <?php echo __('<strong>Attention</strong>: Captcha is case sensitive.') ?>
-        </div>
-        <?php endif; ?>
-    </div>
-    <script type="text/javascript">//<![CDATA[
-    (function ($) {
-        head.js("<?php echo $this->getViewFileUrl('Magento_Captcha::captcha.js') ?>",function() {
-            $('#captcha-container-<?php echo $this->getFormId()?>').captcha({
-                url: '<?php echo $this->getRefreshUrl()?>',
-                type: '<?php echo $this->getFormId() ?>'
-            });
-        });
-    })(jQuery);
-    //]]></script>
-</li>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml
deleted file mode 100644
index 6084f7595ea6f5570dd918c4cea67d10e7261af9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="checkout.onepage.login">
-        <container name="login.form.additional.info" label="Form Additional Info">
-            <block class="Magento\Captcha\Block\Captcha" name="captcha">
-                <action method="setFormId">
-                    <argument name="formId" xsi:type="string">user_login</argument>
-                </action>
-                <action method="setImgWidth">
-                    <argument name="width" xsi:type="string">230</argument>
-                </action>
-                <action method="setImgHeight">
-                    <argument name="width" xsi:type="string">50</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-    <referenceBlock name="checkout.onepage.billing">
-        <container name="form.additional.info" label="Form Additional Info">
-            <referenceBlock name="head">
-                <block class="Magento\Page\Block\Html\Head\Script" name="magento-captcha-onepage-js">
-                    <arguments>
-                        <argument name="file" xsi:type="string">Magento_Captcha::onepage.js</argument>
-                    </arguments>
-                </block>
-            </referenceBlock>
-            <block class="Magento\Captcha\Block\Captcha" name="captcha.guest.checkout">
-                <action method="setFormId">
-                    <argument name="formId" xsi:type="string">guest_checkout</argument>
-                </action>
-                <action method="setImgWidth">
-                    <argument name="width" xsi:type="string">230</argument>
-                </action>
-                <action method="setImgHeight">
-                    <argument name="width" xsi:type="string">50</argument>
-                </action>
-            </block>
-            <block class="Magento\Captcha\Block\Captcha" name="captcha.register.during.checkout">
-                <action method="setFormId">
-                    <argument name="formId" xsi:type="string">register_during_checkout</argument>
-                </action>
-                <action method="setImgWidth">
-                    <argument name="width" xsi:type="string">230</argument>
-                </action>
-                <action method="setImgHeight">
-                    <argument name="width" xsi:type="string">50</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml
deleted file mode 100644
index de3980ceb3694fda74505879d9564ac4aaa607ac..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="form.additional.info">
-        <block class="Magento\Captcha\Block\Captcha" name="captcha">
-            <action method="setFormId">
-                <argument name="formId" xsi:type="string">contact_us</argument>
-            </action>
-            <action method="setImgWidth">
-                <argument name="width" xsi:type="string">230</argument>
-            </action>
-            <action method="setImgHeight">
-                <argument name="width" xsi:type="string">50</argument>
-            </action>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml
deleted file mode 100644
index 99cb001b740245071b13216dce1bf2e0d7eb7f42..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="customer_form_register">
-        <container name="form.additional.info" label="Form Additional Info">
-            <block class="Magento\Captcha\Block\Captcha" name="captcha">
-                <action method="setFormId">
-                    <argument name="formId" xsi:type="string">user_create</argument>
-                </action>
-                <action method="setImgWidth">
-                    <argument name="width" xsi:type="string">230</argument>
-                </action>
-                <action method="setImgHeight">
-                    <argument name="width" xsi:type="string">50</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml
deleted file mode 100644
index c9abccaf0506db1018eb74ebd7484f1b484760c6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="forgotPassword">
-        <container name="form.additional.info" label="Form Additional Info">
-            <block class="Magento\Captcha\Block\Captcha" name="captcha">
-                <action method="setFormId">
-                    <argument name="formId" xsi:type="string">user_forgotpassword</argument>
-                </action>
-                <action method="setImgWidth">
-                    <argument name="width" xsi:type="string">230</argument>
-                </action>
-                <action method="setImgHeight">
-                    <argument name="width" xsi:type="string">50</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml
deleted file mode 100644
index 160e8839ec5271084368be2d7c99c73e404a7225..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="customer_form_login">
-        <container name="form.additional.info" label="Form Additional Info">
-            <block class="Magento\Captcha\Block\Captcha" name="captcha">
-                <action method="setFormId">
-                    <argument name="formId" xsi:type="string">user_login</argument>
-                </action>
-                <action method="setImgWidth">
-                    <argument name="width" xsi:type="string">230</argument>
-                </action>
-                <action method="setImgHeight">
-                    <argument name="width" xsi:type="string">50</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/onepage.js b/app/design/frontend/magento_backup/Magento_Captcha/onepage.js
deleted file mode 100644
index 3ecfd263a3848028c0541637e14327a5e3632617..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/onepage.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage
- * @package     captcha
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($, window, document) {
-    "use strict";
-    $(document).on("login",function() {
-        $("[data-captcha='guest_checkout'], [data-captcha='register_during_checkout']").hide();
-        $("[role='guest_checkout'], [role='register_during_checkout']").hide();
-        var type = ($("#login\\:guest").is(':checked')) ? 'guest_checkout' : 'register_during_checkout';
-        $("[role='" + type + "'], [data-captcha='" + type + "']").show();
-    }).on('billingSave', function() {
-            $(".captcha-reload:visible").trigger("click");
-        });
-})(jQuery, window, document);
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/reload.png b/app/design/frontend/magento_backup/Magento_Captcha/reload.png
deleted file mode 100644
index 2b1e64bc158ab6cb284628823b12db2af8565dfc..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Captcha/reload.png and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart.phtml
deleted file mode 100644
index 2931540d95f4714dc5564cb95fb40995c191c057..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart.phtml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Shopping cart template
- *
- * @see \Magento\Checkout\Block\Cart
- */
-?>
-<?php if ($this->getItemsCount()): ?>
-<div class="cart">
-    <div class="page-title title-buttons">
-        <h1><?php echo __('Shopping Cart') ?></h1>
-        <?php if(!$this->hasError()): ?>
-        <ul class="checkout-types">
-        <?php foreach ($this->getMethods('top_methods') as $method): ?>
-            <?php if ($methodHtml = $this->getMethodHtml($method)): ?>
-            <li><?php echo $methodHtml; ?></li>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </ul>
-        <?php endif; ?>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <?php echo $this->getChildHtml('form_before') ?>
-    <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post" id="form-validate" data-mage-init="{validation: []}">
-        <fieldset>
-            <table id="shopping-cart-table" class="data-table cart-table">
-                <col width="1" />
-                <col />
-                <col width="1" />
-            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
-                <col width="1" />
-            <?php endif ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <col width="1" />
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <col width="1" />
-            <?php endif; ?>
-                <col width="1" />
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <col width="1" />
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <col width="1" />
-            <?php endif; ?>
-                <col width="1" />
-
-            <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
-                <thead>
-                    <tr>
-                        <th rowspan="<?php echo $mergedCells; ?>">&nbsp;</th>
-                        <th rowspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo __('Product Name') ?></span></th>
-                        <th rowspan="<?php echo $mergedCells; ?>"></th>
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
-                        <th rowspan="<?php echo $mergedCells; ?>" class="a-center"><span class="nobr"><?php echo __('Move to Wish List') ?></span></th>
-                        <?php endif ?>
-                        <th class="a-center" colspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo __('Unit Price') ?></span></th>
-                        <th rowspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Qty') ?></th>
-                        <th class="a-center" colspan="<?php echo $mergedCells; ?>"><?php echo __('Subtotal') ?></th>
-                        <th rowspan="<?php echo $mergedCells; ?>" class="a-center">&nbsp;</th>
-                    </tr>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <tr>
-                        <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                        <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                        <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                        <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                    </tr>
-                    <?php endif; ?>
-                </thead>
-                <tfoot>
-                    <tr>
-                        <td colspan="50" class="a-right">
-                            <?php if($this->getContinueShoppingUrl()): ?>
-                                <button type="button" title="<?php echo __('Continue Shopping') ?>" class="button btn-continue"><span><span><?php echo __('Continue Shopping') ?></span></span></button>
-                            <?php endif; ?>
-                            <button type="submit" name="update_cart_action" value="update_qty" title="<?php echo __('Update Shopping Cart'); ?>" class="button btn-update"><span><span><?php echo __('Update Shopping Cart'); ?></span></span></button>
-                            <button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo __('Clear Shopping Cart'); ?>" class="button btn-empty" id="empty_cart_button"><span><span><?php echo __('Clear Shopping Cart'); ?></span></span></button>
-                            <!--[if lt IE 8]>
-                            <input type="hidden" value="" id="update_cart_action_container" />
-                            <![endif]-->
-                            <script type="text/javascript">
-                            //<![CDATA[
-                                (function($) {
-                                    head.js("<?php echo $this->getViewFileUrl('Magento_Checkout::js/shopping-cart.js')?>",
-                                        function() {
-                                            // Internet Explorer (lt 8) does not support value attribute in button elements
-                                            $('#shopping-cart-table').shoppingCart({
-                                                continueShoppingButton: 'button.btn-continue',
-                                                continueShoppingUrl: '<?php echo $this->getContinueShoppingUrl() ?>',
-                                                emptyCartButton: 'button.btn-empty',
-                                                updateCartActionContainer: '#update_cart_action_container'
-                                            });
-                                        });
-                                })(jQuery);
-                            //]]>
-                            </script>
-                        </td>
-                    </tr>
-                </tfoot>
-                <tbody>
-                <?php foreach($this->getItems() as $_item): ?>
-                    <?php echo $this->getItemHtml($_item) ?>
-                <?php endforeach ?>
-                </tbody>
-            </table>
-            <script type="text/javascript">(function($) {$('#shopping-cart-table').decorate('table')})(jQuery)</script>
-        </fieldset>
-    </form>
-    <div class="cart-collaterals">
-        <div class="col2-set">
-            <div class="col-1">
-                <?php echo $this->getChildHtml('crosssell') ?>
-            </div>
-            <div class="col-2">
-                <?php /* Extensions placeholder */ ?>
-                <?php echo $this->getChildHtml('checkout.cart.extra') ?>
-                <?php if (!$this->getIsVirtual()): echo $this->getChildHtml('shipping'); endif; ?>
-            </div>
-        </div>
-        <div class="totals">
-            <?php echo $this->getChildHtml('totals'); ?>
-            <?php if(!$this->hasError()): ?>
-            <ul class="checkout-types">
-            <?php foreach ($this->getMethods('methods') as $method): ?>
-                <?php if ($methodHtml = $this->getMethodHtml($method)): ?>
-                <li><?php echo $methodHtml; ?></li>
-                <?php endif; ?>
-            <?php endforeach; ?>
-            </ul>
-            <?php endif; ?>
-        </div>
-    </div>
-</div>
-<?php else: ?>
-<div class="page-title">
-    <h1><?php echo __('Shopping Cart is Empty') ?></h1>
-</div>
-<div class="cart-empty">
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <?php echo $this->getChildHtml('checkout_cart_empty_widget'); ?>
-    <p><?php echo __('You have no items in your shopping cart.') ?></p>
-    <p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $this->getContinueShoppingUrl()) ?></p>
-    <?php echo $this->getChildHtml('shopping.cart.table.after'); ?>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml
deleted file mode 100644
index 9386430baa075ad710322dcb1a5fa508286e4e3d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<form id="discount-coupon-form" action="<?php echo $this->getUrl('checkout/cart/couponPost') ?>" method="post">
-    <div class="discount">
-        <h2><?php echo __('Discount Codes') ?></h2>
-        <div class="discount-form">
-            <label for="coupon_code"><?php echo __('Enter your coupon code if you have one.') ?></label>
-            <input type="hidden" name="remove" id="remove-coupon" value="0" />
-            <div class="input-box">
-                <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
-            </div>
-            <div class="buttons-set">
-                <button type="button" title="<?php echo __('Apply Coupon') ?>" class="button apply-coupon" value="<?php echo __('Apply Coupon') ?>"><span><span><?php echo __('Apply Coupon') ?></span></span></button>
-                <?php if(strlen($this->getCouponCode())): ?>
-                    &nbsp; <button type="button" title="<?php echo __('Cancel Coupon') ?>" class="button cancel-coupon" value="<?php echo __('Cancel Coupon') ?>"><span><span><?php echo __('Cancel Coupon') ?></span></span></button>
-                <?php endif;?>
-            </div>
-        </div>
-    </div>
-</form>
-<script type="text/javascript">
-//<![CDATA[
-    (function($) {
-        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/discount-codes.js')?>", function() {
-                $('#discount-coupon-form').discountCode({
-                    couponCodeSelector: '#coupon_code', removeCouponSelector: '#remove-coupon',
-                    applyButton: 'button.apply-coupon', cancelButton: 'button.cancel-coupon'
-                });
-            });
-    })(jQuery);
-//]]>
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml
deleted file mode 100644
index 18ca99909fb98eaf4ca024e14d2954805f476fd8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Cart cross sell items template
- *
- * @see \Magento\Checkout\Block\Cart\Crosssell
- */
-?>
-<?php if($this->getItemCount()): ?>
-<div class="crosssell">
-    <h2><?php echo __('Based on your selection, you may be interested in the following items:') ?></h2>
-    <ul id="crosssell-products-list">
-    <?php foreach ($this->getItems() as $_item): ?>
-        <li class="item">
-            <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>"><img src="<?php echo $this->getThumbnailUrl($_item) ?>" width="<?php echo $this->getThumbnailSize() ?>" height="<?php echo $this->getThumbnailSize() ?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
-            <div class="product-details">
-                <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
-                <?php echo $this->getPriceHtml($_item, true) ?>
-                <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="window.location.href='<?php echo $this->getAddToCartUrl($_item) ?>'"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                <ul class="add-to-links" data-role="add-to-links">
-                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                        <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
-                    <?php endif; ?>
-                    <?php if($_compareUrl=$this->getAddToCompareUrl($_item)): ?>
-                        <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-                    <?php endif; ?>
-                </ul>
-            </div>
-        </li>
-    <?php endforeach; ?>
-    </ul>
-    <script type="text/javascript">(function($) {$('#crosssell-products-list').decorate('list', false)})(jQuery)</script>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml
deleted file mode 100644
index e24f55d04aea4a74711e05b4f80b15e9e37c34ca..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php $_product = $this->getProduct(); ?>
-<?php $buttonTitle = __('Update Cart'); ?>
-<?php if ($_product->isSaleable()): ?>
-    <div class="add-to-cart">
-        <?php if (!$_product->isGrouped()): ?>
-        <label for="qty"><?php echo __('Qty:') ?></label>
-        <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>"
-               title="<?php echo __('Qty') ?>" class="input-text qty"
-            <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
-                data-validate="{required:true, 'validate-greater-than-zero':true}"/>
-            <?php else: ?>
-                data-validate="{required:true, digits:true}"/>
-            <?php endif; ?>
-        <?php endif; ?>
-        <button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" id="product-updatecart-button"><span><span><?php echo $buttonTitle ?></span></span></button>
-        <?php echo $this->getChildHtml('', true) ?>
-    </div>
-
-    <script type="text/javascript">
-        (function ($) {
-            head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>", function () {
-                    $('#product_addtocart_form').addToCart({
-                        cartButtonId: "#product-updatecart-button",
-                        cartForm: "#product_addtocart_form"
-                    }).validation();
-                });
-        })(jQuery);
-    </script>
-<?php endif; ?>
-
-
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml
deleted file mode 100644
index 1c3fff9ed0a2b45d28fdc44109e6726736c2005b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/** @var $_item \Magento\Sales\Model\Quote\Item */
-$_item = $this->getItem();
-$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
-$canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
-?>
-<tr>
-    <td><?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><?php endif;?><img src="<?php echo $this->getProductThumbnailUrl() ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /><?php if ($this->hasProductUrl()):?></a><?php endif;?></td>
-    <td>
-        <h2 class="product-name">
-        <?php if ($this->hasProductUrl()):?>
-            <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
-        <?php else: ?>
-            <?php echo $this->escapeHtml($this->getProductName()) ?>
-        <?php endif; ?>
-        </h2>
-        <?php if ($_options = $this->getOptionList()):?>
-        <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
-            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                <div class="truncated_full_value">
-                    <dl class="item-options">
-                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                    </dl>
-                </div>
-                <?php endif; ?>
-            </dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif;?>
-        <?php if ($messages = $this->getMessages()): ?>
-        <?php foreach ($messages as $message): ?>
-            <p class="item-msg <?php echo $message['type'] ?>">* <?php echo $this->escapeHtml($message['text']) ?></p>
-        <?php endforeach; ?>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock): ?>
-            <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
-        <?php endif;?>
-    </td>
-    <td class="a-center">
-        <?php if ($isVisibleProduct): ?>
-        <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><?php echo __('Edit') ?></a>
-        <?php endif ?>
-    </td>
-    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
-    <td class="a-center">
-        <?php if ($isVisibleProduct): ?>
-        <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo __('Move'); ?></a>
-        <?php endif ?>
-    </td>
-    <?php endif ?>
-
-    <?php if ($canApplyMsrp): ?>
-        <td class="a-right"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
-            <span class="cart-price">
-                <span class="cart-msrp-unit"><?php echo __('See price before order confirmation.'); ?></span>
-                <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
-                <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo __("What's this?"); ?></a>
-                <?php $_product = $_item->getProduct(); ?>
-                <script type="text/javascript">
-                    (function ($) {
-                        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>", function () {
-                            $('#<?php echo $helpLinkId ?>').addToCart({
-                                popupId: "#<?php echo $helpLinkId ?>",
-                                productName: '<?php echo $_product->getName() ?>',
-                                realPrice: '<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>',
-                                msrpPrice: '<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,true) ?>',
-                                closeButtonId: '#map-popup-close',
-                                showAddToCart: false
-                            });
-                        });
-                    })(jQuery);
-                </script>
-            </span>
-        </td>
-    <?php else: ?>
-
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <td class="a-right">
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-            <?php else: ?>
-                <span class="cart-price">
-            <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-                <?php endif; ?>
-
-            </span>
-
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-                <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php endif; ?>
-                </div>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                        <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
-                    </div>
-                <?php endif; ?>
-            <?php endif; ?>
-        </td>
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <td>
-            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-            <?php else: ?>
-                <span class="cart-price">
-            <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-                <?php endif; ?>
-
-            </span>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-                <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php endif; ?>
-                </div>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                        <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-                    </div>
-                <?php endif; ?>
-            <?php endif; ?>
-        </td>
-        <?php endif; ?>
-    <?php endif; ?>
-    <td class="a-center">
-        <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{required:true,'validate-greater-than-zero':true}"/>
-    </td>
-    <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($canApplyMsrp): ?>
-                <span class="cart-msrp-subtotal">--</span>
-            <?php else: ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-                <?php endif; ?>
-            <?php endif; ?>
-
-        </span>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($canApplyMsrp): ?>
-                <span class="cart-msrp-subtotal">--</span>
-            <?php else: ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-                <?php endif; ?>
-            <?php endif; ?>
-
-        </span>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <td class="a-center"><a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo __('Remove item')?>" class="btn-remove btn-remove2"><?php echo __('Remove item')?></a></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml
deleted file mode 100644
index 89aa5e352ffd5cb16516a746448430b46595c65c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Checkout\Block\Cart\Shipping */ ?>
-<div class="shipping">
-    <h2><?php echo __('Estimate Shipping and Tax') ?></h2>
-    <div class="shipping-form">
-       <form action="<?php echo $this->getUrl('checkout/cart/estimatePost') ?>" method="post" id="shipping-zip-form">
-            <p><?php echo __('Enter your destination to get a shipping estimate.') ?></p>
-            <ul class="form-list">
-                <li>
-                    <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
-                    <div class="input-box">
-                        <?php echo $this->getDirectoryBlock()->getCountryHtmlSelect($this->getEstimateCountryId()) ?>
-                    </div>
-                </li>
-            <?php //if($this->getStateActive()): ?>
-                <li>
-                    <label for="region_id"<?php if ($this->isStateProvinceRequired()) echo ' class="required"' ?>><?php if ($this->isStateProvinceRequired()) echo '<em>*</em>' ?><?php echo __('State/Province') ?></label>
-                    <div class="input-box">
-                        <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" style="display:none;"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
-                            <option value=""><?php echo __('Please select a region, state or province.') ?></option>
-                        </select>
-                        <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getEstimateRegion()) ?>"  title="<?php echo __('State/Province') ?>" class="input-text" style="display:none;" />
-                   </div>
-                </li>
-            <?php //endif; ?>
-            <?php if($this->getCityActive()): ?>
-                <li>
-                    <label for="city"<?php if ($this->isCityRequired()) echo ' class="required"' ?>><?php if ($this->isCityRequired()) echo '<em>*</em>' ?><?php echo __('City') ?></label>
-                    <div class="input-box">
-                        <input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->escapeHtml($this->getEstimateCity()) ?>" />
-                    </div>
-                </li>
-            <?php endif; ?>
-                <li>
-                    <label for="postcode"<?php if ($this->isZipCodeRequired()) echo ' class="required"' ?>><?php if ($this->isZipCodeRequired()) echo '<em>*</em>' ?><?php echo __('Zip/Postal Code') ?></label>
-                    <div class="input-box">
-                        <input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->escapeHtml($this->getEstimatePostcode()) ?>" />
-                    </div>
-                </li>
-            </ul>
-            <div class="buttons-set">
-                <button type="submit" title="<?php echo __('Get a Quote') ?>" class="button"><span><span><?php echo __('Get a Quote') ?></span></span></button>
-            </div>
-        </form>
-        <script type="text/javascript">
-            (function($) {
-                head.js(
-                    "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-                    "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-                    "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                    "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-                    "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-                    function() {
-                        $('#country').regionUpdater({
-                            optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
-                            regionListId: '#region_id',
-                            regionInputId: '#region',
-                            postcodeId: '#postcode',
-                            form: $('#shipping-zip-form').validation(),
-                            regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                            defaultRegion: "<?php echo $this->getEstimateRegionId() ?>",
-                            countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-                        });
-                    });
-            })(jQuery);
-        </script>
-
-        <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
-        <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
-            <dl class="sp-methods">
-                <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
-                    <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
-                    <dd>
-                        <ul>
-                        <?php foreach ($_rates as $_rate): ?>
-                            <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"';?>>
-                               <?php if ($_rate->getErrorMessage()): ?>
-                                    <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
-                               <?php else: ?>
-                                    <input name="estimate_method" type="radio" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" />
-                                    <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
-                                    <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-                                    <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
-                                    <?php echo $_excl; ?>
-                                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                                    <?php endif; ?>
-                                    </label>
-                               <?php endif ?>
-                            </li>
-                        <?php endforeach; ?>
-                        </ul>
-                    </dd>
-                <?php endforeach; ?>
-            </dl>
-            <div class="buttons-set">
-                <button type="submit" title="<?php echo __('Update Total') ?>" class="button" name="do" value="<?php echo __('Update Total') ?>"><span><span><?php echo __('Update Total') ?></span></span></button>
-            </div>
-        </form>
-        <?php endif; ?>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml
deleted file mode 100644
index b6a106c922877171da62fbef9dd37c5260679c57..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Shoping cart sidebar
- *
- * @see \Magento\Checkout\Block\Cart\Sidebar
- */
-
-?>
-<?php if ($this->getIsNeedToDisplaySideBar()): ?>
-<div class="block block-cart">
-    <?php $_cartQty = $this->getSummaryCount() ?>
-    <div class="block-title">
-        <strong><span><?php echo __('My Cart') ?></span></strong>
-    </div>
-    <div class="block-content">
-        <?php if ($_cartQty > 0): ?>
-        <div class="summary">
-            <?php if ($_cartQty == 1): ?>
-            <p class="amount"><?php echo __('There is <a href="%1">1 item</a> in your cart.', $this->getUrl('checkout/cart')) ?></p>
-            <?php else: ?>
-            <p class="amount"><?php echo __('There are <a href="%1">%2 items</a> in your cart.', $this->getUrl('checkout/cart'), $_cartQty) ?></p>
-            <?php endif ?>
-            <p class="subtotal">
-                <?php if ($this->canApplyMsrp()): ?>
-                <span
-                    class="map-cart-sidebar-total"><?php echo __('You will see the order total before you submit the order.'); ?></span>
-                <?php else: ?>
-                <span
-                    class="label"><?php echo __('Cart Subtotal:') ?></span> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getSubtotal()) ?>
-                <?php if ($_subtotalInclTax = $this->getSubtotalInclTax()): ?>
-                    <br/>
-                    (<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_subtotalInclTax) ?> <?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcText(true) ?>
-                    )
-                    <?php endif; ?>
-                <?php endif; ?>
-            </p>
-        </div>
-        <?php endif ?>
-        <?php if ($_cartQty && $this->isPossibleOnepageCheckout()): ?>
-        <div class="actions">
-            <?php echo $this->getChildHtml('extra_actions') ?>
-            <button id="sidebar-btn-checkout" type="button" title="<?php echo __('Checkout') ?>" class="button">
-                <span><span><?php echo __('Checkout') ?></span></span></button>
-        </div>
-        <?php endif ?>
-        <?php $_items = $this->getRecentItems() ?>
-        <?php if (count($_items)): ?>
-        <p class="block-subtitle"><?php echo __('Recently added item(s)') ?></p>
-        <ol id="cart-sidebar" class="mini-products-list">
-            <?php foreach ($_items as $_item): ?>
-            <?php echo $this->getItemHtml($_item) ?>
-            <?php endforeach; ?>
-        </ol>
-        <script type="text/javascript">
-            (function($) {
-                head.js("<?php echo $this->getViewFileUrl('Magento_Checkout::js/sidebar.js') ?>", function() {
-                    $('#cart-sidebar').sidebar({
-                        checkoutUrl: '<?php echo $this->getCheckoutUrl();?>',
-                        checkoutButton: '#sidebar-btn-checkout',
-                        removeButton: '#cart-sidebar a.btn-remove',
-                        confirmMessage: '<?php echo __('Are you sure you want to remove this item from the shopping cart?') ?>'
-                    });
-                });
-            })(jQuery);
-        </script>
-        <?php else: ?>
-        <p class="empty"><?php echo __('You have no items in your shopping cart.') ?></p>
-        <?php endif ?>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml
deleted file mode 100644
index ca93d77ee3247a35e91836cc8754ff79736ba0bd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-    $_item = $this->getItem();
-    $isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
-    $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
-?>
-<li class="item">
-    <?php if ($this->hasProductUrl()): ?>
-        <a href="<?php echo $this->getProductUrl()?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><img src="<?php echo $this->getProductThumbnailSidebarUrl() ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a>
-    <?php else: ?>
-        <span class="product-image"><img src="<?php echo $this->getProductThumbnailSidebarUrl() ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></span>
-    <?php endif; ?>
-    <div class="product-details">
-        <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo __('Remove This Item') ?>"  class="btn-remove"><?php echo __('Remove This Item') ?></a>
-        <?php if ($isVisibleProduct): ?>
-        <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item') ?>" class="btn-edit"><?php echo __('Edit item')?></a>
-        <?php endif ?>
-        <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->escapeHtml($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
-        <strong><?php echo $this->getQty() ?></strong> x
-
-    <?php if ($canApplyMsrp): ?>
-
-        <span class="map-cart-sidebar-item"><?php echo __('See price before order confirmation.'); ?></span>
-
-    <?php else: ?>
-
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-            <?php echo __('Excl. Tax'); ?>:
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-        <?php else: ?>
-            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-            <br />
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales')): ?>
-                <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                <?php endforeach; ?>
-                </small>
-            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                <?php endforeach; ?>
-            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales')): ?>
-                <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                <?php endforeach; ?>
-                </small>
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
-                <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
-            <?php endif; ?>
-        <?php endif; ?>
-    <?php endif; ?>
-
-
-
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-            <br /><?php echo __('Incl. Tax'); ?>:
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-        <?php else: ?>
-            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-            <br />
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales')): ?>
-                <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                <?php endforeach; ?>
-                </small>
-            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                <?php endforeach; ?>
-            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales')): ?>
-                <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                <?php endforeach; ?>
-                </small>
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
-                <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-            <?php endif; ?>
-        <?php endif; ?>
-    <?php endif; ?>
-
-    <?php endif; //Can apply MSRP ?>
-
-        <?php if ($_options = $this->getOptionList()):?>
-        <div class="truncated" data-mage-init="{truncateOptions:[]}">
-          <div class="truncated_full_value">
-            <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
-                <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                <dd>
-                    <?php if (is_array($_option['value'])): ?>
-                    <?php echo nl2br(implode("\n", $_option['value'])) ?>
-                    <?php else: ?>
-                    <?php echo $_option['value'] ?>
-                    <?php endif; ?>
-                </dd>
-                <?php endforeach; ?>
-            </dl>
-          </div>
-        <a href="#" onclick="return false;" class="details"><?php echo __('Details') ?></a>
-        </div>
-        <?php endif; ?>
-    </div>
-</li>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml
deleted file mode 100644
index 53a0e844767325d825be65a7df87d18f394f4a54..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Shopping cart totals template
- *
- * @see \Magento\Checkout\Block\Cart\Totals
- * @var $this \Magento\Checkout\Block\Cart\Totals
- */
-?>
-<?php if ($this->canApplyMsrp()): ?>
-    <div class="cart-msrp-totals"><?php echo __('You will see the order total before you submit the order.'); ?></div>
-<?php else: ?>
-    <table id="shopping-cart-totals-table">
-        <col />
-        <col width="1" />
-        <tfoot>
-            <?php echo $this->renderTotals('footer'); ?>
-        </tfoot>
-        <tbody>
-            <?php echo $this->renderTotals(); ?>
-        </tbody>
-    </table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cvv.gif b/app/design/frontend/magento_backup/Magento_Checkout/cvv.gif
deleted file mode 100644
index 6d6e9f2907839d58c27ec8de8644f30fc8b4467c..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Checkout/cvv.gif and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js b/app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js
deleted file mode 100644
index e595f089b73c9380318a59e6a9473ea04f76cfea..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage checkout
- * @package     accordion
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint jquery:true browser:true*/
-(function($) {
-    'use strict';
-    // mage.accordion base functionality
-    $.widget('mage.accordion', $.ui.accordion, {
-        options: {
-            heightStyle: 'content',
-            animate: false,
-            beforeActivate: function(e, ui) {
-                // Make sure sections below current are not clickable and sections above are clickable
-                var newPanelParent = $(ui.newPanel).parent();
-                if (!newPanelParent.hasClass('allow')) {
-                    return false;
-                }
-                newPanelParent.addClass('active allow').prevAll().addClass('allow');
-                newPanelParent.nextAll().removeClass('allow');
-                $(ui.oldPanel).parent().removeClass('active');
-            }
-        },
-
-        /**
-         * Accordion creation
-         * @protected
-         */
-        _create: function() {
-            // Custom to enable section
-            this.element.on('enableSection', function(event, data) {
-                $(data.selector).addClass('allow').find('h2').trigger('click');
-            });
-            this._super();
-            $(this.options.activeSelector).addClass('allow active').find('h2').trigger('click');
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml b/app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml
deleted file mode 100644
index fb4954de06b54f679581d5506e3f4cf14c2a3b46..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<script type="text/javascript">
-    (function($) {
-        "use strict";
-        /**
-         * Declaration of resources needed for defined components
-         */
-        $.mage.component({
-            paymentAuthentication: [
-                '<?php echo $this->getViewFileUrl('Magento_Checkout::js/payment-authentication.js') ?>'
-            ]
-        });
-    })(jQuery);
-</script>
-<?php echo $this->getChildHtml() ?>
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js b/app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js
deleted file mode 100644
index 73fdcc71420ce343947b23613ca18c0cc0733f49..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    checkout coupon discount codes
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function ($) {
-    $.widget('mage.discountCode', {
-        options: {
-        },
-        _create: function () {
-            this.couponCode = $(this.options.couponCodeSelector);
-            this.removeCoupon = $(this.options.removeCouponSelector);
-
-            $(this.options.applyButton).on('click', $.proxy(function () {
-                this.couponCode.attr('data-validate', '{required:true}');
-                this.removeCoupon.attr('value', '0');
-                $(this.element).validation().submit();
-            }, this));
-
-            $(this.options.cancelButton).on('click', $.proxy(function () {
-                this.couponCode.removeAttr('data-validate');
-                this.removeCoupon.attr('value', '1');
-                this.element.submit();
-            }, this));
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js b/app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js
deleted file mode 100644
index 279f7f8687d7bfdbc0a3aef71a9aac163255138e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    checkout multi-shipping addresses
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.multiShipping', {
-        options: {
-            addNewAddressBtn: 'button[data-role="add-new-address"]', // Add a new multishipping address.
-            addNewAddressFlag: '#add_new_address_flag', // Hidden input field with value 0 or 1.
-            canContinueBtn: 'button[data-role="can-continue"]', // Continue (update quantity or go to shipping).
-            canContinueFlag: '#can_continue_flag' // Hidden input field with value 0 or 1.
-        },
-
-        /**
-         * Bind event handlers to click events for corresponding buttons.
-         * @private
-         */
-        _create: function() {
-            $(this.options.addNewAddressBtn).on('click', $.proxy(this._addNewAddress, this));
-            $(this.options.canContinueBtn).on('click', $.proxy(this._canContinue, this));
-        },
-
-        /**
-         * Add a new address. Set the hidden input field and submit the form. Then enter a new shipping address.
-         * @private
-         */
-        _addNewAddress: function() {
-            $(this.options.addNewAddressFlag).val(1);
-            this.element.submit();
-        },
-
-        /**
-         * Can the user continue to the next step? The data-flag attribute holds either 0 (no) or 1 (yes).
-         * @private
-         * @param event {Event} - Click event on the corresponding button.
-         */
-        _canContinue: function(event) {
-            $(this.options.canContinueFlag).val(parseInt($(event.currentTarget).data('flag'), 10));
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js b/app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js
deleted file mode 100644
index b9e20dd2b43ac369dfdc67cf8904fb73357cb3dd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js
+++ /dev/null
@@ -1,518 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    one page checkout first step
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-/*global alert*/
-(function($, window) {
-    'use strict';
-    // Base widget, handle ajax events and first section(Checkout Method) in one page checkout accordion
-    $.widget('mage.opcheckout', {
-        options: {
-            checkout: {
-                loginGuestSelector: '#login\\:guest',
-                loginRegisterSelector: '#login\\:register',
-                loginFormSelector: '#login-form',
-                continueSelector: '#onepage-guest-register-button',
-                registerCustomerPasswordSelector: '#register-customer-password',
-                suggestRegistration: false
-            },
-            sectionSelectorPrefix: '#opc-',
-            billingSection: 'billing',
-            ajaxLoaderPlaceButton: false,
-            updateSelectorPrefix: '#checkout-',
-            updateSelectorSuffix: '-load',
-            backSelector: '.back-link',
-            minBalance: 0.0001
-        },
-
-        _create: function() {
-            var _this = this;
-            this.checkoutPrice = this.options.quoteBaseGrandTotal;
-            if (this.options.checkout.suggestRegistration) {
-                $(this.options.checkout.loginGuestSelector).prop('checked', false);
-                $(this.options.checkout.loginRegisterSelector).prop('checked', true);
-            }
-            this.element
-                .on('click', this.options.checkout.continueSelector, function() {
-                    $.proxy(_this._continue($(this)), _this);
-                })
-                .on('gotoSection', function(event, section) {
-                    $.proxy(_this._ajaxUpdateProgress(section), _this);
-                    _this.element.trigger('enableSection', {selector: _this.options.sectionSelectorPrefix + section});
-                })
-                .on('ajaxError', $.proxy(this._ajaxError, this))
-                .on('showAjaxLoader', $.proxy(this._ajaxSend, this))
-                .on('hideAjaxLoader', $.proxy(this._ajaxComplete, this))
-                .on('click', this.options.backSelector, function() {
-                    _this.element.trigger('enableSection', {selector: '#' + _this.element.find('.active').prev().attr('id')});
-                })
-                .on('click', '[data-action="login-form-submit"]', function() {
-                    $(_this.options.checkout.loginFormSelector).submit();
-                });
-            $(this.options.checkoutProgressContainer).on('click', '[data-goto-section]', $.proxy(function(e) {
-                var gotoSection = $(e.target).data('goto-section');
-                this._ajaxUpdateProgress(gotoSection);
-                this.element.trigger('enableSection', {selector: _this.options.sectionSelectorPrefix + gotoSection});
-                return false;
-            }, this));
-        },
-
-        /**
-         * Callback function for before ajax send event(global)
-         * @private
-         */
-        _ajaxSend: function() {
-            var loader = this.element.find('.section.active .please-wait').show();
-            if (this.options.ajaxLoaderPlaceButton) {
-                loader.siblings('.button').hide();
-            }
-        },
-
-        /**
-         * Callback function for ajax complete event(global)
-         * @private
-         */
-        _ajaxComplete: function() {
-            this.element.find('.please-wait').hide();
-            if (this.options.ajaxLoaderPlaceButton) {
-                this.element.find('.button').show();
-            }
-        },
-
-        /**
-         * ajax error for all onepage checkout ajax calls
-         * @private
-         */
-        _ajaxError: function() {
-            window.location.href = this.options.failureUrl;
-        },
-
-        /**
-         * callback function when continue button is clicked
-         * @private
-         * @param elem - continue button
-         * @return {Boolean}
-         */
-        _continue: function(elem) {
-            var json = elem.data('checkout');
-            if (json.isGuestCheckoutAllowed) {
-                if ($(this.options.checkout.loginGuestSelector).is(':checked')) {
-                    this._ajaxContinue(this.options.checkout.saveUrl, {method:'guest'}, this.options.billingSection);
-                    this.element.find(this.options.checkout.registerCustomerPasswordSelector).hide();
-                } else if ($(this.options.checkout.loginRegisterSelector).is(':checked')) {
-                    this._ajaxContinue(this.options.checkout.saveUrl, {method:'register'}, this.options.billingSection);
-                    this.element.find(this.options.checkout.registerCustomerPasswordSelector).show();
-                } else {
-                    alert($.mage.__('Please choose to register or to checkout as a guest.'));
-                    return false;
-                }
-            }
-            this.element.trigger('login');
-        },
-
-        /**
-         * Ajax call to save checkout info to backend and enable next section in accordion
-         * @private
-         * @param url - ajax url
-         * @param data - post data for ajax call
-         * @param gotoSection - the section needs to show after ajax call
-         * @param successCallback - custom callback function in ajax success
-         */
-        _ajaxContinue: function(url, data, gotoSection, successCallback) {
-            $.ajax({
-                url: url,
-                type: 'post',
-                context: this,
-                data: data,
-                dataType: 'json',
-                beforeSend: this._ajaxSend,
-                complete: this._ajaxComplete,
-                success: function(response) {
-                    if (successCallback) {
-                        successCallback.call(this, response);
-                    }
-                    if ($.type(response) === 'object' && !$.isEmptyObject(response)) {
-                        if (response.error) {
-                            var msg = response.message || response.error_messages;
-                            if (msg) {
-                                if ($.type(msg) === 'array') {
-                                    msg = msg.join("\n");
-                                }
-                                $(this.options.countrySelector).trigger('change');
-                                alert($.mage.__(msg));
-                            } else {
-                                alert($.mage.__(response.error));
-                            }
-                            return;
-                        }
-                        if (response.redirect) {
-                            $.mage.redirect(response.redirect);
-                            return false;
-                        }
-                        else if (response.success) {
-                            $.mage.redirect(this.options.review.successUrl);
-                            return false;
-                        }
-                        if (response.update_section) {
-                            if (response.update_section.name === 'payment-method' && response.update_section.html.indexOf('data-checkout-price')) {
-                                this.element.find(this.options.payment.form).find('[data-checkout-price]').remove();
-                            }
-                            $(this.options.updateSelectorPrefix + response.update_section.name + this.options.updateSelectorSuffix)
-                                .html($(response.update_section.html)).trigger('contentUpdated');
-                        }
-                        if (response.duplicateBillingInfo) {
-                            $(this.options.shipping.copyBillingSelector).prop('checked', true).trigger('click');
-                            $(this.options.shipping.addressDropdownSelector).val($(this.options.billing.addressDropdownSelector).val()).change();
-                        }
-                        if (response.goto_section) {
-                            this.element.trigger('gotoSection', response.goto_section);
-                        }
-                    } else {
-                        this.element.trigger('gotoSection', gotoSection);
-                    }
-                }
-            });
-        },
-
-        /**
-         * Update progress sidebar content
-         * @private
-         * @param toStep
-         */
-        _ajaxUpdateProgress: function(toStep) {
-            if (toStep) {
-                $.ajax({
-                    url: this.options.progressUrl,
-                    type: 'get',
-                    async: false,
-                    cache: false,
-                    context: this,
-                    data: toStep ? {toStep: toStep} : null,
-                    success: function(response) {
-                        $(this.options.checkoutProgressContainer).html(response);
-                    }
-                });
-            }
-        }
-    });
-
-    // Extension for mage.opcheckout - second section(Billing Information) in one page checkout accordion
-    $.widget('mage.opcheckout', $.mage.opcheckout, {
-        options: {
-            billing: {
-                addressDropdownSelector: '#billing-address-select',
-                newAddressFormSelector: '#billing-new-address-form',
-                continueSelector: '#billing-buttons-container .button',
-                form: '#co-billing-form'
-            }
-        },
-
-        _create: function() {
-            this._super();
-            this.element
-                .on('change', this.options.billing.addressDropdownSelector, $.proxy(function(e) {
-                this.element.find(this.options.billing.newAddressFormSelector).toggle(!$(e.target).val());
-            }, this))
-                .on('click', this.options.billing.continueSelector, $.proxy(function() {
-                if ($(this.options.billing.form).validation && $(this.options.billing.form).validation('isValid')) {
-                    this._billingSave();
-                }
-            }, this))
-                .find(this.options.billing.form).validation();
-        } ,
-
-        _billingSave: function() {
-            this._ajaxContinue(this.options.billing.saveUrl, $(this.options.billing.form).serialize(), false, function() {
-                //Trigger indicating billing save. eg. GiftMessage listens to this to inject gift options
-                this.element.trigger('billingSave');
-            });
-        }
-    });
-
-    // Extension for mage.opcheckout - third section(Shipping Information) in one page checkout accordion
-    $.widget('mage.opcheckout', $.mage.opcheckout, {
-        options: {
-            shipping: {
-                form: '#co-shipping-form',
-                addressDropdownSelector: '#shipping-address-select',
-                newAddressFormSelector: '#shipping-new-address-form',
-                copyBillingSelector: '#shipping\\:same_as_billing',
-                countrySelector: '#shipping\\:country_id',
-                continueSelector:'#shipping-buttons-container .button'
-            }
-        },
-
-        _create: function() {
-            this._super();
-            this.element
-                .on('change', this.options.shipping.addressDropdownSelector, $.proxy(function(e) {
-                $(this.options.shipping.newAddressFormSelector).toggle(!$(e.target).val());
-            }, this))
-                .on('input propertychange', this.options.shipping.form + ' :input[name]', $.proxy(function() {
-                $(this.options.shipping.copyBillingSelector).prop('checked', false);
-            }, this))
-                .on('click', this.options.shipping.copyBillingSelector, $.proxy(function(e) {
-                if ($(e.target).is(':checked')) {
-                    this._billingToShipping();
-                }
-            }, this))
-                .on('click', this.options.shipping.continueSelector, $.proxy(function() {
-                if ($(this.options.shipping.form).validation && $(this.options.shipping.form).validation('isValid')) {
-                    this._ajaxContinue(this.options.shipping.saveUrl, $(this.options.shipping.form).serialize(), false, function() {
-                        //Trigger indicating shipping save. eg. GiftMessage listens to this to inject gift options
-                        this.element.trigger('shippingSave');
-                    });
-                }
-            }, this))
-                .find(this.options.shipping.form).validation();
-        },
-
-        /**
-         * Copy billing address info to shipping address
-         * @private
-         */
-        _billingToShipping: function() {
-            $(':input[name]', this.options.billing.form).each($.proxy(function(key, value) {
-                var fieldObj = $(value.id.replace('billing:', '#shipping\\:'));
-                fieldObj.val($(value).val());
-                if (fieldObj.is("select")) {
-                    fieldObj.trigger('change');
-                }
-            }, this));
-            $(this.options.shipping.copyBillingSelector).prop('checked', true);
-        }
-    });
-
-    // Extension for mage.opcheckout - fourth section(Shipping Method) in one page checkout accordion
-    $.widget('mage.opcheckout', $.mage.opcheckout, {
-        options: {
-            shippingMethod: {
-                continueSelector: '#shipping-method-buttons-container .button',
-                form: '#co-shipping-method-form'
-            }
-        },
-
-        _create: function() {
-            this._super();
-            var _this = this;
-            this.element
-                .on('click', this.options.shippingMethod.continueSelector, $.proxy(function() {
-                if (this._validateShippingMethod()&&
-                    $(this.options.shippingMethod.form).validation &&
-                    $(this.options.shippingMethod.form).validation('isValid')) {
-                    this._ajaxContinue(this.options.shippingMethod.saveUrl, $(this.options.shippingMethod.form).serialize());
-                }
-            }, this))
-                .on('click', 'input[name="shipping_method"]', function() {
-                    var selectedPrice = _this.shippingCodePrice[$(this).val()] || 0,
-                        oldPrice = _this.shippingCodePrice[_this.currentShippingMethod] || 0;
-                    _this.checkoutPrice = _this.checkoutPrice - oldPrice + selectedPrice;
-                    _this.currentShippingMethod = $(this).val();
-                })
-                .on('contentUpdated', $.proxy(function() {
-                this.currentShippingMethod = this.element.find('input[name="shipping_method"]:checked').val();
-                this.shippingCodePrice = this.element.find('[data-shipping-code-price]').data('shipping-code-price');
-            }, this))
-                .find(this.options.shippingMethod.form).validation();
-        },
-
-        /**
-         * Make sure at least one shipping method is selected
-         * @return {Boolean}
-         * @private
-         */
-        _validateShippingMethod: function() {
-            var methods = this.element.find('[name="shipping_method"]');
-            if (methods.length === 0) {
-                alert($.mage.__('We are not able to ship to the selected shipping address. Please choose another address or edit the current address.'));
-                return false;
-            }
-            if (methods.filter(':checked').length) {
-                return true;
-            }
-            alert($.mage.__('Please specify a shipping method.'));
-            return false;
-        }
-    });
-
-    // Extension for mage.opcheckout - fifth section(Payment Information) in one page checkout accordion
-    $.widget('mage.opcheckout', $.mage.opcheckout, {
-        options: {
-            payment: {
-                continueSelector: '#payment-buttons-container .button',
-                form: '#co-payment-form',
-                methodsContainer: '#checkout-payment-method-load',
-                freeInput: {
-                    tmpl: '<input id="hidden-free" type="hidden" name="payment[method]" value="free">',
-                    selector: '#hidden-free'
-                }
-            }
-        },
-
-        _create: function() {
-            this._super();
-            this.element
-                .on('click', this.options.payment.continueSelector, $.proxy(function() {
-                if (this._validatePaymentMethod() &&
-                    $(this.options.payment.form).validation &&
-                    $(this.options.payment.form).validation('isValid')) {
-                    this._ajaxContinue(this.options.payment.saveUrl, $(this.options.payment.form).serialize());
-                }
-            }, this))
-                .on('updateCheckoutPrice', $.proxy(function(event, data) {
-                if (data.price) {
-                    this.checkoutPrice += data.price;
-                }
-                if (data.totalPrice) {
-                    data.totalPrice = this.checkoutPrice;
-                }
-                if (this.checkoutPrice < this.options.minBalance) {
-                    // Add free input field, hide and disable unchecked checkbox payment method and all radio button payment methods
-                    this._disablePaymentMethods();
-                } else {
-                    // Remove free input field, show all payment method
-                    this._enablePaymentMethods();
-                }
-            }, this))
-                .on('contentUpdated', this.options.payment.form, $.proxy(function() {
-                $(this.options.payment.form).find('dd [name^="payment["]').prop('disabled', true);
-                var checkoutPrice = this.element.find(this.options.payment.form).find('[data-checkout-price]').data('checkout-price');
-                if ($.isNumeric(checkoutPrice)) {
-                    this.checkoutPrice = checkoutPrice;
-                }
-                if (this.checkoutPrice < this.options.minBalance) {
-                    this._disablePaymentMethods();
-                } else {
-                    this._enablePaymentMethods();
-                }
-            }, this))
-                .on('click', this.options.payment.form + ' dt input:radio', $.proxy(this._paymentMethodHandler, this))
-                .find(this.options.payment.form).validation({
-                    errorPlacement: function(error, element) {
-                        if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-cc-ukss') >= 0) {
-                            element.parents('form').find('[data-validation-msg="validate-cc-ukss"]').html(error);
-                        } else {
-                            element.after(error);
-                        }
-                    }
-                });
-        },
-
-        /**
-         * Display payment details when payment method radio button is checked
-         * @private
-         * @param e
-         */
-        _paymentMethodHandler: function(e) {
-            var _this = $(e.target),
-                parentsDl = _this.closest('dl');
-            parentsDl.find('dt input:radio').prop('checked', false);
-            _this.prop('checked', true);
-            parentsDl.find('dd ul').hide().find('[name^="payment["]').prop('disabled', true);
-            _this.parent().nextUntil('dt').find('ul').show().find('[name^="payment["]').prop('disabled', false);
-        },
-
-        /**
-         * make sure one payment method is selected
-         * @private
-         * @return {Boolean}
-         */
-        _validatePaymentMethod: function() {
-            var methods = this.element.find('[name^="payment["]');
-            if (methods.length === 0) {
-                alert($.mage.__("We can't complete your order because you don't have a payment method available."));
-                return false;
-            }
-            if (this.checkoutPrice < this.options.minBalance) {
-                return true;
-            } else if (methods.filter('input:radio:checked').length) {
-                return true;
-            }
-            alert($.mage.__('Please specify payment method.'));
-            return false;
-        },
-
-        /**
-         * Disable and enable payment methods
-         * @private
-         */
-        _disablePaymentMethods: function() {
-            var paymentForm = $(this.options.payment.form);
-            paymentForm.find('input[name="payment[method]"]').prop('disabled', true);
-            paymentForm.find(this.options.payment.methodsContainer).hide().find('[name^="payment["]').prop('disabled', true);
-            paymentForm.find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', true).parent().hide();
-            paymentForm.find(this.options.payment.freeInput.selector).remove();
-            $.tmpl(this.options.payment.freeInput.tmpl).appendTo(paymentForm);
-        },
-
-        /**
-         * Enable and enable payment methods
-         * @private
-         */
-        _enablePaymentMethods: function() {
-            var paymentForm = $(this.options.payment.form);
-            paymentForm.find('input[name="payment[method]"]').prop('disabled', false);
-            paymentForm.find('input[name="payment[method]"]:checked').trigger('click');
-            paymentForm.find(this.options.payment.methodsContainer).show();
-            paymentForm.find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', false).parent().show();
-            paymentForm.find(this.options.payment.freeInput.selector).remove();
-        }
-    });
-
-    // Extension for mage.opcheckout - last section(Order Review) in one page checkout accordion
-    $.widget('mage.opcheckout', $.mage.opcheckout, {
-        options: {
-            review: {
-                continueSelector: '#review-buttons-container .button',
-                container: '#opc-review',
-                agreementFormSelector:'#checkout-agreements',
-                submitContainer: '#checkout-review-submit'
-            }
-        },
-
-        _create: function() {
-            this._super();
-            this.element
-                .on('click', this.options.review.continueSelector, $.proxy(this._saveOrder, this))
-                .on('saveOrder', this.options.review.container, $.proxy(this._saveOrder, this))
-                .on('contentUpdated', this.options.review.container, $.proxy(function() {
-                    var paypalIframe = this.element.find(this.options.review.container)
-                        .find('[data-container="paypal-iframe"]');
-                    if (paypalIframe.length) {
-                        paypalIframe.show();
-                        $(this.options.review.submitContainer).hide();
-                    }
-                }, this));
-        },
-
-        _saveOrder: function() {
-            if ($(this.options.payment.form).validation &&
-                $(this.options.payment.form).validation('isValid')) {
-                this._ajaxContinue(
-                    this.options.review.saveUrl,
-                    $(this.options.payment.form).serialize() + '&' + $(this.options.review.agreementFormSelector).serialize());
-            }
-        }
-    });
-})(jQuery, window);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/overview.js b/app/design/frontend/magento_backup/Magento_Checkout/js/overview.js
deleted file mode 100644
index e2f53ed1d13452bc3aea164332a451709c5dc714..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/overview.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    checkout multi-shipping review order overview
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint jquery:true*/
-/*global alert*/
-(function($) {
-    "use strict";
-    $.widget('mage.orderOverview', {
-        options: {
-            opacity: 0.5, // CSS opacity for the 'Place Order' button when it's clicked and then disabled.
-            pleaseWaitLoader: 'span.please-wait', // 'Submitting order information...' Ajax loader.
-            placeOrderSubmit: 'button[type="submit"]', // The 'Place Order' button.
-            agreements: '#checkout-agreements' // Container for all of the checkout billing agreements.
-        },
-
-        /**
-         * Bind a submit handler to the form.
-         * @private
-         */
-        _create: function() {
-            this.element.on('submit', $.proxy(this._showLoader, this));
-        },
-
-        /**
-         * Verify that all agreements and terms/conditions are checked. Show the Ajax loader. Disable
-         * the submit button (i.e. Place Order).
-         * @return {Boolean}
-         * @private
-         */
-        _showLoader: function() {
-            if ($(this.options.agreements).find('input[type="checkbox"]:not(:checked)').length > 0) {
-                alert($.mage.__('Please agree to all Terms and Conditions before placing the orders.'));
-                return false;
-            }
-            this.element.find(this.options.pleaseWaitLoader).show().end()
-                .find(this.options.placeOrderSubmit).prop('disabled', true).css('opacity', this.options.opacity);
-            return true;
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js b/app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js
deleted file mode 100644
index 04f406adca6a5cb33b95815ebc09879063ae62fa..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     js
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint jquery:true*/
-(function ($) {
-    "use strict";
-    $.widget('mage.paymentAuthentication', {
-        options : {
-            bodySelector: '[data-container="body"]'
-        },
-
-        _create: function () {
-            // add a trigger on the body for payment authentication state changes
-            this.element.closest(this.options.bodySelector).on("paymentAuthentication", $.proxy(this._paymentmentAthenticationTrigger, this));
-        },
-
-        /**
-         * This method processes the paymentAuthentication actions.
-         */
-        _paymentmentAthenticationTrigger: function (event, data) {
-            if (data.state === 'start') {
-                this.element.hide();
-            } else {
-                this.element.show();
-            }
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js b/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
deleted file mode 100644
index fbc1983892d9d911f30205223995e3880c0ac63a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    multshipping payment
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-/*global alert*/
-(function($) {
-    'use strict';
-    $.widget('mage.payment', {
-        options: {
-            continueSelector: '#payment-continue',
-            methodsContainer: '#payment-methods',
-            minBalance: 0.0001,
-            tmpl: '<input id="hidden-free" type="hidden" name="payment[method]" value="free">'
-        },
-
-        _create: function() {
-            this.element.find('dd [name^="payment["]').prop('disabled', true).end()
-                .on('click', this.options.continueSelector, $.proxy(this._submitHandler, this))
-                .on('updateCheckoutPrice', $.proxy(function(event, data) {
-                //updating the checkoutPrice
-                if (data.price) {
-                    this.options.checkoutPrice += data.price;
-                }
-                //updating total price
-                if (data.totalPrice) {
-                    data.totalPrice = this.options.checkoutPrice;
-                }
-                if (this.options.checkoutPrice < this.options.minBalance) {
-                    // Add free input field, hide and disable unchecked checkbox payment method and all radio button payment methods
-                    this._disablePaymentMethods();
-                } else {
-                    // Remove free input field, show all payment method
-                    this._enablePaymentMethods();
-                }
-            }, this))
-                .on('click', 'dt input:radio', $.proxy(this._paymentMethodHandler, this));
-
-            if (this.options.checkoutPrice < this.options.minBalance) {
-                this._disablePaymentMethods();
-            } else {
-                this._enablePaymentMethods();
-            }
-        },
-
-        /**
-         * Display payment details when payment method radio button is checked
-         * @private
-         * @param e
-         */
-        _paymentMethodHandler: function(e) {
-            var element = $(e.target),
-                parentsDl = element.closest('dl');
-            parentsDl.find('dt input:radio').prop('checked', false);
-            parentsDl.find('.items').hide().find('[name^="payment["]').prop('disabled', true);
-            element.prop('checked', true).parent().nextUntil('dt').find('.items').show().find('[name^="payment["]').prop('disabled', false);
-        },
-
-        /**
-         * make sure one payment method is selected
-         * @private
-         * @return {Boolean}
-         */
-        _validatePaymentMethod: function() {
-            var methods = this.element.find('[name^="payment["]'),
-                isValid = false;
-            if (methods.length === 0) {
-                alert($.mage.__("We can't complete your order because you don't have a payment method available."));
-            }
-            else if (methods.filter(':checked').length) {
-                isValid = true;
-            } else {
-                alert($.mage.__('Please specify payment method.'));
-            }
-            return isValid;
-        },
-
-        /**
-         * Disable and enable payment methods
-         * @private
-         */
-        _disablePaymentMethods: function() {
-            this.element.find('input[name="payment[method]"]').prop('disabled', true).end()
-                .find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', true).parent().hide();
-            this.element.find('[name="payment[method]"][value="free"]').parent('dt').remove();
-            this.element.find(this.options.methodsContainer).hide().find('[name^="payment["]').prop('disabled', true);
-            $.tmpl(this.options.tmpl).appendTo(this.element);
-        },
-
-        /**
-         * Enable and enable payment methods
-         * @private
-         */
-        _enablePaymentMethods: function() {
-            this.element.find('input[name="payment[method]"]').prop('disabled', false).end()
-                .find('input[name="payment[method]"][value="free"]').remove().end()
-                .find('dt input:radio:checked').trigger('click').end()
-                .find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', false).parent().show();
-            this.element.find(this.options.methodsContainer).show();
-        },
-
-        /**
-         * Validate  before form submit
-         * @private
-         */
-        _submitHandler: function(e) {
-            e.preventDefault();
-            if (this._validatePaymentMethod()) {
-                this.element.submit();
-            }
-        }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/region-updater.js b/app/design/frontend/magento_backup/Magento_Checkout/js/region-updater.js
deleted file mode 100644
index 4be2fa30b5d5c053041ac29c07b00555e0c82e12..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/region-updater.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    frontend Checkout region-updater
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true expr:true*/
-(function($) {
-    $.widget('mage.regionUpdater', {
-        options: {
-            regionTemplate: '<option value="${value}" title="${title}" {{if isSelected}}selected="selected"{{/if}}>${title}</option>',
-            isRegionRequired: true,
-            isZipRequired: true,
-            isCountryRequired: true
-        },
-
-        _create: function() {
-            this._updateRegion(this.element.find('option:selected').val());
-            this.element.on('change', $.proxy(function(e) {
-                this._updateRegion($(e.target).val());
-            }, this));
-            if (this.isCountryRequired) {
-                this.element.addClass('required-entry');
-            }
-            $(this.options.regionListId).on('change', $.proxy(function(e) {
-                this.setOption = false;
-                this.currentRegionOption = $(e.target).val();
-            }, this));
-            $(this.options.regionInputId).on('focusout', $.proxy(function() {
-                this.setOption = true;
-            }, this));
-        },
-
-        /**
-         * Remove options from dropdown list
-         * @param {object} selectElement - jQuery object for dropdown list
-         * @private
-         */
-        _removeSelectOptions: function(selectElement) {
-            selectElement.find('option').each(function(index) {
-                if (index) {
-                    $(this).remove();
-                }
-            });
-        },
-
-        /**
-         * Render dropdown list
-         * @param {object} selectElement - jQuery object for dropdown list
-         * @param {string} key - region code
-         * @param {object} value - region object
-         * @private
-         */
-        _renderSelectOption: function(selectElement, key, value) {
-            selectElement.append($.proxy(function() {
-                $.template('regionTemplate', this.options.regionTemplate);
-                if (this.options.defaultRegion === key) {
-                    return $.tmpl('regionTemplate', {value: key, title: value.name, isSelected: true});
-                } else {
-                    return $.tmpl('regionTemplate', {value: key, title: value.name});
-                }
-            }, this));
-        },
-
-        /**
-         * Takes clearError callback function as first option
-         * If no form is passed as option, look up the closest form and call clearError method.
-         * @private
-         */
-        _clearError: function() {
-            if (this.options.clearError && typeof(this.options.clearError) === "function") {
-                this.options.clearError.call(this);
-            } else {
-                if (!this.options.form) {
-                    this.options.form = this.element.closest('form').length ? $(this.element.closest('form')[0]) : null;
-                }
-                this.options.form && this.options.form.data('validation') && this.options.form.validation('clearError',
-                    this.options.regionListId, this.options.regionInputId, this.options.postcodeId);
-            }
-        },
-        /**
-         * Update dropdown list based on the country selected
-         * @param {string} country - 2 uppercase letter for country code
-         * @private
-         */
-        _updateRegion: function(country) {
-            // Clear validation error messages
-            var regionList = $(this.options.regionListId),
-                regionInput = $(this.options.regionInputId),
-                postcode = $(this.options.postcodeId),
-                requiredLabel = regionList.parent().siblings('label').children('em');
-            this._clearError();
-            this._checkRegionRequired(country);
-            // Populate state/province dropdown list if available or use input box
-            if (this.options.regionJson[country]) {
-                this._removeSelectOptions(regionList);
-                $.each(this.options.regionJson[country], $.proxy(function(key, value) {
-                    this._renderSelectOption(regionList, key, value);
-                }, this));
-                if (this.currentRegionOption) {
-                    regionList.val(this.currentRegionOption);
-                }
-                if (this.setOption) {
-                    regionList.find("option").filter(function() {
-                        return this.text === regionInput.val();
-                    }).attr('selected', true);
-                }
-                if (this.options.isRegionRequired) {
-                    regionList.addClass('required-entry').removeAttr('disabled');
-                    requiredLabel.show();
-                } else {
-                    regionList.removeClass('required-entry validate-select').removeAttr('data-validate');
-                    requiredLabel.hide();
-                    if (!this.options.optionalRegionAllowed) {
-                        regionList.attr('disabled', 'disabled');
-                    }
-                }
-                regionList.show();
-                regionInput.hide();
-            } else {
-                if (this.options.isRegionRequired) {
-                    regionInput.addClass('required-entry').removeAttr('disabled');
-                    requiredLabel.show();
-                } else {
-                    if (!this.options.optionalRegionAllowed) {
-                        regionInput.attr('disabled', 'disabled');
-                    }
-                }
-                regionList.removeClass('required-entry').hide();
-                regionInput.show();
-                requiredLabel.hide();
-            }
-            // If country is in optionalzip list, make postcode input not required
-            if (this.options.isZipRequired) {
-                $.inArray(country, this.options.countriesWithOptionalZip) >= 0 ?
-                    postcode.removeClass('required-entry').parent().siblings('label').children('em').hide() :
-                    postcode.addClass('required-entry').parent().siblings('label').children('em').show();
-            }
-            // Add defaultvalue attribute to state/province select element
-            regionList.attr('defaultvalue', this.options.defaultRegion);
-        },
-
-        /**
-         * Check if the selected country has a mandatory region selection
-         *
-         * @param {string} country Code of the country - 2 uppercase letter for country code
-         * @private
-         */
-        _checkRegionRequired: function(country) {
-            this.options.isRegionRequired = false;
-            var self = this;
-            $.each(this.options.regionJson.config.regions_required, function(index, elem){
-                if (elem == country) {
-                    self.options.isRegionRequired = true;
-                }
-            });
-        }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js b/app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js
deleted file mode 100644
index 1e6baf526475ae33fb1a1888944ceeb4545e585d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage checkout shopping cart
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($) {
-    $.widget('mage.shoppingCart', {
-        _create: function() {
-            if ($(this.options.updateCartActionContainer).length > 0) { /* <!--[if lt IE 8]> Only */
-                $(this.options.emptyCartButton).on('click', $.proxy(function() {
-                    $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
-                    $(this.options.updateCartActionContainer)
-                        .attr('name', 'update_cart_action').attr('value', 'empty_cart');
-                }, this));
-            }
-            $(this.options.continueShoppingButton).on('click', $.proxy(function() {
-                location.href = this.options.continueShoppingUrl;
-            }, this));
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js b/app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js
deleted file mode 100644
index 825b4bb73c0f6817f177f541afdcb28186debac6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage side bar
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-/*global confirm:true*/
-(function ($) {
-    $.widget('mage.sidebar', {
-        options: {
-            checkoutUrl: '',
-            checkoutButton: '',
-            removeButton: '',
-            confirmMessage: ''
-        },
-        _create: function() {
-            $(this.options.checkoutButton).on('click', $.proxy(function() {
-                location.href = this.options.checkoutUrl;
-            }, this));
-            $(this.options.removeButton).on('click', $.proxy(function() {
-                return confirm(this.options.confirmMessage);
-            }, this));
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml
deleted file mode 100644
index edb922b5c54b2fd2e4aaef04b1b82e294cdd1a23..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="catalog_product_view"/>
-    <referenceBlock name="product.info">
-        <block class="Magento\Checkout\Block\Cart\Item\Configure" name="checkout.cart.item.configure.block"/>
-    </referenceBlock>
-    <referenceBlock name="product.info.addtocart">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">Magento_Checkout::cart/item/configure/updatecart.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="product.info.addtocart.additional">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">Magento_Checkout::cart/item/configure/updatecart.phtml</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml
deleted file mode 100644
index 72685dcf9048c5ec6f9ee0d2b271d5100ed56c67..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Cart" name="checkout.cart" template="cart.phtml">
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="simple" template="cart/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="cart/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="cart/item/default.phtml"/>
-            <container name="checkout.cart.empty.widget" as="checkout_cart_empty_widget" label="Empty Shopping Cart Content Before"/>
-            <container name="checkout.cart.top_methods" as="top_methods" label="Payment Methods Before Checkout Button">
-                <block class="Magento\Checkout\Block\Onepage\Link" name="checkout.cart.methods.onepage.top" template="onepage/link.phtml"/>
-            </container>
-            <container name="checkout.cart.form.before" as="form_before" label="Shopping Cart Form Before"/>
-            <container name="checkout.cart.methods" as="methods" label="Payment Methods After Checkout Button">
-                <block class="Magento\Checkout\Block\Onepage\Link" name="checkout.cart.methods.onepage.bottom" template="onepage/link.phtml"/>
-                <block class="Magento\Checkout\Block\Multishipping\Link" name="checkout.cart.methods.multishipping" template="multishipping/link.phtml"/>
-            </container>
-            <container name="checkout.cart.extra" label="Shopping Cart Extra Contents">
-                <container name="checkout.cart.widget" as="checkout_cart_widget" before="-" label="Shopping Cart Items After"/>
-                <block class="Magento\Checkout\Block\Cart\Coupon" name="checkout.cart.coupon" as="coupon" template="cart/coupon.phtml"/>
-            </container>
-            <block class="Magento\Checkout\Block\Cart\Shipping" name="checkout.cart.shipping" as="shipping" template="cart/shipping.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" as="crosssell" template="cart/crosssell.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Totals" name="checkout.cart.totals" as="totals" template="cart/totals.phtml"/>
-        </block>
-    </referenceContainer>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.xml
deleted file mode 100644
index 6992a9165dc27dc8a182b4adb75c970e33642878..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout" design_abstraction="custom">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\State" name="checkout_state" template="multishipping/state.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml
deleted file mode 100644
index 01155fca00b61a3a223960aeccda1a52c0f05ed8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml
deleted file mode 100644
index 01155fca00b61a3a223960aeccda1a52c0f05ed8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml
deleted file mode 100644
index 01155fca00b61a3a223960aeccda1a52c0f05ed8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml
deleted file mode 100644
index 01155fca00b61a3a223960aeccda1a52c0f05ed8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml
deleted file mode 100644
index 01155fca00b61a3a223960aeccda1a52c0f05ed8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml
deleted file mode 100644
index 8476c3644e26d46eed734f111f6d07ebce62d9bf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Address Selection" design_abstraction="custom">
-    <update handle="checkout_multishipping"/>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\Address\Select" name="checkout_address_select" template="multishipping/address/select.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml
deleted file mode 100644
index edbe6ce92e8a5de9ea4e21341d9db672b9eca134..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\Address\Select" name="checkout_address_select" template="multishipping/address/select.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.xml
deleted file mode 100644
index cb8f206e7354716af5da1032b29bac04c2b7baad..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\Addresses" name="checkout_addresses" template="multishipping/addresses.phtml">
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml
deleted file mode 100644
index 727670fe7b56bd7281e08ff961b94cadf5be183d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\Billing" name="checkout_billing" template="multishipping/billing.phtml">
-            <action method="setMethodFormTemplate">
-                <argument name="method" xsi:type="string">purchaseorder</argument>
-                <argument name="template" xsi:type="string">Magento_Payment::form/purchaseorder.phtml</argument>
-            </action>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml
deleted file mode 100644
index 8e46496c74a4abeae1308d37ec5d2d8b73abe645..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Customer Address Edit Form" design_abstraction="custom">
-    <referenceContainer name="content">
-        <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="address/edit.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.xml
deleted file mode 100644
index db128f00b8c2ad1e461a633f235a29cccbe556cf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account_login"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml
deleted file mode 100644
index 6fae4733fab34f677ddb6b62c02f9f764b3bc604..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\Overview" name="checkout_overview" template="multishipping/overview.phtml">
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="row-grouped" template="multishipping/overview/item.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="row-configurable" template="multishipping/overview/item.phtml"/>
-            <block class="Magento\Checkout\Block\Multishipping\Payment\Info" name="payment_info">
-                <action method="setInfoTemplate">
-                    <argument name="method" xsi:type="string"/>
-                    <argument name="template" xsi:type="string"/>
-                </action>
-            </block>
-            <block class="Magento\Checkout\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="multishipping/agreements.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Totals" name="totals"/>
-            <container name="checkout.multishipping.overview.items.after" as="items_after" label="Overview Items After"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.xml
deleted file mode 100644
index a3a49fd46d2637a2eef662f5a9765381d02ff1ff..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account_create"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml
deleted file mode 100644
index 09e49208bc08b01f172ffa7f34981237f598f9ef..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\Shipping" name="checkout_shipping" template="multishipping/shipping.phtml">
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
-            <block class="Magento\Checkout\Block\Multishipping\Billing\Items" name="checkout_billing_items" template="multishipping/billing/items.phtml">
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml
deleted file mode 100644
index 6e453eef56b5c4d07809923cc7659816b670f26f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="checkout_multishipping"/>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Multishipping\Success" name="checkout_success" template="multishipping/success.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml
deleted file mode 100644
index 7784b3f5619752cf1c1472400b48aeb1d0494e47..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="shipping_method_additional" output="1" template="onepage/shipping_method/additional.phtml">
-        <action method="setDontDisplayContainer">
-            <argument name="param" xsi:type="string">1</argument>
-        </action>
-    </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml
deleted file mode 100644
index fa508817825c5823e9f48ef086cec96b34cd79ec..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-right.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Onepage\Failure" name="checkout.failure" template="onepage/failure.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
deleted file mode 100644
index ff432355736cf749f722057ac15a4a615be34556..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-right.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="right">
-        <container name="checkout.progress.wrapper" label="Checkout Progress Wrapper" htmlTag="div" htmlId="checkout-progress-wrapper">
-            <block class="Magento\Checkout\Block\Onepage\Progress" name="checkout.progress" before="-" template="onepage/progress.phtml"/>
-        </container>
-    </referenceContainer>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Onepage" name="checkout.onepage" template="onepage.phtml">
-            <block class="Magento\Checkout\Block\Onepage\Login" name="checkout.onepage.login" as="login" template="onepage/login.phtml">
-                <container name="checkout.onepage.login.before" as="login_before" label="Login/Registration Before" htmlTag="div"/>
-            </block>
-            <block class="Magento\Checkout\Block\Onepage\Billing" name="checkout.onepage.billing" as="billing" template="onepage/billing.phtml"/>
-            <block class="Magento\Checkout\Block\Onepage\Shipping" name="checkout.onepage.shipping" as="shipping" template="onepage/shipping.phtml"/>
-            <block class="Magento\Checkout\Block\Onepage\Shipping\Method" name="checkout.onepage.shipping_method" as="shipping_method" template="onepage/shipping_method.phtml">
-                <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Available" name="checkout.onepage.shipping_method.available" as="available" template="onepage/shipping_method/available.phtml"/>
-                <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="checkout.onepage.shipping_method.additional" as="additional" template="onepage/shipping_method/additional.phtml"/>
-            </block>
-            <block class="Magento\Checkout\Block\Onepage\Payment" name="checkout.onepage.payment" as="payment" template="onepage/payment.phtml">
-                <block class="Magento\Checkout\Block\Onepage\Payment\Methods" name="checkout.payment.methods" as="methods" template="onepage/payment/methods.phtml">
-                    <action method="setMethodFormTemplate">
-                        <argument name="method" xsi:type="string">purchaseorder</argument>
-                        <argument name="template" xsi:type="string">Magento_Payment::form/purchaseorder.phtml</argument>
-                    </action>
-                </block>
-                <block class="Magento\View\Block\Template" name="checkout.onepage.payment.additional" as="additional"/>
-                <block class="Magento\View\Block\Template" name="checkout.onepage.payment.methods_additional" as="methods_additional"/>
-            </block>
-            <block class="Magento\Checkout\Block\Onepage\Review" name="checkout.onepage.review" as="review" template="onepage/review.phtml"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml
deleted file mode 100644
index 25a577d24d14df99f07b1f58a672146bddd8273b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
- -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Checkout\Block\Onepage\Payment\Methods" name="payment_method" output="1" template="onepage/payment/methods.phtml">
-        <action method="setMethodFormTemplate">
-            <argument name="method" xsi:type="string">purchaseorder</argument>
-            <argument name="template" xsi:type="string">Magento_Payment::form/purchaseorder.phtml</argument>
-        </action>
-    </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.xml
deleted file mode 100644
index 80228f5a508414d315f492525309ceed9ea5b7af..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Checkout\Block\Onepage\Progress" name="progress" output="1" template="onepage/progress.phtml">
-        <block class="Magento\Checkout\Block\Onepage\Payment\Info" name="payment_info">
-            <action method="setInfoTemplate">
-                <argument name="method" xsi:type="string"/>
-                <argument name="template" xsi:type="string"/>
-            </action>
-        </block>
-    </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml
deleted file mode 100644
index 04bf6de13458fe6d0719c76a80fb97b3c8e68068..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Checkout\Block\Onepage\Review\Info" name="order_review" output="1" template="onepage/review/info.phtml">
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Totals" name="checkout.onepage.review.info.totals" as="totals" template="onepage/review/totals.phtml"/>
-        <container name="checkout.onepage.review.info.items.before" as="items_before" label="Items Before"/>
-        <container name="checkout.onepage.review.info.items.after" as="items_after" label="Items After"/>
-        <block class="Magento\Checkout\Block\Agreements" name="checkout.onepage.agreements" as="agreements" template="onepage/agreements.phtml"/>
-        <block class="Magento\View\Block\Template" name="checkout.onepage.review.button" as="button" template="Magento_Checkout::onepage/review/button.phtml"/>
-    </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.xml
deleted file mode 100644
index 01ea8488482668aeabb14ff500c89c79d8e79dd4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Available" name="shipping_method" output="1" template="onepage/shipping_method/available.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.xml
deleted file mode 100644
index ac8dc93f7f630c463afce9e137e14508e72e515c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-right.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success" template="success.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml
deleted file mode 100644
index 942683120c65281a8055278185cc71d80b7f134e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head.components">
-        <block class="Magento\Page\Block\Js\Components" name="checkout_page_head_components" template="Magento_Checkout::js/components.phtml"/>
-    </referenceBlock>
-    <referenceBlock name="top.links">
-        <block class="Magento\Checkout\Block\Cart\Link" name="my-cart-link"/>
-        <block class="Magento\Checkout\Block\Link" name="onepage-checkout-link" after="my-cart-link">
-            <arguments>
-                <argument name="label" xsi:type="string">Checkout</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <referenceContainer name="right">
-        <block class="Magento\Checkout\Block\Cart\Sidebar" name="cart_sidebar" template="cart/sidebar.phtml" before="-">
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="simple" template="cart/sidebar/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="cart/sidebar/default.phtml"/>
-            <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="cart/sidebar/default.phtml"/>
-            <container name="cart_sidebar.extra_actions" as="extra_actions" label="My Cart Extra Actions"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml
deleted file mode 100644
index 4dea9b79df970b74ebce5326089d506aaae4986d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="multiple-checkout">
-    <div class="page-title title-buttons">
-        <h1><?php echo __('Change Billing Address') ?></h1>
-        <button type="button" title="<?php echo __('Add New Address') ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><span><span><?php echo __('Add New Address') ?></span></span></button>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <?php $_index=0 ?>
-    <?php foreach ($this->getAddressCollection() as $_address): ?>
-        <?php if($_index%3==0): ?><div class="col3-set"><?php endif; ?>
-        <div class="col-<?php echo ($_index%3+1) ?>">
-                <p class="actions">
-                    <a href="<?php echo $this->getEditAddressUrl($_address) ?>"><?php echo __('Edit Address') ?></a> <span class="separator">|</span> 
-                    <a href="<?php echo $this->getSetAddressUrl($_address) ?>"><strong><?php echo __('Select Address') ?></strong></a>
-                </p>
-                <address>
-                    <?php echo $_address->format('html') ?>
-                </address>
-                <?php if($this->isAddressDefaultBilling($_address)): ?>
-                   <strong><?php echo __('Default Billing') ?></strong>
-                <?php endif; ?>
-                <?php if($this->isAddressDefaultShipping($_address)): ?>
-                    <br /><strong><?php echo __('Default Shipping') ?></strong>
-                <?php endif; ?>
-        </div>
-        <?php $_index++ ?>
-        <?php if($_index && $_index%3==0): ?></div><?php endif; ?>
-    <?php endforeach; ?>
-    <?php if(!$_index || $_index%3!=0): ?></div><?php endif; ?>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Billing Information') ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml
deleted file mode 100644
index 2b55e1349e1152425924194ce734e89578c4bd99..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Ship to multiple address template
- *
- * @see \Magento\Checkout\Block\Multishipping\Addresses
- */
-?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form id="checkout_multishipping_form" action="<?php echo $this->getPostActionUrl() ?>" method="post">
-    <div class="multiple-checkout">
-        <div class="page-title title-buttons">
-            <h1><?php echo __('Ship to Multiple Addresses') ?></h1>
-            <button type="button" title="<?php echo __('Enter a New Address') ?>" class="button" data-role="add-new-address"><span><span><?php echo __('Enter a New Address') ?></span></span></button>
-        </div>
-        <input type="hidden" name="continue" value="0" id="can_continue_flag" />
-        <input type="hidden" name="new_address" value="0" id="add_new_address_flag" />
-        <h2><?php echo __('Please select a shipping address for applicable items.') ?></h2>
-        <table class="data-table" id="multiship-addresses-table">
-            <col />
-            <col width="1" />
-            <col width="1" />
-            <col width="1" />
-            <thead>
-                <tr>
-                    <th><?php echo __('Product') ?></th>
-                    <th class="a-center"><?php echo __('Qty') ?></th>
-                    <th><?php echo __('Send To') ?></th>
-                    <th>&nbsp;</th>
-                </tr>
-            </thead>
-            <tfoot>
-                <tr>
-                    <td colspan="100" class="a-right"><button type="submit" title="<?php echo __('Update Qty &amp; Addresses') ?>" class="button" data-role="can-continue" data-flag="0"><span><span><?php echo __('Update Qty &amp; Addresses') ?></span></span></button></td>
-                </tr>
-            </tfoot>
-            <tbody>
-            <?php foreach ($this->getItems() as $_index => $_item): ?>
-                <?php if ($_item->getQuoteItem()) :?>
-                <tr>
-                    <td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
-                    <td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/></td>
-                    <td><?php if ($_item->getProduct()->getIsVirtual()): echo __('Shipping selection is not applicable.'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
-                    <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="btn-remove2"><?php echo __('Remove Item') ?></a></td>
-                </tr>
-                <?php endif; ?>
-            <?php endforeach; ?>
-            </tbody>
-        </table>
-        <script type="text/javascript">jQuery('#multiship-addresses-table').decorate('table')</script>
-        <div class="buttons-set">
-            <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Shopping Cart') ?></a></p>
-            <button type="submit" title="<?php echo __('Continue to Shipping Information') ?>" class="button<?php if ($this->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><span><?php echo __('Continue to Shipping Information') ?></span></span></button>
-        </div>
-    </div>
-</form>
-<script type="text/javascript">
-    head.js(
-        "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-        "<?php echo $this->getViewFileUrl('Magento_Checkout::js/multi-shipping.js') ?>",
-        function() {
-            jQuery('#checkout_multishipping_form').multiShipping().validation();
-        }
-    );
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml
deleted file mode 100644
index 153ce90330db818037c449dea185ce33cc31312e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Checkout\Block\Agreements
- */
-?>
-
-<?php if (!$this->getAgreements()) return; ?>
-<ol id="checkout-agreements" class="checkout-agreements">
-<?php foreach ($this->getAgreements() as $_a): ?>
-    <li>
-        <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
-            <?php if ($_a->getIsHtml()):?>
-                <?php echo $_a->getContent() ?>
-            <?php else:?>
-                <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
-            <?php endif; ?>
-        </div>
-        <p class="agree">
-            <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
-        </p>
-    </li>
-<?php endforeach ?>
-</ol>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.phtml
deleted file mode 100644
index faa48086693017829739d07da92ced10af5c685e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.phtml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Multishipping checkout billing information
- *
- * @see \Magento\Checkout\Block\Multishipping\Billing
- */
-?>
-<div class="multiple-checkout">
-    <div class="page-title">
-        <h1><?php echo __('Billing Information') ?></h1>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="multishipping-billing-form">
-        <div class="col2-set">
-            <div class="col-1 col-narrow">
-                <div class="box">
-                    <div class="box-title">
-                        <h2><?php echo __('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getSelectAddressUrl() ?>"><?php echo __('Change') ?></a></h2>
-                    </div>
-                    <div class="box-content">
-                        <?php $_address=$this->getAddress() ?>
-                        <address><?php echo $_address->format('html') ?></address>
-                    </div>
-                </div>
-            </div>
-            <div class="col-2 col-wide">
-                <div class="box">
-                    <div class="box-title">
-                        <h2><?php echo __('Payment Method') ?></h2>
-                    </div>
-                    <div class="box-content">
-                        <!-- Payment methods forms list -->
-                        <dl class="sp-methods">
-                        <?php
-                            $_methods       = $this->getMethods();
-                            $_methodsCount  = count($_methods);
-                        ?>
-                        <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
-                            <dt>
-                                <?php if ($_methodsCount > 1): ?>
-                                <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" <?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
-                                <?php else :?>
-                                <span class="no-display"><input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio" /></span>
-                                <?php endif;?>
-                                <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label>
-                            </dt>
-                            <?php if($html = $this->getChildHtml('payment.method.'.$_code)) : ?>
-                            <dd>
-                                <?php echo $html; ?>
-                            </dd>
-                            <?php endif; ?>
-                        <?php endforeach; ?>
-                        </dl>
-                        <?php echo $this->getChildHtml('checkout_billing_items') ?>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="buttons-set">
-            <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Shipping Information') ?></a></p>
-            <button id="payment-continue" type="submit" title="<?php echo __('Continue to Review Your Order') ?>" class="button"><span><span><?php echo __('Continue to Review Your Order') ?></span></span></button>
-        </div>
-    </form>
-    <script type="text/javascript">
-            head.js(
-                "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('Magento_Checkout::js/payment.js') ?>",
-                function() {
-                    jQuery('#multishipping-billing-form').payment({
-                        checkoutPrice: <?php echo (float)$this->getQuoteBaseGrandTotal(); ?>
-                    }).validation({
-                        errorPlacement: function(error, element) {
-                            if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-cc-ukss') >= 0) {
-                                element.parents('form').find('[data-validation-msg="validate-cc-ukss"]').html(error);
-                            } else {
-                                element.after(error);
-                            }
-                        }
-                    });
-                });
-    </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.phtml
deleted file mode 100644
index 96d7e0a4e99542c3be17e5adfd3e7776dd6388b4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.phtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($this->getQuote()->hasVirtualItems()): ?>
-    <div class="col2-set">
-        <h2 class="legend"><?php echo __('Other Items in Your Order') ?></h2>
-        <div class="col-1 col-narrow"></div>
-        <div class="col-2 col-wide">
-            <h3><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getVirtualProductEditUrl() ?>"><?php echo __('Edit Items') ?></a></h3>
-            <table class="data-table" id="unavailable-shipping-table">
-                <col />
-                <col width="1" />
-                <thead>
-                    <tr>
-                        <th><?php echo __('Product Name') ?></th>
-                        <th class="a-center"><?php echo __('Qty') ?></th>
-                    </tr>
-                </thead>
-                <tbody>
-                <?php foreach ($this->getVirtualQuoteItems() as $_item): ?>
-                    <tr>
-                        <td><?php echo $this->getItemHtml($_item) ?></td>
-                        <td class="a-center"><?php echo $_item->getQty() ?></td>
-                    </tr>
-                <?php endforeach; ?>
-                </tbody>
-            </table>
-            <script type="text/javascript">(function($) {$('#unavailable-shipping-table').decorate('table')})(jQuery)</script>
-        </div>
-    </div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.phtml
deleted file mode 100644
index 9f29bfc973412e94b4a9b2fa7af944ebcb180449..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.phtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
-<?php if ($_options = $this->getOptionList()):?>
-<dl class="item-options">
-    <?php foreach ($_options as $_option) : ?>
-    <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-    <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-    <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-        <?php if (isset($_formatedOptionValue['full_view'])): ?>
-        <div class="truncated_full_value">
-            <dl class="item-options">
-                <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-            </dl>
-        </div>
-        <?php endif; ?>
-    </dd>
-    <?php endforeach; ?>
-</dl>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml
deleted file mode 100644
index e141179eb76567af04b7515d9e753c0046fe51c1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<a href="<?php echo $this->getCheckoutUrl()?>" title="<?php echo __('Checkout with Multiple Addresses');?>"><?php echo __('Checkout with Multiple Addresses');?></a>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml
deleted file mode 100644
index 73b2f58a5c06abe3e9fc0f3105d1c29f61f521f5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Checkout\Block\Multishipping\Overview */ ?>
-<div class="multiple-checkout">
-    <div class="page-title">
-        <h1><?php echo __('Review Order') ?></h1>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="review-order-form">
-        <div class="col2-set">
-            <h2 class="legend"><?php echo __('Billing Information') ?></h2>
-            <div class="col-1">
-                <div class="box">
-                    <?php $_address=$this->getBillingAddress() ?>
-                    <div class="box-title">
-                        <h3><?php echo __('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingAddressUrl($_address) ?>"><?php echo __('Change') ?></a></h3>
-                    </div>
-                    <div class="box-content">
-                        <address>
-                            <?php echo $_address->format('html') ?>
-                        </address>
-                    </div>
-                </div>
-            </div>
-            <div class="col-2">
-                <div class="box">
-                    <div class="box-title">
-                        <h3><?php echo __('Payment Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingUrl() ?>"><?php echo __('Change') ?></a></h3>
-                    </div>
-                    <div class="box-content">
-                        <input type="hidden" name="payment[cc_number]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcNumber())?>" />
-                        <input type="hidden" name="payment[cc_cid]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcCid())?>" />
-                        <?php echo $this->getPaymentHtml() ?>
-                    </div>
-                </div>
-            </div>
-         </div>
-        <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
-        <div class="col2-set">
-        <h2 class="legend"><?php echo __('Shipping Information') ?></h2>
-        <?php foreach ($this->getShippingAddresses() as $_index => $_address): ?>
-            <h3 class="legend"><?php echo __('Address %1 of %2', ($_index+1), $this->getShippingAddressCount()) ?></h3>
-                <div class="col-1 col-narrow">
-                    <div class="box">
-                        <div class="box-title">
-                            <h4><?php echo __('Shipping To') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingAddressUrl($_address) ?>"><?php echo __('Change') ?></a></h4>
-                        </div>
-                        <div class="box-content">
-                            <address>
-                                <?php echo $_address->format('html') ?>
-                            </address>
-                        </div>
-                    </div>
-                    <div class="box">
-                        <div class="box-title">
-                            <h4><?php echo __('Shipping Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingUrl() ?>"><?php echo __('Change') ?></a></h4>
-                        </div>
-                        <div class="box-content">
-                            <?php if($_rate=$this->getShippingAddressRate($_address)): ?>
-                            <p>
-                            <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?> - <?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
-                            <?php $_excl = $this->getShippingPriceExclTax($_address); ?>
-                            <?php $_incl = $this->getShippingPriceInclTax($_address); ?>
-                            <?php echo $_excl; ?>
-                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                            <?php endif; ?>
-                            </p>
-                            <?php endif; ?>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-2 col-wide">
-                    <h4><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getAddressesEditUrl() ?>"><?php echo __('Edit Items') ?></a></h4>
-                    <table class="data-table" id="overview-table-<?php echo $_address->getId() ?>">
-                        <col />
-                        <col width="1" />
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                        <col width="1" />
-                        <?php endif; ?>
-                        <col width="1" />
-                        <col width="1" />
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                        <col width="1" />
-                        <?php endif; ?>
-                        <thead>
-                            <tr>
-                                <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Product Name') ?></th>
-                                <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Price') ?></th>
-                                <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Qty') ?></th>
-                                <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Subtotal') ?></th>
-                            </tr>
-                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                            <tr>
-                                <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                                <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                                <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                                <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                            </tr>
-                            <?php endif; ?>
-                        </thead>
-                        <tfoot>
-                            <?php echo $this->renderTotals($this->getShippingAddressTotals($_address)); ?>
-                        </tfoot>
-                        <tbody>
-                        <?php foreach ($this->getShippingAddressItems($_address) as $_item): ?>
-                            <?php echo $this->getRowItemHtml($_item); ?>
-                        <?php endforeach; ?>
-                        </tbody>
-                    </table>
-                    <script type="text/javascript">jQuery('#overview-table-<?php echo $_address->getId() ?>').decorate('table')</script>
-                </div>
-            <?php if($this->getShippingAddressCount()!=$_index+1): ?>
-                <div class="divider"></div>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </div>
-        <?php if ($this->getQuote()->hasVirtualItems()): ?>
-        <div class="col2-set">
-            <h2 class="legend"><?php echo __('Other Items in Your Order') ?></h2>
-            <div class="col-1 col-narrow"></div>
-            <div class="col-2 col-wide">
-                <h3><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getVirtualProductEditUrl() ?>"><?php echo __('Edit Items') ?></a></h3>
-                <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
-                <table class="data-table" id="virtual-overview-table">
-                    <col />
-                    <col width="1" />
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <col width="1" />
-                    <?php endif; ?>
-                    <col width="1" />
-                    <col width="1" />
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                    <col width="70" />
-                    <?php endif; ?>
-                    <thead>
-                        <tr>
-                            <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Product Name') ?></th>
-                            <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Price') ?></th>
-                            <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Qty') ?></th>
-                            <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Subtotal') ?></th>
-                        </tr>
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                        <tr>
-                            <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                            <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                            <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                            <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                        </tr>
-                        <?php endif; ?>
-                    </thead>
-                    <tfoot>
-                        <?php echo $this->renderTotals($this->getBillinAddressTotals()); ?>
-                    </tfoot>
-                    <tbody>
-                    <?php foreach ($this->getVirtualItems() as $_item): ?>
-                        <?php echo $this->getRowItemHtml($_item); ?>
-                    <?php endforeach; ?>
-                    </tbody>
-                    </table>
-                    <script type="text/javascript">jQuery('#virtual-overview-table').decorate('table')</script>
-                </div>
-        </div>
-        <?php endif; ?>
-
-           <?php echo $this->getChildHtml('items_after'); ?>
-
-            <div id="checkout-review-submit" data-mage-init="{paymentAuthentication:{}}">
-                <?php echo $this->getChildHtml('agreements') ?>
-                <div class="place-order">
-                    <div class="grand-total">
-                        <div class="inner">
-                            <big><?php echo __('Grand Total:') ?> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()) ?></big>
-                            <div id="review-buttons-container">
-                                <button type="submit" title="<?php echo __('Place Order') ?>" class="button btn-checkout" id="review-button"><span><span><?php echo __('Place Order') ?></span></span></button>
-                            </div>
-                        </div>
-                    </div>
-                    <span class="please-wait" id="review-please-wait" style="display:none;">
-                        <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information...') ?>" title="<?php echo __('Submitting order information...') ?>" class="v-middle" /> <?php echo __('Submitting order information...') ?>
-                    </span>
-                </div>
-            </div>
-            <div class="buttons-set">
-                <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Billing Information') ?></a></p>
-            </div>
-        </form>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Checkout::js/overview.js')?>", function() {
-                jQuery('#review-order-form').orderOverview();
-            });
-        </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml
deleted file mode 100644
index bc68ca43f9e8ef027261960f4724526541978f97..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Quote Item row html
- *
- * @see \Magento\Checkout\Block\Cart\Item\Renderer
- */
-?>
-<?php $_item = $this->getItem() ?>
-<tr>
-    <td><?php echo $this->getRenderedBlock()->getItemHtml($_item) ?></td>
-
-    <!--- Excluding Tax -->
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-            <?php endif; ?>
-
-        </div>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <!--- // Excluding Tax -->
-
-    <!--- Including Tax -->
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-            <?php endif; ?>
-
-        </div>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-
-    </td>
-    <?php endif; ?>
-    <!--- // Including Tax -->
-
-    <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
-
-    <!--- Excluding Tax Subtotal -->
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-        </div>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <!--- //Excluding Tax Subtotal -->
-
-    <!--- Including Tax Subtotal -->
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            <?php endif; ?>
-
-        </div>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <!--- //Including Tax Subtotal -->
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml
deleted file mode 100644
index 50bd5ae841cca7231d7bb24af81513d23956fab2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Multishipping checkout shipping template
- *
- * @see \Magento\Checkout\Block\Multishipping\Shipping
- * @var $this \Magento\Checkout\Block\Multishipping\Shipping
- */
-?>
-<div class="multiple-checkout">
-    <div class="page-title">
-        <h1><?php echo __('Select Shipping Method') ?></h1>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="shipping_method_form">
-        <?php foreach ($this->getAddresses() as $_index => $_address): ?>
-        <div class="col2-set">
-            <h2 class="legend"><?php echo __('Address %1 of %2', ($_index+1), $this->getAddressCount()) ?></h2>
-            <div class="col-1 col-narrow">
-                <div class="box">
-                    <div class="box-title">
-                        <h3><?php echo __('Shipping To') ?> <span class="separator">|</span> <a href="<?php echo $this->getAddressEditUrl($_address) ?>"><?php echo __('Change') ?></a></h3>
-                    </div>
-                    <div class="box-content">
-                        <address><?php echo $_address->format('html') ?></address>
-                    </div>
-                </div>
-                <div class="box box-sp-methods">
-                    <div class="pointer"></div>
-                    <div class="box-title">
-                        <h3><?php echo __('Shipping Method') ?></h3>
-                    </div>
-                    <div class="box-content">
-                        <?php if (!($_shippingRateGroups = $this->getShippingRates($_address))): ?>
-                            <p><?php echo __('Sorry, no quotes are available for this order.') ?></p>
-                        <?php else: ?>
-                        <dl class="sp-methods">
-                            <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
-                                <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
-                                <dd>
-                                    <ul>
-                                    <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
-                                        <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"' ?>>
-                                           <?php if ($_rate->getErrorMessage()): ?>
-                                                <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
-                                           <?php else: ?>
-                                                <?php if ($_sole) : ?>
-                                                <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
-                                                <?php else: ?>
-                                                <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
-                                                <?php endif; ?>
-                                                <label for="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
-                                                <?php $_excl = $this->getShippingPrice($_address, $_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-                                                <?php $_incl = $this->getShippingPrice($_address, $_rate->getPrice(), true); ?>
-                                                <?php echo $_excl; ?>
-                                                <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                                    (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                                                <?php endif; ?>
-                                                </label>
-                                           <?php endif ?>
-                                        </li>
-                                    <?php endforeach; ?>
-                                    </ul>
-                                </dd>
-                            <?php endforeach; ?>
-                        </dl>
-                        <?php endif; ?>
-                    </div>
-                </div>
-            </div>
-            <div class="col-2 col-wide">
-                <?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('multishipping_adress_checkbox', $_address); ?>
-                <h3><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getItemsEditUrl($_address) ?>"><?php echo __('Edit Items') ?></a></h3>
-                <table class="data-table" id="shipping-table-<?php echo $_address->getId() ?>">
-                    <col />
-                    <col width="1" />
-                    <thead>
-                        <tr>
-                            <th><?php echo __('Product Name') ?></th>
-                            <th class="a-center"><?php echo __('Qty') ?></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    <?php foreach ($this->getAddressItems($_address) as $_item): ?>
-                        <tr>
-                            <td>
-                                <?php echo $this->getItemHtml($_item->getQuoteItem()) ?>
-                            </td>
-                            <td class="a-center"><?php echo $_item->getQty() ?></td>
-                        </tr>
-                    <?php endforeach; ?>
-                    </tbody>
-                </table>
-                <script type="text/javascript">(function($) {$('#shipping-table-<?php echo $_address->getId()?>').decorate('table')})(jQuery)</script>
-                <?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('multishipping_address', $_address); ?>
-            </div>
-        </div>
-        <?php endforeach; ?>
-        <?php echo $this->getChildHtml('checkout_billing_items') ?>
-        <div class="buttons-set">
-            <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Select Addresses') ?></a></p>
-            <button type="submit" title="<?php echo __('Continue to Billing Information') ?>" class="button"><span><span><?php echo __('Continue to Billing Information') ?></span></span></button>
-        </div>
-    </form>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml
deleted file mode 100644
index 660d5fe126cc8c7922d7df0d52b375355e0137f9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php 
-/**
- * Mustishipping state
- * 
- * @see \Magento\Checkout\Block\Multishipping\State
- */
-?>
-<ul class="checkout-progress" id="checkout-progress-state">
-<?php foreach ($this->getSteps() as $_step): ?>
-    <li title="<?php echo $_step->getLabel() ?>"<?php if($_step->getIsActive()): ?> class="active"<?php endif; ?>><span><?php echo $_step->getLabel() ?></span></li>
-<?php endforeach; ?>
-</ul>
-<script type="text/javascript">(function($) {$('#checkout-progress-state li').decorate('generic', ['first','last'])})(jQuery)</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.phtml
deleted file mode 100644
index d666ec7ca0aa75422584ac4bf86972a3dd8451b2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.phtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="multiple-checkout">
-    <div class="page-title">
-        <h1><?php echo __('Order Success') ?></h1>
-    </div>
-    <h2 class="sub-title"><?php echo __('Thank you for your purchase!') ?></h2>
-    <p><?php echo __('Thanks for your order. We\'ll send you emails with order details and tracking information.') ?></p>
-    <?php if($_orderIds = $this->getOrderIds()): ?>
-    <p>
-        <?php $flag = false ?>
-        <?php echo __('Your order number is ') ?>
-        <?php foreach ($_orderIds as $orderId=>$incrementId): ?>
-            <?php if ($flag): ?>
-                <?php echo ', ' ?>
-            <?php endif; ?>
-            <?php $flag = true ?>
-            <a href="<?php echo $this->getViewOrderUrl($orderId) ?>"><?php echo $incrementId ?></a>
-        <?php endforeach; ?>
-    </p>
-    <?php endif; ?>
-    <?php echo $this->getChildHtml() ?>
-    <div class="buttons-set">
-        <button type="button" title="<?php echo __('Continue Shopping') ?>" class="button" onclick="window.location = '<?php echo $this->getContinueUrl() ?>';"><span><span><?php echo __('Continue Shopping') ?></span></span></button>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage.phtml
deleted file mode 100644
index 1ee814f2e6397be8fb595d4fa8546cd41ca052fe..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage.phtml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-$_paymentBlock = $this->getLayout()->getBlock('checkout.onepage.payment');
-$_registerParam = $this->getRequest()->getParam('register');
-?>
-<div class="page-title">
-    <h1><?php echo __('Checkout') ?></h1>
-</div>
-<ol class="opc" id="checkoutSteps">
-<?php $i=0; foreach($this->getSteps() as $_stepId => $_stepInfo): ?>
-<?php if (!$this->getChildBlock($_stepId) || !$this->getChildBlock($_stepId)->isShow()): continue; endif; $i++ ?>
-    <li id="opc-<?php echo $_stepId ?>" class="section<?php echo !empty($_stepInfo['allow'])?' allow':'' ?><?php echo !empty($_stepInfo['complete'])?' saved':'' ?>">
-        <div class="step-title">
-            <span class="number"><?php echo $i ?></span>
-            <h2><?php echo $_stepInfo['label'] ?></h2>
-            <a href="#"><?php echo __('Edit') ?></a>
-        </div>
-        <div id="checkout-step-<?php echo $_stepId ?>" class="step a-item" style="display:none;">
-            <?php echo $this->getChildHtml($_stepId) ?>
-        </div>
-    </li>
-<?php endforeach ?>
-</ol>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/opcheckout.js') ?>",
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/accordion.js') ?>",
-            function() {
-                $('#checkoutSteps')
-                    .accordion({
-                        activeSelector: '#opc-<?php echo $this->getActiveStep() ?>'
-                    })
-                    .opcheckout({
-                        quoteBaseGrandTotal: <?php echo (float)$_paymentBlock->getQuoteBaseGrandTotal() ?>,
-                        progressUrl: '<?php echo $this->getUrl('checkout/onepage/progress') ?>',
-                        reviewUrl: '<?php echo $this->getUrl('checkout/onepage/review') ?>',
-                        failureUrl: '<?php echo $this->getUrl('checkout/cart') ?>',
-                        getAddressUrl: '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/',
-                        checkoutAgreements: '#checkout-agreements',
-                        checkoutProgressContainer: '#checkout-progress-wrapper',
-                        ajaxLoaderPlaceButton: true,
-                        checkout: {
-                            suggestRegistration: <?php echo ($_registerParam || $_registerParam === '') ? 'true' : 'false' ?>,
-                            saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveMethod') ?>'
-                        },
-                        billing: {
-                            saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>'
-                        },
-                        shipping: {
-                            saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>'
-                        },
-                        shippingMethod: {
-                            saveUrl: "<?php echo $this->getUrl('checkout/onepage/saveShippingMethod') ?>"
-                        },
-                        payment: {
-                            <?php if ($_paymentBlock->getChildBlock('methods')->getSelectedMethodCode()): ?>
-                                defaultPaymentMethod: "<?php echo $_paymentBlock->getChildBlock('methods')->getSelectedMethodCode() ?>",
-                            <?php endif ?>
-                            saveUrl: '<?php echo $this->getUrl('checkout/onepage/savePayment') ?>'
-                        },
-                        review: {
-                            saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>',
-                            successUrl: '<?php echo $this->getUrl('checkout/onepage/success') ?>'
-                        }
-                    });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js b/app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js
deleted file mode 100644
index 3f12f8f0730b2d3e3e6b188e930438a2b6c8ae58..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Varien
- * @package     js
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-Accordion = Class.create();
-Accordion.prototype = {
-    initialize: function(elem, clickableEntity, checkAllow) {
-        this.container = $(elem);
-        this.checkAllow = checkAllow || false;
-        this.disallowAccessToNextSections = false;
-        this.sections = $$('#' + elem + ' .section');
-        this.currentSection = false;
-        var headers = $$('#' + elem + ' .section ' + clickableEntity);
-        headers.each(function(header) {
-            Event.observe(header,'click',this.sectionClicked.bindAsEventListener(this));
-        }.bind(this));
-    },
-
-    sectionClicked: function(event) {
-        this.openSection($(Event.element(event)).up('.section'));
-        Event.stop(event);
-    },
-
-    openSection: function(section) {
-        var section = $(section);
-
-        // Check allow
-        if (this.checkAllow && !Element.hasClassName(section, 'allow')){
-            return;
-        }
-
-        if(section.id != this.currentSection) {
-            this.closeExistingSection();
-            this.currentSection = section.id;
-            $(this.currentSection).addClassName('active');
-            var contents = Element.select(section, '.a-item');
-            contents[0].show();
-            //Effect.SlideDown(contents[0], {duration:.2});
-
-            if (this.disallowAccessToNextSections) {
-                var pastCurrentSection = false;
-                for (var i=0; i<this.sections.length; i++) {
-                    if (pastCurrentSection) {
-                        Element.removeClassName(this.sections[i], 'allow')
-                    }
-                    if (this.sections[i].id==section.id) {
-                        pastCurrentSection = true;
-                    }
-                }
-            }
-        }
-    },
-
-    closeSection: function(section) {
-        $(section).removeClassName('active');
-        var contents = Element.select(section, '.a-item');
-        contents[0].hide();
-        //Effect.SlideUp(contents[0]);
-    },
-
-    openNextSection: function(setAllow){
-        for (section in this.sections) {
-            var nextIndex = parseInt(section)+1;
-            if (this.sections[section].id == this.currentSection && this.sections[nextIndex]){
-                if (setAllow) {
-                    Element.addClassName(this.sections[nextIndex], 'allow')
-                }
-                this.openSection(this.sections[nextIndex]);
-                return;
-            }
-        }
-    },
-
-    openPrevSection: function(setAllow){
-        for (section in this.sections) {
-            var prevIndex = parseInt(section)-1;
-            if (this.sections[section].id == this.currentSection && this.sections[prevIndex]){
-                if (setAllow) {
-                    Element.addClassName(this.sections[prevIndex], 'allow')
-                }
-                this.openSection(this.sections[prevIndex]);
-                return;
-            }
-        }
-    },
-
-    closeExistingSection: function() {
-        if(this.currentSection) {
-            this.closeSection(this.currentSection);
-        }
-    }
-};
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml
deleted file mode 100644
index 72256eb7c3ce5a226fa5f902318bfdffc59259d8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Checkout\Block\Agreements
- */
-?>
-
-<?php if (!$this->getAgreements()) return; ?>
-<form action="" id="checkout-agreements" onsubmit="return false;">
-<ol class="checkout-agreements">
-<?php foreach ($this->getAgreements() as $_a): ?>
-    <li>
-        <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
-            <?php if ($_a->getIsHtml()):?>
-                <?php echo $_a->getContent() ?>
-            <?php else:?>
-                <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
-            <?php endif; ?>
-        </div>
-        <p class="agree">
-            <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
-        </p>
-    </li>
-<?php endforeach ?>
-</ol>
-</form>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml
deleted file mode 100644
index 35d3e9389cb7663e07ce5d3307fa465eb5882771..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Checkout\Block\Onepage\Billing  */ ?>
-<form id="co-billing-form" action="">
-<fieldset>
-    <ul class="form-list">
-    <?php if ($this->customerHasAddresses()): ?>
-        <li class="wide">
-            <label for="billing-address-select"><?php echo __('Select a billing address from your address book or enter a new address.') ?></label>
-            <div class="input-box">
-                <?php echo $this->getAddressesHtmlSelect('billing') ?>
-            </div>
-        </li>
-    <?php endif; ?>
-    <li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
-        <fieldset>
-            <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
-            <ul>
-                <li class="fields"><?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:company"><?php echo __('Company') ?></label>
-                        <div class="input-box">
-                            <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                        </div>
-                    </div>
-        <?php if(!$this->isCustomerLoggedIn()): ?>
-                    <div class="field">
-                        <label for="billing:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
-                        </div>
-                    </div>
-        <?php endif; ?>
-                </li>
-        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                <li class="wide">
-                    <label for="billing:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" title="<?php echo __('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-        <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-        <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                <li class="wide">
-                    <div class="input-box">
-                        <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-        <?php endfor; ?>
-                <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
-                <li class="wide">
-                    <label for="billing:vat_id"><?php echo __('VAT Number') ?></label>
-                    <div class="input-box">
-                        <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
-                    </div>
-                </li>
-                <?php endif; ?>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:city" class="required"><em>*</em><?php echo __('City') ?></label>
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="billing:city" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                        <div class="input-box">
-                            <select id="billing:region_id" name="billing[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;" <?php if ($this->getConfig('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>>
-                                <option value=""><?php echo __('Please select region, state or province') ?></option>
-                            </select>
-                            <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>"  title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" <?php if ($this->getConfig('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>/>
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:postcode" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'validate-zip-international':true}"/>
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
-                        <div class="input-box">
-                            <?php echo $this->getCountryHtmlSelect('billing') ?>
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:fax"><?php echo __('Fax') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
-                        </div>
-                    </div>
-                </li>
-                <?php if(!$this->isCustomerLoggedIn()): ?>
-
-        <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
-        <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
-            <?php if ($_dob->isEnabled() || $_gender->isEnabled()): ?>
-                <li class="fields">
-                <?php if ($_dob->isEnabled()): ?>
-                    <div class="field">
-                        <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
-                    </div>
-                <?php endif; ?>
-                <?php if ($_gender->isEnabled()): ?>
-                    <div class="field">
-                        <?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
-                    </div>
-                <?php endif ?>
-                </li>
-            <?php endif ?>
-
-        <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
-        <?php if ($_taxvat->isEnabled()): ?>
-                <li>
-                    <?php echo $_taxvat->setTaxvat($this->getQuote()->getCustomerTaxvat())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
-                </li>
-        <?php endif ?>
-
-                <li class="fields" id="register-customer-password">
-                    <div class="field">
-                        <label for="billing:customer_password" class="required"><em>*</em><?php echo __('Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:confirm_password" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="billing[confirm_password]" title="<?php echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true}"/>
-                        </div>
-                    </div>
-                </li>
-                <?php endif; ?>
-                <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
-                    <li class="control">
-                        <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="billing:save_in_address_book" <?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo __('Save in address book') ?></label>
-                    </li>
-                <?php else:?>
-                    <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
-                <?php endif; ?>
-                <?php echo $this->getChildHtml('form.additional.info'); ?>
-            </ul>
-        </fieldset>
-    </li>
-    <?php /* Extensions placeholder */ ?>
-    <?php echo $this->getChildHtml('checkout.onepage.billing.extra')?>
-    <?php if ($this->canShip()): ?>
-        <li class="control">
-            <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo  __('Ship to this address') ?>" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo  __('Ship to this address') ?></label></li>
-        <li class="control">
-            <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo __('Ship to different address') ?>" class="radio" /><label for="billing:use_for_shipping_no"><?php echo __('Ship to different address') ?></label>
-        </li>
-    <?php endif; ?>
-    </ul>
-    <?php if (!$this->canShip()): ?>
-        <input type="hidden" name="billing[use_for_shipping]" value="1" />
-    <?php endif; ?>
-    <div class="buttons-set" id="billing-buttons-container">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <button type="button" title="<?php echo __('Continue') ?>" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
-        <span class="please-wait" id="billing-please-wait" style="display:none;">
-            <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
-        </span>
-    </div>
-</fieldset>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-            function() {
-                $('#billing\\:country_id').regionUpdater({
-                    optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
-                    regionListId: '#billing\\:region_id',
-                    regionInputId: '#billing\\:region',
-                    postcodeId: '#billing\\:postcode',
-                    regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                    defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
-                    countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/failure.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/failure.phtml
deleted file mode 100644
index dfccd26f471f9e474cdca1e7574ec71987258f57..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/failure.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Something went wrong while processing your payment.') ?></h1>
-</div>
-<?php if ($this->getRealOrderId()) : ?><p><?php echo __('Order #') . $this->getRealOrderId() ?></p><?php endif ?>
-<?php if ($error = $this->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
-<p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $this->getContinueShoppingUrl()) ?></p>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml
deleted file mode 100644
index e8cd3bda3e0324295c977f4973732458cd9e5b6e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($this->isPossibleOnepageCheckout()):?>
-    <button type="button" title="<?php echo __('Proceed to Checkout') ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo __('Proceed to Checkout') ?></span></span></button>
-<?php endif?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml
deleted file mode 100644
index db2cb53047d07c70020145cce63565351ca36535..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* Extensions placeholder */ ?>
-<?php echo $this->getChildHtml('checkout.onepage.login.extra')?>
-<div class="col2-set">
-    <?php echo $this->getChildHtml('login_before')?>
-    <div class="col-1">
-        <h3><?php if( $this->isAllowedGuestCheckout() ): ?><?php echo __('Checkout as a Guest or Register') ?><?php else: ?><?php echo __('Register to Create an Account') ?><?php endif; ?></h3>
-        <?php if( $this->isAllowedGuestCheckout() ): ?>
-            <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
-        <?php else: ?>
-            <p><strong><?php echo __('Register and save time!') ?></strong><br />
-            <?php echo __('Sign up with us to save time on your next checkout:') ?></p>
-            <ul>
-                <li><?php echo __('Fast and easy check out') ?></li>
-                <li><?php echo __('Get easy access to your order history and status.') ?></li>
-            </ul>
-        <?php endif; ?>
-        <?php if( $this->isAllowedGuestCheckout() ): ?>
-            <ul class="form-list">
-                <?php if( $this->isAllowedGuestCheckout() ): ?>
-                <li class="control">
-                    <input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo __('Checkout as Guest') ?></label>
-                </li>
-                <?php endif; ?>
-                <li class="control">
-                    <input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER || !$this->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo __('Register') ?></label>
-                </li>
-            </ul>
-            <h4><?php echo __('Register and save time!') ?></h4>
-            <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
-            <ul class="ul">
-                <li><?php echo __('Fast and easy check out') ?></li>
-                <li><?php echo __('Get easy access to your order history and status.') ?></li>
-            </ul>
-        <?php else: ?>
-            <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
-        <?php endif; ?>
-    </div>
-    <div class="col-2">
-        <h3><?php echo __('Login') ?></h3>
-        <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-        <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
-        <fieldset>
-            <h4><?php echo __('Already registered?') ?></h4>
-            <p><?php echo __('Please log in below:') ?></p>
-            <ul class="form-list">
-                <li>
-                    <label for="login-email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" class="input-text" id="login-email" name="login[username]" data-validate="{required:true, 'validate-email':true}" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
-                    </div>
-                </li>
-                <li>
-                    <label for="login-password" class="required"><em>*</em><?php echo __('Password') ?></label>
-                    <div class="input-box">
-                        <input type="password" class="input-text" id="login-password" name="login[password]" data-validate="{required:true}"/>
-                    </div>
-                </li>
-                <?php echo $this->getChildHtml('login.form.additional.info'); ?>
-            </ul>
-        </fieldset>
-        </form>
-    </div>
-</div>
-<div class="col2-set">
-    <div class="col-1">
-        <div class="buttons-set">
-            <p class="required">&nbsp;</p>
-            <button type="button" class="button" data-checkout='{"isGuestCheckoutAllowed":true}'><span><span><?php echo ($this->isAllowedGuestCheckout() ? __('Continue') : __('Register')) ?></span></span></button>
-            <span class="please-wait" style="display:none;">
-                <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo __('Loading next step...') ?>
-            </span>
-        </div>
-    </div>
-    <div class="col-2">
-        <div class="buttons-set">
-            <p class="required"><?php echo __('* Required Fields') ?></p>
-            <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo __('Forgot your password?') ?></a>
-            <button type="submit" class="button" data-action='login-form-submit'><span><span><?php echo __('Login') ?></span></span></button>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            function() {
-                $('#login-form').validation();
-            }
-        )}
-    )(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml
deleted file mode 100644
index 4a11e6f8b6cc90e792f9f0f944ab986d54a67179..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<form action="" id="co-payment-form">
-    <fieldset>
-        <?php echo $this->getChildHtml('methods') ?>
-    </fieldset>
-</form>
-<div class="buttons-set" id="payment-buttons-container">
-    <p class="required"><?php echo __('* Required Fields') ?></p>
-    <p class="back-link"><a href="#"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-    <button type="button" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
-    <span class="please-wait" id="payment-please-wait" style="display:none;">
-        <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
-    </span>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.phtml
deleted file mode 100644
index 914206cc665cace5f5013dfa06b960e0f2eac313..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * One page checkout payment methods
- *
- * @see \Magento\Checkout\Block\Onepage\Payment\Methods
- */
-?>
-<dl class="sp-methods" id="checkout-payment-method-load">
-<?php
-    $methods = $this->getMethods();
-    $oneMethod = count($methods) <= 1;
-?>
-<?php if (empty($methods)): ?>
-    <dt>
-        <?php echo __('No Payment Methods') ?>
-    </dt>
-<?php else:
-    foreach ($methods as $_method):
-        $_code = $_method->getCode();
-?>
-    <dt>
-    <?php if(!$oneMethod): ?>
-        <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" <?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
-    <?php else: ?>
-        <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
-        <?php $oneMethod = $_code; ?>
-    <?php endif; ?>
-        <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
-    </dt>
-    <?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
-    <dd>
-        <?php echo $html; ?>
-    </dd>
-    <?php endif; ?>
-<?php endforeach;
-    endif;
-?>
-</dl>
-<div class="no-display" data-checkout-price="<?php echo (float)$this->getQuote()->getBaseGrandTotal(); ?>" />
-<?php echo $this->getChildChildHtml('additional'); ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.phtml
deleted file mode 100644
index c68bcf8d449b8e03f10967ad52094ca85ca009db..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.phtml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Checkout\Block\Onepage\Progress */
-?>
-<div class="block block-progress opc-block-progress">
-    <div class="block-title">
-        <strong><span><?php echo __('Your Checkout Progress') ?></span></strong>
-    </div>
-    <div class="block-content">
-        <dl>
-        <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
-        <?php if ($this->isStepComplete('billing')): ?>
-            <dt class="complete">
-                <?php echo __('Billing Address') ?> <span class="separator">|</span>
-                <a href="#billing" data-goto-section="billing"><?php echo __('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <address><?php echo $this->getBilling()->format('html') ?></address>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo __('Billing Address') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
-
-        <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
-        <?php if ($this->isStepComplete('shipping')): ?>
-            <dt class="complete">
-                <?php echo __('Shipping Address') ?> <span class="separator">|</span>
-                <a href="#payment" data-goto-section="shipping"><?php echo __('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <address><?php echo $this->getShipping()->format('html') ?></address>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo __('Shipping Address') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
-
-        <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
-        <?php if ($this->isStepComplete('shipping_method')): ?>
-            <dt class="complete">
-                <?php echo __('Shipping Method') ?> <span class="separator">|</span>
-                <a href="#shipping_method" data-goto-section="shipping_method"><?php echo __('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <?php if ($this->getShippingMethod()): ?>
-                    <?php echo $this->escapeHtml($this->getShippingDescription()) ?>
-
-                    <?php $_excl = $this->getShippingPriceExclTax(); ?>
-                    <?php $_incl = $this->getShippingPriceInclTax(); ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                        <?php echo $_incl; ?>
-                    <?php else: ?>
-                        <?php echo $_excl; ?>
-                    <?php endif; ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                    <?php endif; ?>
-
-                <?php else: ?>
-                    <?php echo __('Shipping method has not been selected yet') ?>
-                <?php endif; ?>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo __('Shipping Method') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
-
-        <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
-        <?php if ($this->isStepComplete('payment')): ?>
-            <dt class="complete">
-                <?php echo __('Payment Method') ?> <span class="separator">|</span>
-                <a href="#payment" data-goto-section="payment"><?php echo __('Change') ?></a>
-            </dt>
-            <dd class="complete">
-                <?php echo $this->getPaymentHtml() ?>
-            </dd>
-        <?php else: ?>
-            <dt>
-                <?php echo __('Payment Method') ?>
-            </dt>
-        <?php endif; ?>
-        <?php endif; ?>
-        </dl>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml
deleted file mode 100644
index 8b82981faf5f28dae164ead823e9340deb1770ba..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="order-review" id="checkout-review-load">
-    <?php echo $this->getChildHtml('info') ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml
deleted file mode 100644
index 82172d3fe298aedbcbadf965685bf1012b90581d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<button data-role="review-save" type="submit" title="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.phtml
deleted file mode 100644
index 48f12caf1e4fb063d7fe560f04e2ecc8593ca6e4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.phtml
+++ /dev/null
@@ -1,74 +0,0 @@
-\<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php echo $this->getChildHtml('items_before'); ?>
-<div id="checkout-review-table-wrapper" data-mage-init="{paymentAuthentication:{}}">
-    <table class="data-table" id="checkout-review-table">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
-        <col />
-        <col width="1" />
-        <col width="1" />
-        <col width="1" />
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <col width="1" />
-        <col width="1" />
-        <?php endif; ?>
-        <thead>
-            <tr>
-                <th rowspan="<?php echo $rowspan ?>"><?php echo __('Product Name') ?></th>
-                <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Price') ?></th>
-                <th rowspan="<?php echo $rowspan ?>" class="a-center"><?php echo __('Qty') ?></th>
-                <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Subtotal') ?></th>
-            </tr>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <tr>
-                    <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                    <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                    <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                    <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                </tr>
-            <?php endif; ?>
-        </thead>
-        <?php echo $this->getChildHtml('totals'); ?>
-        <tbody>
-        <?php foreach($this->getItems() as $_item): ?>
-            <?php echo $this->getItemHtml($_item)?>
-        <?php endforeach ?>
-        </tbody>
-    </table>
-</div>
-<?php echo $this->getChildHtml('items_after'); ?>
-<script type="text/javascript">jQuery('#checkout-review-table').decorate('table')</script>
-<div id="checkout-review-submit" data-mage-init="{paymentAuthentication:{}}">
-    <?php echo $this->getChildHtml('agreements') ?>
-    <div class="buttons-set" id="review-buttons-container">
-        <p class="f-left"><?php echo __('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Your Cart') ?></a></p>
-        <?php echo $this->getChildHtml('button') ?>
-        <span class="please-wait" id="review-please-wait" style="display:none;">
-            <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information...') ?>" title="<?php echo __('Submitting order information...') ?>" class="v-middle" /> <?php echo __('Submitting order information...') ?>
-        </span>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml
deleted file mode 100644
index e3ea7b940b3b9f3b2c184c2db6791a5c2ae76c40..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem()?>
-<tr>
-    <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
-        <?php if ($_options = $this->getOptionList()):?>
-        <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
-            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                <div class="truncated_full_value">
-                    <dl class="item-options">
-                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                    </dl>
-                </div>
-                <?php endif; ?>
-            </dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif;?>
-        <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
-            <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
-        <?php endif;?>
-    </td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-            <?php endif; ?>
-
-        </span>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-            <?php endif; ?>
-
-        </span>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <td class="a-center"><?php echo $_item->getQty() ?></td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-        </span>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            <?php endif; ?>
-
-        </span>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml
deleted file mode 100644
index 9479a681acc26c13612de4271303442c4e2e55cd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Checkout\Block\Cart\Totals
- */
-?>
-<?php if ($this->getTotals()): ?>
-<tfoot>
-    <?php $_colspan = $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 5 : 3; ?>
-    <?php echo $this->renderTotals(null, $_colspan); ?>
-    <?php echo $this->renderTotals('footer', $_colspan); ?>
-    <?php if ($this->needDisplayBaseGrandtotal()):?>
-    <tr>
-        <td class="a-right" colspan="<?php echo $_colspan; ?>">
-            <small><?php echo __('Your credit card will be charged for') ?></small>
-        </td>
-        <td class="a-right">
-            <small><?php echo $this->displayBaseGrandtotal() ?></small>
-        </td>
-    </tr>
-    <?php endif?>
-</tfoot>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml
deleted file mode 100644
index 05f7c7fbcdc64226cb3f8d1e3ace267cfa331fbb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Checkout\Block\Onepage\Shipping */ ?>
-<form action="" id="co-shipping-form">
-    <ul class="form-list">
-    <?php if ($this->customerHasAddresses()): ?>
-       <li class="wide">
-           <label for="shipping-address-select"><?php echo __('Select a shipping address from your address book or enter a new address.') ?></label>
-           <div class="input-box">
-               <?php echo $this->getAddressesHtmlSelect('shipping') ?>
-           </div>
-       </li>
-    <?php endif ?>
-        <li id="shipping-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif ?>>
-            <fieldset>
-                <input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
-                <ul>
-                    <li class="fields"><?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->toHtml() ?></li>
-                    <li class="fields">
-                        <div class="fields">
-                            <label for="shipping:company"><?php echo __('Company') ?></label>
-                            <div class="input-box">
-                                <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                            </div>
-                        </div>
-                    </li>
-            <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                    <li class="wide">
-                        <label for="shipping:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                        </div>
-                    </li>
-            <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-            <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                    <li class="wide">
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                        </div>
-                    </li>
-            <?php endfor; ?>
-                    <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
-                    <li class="wide">
-                        <label for="billing:vat_id"><?php echo __('VAT Number'); ?></label>
-                        <div class="input-box">
-                            <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo __('VAT Number'); ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
-                        </div>
-                    </li>
-                    <?php endif; ?>
-                    <li class="fields">
-                        <div class="field">
-                            <label for="shipping:city" class="required"><em>*</em><?php echo __('City') ?></label>
-                            <div class="input-box">
-                                <input type="text" title="<?php echo __('City') ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="shipping:city" />
-                            </div>
-                        </div>
-                        <div class="field">
-                            <label for="shipping:region" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                            <div class="input-box">
-                                <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                                    <option value=""><?php echo __('Please select a region, state or province.') ?></option>
-                                </select>
-                                <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
-                            </div>
-                        </div>
-                    </li>
-                    <li class="fields">
-                        <div class="field">
-                            <label for="shipping:postcode" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                            <div class="input-box">
-                                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
-                            </div>
-                        </div>
-                        <div class="field">
-                            <label for="shipping:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
-                            <div class="input-box">
-                                <?php echo $this->getCountryHtmlSelect('shipping') ?>
-                            </div>
-                        </div>
-                    </li>
-                    <li class="fields">
-                        <div class="field">
-                            <label for="shipping:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                            <div class="input-box">
-                                <input type="text" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" />
-                            </div>
-                        </div>
-                        <div class="field">
-                            <label for="shipping:fax"><?php echo __('Fax') ?></label>
-                            <div class="input-box">
-                                <input type="text" name="shipping[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" />
-                            </div>
-                        </div>
-                    </li>
-                <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
-                    <li class="control">
-                        <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="shipping:save_in_address_book" <?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo __('Save in address book') ?></label></li>
-                <?php else:?>
-                    <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
-                <?php endif;?>
-                </ul>
-            </fieldset>
-        </li>
-        <li class="control">
-            <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo __('Use Billing Address') ?>" class="checkbox" /><label for="shipping:same_as_billing"><?php echo __('Use Billing Address') ?></label>
-        </li>
-    </ul>
-    <div class="buttons-set" id="shipping-buttons-container">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <p class="back-link"><a href="#"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-        <button type="button" class="button" title="<?php echo __('Continue') ?>"><span><span><?php echo __('Continue') ?></span></span></button>
-        <span id="shipping-please-wait" class="please-wait" style="display:none;">
-            <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
-        </span>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-            function() {
-                $('#shipping\\:country_id').regionUpdater({
-                    optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
-                    regionListId: '#shipping\\:region_id',
-                    regionInputId: '#shipping\\:region',
-                    postcodeId: '#shipping\\:postcode',
-                    regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                    defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
-                    countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>,
-                    clearError: function() {
-                        var selectorArr = ['#shipping\\:region_id', '#shipping\\:region', '#shipping\\:postcode'];
-                        for (var i = 0; i < selectorArr.length; i++) {
-                            $(selectorArr[i]).removeClass('validation-failed').next("div.validation-advice").remove();
-                        }
-                    }
-                });
-            });
-    })(jQuery);
-</script>
-
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml
deleted file mode 100644
index ac7166ee1b1fecd1fdc690342a1c90bcf499c674..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<form id="co-shipping-method-form" action="">
-    <div id="checkout-shipping-method-load">
-        <?php echo $this->getChildHtml('available') ?>
-    </div>
-    <div id="onepage-checkout-shipping-method-additional-load">
-        <?php echo $this->getChildHtml('additional') ?>
-    </div>
-    <div class="buttons-set" id="shipping-method-buttons-container">
-        <p class="back-link"><a href="#"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-        <button type="button" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
-        <span id="shipping-method-please-wait" class="please-wait" style="display:none;">
-            <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
-        </span>
-    </div>
-</form>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml
deleted file mode 100644
index 9a816287728fb064b25a99cb0e2bab248743ca3c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if (!$this->getQuote()->isVirtual()): ?>
-    <?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('onepage_checkout', $this->getQuote(), $this->getDontDisplayContainer()) ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.phtml
deleted file mode 100644
index 8fa017be225537ef5fdbd225c26cbc01d1260379..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Checkout\Block\Onepage\Shipping\Method\Available */ ?>
-<?php $_shippingRateGroups = $this->getShippingRates(); ?>
-<?php if (!$_shippingRateGroups): ?>
-    <p><?php echo __('Sorry, no quotes are available for this order.') ?></p>
-<?php else: ?>
-    <dl class="sp-methods">
-    <?php $shippingCodePrice = array(); ?>
-    <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
-        <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
-        <dd>
-            <ul>
-            <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
-                <?php $shippingCodePrice[] = '"'.$_rate->getCode().'":'.(float)$_rate->getPrice(); ?>
-                <li>
-                   <?php if ($_rate->getErrorMessage()): ?>
-                    <ul class="messages"><li class="error-msg"><ul><li><?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></li></ul></li></ul>
-                   <?php else: ?>
-                        <?php if ($_sole) : ?>
-                        <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
-                        <?php else: ?>
-                        <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio"/>
-                        <?php endif; ?>
-                        <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
-                        <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
-                        <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
-                        <?php echo $_excl; ?>
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
-                        <?php endif; ?>
-                        </label>
-                   <?php endif ?>
-                </li>
-            <?php endforeach; ?>
-            </ul>
-        </dd>
-    <?php endforeach; ?>
-    </dl>
-    <div class="no-display" data-shipping-code-price='{<?php echo implode(",",$shippingCodePrice); ?>}'></div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/success.phtml b/app/design/frontend/magento_backup/Magento_Checkout/success.phtml
deleted file mode 100644
index 169c4d693f39925a402e7c303848f2dd45fec34c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/success.phtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('We received your order.') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<h2 class="sub-title"><?php echo __('Thank you for your purchase!') ?></h2>
-
-<?php if ($this->getOrderId()):?>
-<?php if ($this->getCanViewOrder()) :?>
-    <p><?php echo __('Your order # is: %1.', sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getViewOrderUrl()), $this->escapeHtml($this->getOrderId()))) ?></p>
-<?php  else :?>
-    <p><?php echo __('Your order # is: %1.', $this->escapeHtml($this->getOrderId())) ?></p>
-<?php endif;?>
-    <p><?php echo __('We\'ll send you a confirmation email with order details and tracking information.') ?></p>
-<?php if ($this->getCanViewOrder() && $this->getCanPrintOrder()) :?>
-    <p>
-        <?php echo __('Click <a href="%1" onclick="this.target=\'_blank\'">here to print</a> a copy of your order confirmation.', $this->getPrintUrl()) ?>
-        <?php echo $this->getChildHtml() ?>
-    </p>
-<?php endif;?>
-<?php endif;?>
-
-<?php if ($this->getAgreementRefId()): ?>
-    <p><?php echo __('Your billing agreement # is: %1.', sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getAgreementUrl()), $this->escapeHtml($this->getAgreementRefId())))?></p>
-<?php endif;?>
-
-<?php if ($profiles = $this->getRecurringProfiles()):?>
-<p><?php echo __('Your recurring payment profiles:'); ?></p>
-<ul class="disc">
-<?php foreach($profiles as $profile):?>
-<?php $profileIdHtml = ($this->getCanViewProfiles() ? sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getProfileUrl($profile)), $this->escapeHtml($this->getObjectData($profile, 'reference_id'))) : $this->escapeHtml($this->getObjectData($profile, 'reference_id')));?>
-    <li><?php echo __('Payment profile # %1: "%2"', $profileIdHtml, $this->escapeHtml($this->getObjectData($profile, 'schedule_description')))?></li>
-<?php endforeach;?>
-</ul>
-<?php endif;?>
-
-<div class="buttons-set">
-    <button type="button" class="button" title="<?php echo __('Continue Shopping') ?>" onclick="window.location='<?php echo $this->getUrl() ?>'"><span><span><?php echo __('Continue Shopping') ?></span></span></button>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/total/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/total/default.phtml
deleted file mode 100644
index d34e1906d404f3b85f42219f1c876f5fa51995e4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/total/default.phtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<tr>
-    <th colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
-        <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?php echo $this->escapeHtml($this->getTotal()->getTitle()); ?>
-        <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
-    </th>
-    <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
-        <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?>
-        <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/total/nominal.phtml b/app/design/frontend/magento_backup/Magento_Checkout/total/nominal.phtml
deleted file mode 100644
index 58537f0ac3f29210e2bb38167ad6ad89f935df52..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/total/nominal.phtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Checkout\Block\Total\Nominal
- */
-?>
-<tr>
-    <th colspan="<?php echo $this->getColspan() + 1; ?>" style="<?php echo $this->getTotalStyle() ?>" class="a-right">
-        <?php echo sprintf(($this->getRenderingArea() == $this->getTotalArea()) ? '<strong>%s</strong>' : '%s', $this->escapeHtml($this->getTotalTitle())) ?>
-    </th>
-</tr>
-<?php foreach ($this->getTotalItems() as $i => $item): ?>
-<?php foreach ($this->getTotalItemDetails($item) as $j => $row):?>
-<tr class="summary-details <?php echo "summary-details-nominal-{$i}" . (0 == $j ? ' summary-details-first' : '') . ($this->getItemDetailsRowIsCompounded($row) ? '' : ' summary-details-excluded')?>" style="display:none;">
-    <td colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotalStyle() ?>" class="a-right">
-        <?php echo $this->escapeHtml($this->getItemDetailsRowLabel($row)) ?>
-    </td>
-    <td class="a-right">
-        <?php echo $this->formatPrice($this->getItemDetailsRowAmount($row)) ?>
-    </td>
-</tr>
-<?php endforeach; ?>
-<tr class="summary-total" onclick="expandDetails(this, '<?php echo ".summary-details-nominal-{$i}"?>')">
-    <td colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotalStyle() ?>">
-        <div class="summary-collapse"><?php echo $this->escapeHtml($this->getItemName($item)); ?></div>
-    </td>
-    <td class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getItemRowTotal($item)) ?>
-    </td>
-</tr>
-<?php endforeach; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml b/app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml
deleted file mode 100644
index 998107b44cab928eb5c98b87cd72cfbc0b617e1e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php global $taxIter; $taxIter++; ?>
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $this->getTotal()->getValue()!=0): ?>
-<?php $isTop = 1; ?>
-            <?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
-                <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
-                <?php $percent = $info['percent']; ?>
-                <?php $amount = $info['amount']; ?>
-                <?php $rates = $info['rates']; ?>
-                <?php $isFirst = 1; ?>
-
-                <?php foreach ($rates as $rate): ?>
-                <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-                    <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
-                        <?php echo $this->escapeHtml($rate['title']); ?>
-                        <?php if (!is_null($rate['percent'])): ?>
-                            (<?php echo (float)$rate['percent']; ?>%)
-                        <?php endif; ?>
-                        <br />
-                    </td>
-                    <?php if ($isFirst): ?>
-                        <td rowspan="<?php echo count($rates); ?>" class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>">
-                            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount); ?>
-                        </td>
-                    <?php endif; ?>
-                </tr>
-                <?php $isFirst = 0; ?>
-                <?php $isTop = 0; ?>
-                <?php endforeach; ?>
-            <?php endforeach; ?>
-<?php endif;?>
-<tr<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $this->getTotal()->getValue()!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
-    <td class="a-right" colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <div class="summary-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
-        <?php else: ?>
-            <?php echo $this->getTotal()->getTitle() ?>
-        <?php endif;?>
-    </td>
-    <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>">
-        <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml b/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
deleted file mode 100644
index 4bb4b239282cdc19eb6fb0f8ecaf18ba84418927..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if($_heading = $this->getContentHeading()): ?>
-    <div class="page-title">
-        <h1><?php echo $_heading; ?></h1>
-    </div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif b/app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif
deleted file mode 100644
index 16fc968deb5ea628fc160d01fd872fa44d36481b..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml
deleted file mode 100644
index d5b7d2f834c92294e2a3dd6fadd48a4a0c37b05f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="footer">
-        <block class="Magento\Cms\Block\Block" name="cms_footer_links" before="footer_links">
-            <!--
-                The content of this block is taken from the database by its block_id.
-                You can manage it in admin CMS -> Static Blocks
-            -->
-            <action method="setBlockId">
-                <argument name="block_id" xsi:type="string">footer_links</argument>
-            </action>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml b/app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
deleted file mode 100644
index ba0a322322bb483ebe2ed332a0dc12d9e931ecaf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml b/app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
deleted file mode 100644
index 77b50f85a702963522471ec5740deb02df848259..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="widget widget-static-block"><?php echo $this->getText(); ?></div>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/widgets.css b/app/design/frontend/magento_backup/Magento_Cms/widgets.css
deleted file mode 100644
index 40f66253d64fe26a8447cba89d4ca4125ee92a9c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/widgets.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* Widget: CMS Static Block */
-.widget-static-block {}
-.sidebar .widget-static-block { display:block; margin:0 0 15px; }
-
-/* Widget: CMS Page Link */
-.widget-cms-link-inline { display:inline; }
-
-.col-main .widget-cms-link { display:block; text-align:right; margin:7px 0; }
-.col-main .widget-cms-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding-right:15px; }
-
-.sidebar .widget-cms-link { display:block; margin:0 0 15px; padding:0 10px; }
-.sidebar .widget-cms-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding:0 15px 0 0; }
diff --git a/app/design/frontend/magento_backup/Magento_Contacts/form.phtml b/app/design/frontend/magento_backup/Magento_Contacts/form.phtml
deleted file mode 100644
index 91f06ee1dd61c8fa33d611b68d65bc44d32a70b1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Contacts/form.phtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div id="messages_product_view"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
-<div class="page-title">
-    <h1><?php echo __('Contact Us') ?></h1>
-</div>
-<form action="<?php echo $this->getFormAction(); ?>" id="contact-form" method="post">
-    <div class="fieldset">
-        <h2 class="legend"><?php echo __('Contact Information') ?></h2>
-        <ul class="form-list">
-            <li class="fields">
-                <div class="field">
-                    <label for="name" class="required"><em>*</em><?php echo __('Name') ?></label>
-                    <div class="input-box">
-                        <input name="name" id="name" title="<?php echo __('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="email" class="required"><em>*</em><?php echo __('Email') ?></label>
-                    <div class="input-box">
-                        <input name="email" id="email" title="<?php echo __('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserEmail()) ?>" class="input-text" type="text" data-validate="{required:true, 'validate-email':true}"/>
-                    </div>
-                </div>
-            </li>
-            <li>
-                <label for="telephone"><?php echo __('Telephone') ?></label>
-                <div class="input-box">
-                    <input name="telephone" id="telephone" title="<?php echo __('Telephone') ?>" value="" class="input-text" type="text" />
-                </div>
-            </li>
-            <li class="wide">
-                <label for="comment" class="required"><em>*</em><?php echo __('Comment') ?></label>
-                <div class="input-box">
-                    <textarea name="comment" id="comment" title="<?php echo __('Comment') ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"></textarea>
-                </div>
-            </li>
-            <?php echo $this->getChildHtml('form.additional.info'); ?>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <input type="text" name="hideit" id="hideit" value="" style="display:none !important;" />
-        <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>", function() {
-                $('#contact-form').validation();
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Core/fam_book_open.png b/app/design/frontend/magento_backup/Magento_Core/fam_book_open.png
deleted file mode 100644
index 7d863f949741ff83fd8373a77c0d95a3d95e441f..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Core/fam_book_open.png and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css b/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
deleted file mode 100644
index 11a5aa8ba79fcf297026f019e93ab3dda958b546..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Core
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-.dialog { border:1px solid #555; }
-.dialog .bot { display:none !important; }
-.overlay_magento { background-color:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; }
-.top.table_window { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; }
-
-.magento_nw { width:6px; height:28px; }
-.magento_n { height:28px; }
-.magento_ne { width:6px; height:28px; }
-
-.magento_w { width:6px; }
-.magento_e { width:6px; }
-.magento_w,
-.magento_e,
-.magento_content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; }
-
-.magento_sw { background:#deebf0; width:5px; height:3px; }
-.magento_s { background:#deebf0; height:3px; }
-.magento_se,
-
-.magento_sizer { background:#deebf0; width:5px; height:3px; }
-.magento_sizer { cursor:se-resize; }
-
-.magento_close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; }
-
-.magento_title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; }
-
-.magento_content { overflow:auto; font-size:12px; }
-.magento_content,
-.magento_content label { color:#333; font-family:Arial, sans-serif; }
-
-.magento_buttons { padding:10px; text-align:right; }
-.magento_buttons input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502;  background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; }
-.magento_buttons button.button span span span { display:inline; background:none; padding:0; height:auto; }
-
-/* FOR IE */
-* html .magento_close { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_close.png", sizingMethod="crop"); }
-
-
-.dialog.ui-dialog, .ui-dialog .ui-dialog-titlebar, .ui-dialog .ui-dialog-buttonset button.button { -webkit-border-radius: 0px; border-radius: 0px; }
-.dialog.ui-dialog { border:1px solid #555; display: none; padding: 0; }
-.ui-widget-overlay { background:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; position: absolute; left:0px; top:0px; }
-.ui-dialog .ui-dialog-titlebar { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; height:28px; border: none; }
-.ui-dialog .ui-dialog-titlebar span { margin: 0px; }
-.ui-dialog .ui-dialog-title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; cursor: move; }
-.ui-dialog .ui-dialog-content, .ui-dialog .ui-dialog-titlebar, .ui-dialog .ui-dialog-buttonset { padding: 0 6px; }
-.ui-dialog .ui-icon { text-indent: -99999px; }
-.ui-dialog .ui-dialog-titlebar-close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; margin: 0px; padding: 0; }
-.ui-dialog .ui-dialog-titlebar-close .ui-icon { display: none; }
-.ui-dialog .ui-dialog-titlebar-close.ui-state-hover { border: none; }
-.ui-dialog .ui-dialog-content form { display: block; overflow: hidden; }
-.ui-dialog .ui-dialog-content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; overflow: auto; }
-.ui-dialog .ui-dialog-buttonpane { background: #fafafa; margin: 0; padding: 0; border: none;}
-.ui-dialog .ui-dialog-buttonset { padding:10px; text-align:right; }
-.ui-dialog .ui-dialog-buttonset input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502;  background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; margin-left: 5px; }
-.ui-dialog .ui-dialog-buttonset button.button { margin-left: 5px; background: #FFAC47; border-color: #ED6502 #A04300 #A04300 #ED6502; border-style: solid; border-width: 1px; color: #FFFFFF; cursor: pointer; font: bold 12px arial,helvetica,sans-serif; padding: 0; }
-.ui-dialog .ui-dialog-buttonset button.button span { padding: 0 7px 1px; text-align: center !important; white-space: nowrap; display: block; background: transparent; height: auto; color:#ffffff; }
-.ui-dialog .ui-dialog-buttonset button.button span span span { display:inline; background:none; padding:0; height:auto; }
-
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: 0px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: 0px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -7px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: 0px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: 0px; top: -5px;}
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif
deleted file mode 100644
index 32d6ca84f3f541bf3a7bf29d9eb67b7f0b403d27..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif
deleted file mode 100644
index 2a8c1375eb0bd58b04aab652e041237c8674f385..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif
deleted file mode 100644
index c9a37315deca7bf581033ad28aeeb2713a4d6e33..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png
deleted file mode 100644
index 6e2b6dfb1d098287e6f7f87f1d2acefcd4a074ec..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png and /dev/null differ
diff --git a/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml b/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
deleted file mode 100644
index 3675b14f271dd8c0bd60770508e0eb9f8b854cad..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @package     Magento_Core
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<script type="text/javascript" src="<?php echo $this->getViewFileUrl('prototype/window.js') ?>"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('Magento_Core::prototype/magento.css') ?>"/>
-<script type="text/javascript" src="<?php echo $this->getViewFileUrl('mage/edit-trigger.js') ?>"></script>
-<script type="text/javascript" src="<?php echo $this->getViewFileUrl('mage/translate-inline.js') ?>"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('mage/translate-inline.css') ?>"/>
-
-<script id="translate-inline-icon" type="text/x-jQuery-tmpl">
-    <img src="${img}" height="16" width="16" class="translate-edit-icon">
-</script>
-<script id="translate-form-template" type="text/x-jquery-tmpl">
-    <form id="${id}">
-        {{each(i, item) items}}
-            <div class="magento_table_container"><table cellspacing="0">
-                {{each item}}
-                <tr>
-                    <th class="label" style="text-transform: capitalize;">${$index}:</th>
-                    <td class="value">${$value}</td>
-                </tr>
-                {{/each}}
-                <tr>
-                    <th class="label"><label for="perstore_${i}">Store View Specific:</label></th>
-                    <td class="value">
-                        <input id="perstore_${i}" name="translate[${i}][perstore]" type="checkbox" value="1"/>
-                    </td>
-                </tr>
-                <tr>
-                    <th class="label"><label for="custom_${i}">Custom:</label></th>
-                    <td class="value">
-                        <input name="translate[${i}][original]" type="hidden" value="${item.scope}::${escape(item.original)}"/>
-                        <input id="custom_${i}" name="translate[${i}][custom]" class="input-text" value="${escape(item.translated)}" />
-                    </td>
-                </tr>
-            </table></div>
-        {{/each}}
-    </form>
-    {{if message}}<p class="a-center accent">${message}</p>{{/if}}
-</script>
-
-<div data-role="translate-dialog" data-mage-init="{translateInline: {ajaxUrl:&quot;<?php echo $this->getAjaxUrl() ?>&quot;}, loader: {}}"></div>
-<script type="text/javascript">
-    (function($){
-        $('body').editTrigger({img: '<?php echo $this->getViewFileUrl('Magento_Core::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
-        $('body').addClass('trnslate-inline-area');
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard.phtml
deleted file mode 100644
index 71bdc537d385bf52d31ba14d04b9d92b50b4b75e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard.phtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="dashboard">
-    <div class="page-title">
-        <h1><?php echo __('My Dashboard') ?></h1>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <?php echo $this->getChildHtml('hello') ?>
-    <?php echo $this->getChildHtml('top') ?>
-    <div class="box-account box-info">
-        <div class="box-head">
-            <h2><?php echo __('Account Information') ?></h2>
-        </div>
-        <?php /* Extensions placeholder */ ?>
-        <?php echo $this->getChildHtml('customer.account.dashboard.extra') ?>
-        <?php echo $this->getChildHtml('info') ?>
-        <?php echo $this->getChildHtml('address') ?>
-    </div>
-    <?php echo $this->getChildHtml('info1') ?>
-    <?php echo $this->getChildHtml('info2') ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.phtml
deleted file mode 100644
index c43dbb709ed1706cdb772612512253091cb251ac..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.phtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="col2-set">
-    <div class="box">
-        <div class="box-title">
-            <h3><?php echo __('Address Book') ?></h3>
-            <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo __('Manage Addresses') ?></a>
-        </div>
-        <div class="box-content">
-            <div class="col-1">
-                <h4><?php echo __('Default Billing Address') ?></h4>
-                <address>
-                    <?php echo $this->getPrimaryBillingAddressHtml() ?><br />
-                    <a href="<?php echo $this->getPrimaryBillingAddressEditUrl() ?>"><?php echo __('Edit Address') ?></a>
-                </address>
-            </div>
-            <div class="col-2">
-                <h4><?php echo __('Default Shipping Address') ?></h4>
-                <address>
-                    <?php echo $this->getPrimaryShippingAddressHtml() ?><br />
-                    <a href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>"><?php echo __('Edit Address') ?></a>
-                </address>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml
deleted file mode 100644
index ac1e45a25aa2fda40d32853c52ae199ecd690f2e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="welcome-msg">
-    <p class="hello"><strong><?php echo __('Hello, %1!', $this->escapeHtml($this->getCustomerName())) ?></strong></p>
-    <p><?php echo __('From your dashboard you can review recent account activity and edit your account information.') ?></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml
deleted file mode 100644
index 919b2556f1d1333525fe0c1cdc5031c698b5f3a2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="col2-set">
-    <div class="col-1">
-        <div class="box">
-            <div class="box-title">
-                <h3><?php echo __('Contact Information') ?></h3>
-                <a href="<?php echo $this->getUrl('customer/account/edit') ?>"><?php echo __('Edit') ?></a>
-            </div>
-            <div class="box-content">
-                <p>
-                    <?php echo $this->escapeHtml($this->getCustomer()->getName()) ?><br />
-                    <?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?><br />
-                    <a href="<?php echo $this->getChangePasswordUrl() ?>"><?php echo __('Change Password') ?></a>
-                </p>
-            </div>
-        </div>
-    </div>
-    <?php if( $this->isNewsletterEnabled() ): ?>
-    <div class="col-2">
-        <div class="box">
-            <div class="box-title">
-                <h3><?php echo __('Newsletters') ?></h3>
-                <a href="<?php echo $this->getUrl('newsletter/manage') ?>"><?php echo __('Edit') ?></a>
-            </div>
-            <div class="box-content">
-                <p>
-                    <?php if( $this->getIsSubscribed() ): ?>
-                        <?php echo __("You subscribe to 'General Subscription'.") ?>
-                    <?php else: ?>
-                        <?php echo __('You do not subscribe to a newsletter.') ?>
-                    <?php endif; ?>
-                </p>
-            </div>
-        </div>
-        <?php /* Extensions placeholder */ ?>
-        <?php echo $this->getChildHtml('customer.account.dashboard.info.extra')?>
-    </div>
-    <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml
deleted file mode 100644
index acbb68584c9032e9ae708aa22521ece5e6b679ac..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="col-2">
-    <h4><?php echo __('Newsletters') ?></h4>
-    <a href="<?php echo $this->getUrl('newsletter/manage') ?>"><?php echo __('Edit Newsletters') ?></a>
-    <p><?php echo __('You subscribe to our newsletter.') ?></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml
deleted file mode 100644
index 5dd122210dc5841cce88dce129f9d9802910c9da..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="buttons-set">
-    <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/navigation.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/navigation.phtml
deleted file mode 100644
index 9fe95fd9470434a2921cc428a5f1d0a7506e92b7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/navigation.phtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Page\Block\Links */
-?>
-<?php /** @var $this \Magento\Customer\Block\Account\Navigation */ ?>
-<div class="block block-account">
-    <div class="block-title">
-        <strong><span><?php echo __('My Account'); ?></span></strong>
-    </div>
-    <div class="block-content">
-        <ul>
-            <?php echo $this->getChildHtml();?>
-        </ul>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address.js b/app/design/frontend/magento_backup/Magento_Customer/address.js
deleted file mode 100644
index 5e63a788204c5750ea95cf74676f3c0bfe00fa23..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage customer view
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true, jquery:true*/
-/*global confirm:true*/
-(function($, window) {
-    "use strict";
-    $.widget('mage.address', {
-        /**
-         * Options common to all instances of this widget.
-         * @type {Object}
-         */
-        options: {
-            deleteConfirmMessage: $.mage.__('Are you sure you want to delete this address?')
-        },
-
-        /**
-         * Bind event handlers for adding and deleting addresses.
-         * @private
-         */
-        _create: function() {
-            $(this.options.addAddress).on('click', $.proxy(this._addAddress, this));
-            $(this.options.deleteAddress).on('click', $.proxy(this._deleteAddress, this));
-        },
-
-        /**
-         * Add a new address.
-         * @private
-         */
-        _addAddress: function() {
-            window.location = this.options.addAddressLocation;
-        },
-
-        /**
-         * Delete the address whose id is specified in a data attribute after confirmation from the user.
-         * @private
-         * @param {Event}
-         * @return {Boolean}
-         */
-        _deleteAddress: function(e) {
-            if (confirm(this.options.deleteConfirmMessage)) {
-                if (typeof $(e.target).parent().data('address') !== 'undefined') {
-                    window.location = this.options.deleteUrlPrefix + $(e.target).parent().data('address');
-                }
-                else {
-                    window.location = this.options.deleteUrlPrefix + $(e.target).data('address');
-                }
-            }
-            return false;
-        }
-    });
-})(jQuery, window);
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address.phtml b/app/design/frontend/magento_backup/Magento_Customer/address.phtml
deleted file mode 100644
index 9587b2ff326b7abd75bd7eb78e7c57a19f49019b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address.phtml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    customer address
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Address Books') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<table width="100%">
-    <tr>
-        <td style="width:50%;"><h3>Default</h3>
-            <table width="100%">
-            <?php if(!empty($primaryAddresses)): ?>
-                <?php foreach($primaryAddresses as $_address): ?>
-                <tr>
-                    <td>
-                    <address>
-                        <?php echo $_address->format('html') ?>
-                    </address>
-                    <p>
-                        <strong><a href="<?php echo $this->getUrl('customer/address/form', array('address'=>$_address->getAddressId())) ?>" class="red-link"><?php echo __('Edit Address') ?></a></strong>
-                    </p>
-                    </td>
-                </tr>
-                <?php endforeach; ?>
-            <?php else: ?>
-                <tr>
-                    <td>
-                        <p><?php echo __('You have no default entries in your address book.') ?></p>
-                    </td>
-                </tr>
-            <?php endif ?>
-            </table>
-        </td>
-        <td style="width:50%;"><h3><?php echo __('Additional Address Entries') ?></h3>
-            <table width="100%">
-            <?php if(!empty($alternativeAddresses)): ?>
-                <?php foreach($alternativeAddresses as $_address): ?>
-                <tr>
-                    <td>
-                    <address>
-                        <?php echo $_address->format('html') ?>
-                    </address>
-                    <p>
-                        <strong><a href="<?php echo $this->getUrl('customer/address/form', array('address'=>$_address->getAddressId())) ?>" class="red-link"><?php echo __('Edit Address') ?></a></strong><span class="separator">&nbsp;|&nbsp;</span><strong><a href="#" role="delete-address" data-address="<?php echo $_address->getAddressId() ?>" class="red-link"><?php echo __('Delete Address') ?></a></strong>
-                    </p>
-                    </td>
-                </tr>
-                <?php endforeach; ?>
-            <?php else: ?>
-                <tr>
-                    <td>
-                        <p><?php echo __('You have no additional entries in your address book.') ?></p>
-                    </td>
-                </tr>
-            <?php endif ?>
-            </table>
-        </td>
-    </tr>
-</table>
-<div class="buttons-set">
-    <p class="back-link"><a href="<?php echo $this->getUrl('customer/account/') ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-    <button type="button" class="button" role="add-address"><span><span><?php echo __('New Address') ?></span></span></button>
-</div>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('Magento_Customer::address.js') ?>", function() {
-        jQuery('div.page-title').address({
-            deleteAddress: "p a[role='delete-address']",
-            deleteUrlPrefix: "<?php echo $this->getUrl('customer/address/delete') ?>address/",
-            addAddress: "div.buttons-set button[role='add-address']",
-            addAddressLocation: "<?php echo $this->getUrl('customer/address/form') ?>"
-        });
-    });
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address/book.phtml b/app/design/frontend/magento_backup/Magento_Customer/address/book.phtml
deleted file mode 100644
index b119c1ce8ecf6cfd19bb40c93d4efde115406584..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address/book.phtml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    customer address book
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Temlate for \Magento\Customer\Block\Address\Book block
- * @var $this \Magento\Customer\Block\Address\Book
- */
-?>
-<div class="page-title title-buttons">
-    <h1><?php echo __('Address Book') ?></h1>
-    <button type="button" role="add-address" title="<?php echo __('Add New Address') ?>" class="button"><span><span><?php echo __('Add New Address') ?></span></span></button>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="col2-set addresses-list">
-    <div class="col-1 addresses-primary">
-        <h2><?php echo __('Default Addresses') ?></h2>
-        <ol>
-        <?php if($_pAddsses = $this->getDefaultBilling()): ?>
-            <li class="item">
-                <h3><?php echo __('Default Billing Address') ?></h3>
-                <address>
-                    <?php echo $this->getAddressHtml($this->getAddressById($_pAddsses)) ?>
-                </address>
-                <p><a href="<?php echo $this->getAddressEditUrl($this->getAddressById($_pAddsses)) ?>"><?php echo __('Change Billing Address') ?></a></p>
-           </li>
-        <?php else: ?>
-            <li class="item">
-                <h3><?php echo __('Default Billing Address') ?></h3>
-                <?php echo __('You have no default billing address in your address book.') ?>
-            </li>
-        <?php endif ?>
-
-        <?php if($_pAddsses = $this->getDefaultShipping()): ?>
-            <li class="item">
-                <h3><?php echo __('Default Shipping Address') ?></h3>
-                <address>
-                    <?php echo $this->getAddressHtml($this->getAddressById($_pAddsses)) ?>
-                </address>
-                <p><a href="<?php echo $this->getAddressEditUrl($this->getAddressById($_pAddsses)) ?>"><?php echo __('Change Shipping Address') ?></a></p>
-            </li>
-        <?php else: ?>
-            <li class="item empty">
-                <h3><?php echo __('Default Shipping Address') ?></h3>
-                <p><?php echo __('You have no default shipping address in your address book.') ?></p>
-            </li>
-        <?php endif ?>
-        </ol>
-    </div>
-    <div class="col-2 addresses-additional">
-        <h2><?php echo __('Additional Address Entries') ?></h2>
-        <ol>
-        <?php if($_pAddsses = $this->getAdditionalAddresses()): ?>
-            <?php foreach($_pAddsses as $_address): ?>
-            <li class="item">
-                <address>
-                    <?php echo $this->getAddressHtml($_address) ?>
-                </address>
-                <p><a href="<?php echo $this->getUrl('customer/address/edit', array('id'=>$_address->getId())) ?>"><?php echo __('Edit Address') ?></a> <span class="separator">|</span> <a href="#" class="link-remove" role="delete-address" data-address="<?php echo $_address->getId() ?>"><?php echo __('Delete Address') ?></a></p>
-            </li>
-            <?php endforeach; ?>
-        <?php else: ?>
-            <li class="item empty">
-                <p><?php echo __('You have no more address entries in your address book.') ?></p>
-            </li>
-        <?php endif ?>
-        </ol>
-    </div>
-</div>
-<div class="buttons-set">
-    <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-</div>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('Magento_Customer::address.js');?>", function() {
-        jQuery('div.page-title').address({
-            deleteAddress: "li.item a[role='delete-address']",
-            deleteUrlPrefix: '<?php echo $this->getDeleteUrl() ?>id/',
-            addAddress: "div.title-buttons button[role='add-address']",
-            addAddressLocation: '<?php echo $this->getAddAddressUrl() ?>'
-        });
-    });
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml b/app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml
deleted file mode 100644
index c74bf1efc2961f98b7c5b0790192fe2df3a7865a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Edit customer address template
- *
- * @var $this \Magento\Customer\Block\Address\Edit
- */
-?>
-<?php if($this->getTitle()): ?>
-<div class="page-title">
-    <h1><?php echo $this->getTitle() ?></h1>
-</div>
-<?php endif; ?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
-    <div class="fieldset">
-    <?php echo $this->getBlockHtml('formkey')?>
-    <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
-    <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
-        <h2 class="legend"><?php echo __('Contact Information') ?></h2>
-        <ul class="form-list">
-            <li class="fields">
-                <?php echo $this->getNameBlockHtml() ?>
-            </li>
-            <li class="wide">
-                <label for="company"><?php echo __('Company') ?></label>
-                <div class="input-box">
-                    <input type="text" name="company" id="company" title="<?php echo __('Company') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                </div>
-            </li>
-            <li class="fields">
-                <div class="field">
-                    <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="telephone" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text  <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="telephone" />
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="fax"><?php echo __('Fax') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="fax" id="fax" title="<?php echo __('Fax') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" />
-                    </div>
-                </div>
-            </li>
-        </ul>
-    </div>
-    <div class="fieldset">
-        <h2 class="legend"><?php echo __('Address') ?></h2>
-        <ul class="form-list">
-        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-            <li class="wide">
-                <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
-                <div class="input-box">
-                    <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
-                </div>
-            </li>
-        <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-        <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-            <li class="wide">
-                <div class="input-box">
-                    <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                </div>
-            </li>
-        <?php endfor; ?>
-            <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
-            <li class="wide">
-                <label for="vat_id"><?php echo __('VAT Number') ?></label>
-                <div class="input-box">
-                    <input type="text" name="vat_id" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" id="vat_id" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
-                </div>
-            </li>
-            <?php endif; ?>
-            <li class="fields">
-                <div class="field">
-                    <label for="city" class="required"><em>*</em><?php echo __('City') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>"  title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                    <div class="input-box">
-                        <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;" <?php if ($this->getConfigNode('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>>
-                           <option value=""><?php echo __('Please select region, state or province') ?></option>
-                        </select>
-                        <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>"  title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"  <?php if ($this->getConfigNode('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>/>
-                    </div>
-                </div>
-            </li>
-            <li class="fields">
-                <div class="field">
-                    <label for="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
-                    <div class="input-box">
-                        <?php echo $this->getCountryHtmlSelect() ?>
-                    </div>
-                </div>
-            </li>
-            <li<?php if($this->canSetAsDefaultBilling()) echo ' class="control"' ?>>
-                <?php if($this->isDefaultBilling()): ?>
-                    <strong><?php echo __('Default Billing Address') ?></strong>
-                <?php elseif($this->canSetAsDefaultBilling()): ?>
-                    <input type="checkbox" id="primary_billing" name="default_billing" value="1" title="<?php echo __('Use this as my default billing address.') ?>" class="checkbox" /><label for="primary_billing"><?php echo __('Use as my default billing address') ?></label>
-                <?php else: ?>
-                    <input type="hidden" name="default_billing" value="1" />
-                <?php endif; ?>
-            </li>
-            <li<?php if($this->canSetAsDefaultShipping()) echo ' class="control"' ?>>
-                <?php if($this->isDefaultShipping()): ?>
-                    <strong><?php echo __('Default Shipping Address') ?></strong>
-                <?php elseif($this->canSetAsDefaultShipping()): ?>
-                    <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" title="<?php echo __('Use this as my default shipping address.') ?>" class="checkbox" /><label for="primary_shipping"><?php echo __('Use as my default shipping address') ?></label>
-                <?php else: ?>
-                    <input type="hidden" name="default_shipping" value="1" />
-                <?php endif; ?>
-            </li>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-        <button type="submit" title="<?php echo __('Save Address') ?>" class="button"><span><span><?php echo __('Save Address') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-            function() {
-                $('#country').regionUpdater({
-                    optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
-                    regionListId: '#region_id',
-                    regionInputId: '#region',
-                    postcodeId: '#zip',
-                    form: $('#form-validate').validation(),
-                    regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                    defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
-                    countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/balance.phtml b/app/design/frontend/magento_backup/Magento_Customer/balance.phtml
deleted file mode 100644
index 2fa29d65b4ccfd8fb6c3888923f974c64dcc3ac4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/balance.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php echo __('Your account balance is: %1', $customer->getStoreBalance()) ?> 
-<div class="buttons-set">
-    <p class="back-link"><a href="<?php echo $this->getUrl('customer/account') ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/address.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/address.phtml
deleted file mode 100644
index 9bcabcd4004216fb7ef8fb871d083d011cb6204e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/address.phtml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<div class="page-title">
-    <h1><?php if($data->getAddressId()): ?><?php echo __('Edit Address Entry') ?><?php else: ?><?php echo __('New Address Entry') ?><?php endif ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $action ?>" method="post" id="form-validate">
-    <div class="fieldset">
-    <input type="hidden" name="address_id" value="<?php echo $data->getAddressId() ?>" />
-    <input type="hidden" name="customer_id" id="address_id" value="<?php echo $data->getCustomerId() ?>" />
-        <h2 class="legend"><?php echo __('Personal Information') ?></h2>
-        <ul class="form-list">
-            <li class="fields">
-                <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($data)->toHtml() ?>
-            </li>
-            <li>
-                <label for="company"><?php echo __('Company') ?></label>
-                <div class="input-box">
-                    <input type="text" name="company" id="company" title="<?php echo __('Company') ?>" value="<?php echo $this->escapeHtml($data->getCompany()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                </div>
-            </li>
-        </ul>
-    </div>
-    <div class="fieldset">
-        <h2 class="legend"><?php echo __('Address') ?></h2>
-        <ul class="form-list">
-        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-            <li class="wide">
-                <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
-                <div class="input-box">
-                    <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
-                </div>
-            </li>
-        <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-        <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-            <li class="wide">
-                <div class="input-box">
-                    <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                </div>
-            </li>
-        <?php endfor; ?>
-            <li class="fields">
-                <div class="field">
-                    <label for="city" class="required"><em>*</em><?php echo __('City') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="city" value="<?php echo $this->escapeHtml($data->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                    <div class="input-box">
-                        <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                            <option value=""><?php echo __('Please select a region, state or province.') ?></option>
-                        </select>
-                        <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>"  title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
-                    </div>
-                </div>
-            </li>
-            <li class="fields">
-                <div class="field">
-                    <label for="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="postcode" value="<?php echo $this->escapeHtml($data->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
-                    <div class="input-box">
-                        <select name="country_id" id="country" title="<?php echo __('Country') ?>" class="validate-select">
-                            <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
-                        </select>
-                    </div>
-                </div>
-            </li>
-            <li class="fields">
-                <div class="field">
-                    <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="telephone" value="<?php echo $this->escapeHtml($data->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="telephone" >
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="fax"><?php echo __('Fax') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="fax" value="<?php echo $this->escapeHtml($data->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="fax" />
-                    </div>
-                </div>
-            </li>
-        <?php foreach ($primaryTypes as $code=>$type): ?>
-            <li<?php if (!$address->isPrimary($type['address_type_id'])) echo ' class="control"' ?>>
-            <?php if ($address->isPrimary($type['address_type_id'])): ?>
-                <strong><?php echo __("This is my default %1 address.", ucfirst($type['name'])) ?></strong>
-            <?php else: ?>
-                <input type="checkbox" id="primary_<?php echo $code ?>" name="primary_types[]" value="<?php echo $type['address_type_id'] ?>" class="checkbox" /><label for="primary_<?php echo $code ?>"><?php echo __("Use this as my default %1 address.", ucfirst($type['name'])) ?></label>
-            <?php endif ?>
-            </li>
-        <?php endforeach ?>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <p class="back-link"><a href="<?php echo $this->getUrl('customer/address/') ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-        <button type="submit" class="button" title="<?php echo __('Save Address') ?>"><span><span><?php echo __('Save Address') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-//<![CDATA[
-(function($) {
-    head.js(
-        "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-        "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-        function() {
-            $('#country').regionUpdater({
-                optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
-                regionListId: '#region_id',
-                regionInputId: '#region',
-                postcodeId: '#zip',
-                form: $('#form-validate').validation(),
-                regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
-                countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-            });
-        });
-})(jQuery);
-//]]>
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/changepassword.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/changepassword.phtml
deleted file mode 100644
index 1e4ff4df641c451350cab11672d1bb0800c9c498..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/changepassword.phtml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Change Account Password') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $action ?>" method="post" id="form-validate">
-<div class="fieldset">
-    <h2 class="legend"><?php echo __('Change Account Password') ?></h2>
-    <ul class="form-list">
-        <li>
-            <label for="current_password" class="required"><em>*</em><?php echo __('Current Password') ?></label>
-            <div class="input-box">
-                <input type="password" title="<?php echo __('Current Password') ?>" class="input-text" name="current_password" id="current_password" />
-            </div>
-        </li>
-        <li class="fields">
-            <div class="field">
-                <label for="password" class="required"><em>*</em><?php echo __('New Password') ?></label>
-                <div class="input-box">
-                    <input type="password" title="<?php echo __('New Password') ?>" class="input-text" name="password" id="password" />
-                </div>
-            </div>
-            <div class="field">
-                <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm New Password') ?></label>
-                <div class="input-box">
-                    <input type="password" title="<?php echo __('Confirm New Password') ?>" class="input-text" name="confirmation" id="confirmation" />
-                </div>
-            </div>
-        </li>
-    </ul>
-</div>
-<div class="buttons-set">
-    <p class="required"><?php echo __('* Required Fields') ?></p>
-    <p class="back-link"><a href="<?php echo $this->getUrl('customer/account') ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-    <button type="submit" title="<?php echo __('Save Password') ?>" class="button"><span><span><?php echo __('Save Password') ?></span></span></button>
-</div>
-</form>
-<script type="text/javascript">
-//<![CDATA[
-(function($) {
-    head.js(
-        "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-        "<?php echo $this->getViewFileUrl('Magento_Customer::set-password.js') ?>",
-        <?php if ($_dob->isEnabled()): ?>
-            "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
-        <?php endif ?>
-        function() {
-            $('#change-password').setPassword({
-                currentPasswordId: '#current-password',
-                passwordId: '#password',
-                confirmationId: '#confirmation',
-                passwordContainer: 'div.fieldset',
-                showOnDefault: <?php echo $this->getCustomer()->getChangePassword() ? 'true' : 'false' ?>
-            });
-            $('#form-validate').validation({
-            <?php if ($_dob->isEnabled()): ?>
-                errorPlacement: function(error, element) {
-                    if (element.prop('id') === 'dob') {
-                        var dobElement = $('.customer-dob'),
-                            errorClass = error.prop('class');
-                        error.insertAfter(element.parent());
-                        dobElement.find('.validate-custom').addClass(errorClass)
-                            .after('<div class="' + errorClass + '"></div>');
-                    }
-                    else {
-                        error.insertAfter(element);
-                    }
-                },
-                ignore: ':hidden:not(#dob)'
-                <?php endif ?>
-            });
-        });
-})(jQuery);
-//]]>
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml
deleted file mode 100644
index 415eecd38d18eb3c4865291e18e52a1c2bc8afc5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Send confirmation link') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="" method="post" id="form-validate">
-    <div class="fieldset">
-        <h2 class="legend"><?php echo __('Retrieve your confirmation link here') ?></h2>
-        <p><?php echo __('Please enter your email below and we\'ll send you confirmation link for it.') ?></p>
-        <ul class="form-list">
-            <li>
-                <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                <div class="input-box">
-                    <input type="text" name="email" id="email_address" title="<?php echo __('Email Address') ?>" class="input-text" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}"/>
-                </div>
-            </li>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <p class="back-link"><a href="<?php echo $this->helper('Magento\Customer\Helper\Data')->getLoginUrl() ?>"><small>&laquo; </small><?php echo __('Back to Login') ?></a></p>
-        <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            function() {
-                $('#form-validate').validation();
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml
deleted file mode 100644
index 211c497882b6a103265227b1469f3e751588148f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Edit Account Information') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
-    <div class="fieldset">
-        <?php echo $this->getBlockHtml('formkey')?>
-        <h2 class="legend"><?php echo __('Account Information') ?></h2>
-        <ul class="form-list">
-            <li class="fields">
-                <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getCustomer())->toHtml() ?>
-            </li>
-            <li>
-                <label for="email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                <div class="input-box">
-                    <input type="text" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
-                </div>
-            </li>
-        <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
-        <?php if ($_dob->isEnabled()): ?>
-            <li><?php echo $_dob->setDate($this->getCustomer()->getDob())->toHtml() ?></li>
-        <?php endif ?>
-        <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
-        <?php if ($_taxvat->isEnabled()): ?>
-            <li><?php echo $_taxvat->setTaxvat($this->getCustomer()->getTaxvat())->toHtml() ?></li>
-        <?php endif ?>
-        <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
-        <?php if ($_gender->isEnabled()): ?>
-            <li><?php echo $_gender->setGender($this->getCustomer()->getGender())->toHtml() ?></li>
-        <?php endif ?>
-            <li class="control">
-                <input type="checkbox" name="change_password" id="change-password" value="1" title="<?php echo __('Change Password') ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="change-password"><?php echo __('Change Password') ?></label>
-            </li>
-        </ul>
-    </div>
-    <div class="fieldset" style="display:none;">
-        <h2 class="legend"><?php echo __('Change Password') ?></h2>
-        <ul class="form-list">
-            <li>
-                <label for="current-password" class="required"><em>*</em><?php echo __('Current Password') ?></label>
-                <div class="input-box">
-                    <input type="password" title="<?php echo __('Current Password') ?>" class="input-text" name="current_password" id="current-password" />
-                </div>
-            </li>
-            <li class="fields">
-                <div class="field">
-                    <label for="password" class="required"><em>*</em><?php echo __('New Password') ?></label>
-                    <div class="input-box">
-                        <input type="password" title="<?php echo __('New Password') ?>" class="input-text" name="password" id="password" />
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm New Password') ?></label>
-                    <div class="input-box">
-                        <input type="password" title="<?php echo __('Confirm New Password') ?>" class="input-text" name="confirmation" id="confirmation" />
-                    </div>
-                </div>
-            </li>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-        <button type="submit" title="<?php echo __('Save') ?>" class="button"><span><span><?php echo __('Save') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            "<?php echo $this->getViewFileUrl('Magento_Customer::set-password.js') ?>",
-            <?php if ($_dob->isEnabled()): ?>
-                "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
-            <?php endif ?>
-            function() {
-                $('#change-password').setPassword({
-                    currentPasswordId: '#current-password',
-                    passwordId: '#password',
-                    confirmationId: '#confirmation',
-                    passwordContainer: 'div.fieldset',
-                    showOnDefault: <?php echo $this->getCustomer()->getChangePassword() ? 'true' : 'false' ?>
-                });
-                $('#form-validate').validation({
-                <?php if ($_dob->isEnabled()): ?>
-                    errorPlacement: function(error, element) {
-                        if (element.prop('id') === 'dob') {
-                            var dobElement = $('.customer-dob'),
-                                errorClass = error.prop('class');
-                            error.insertAfter(element.parent());
-                            dobElement.find('.validate-custom').addClass(errorClass)
-                                .after('<div class="' + errorClass + '"></div>');
-                        }
-                        else {
-                            error.insertAfter(element);
-                        }
-                    },
-                    ignore: ':hidden:not(#dob)'
-                    <?php endif ?>
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml
deleted file mode 100644
index c59d80ba863146550dca6b8a4c3dcae1b760422f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Forgot Your Password?') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getUrl('*/*/forgotpasswordpost') ?>" method="post" id="form-validate">
-    <div class="fieldset">
-        <h2 class="legend"><?php echo __('Retrieve your password here') ?></h2>
-        <p><?php echo __("Please enter your email address. We'll send a link to reset your password.") ?></p>
-        <ul class="form-list">
-            <li>
-                <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                <div class="input-box">
-                    <input type="text" name="email" alt="email" id="email_address" class="input-text" value="<?php echo $this->escapeHtml($this->getEmailValue()) ?>" data-validate="{required:true, 'validate-email':true}" />
-                </div>
-            </li>
-            <?php echo $this->getChildHtml('form.additional.info'); ?>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <p class="back-link"><a href="<?php echo $this->helper('Magento\Customer\Helper\Data')->getLoginUrl() ?>"><small>&laquo; </small><?php echo __('Back to Login') ?></a></p>
-        <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            function() {
-                $('#form-validate').validation();
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/login.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/login.phtml
deleted file mode 100644
index fa3b3e4e670e89d4b0cd7833483bcc65df87d2b3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/login.phtml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Customer login form template
- *
- * @see \Magento\Customer\Block\Form\Login
- */
-?>
-<div class="account-login">
-    <div class="page-title">
-        <h1><?php echo __('Login or Create an Account') ?></h1>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <?php /* Extensions placeholder */ ?>
-    <?php echo $this->getChildHtml('customer.form.login.extra')?>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
-        <div class="col2-set">
-            <div class="col-1 new-users">
-                <div class="content">
-                    <h2><?php echo __('New Customers') ?></h2>
-                    <p><?php echo __('With your own account, you can check out faster, store multiple shipping addesses, see your shopping activity and more.') ?></p>
-                </div>
-            </div>
-            <div class="col-2 registered-users">
-                <div class="content">
-                    <h2><?php echo __('Registered Customers') ?></h2>
-                    <p><?php echo __('If you have an account with us, please log in.') ?></p>
-                    <ul class="form-list">
-                        <li>
-                            <label for="email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                            <div class="input-box">
-                                <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text" title="<?php echo __('Email Address') ?>" data-validate="{required:true, 'validate-email':true}" />
-                            </div>
-                        </li>
-                        <li>
-                            <label for="pass" class="required"><em>*</em><?php echo __('Password') ?></label>
-                            <div class="input-box">
-                                <input type="password" name="login[password]" class="input-text" id="pass" title="<?php echo __('Password') ?>" data-validate="{required:true, 'validate-password':true}" />
-                            </div>
-                        </li>
-                        <?php echo $this->getChildHtml('form.additional.info'); ?>
-                    </ul>
-                    <p class="required"><?php echo __('* Required Fields') ?></p>
-                </div>
-            </div>
-        </div>
-        <div class="col2-set">
-            <div class="col-1 new-users">
-                <div class="buttons-set">
-                    <button type="button" title="<?php echo __('Create an Account') ?>" class="button"><span><span><?php echo __('Create an Account') ?></span></span></button>
-                </div>
-            </div>
-            <div class="col-2 registered-users">
-                <div class="buttons-set">
-                    <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo __('Forgot Your Password?') ?></a>
-                    <button type="submit" class="button" title="<?php echo __('Login') ?>" name="send" id="send2"><span><span><?php echo __('Login') ?></span></span></button>
-                </div>
-            </div>
-        </div>
-    </form>
-    <script type="text/javascript">
-        (function($) {
-            head.js(
-                "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-                function() {
-                    $('#login-form .new-users button').on('click', function() {window.location='<?php echo $this->getCreateAccountUrl() ?>';});
-                    $('#login-form').validation();
-                });
-        })(jQuery);
-    </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml
deleted file mode 100644
index be42c0ce0c8a076fc9e50f755e505ece55fca905..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="block block-login">
-    <div class="block-title">
-        <strong><span><?php echo __('Login') ?></span></strong>
-    </div>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post">
-        <div class="block-content">
-            <label for="mini-login"><?php echo __('Email:') ?></label><input type="text" name="login[username]" id="mini-login" class="input-text" />
-            <label for="mini-password"><?php echo __('Password:') ?></label><input type="password" name="login[password]" id="mini-password" class="input-text" />
-            <div class="actions">
-                <button type="submit" class="button"><span><span><?php echo __('Login') ?></span></span></button>
-            </div>
-        </div>
-    </form>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml
deleted file mode 100644
index 0c51597d8a3d7c06ff0d6b9dcadc149e152c0984..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Newsletter Subscription') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php echo $this->getChildHtml('form_before')?>
-<form action="<?php echo $this->getAction() ?>" method="post" id="form-validate">
-    <div class="fieldset">
-        <?php echo $this->getBlockHtml('formkey')?>
-        <h2 class="legend"><?php echo __('Newsletter Subscription') ?></h2>
-        <ul class="form-list">
-            <li class="control"><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo __('General Subscription') ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="subscription"><?php echo __('General Subscription') ?></label></li>
-            <?php /* Extensions placeholder */ ?>
-            <?php echo $this->getChildHtml('customer.form.newsletter.extra')?>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-        <button type="submit" title="<?php echo __('Save') ?>" class="button"><span><span><?php echo __('Save') ?></span></span></button>
-    </div>
-</form>
-<?php /* Extensions placeholder */ ?>
-<?php echo $this->getChildHtml('customer.form.newsletter.extra2')?>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/register.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/register.phtml
deleted file mode 100644
index 3b5e2c03ae27c2ed7c5d9fa335fc7414feddc038..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/register.phtml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Create account form template
- *
- * @var $this \Magento\Customer\Block\Form\Register
- */
-?>
-<div class="account-create">
-    <div class="page-title">
-        <h1><?php echo __('Create an Account') ?></h1>
-    </div>
-    <?php echo $this->getChildHtml('form_fields_before')?>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <?php /* Extensions placeholder */ ?>
-    <?php echo $this->getChildHtml('customer.form.register.extra')?>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
-        <div class="fieldset">
-            <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
-            <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
-            <h2 class="legend"><?php echo __('Personal Information') ?></h2>
-            <ul class="form-list">
-                <li class="fields">
-                    <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
-                </li>
-                <li>
-                    <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
-                    </div>
-                </li>
-                <?php if ($this->isNewsletterEnabled()): ?>
-                <li class="control">
-                    <div class="input-box">
-                        <input type="checkbox" name="is_subscribed" title="<?php echo __('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    </div>
-                    <label for="is_subscribed"><?php echo __('Sign Up for Newsletter') ?></label>
-                    <?php /* Extensions placeholder */ ?>
-                    <?php echo $this->getChildHtml('customer.form.register.newsletter')?>
-                </li>
-                <?php endif ?>
-            <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
-            <?php if ($_dob->isEnabled()): ?>
-                <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
-            <?php endif ?>
-            <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
-            <?php if ($_taxvat->isEnabled()): ?>
-                <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
-            <?php endif ?>
-            <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
-            <?php if ($_gender->isEnabled()): ?>
-                <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
-            <?php endif ?>
-            </ul>
-        </div>
-    <?php if($this->getShowAddressFields()): ?>
-        <div class="fieldset">
-            <input type="hidden" name="create_address" value="1" />
-            <h2 class="legend"><?php echo __('Address Information') ?></h2>
-            <ul class="form-list">
-                <li class="fields">
-                    <div class="field">
-                        <label for="company"><?php echo __('Company') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" />
-                        </div>
-                    </div>
-                </li>
-            <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                <li class="wide">
-                    <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-            <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-            <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                <li class="wide">
-                    <div class="input-box">
-                        <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-            <?php endfor; ?>
-                <li class="fields">
-                    <div class="field">
-                        <label for="city" class="required"><em>*</em><?php echo __('City') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                        <div class="input-box">
-                            <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                                <option value=""><?php echo __('Please select a region, state or province.') ?></option>
-                            </select>
-
-                            <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
-                        <div class="input-box">
-                            <?php echo $this->getCountryHtmlSelect() ?>
-                        </div>
-                    </div>
-                </li>
-            </ul>
-            <input type="hidden" name="default_billing" value="1" />
-            <input type="hidden" name="default_shipping" value="1" />
-        </div>
-    <?php endif; ?>
-        <div class="fieldset">
-            <h2 class="legend"><?php echo __('Login Information') ?></h2>
-            <ul class="form-list">
-                <li class="fields">
-                    <div class="field">
-                        <label for="password" class="required"><em>*</em><?php echo __('Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="password" id="password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="confirmation" title="<?php echo __('Confirm Password') ?>" id="confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" />
-                        </div>
-                    </div>
-                </li>
-                <?php echo $this->getChildHtml('form.additional.info'); ?>
-            </ul>
-        </div>
-        <div class="buttons-set">
-            <p class="required"><?php echo __('* Required Fields') ?></p>
-            <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-            <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
-        </div>
-    </form>
-    <script type="text/javascript">
-        (function($) {
-            head.js(
-                "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-                "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-                <?php if ($_dob->isEnabled()): ?>
-                "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
-                <?php endif ?>
-                function() {
-                    var dataForm = $('#form-validate').validation({
-                        <?php if ($_dob->isEnabled()): ?>
-                        errorPlacement: function(error, element) {
-                            if (element.prop('id') === 'dob') {
-                                var dobElement = $('.customer-dob'),
-                                    errorClass = error.prop('class');
-                                error.insertAfter(element.parent());
-                                dobElement.find('.validate-custom').addClass(errorClass)
-                                    .after('<div class="' + errorClass + '"></div>');
-                            }
-                            else {
-                                error.insertAfter(element);
-                            }
-                        },
-                        ignore: ':hidden:not(#dob)'
-                        <?php endif ?>
-                    });
-                    <?php if($this->getShowAddressFields()): ?>
-                    $('#country').regionUpdater({
-                        optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
-                        regionListId: '#region_id',
-                        regionInputId: '#region',
-                        postcodeId: '#zip',
-                        form: dataForm,
-                        regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                        defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
-                        countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-                    });
-                    <?php endif; ?>
-                });
-        })(jQuery);
-    </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.phtml
deleted file mode 100644
index 470eafe25a241246de16e2562c57575efb1aaa4a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Create a new password'); ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml(); ?>
-<form action="<?php echo $this->getUrl('*/*/resetpasswordpost', array('_query' => array('id' => $this->getCustomerId(), 'token' => $this->getResetPasswordLinkToken()))); ?>" method="post" id="form-validate">
-    <div class="fieldset" style="margin-top: 70px;">
-        <ul class="form-list">
-            <li class="fields">
-                <div class="field">
-                    <label for="password" class="required"><em>*</em><?php echo __('New Password'); ?></label>
-                    <div class="input-box">
-                        <input type="password" class="input-text" name="password" id="password" data-validate="{required:true, 'validate-password':true}"/>
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm New Password'); ?></label>
-                    <div class="input-box">
-                        <input type="password" class="input-text" name="confirmation" id="confirmation" data-validate="{required:true,equalTo:'#password'}"/>
-                    </div>
-                </div>
-            </li>
-        </ul>
-    </div>
-    <div class="buttons-set">
-        <p class="required"><?php echo __('* Required Fields'); ?></p>
-        <button type="submit" title="<?php echo __('Submit'); ?>" class="button"><span><span><?php echo __('Submit'); ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            function() {
-                $('#form-validate').validation();
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js b/app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js
deleted file mode 100644
index b95e8ce5013350959945c3cce0abce0894311879..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @package     EE_Checkout_Balance
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.checkoutBalance', {
-        /**
-         * Initialize store credit events
-         * @private
-         */
-        _create: function() {
-            this.eventData = {
-                price: this.options.balance,
-                totalPrice: 0
-            };
-            this.element.on('change', $.proxy(function(e) {
-                if ($(e.target).is(':checked')) {
-                    this.eventData.price = -1 * this.options.balance;
-                } else {
-                    if (this.options.amountSubstracted) {
-                        this.eventData.price = this.options.usedAmount;
-                        this.options.amountSubstracted = false;
-                    } else {
-                        this.eventData.price = this.options.balance;
-                    }
-                }
-                this.element.trigger('updateCheckoutPrice', this.eventData);
-            }, this));
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml
deleted file mode 100644
index 7fa2bdb7b5933cabeb45ada49586f87f0c3827ab..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account (All Pages)" type="page">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-left.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <container name="my.account.wrapper" label="My Account Wrapper" htmlTag="div" htmlClass="my-account"/>
-    </referenceContainer>
-    <referenceContainer name="left">
-        <block class="Magento\Page\Block\Links" name="customer_account_navigation" before="-" template="Magento_Customer::account/navigation.phtml">
-            <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-account-link">
-                <arguments>
-                    <argument name="label" xsi:type="string">Account Dashboard</argument>
-                    <argument name="path" xsi:type="string">customer/account</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-account-edit-link">
-                <arguments>
-                    <argument name="label" xsi:type="string">Account Information</argument>
-                    <argument name="path" xsi:type="string">customer/account/edit</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-address-link">
-                <arguments>
-                    <argument name="label" xsi:type="string">Address Book</argument>
-                    <argument name="path" xsi:type="string">customer/address</argument>
-                </arguments>
-            </block>
-        </block>
-        <block class="Magento\Catalog\Block\Product\Compare\Sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
-    </referenceContainer>
-    <move element="cart_sidebar" destination="left" before="catalog.compare.sidebar"/>
-    <remove name="tags_popular"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.xml
deleted file mode 100644
index 11665c9f4d3ffe45aaae6440acd9c1e503bd5e2d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Confirmation" type="page">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-        <action method="setHeaderTitle">
-            <argument translate="true" name="title" xsi:type="string">Send confirmation link</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\View\Block\Template" name="accountConfirmation" template="Magento_Customer::form/confirmation.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml
deleted file mode 100644
index 0ef9e4c454e3f71ca668447de014ce5e358cc159..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Customer\Block\Form\Register" name="customer_form_register" template="form/register.phtml">
-            <container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml
deleted file mode 100644
index e0ac7ce426e7c10aef87781e9b9c5bbb078a8475..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Reset a Password" type="page">
-    <referenceBlock name="head">
-        <action method="setTitle">
-            <argument translate="true" name="title" xsi:type="string">Reset a Password</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-        <action method="setHeaderTitle">
-            <argument translate="true" name="title" xsi:type="string">Reset a Password</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Customer\Block\Account\Resetpassword" name="resetPassword" template="form/resetforgottenpassword.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml
deleted file mode 100644
index 0afcc479a7717fbadfc3c3f9bd57bdbf9fe487b5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceBlock name="root">
-        <action method="setHeaderTitle">
-            <argument translate="true" name="title" xsi:type="string">Edit Account Info</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Customer\Block\Form\Edit" name="customer_edit" template="form/edit.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
deleted file mode 100644
index 7edcb2693b7336a7da93feb41688dda5047d3b5a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <action method="setTitle">
-            <argument translate="true" name="title" xsi:type="string">Forgot Your Password</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-        <action method="setHeaderTitle">
-            <argument translate="true" name="title" xsi:type="string">Password forgotten</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Customer\Block\Account\Forgotpassword" name="forgotPassword" template="form/forgotpassword.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml
deleted file mode 100644
index e817f42626ac18a962e2a45288821499b4509eb4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Dashboard" type="page">
-    <update handle="customer_account"/>
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-left.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Customer\Block\Account\Dashboard" name="customer_account_dashboard" template="account/dashboard.phtml">
-            <block class="Magento\Customer\Block\Account\Dashboard\Hello" name="customer_account_dashboard_hello" as="hello" template="account/dashboard/hello.phtml"/>
-            <block class="Magento\View\Block\Template" name="customer_account_dashboard_top" as="top"/>
-            <block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="account/dashboard/info.phtml"/>
-            <block class="Magento\Customer\Block\Account\Dashboard\Newsletter" name="customer_account_dashboard_newsletter" as="newsletter" template="account/dashboard/newsletter.phtml"/>
-            <block class="Magento\Customer\Block\Account\Dashboard\Address" name="customer_account_dashboard_address" as="address" template="account/dashboard/address.phtml"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.xml
deleted file mode 100644
index 79c1494f7cc4f5d4a89c82771d98e6c648a64730..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Login Form" type="page">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Customer\Block\Form\Login" name="customer_form_login" template="form/login.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.xml
deleted file mode 100644
index f92de06af03eed39f62742a89dfe7072a6642c0d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Logout Success" type="page">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\View\Block\Template" name="customer_logout" template="Magento_Customer::logout.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml
deleted file mode 100644
index 25b2a9eab9025da98c873747b6070f2c0c2549f6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Address Edit Form" type="page">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="address/edit.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml
deleted file mode 100644
index a5e18be842269f7a6355522e5bca612d99cb8619..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Customer\Block\Address\Book" name="address_book" template="address/book.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.xml
deleted file mode 100644
index 716f6953c985f1f86f0f3f0141e5394eaa4b26f4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="top.links">
-        <block class="Magento\Customer\Block\Account\Link" name="my-account-link">
-            <arguments>
-                <argument name="label" xsi:type="string">My Account</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link" after="onepage-checkout-link"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/logout.phtml b/app/design/frontend/magento_backup/Magento_Customer/logout.phtml
deleted file mode 100644
index 5cdd57b3d0ced88ceddaf017053cda68b3029731..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/logout.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('You are now logged out') ?></h1>
-</div>
-<p><?php echo __('You have logged out and will be redirected to our homepage in 5 seconds.') ?></p>
-<script type="text/javascript">
-    (function($){
-        $($.mage.redirect("<?php echo $this->getUrl() ?>","assign",5000));
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/set-password.js b/app/design/frontend/magento_backup/Magento_Customer/set-password.js
deleted file mode 100644
index 8f4404c5ac1da73e23fec45182e0dcb87fbef5f7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/set-password.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage customer view
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true expr:true*/
-(function ($) {
-    $.widget('mage.setPassword', {
-        _create: function() {
-            this.element.on('change', $.proxy(function(event) {
-                $(event.target).is(':checked') ? this._showPassword() : this._hidePassword();
-            }, this));
-            this.options.showOnDefault && this._showPassword();
-        },
-
-        /**
-         * Hide password input fields
-         * @private
-         */
-        _hidePassword: function() {
-            $(this.options.currentPasswordId).removeAttr('data-validate')
-                .parents(this.options.passwordContainer).hide();
-            $(this.options.passwordId).removeAttr('data-validate');
-            $(this.options.confirmationId).removeAttr('data-validate');
-        },
-
-        /**
-         * Show password input fields
-         * @private
-         */
-        _showPassword: function() {
-            $(this.options.currentPasswordId).attr('data-validate', '{required:true}')
-                .parents(this.options.passwordContainer).show();
-            $(this.options.passwordId).attr('data-validate', "{required:true, 'validate-password':true}");
-            $(this.options.confirmationId).attr('data-validate',
-                '{required:true, equalTo:"' + this.options.passwordId + '"}');
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/dob.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/dob.phtml
deleted file mode 100644
index 3ace2f5a707183a3e573b1ba800eb26dbf6dde6e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/dob.phtml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
-USAGE:
-
-Simple:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
-   ->setDate($this->getCustomer()->getDob())
-   ->toHtml() ?>
-
-For checkout/onepage/billing.phtml:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
-   ->setDate($this->getCustomer()->getDob())
-   ->setFieldIdFormat('billing:%s')
-   ->setFieldNameFormat('billing[%s]')
-   ->toHtml() ?>
-
-NOTE: Regarding styles - if we leave it this way, we'll move it to boxes.css
-      Alternatively we could calculate widths automatically using block input parameters.
-*/
-
-/**
- * @see \Magento\Customer\Block\Widget\Dob
- */
-?>
-<label for="<?php echo $this->getFieldId('month')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo __('Date of Birth') ?></label>
-<div class="input-box customer-dob">
-<?php
-    $this->setDateInput('d',
-        '<div class="dob-day">
-             <input type="text" id="' . $this->getFieldId('day') . '" name="' . $this->getFieldName('day') . '" value="' . $this->getDay() . '" title="' . __('Day') . '" class="input-text validate-custom" ' . $this->getFieldParams() . ' />
-             <label for="' . $this->getFieldId('day') . '">' . __('Day (DD)') . '</label>
-         </div>'
-    );
-
-    $this->setDateInput('m',
-        '<div class="dob-month">
-             <input type="text" id="' . $this->getFieldId('month') . '" name="' . $this->getFieldName('month') . '" value="' . $this->getMonth()  . '" title="' . __('Month')  . '" class="input-text validate-custom" ' . $this->getFieldParams()  . ' />
-             <label for="' . $this->getFieldId('month') . '">' . __('Month (MM)')  . '</label>
-         </div>'
-    );
-
-    $this->setDateInput('y',
-        '<div class="dob-year">
-             <input type="text" id="' . $this->getFieldId('year') . '" name="' . $this->getFieldName('year') . '" value="' . $this->getYear()  . '" title="' . __('Year')  . '" class="input-text validate-custom" ' . $this->getFieldParams()  . ' />
-             <label for="' . $this->getFieldId('year') . '">' . __('Year (YYYY)')  . '</label>
-         </div>'
-    );
-?>
-    <?php echo $this->getSortedDateInputs() ?>
-    <div class="dob-full" style="display:none;">
-        <input type="hidden" id="<?php echo $this->getFieldId('dob')?>" name="<?php echo $this->getFieldName('dob')?>" data-validate="{'validate-dob': ['.dob-day', '.dob-month', '.dob-year', <?php echo $this->isRequired() ? 'true' : 'false' ?>]}"/>
-    </div>
-
-    <div class="validation-advice" style="display:none;"></div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml
deleted file mode 100644
index 9ea8f5f6d42f01b65eda158c15c868e8859ba944..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<label for="<?php echo $this->getFieldId('gender')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo __('Gender') ?></label>
-<div class="input-box">
-    <select id="<?php echo $this->getFieldId('gender')?>" name="<?php echo $this->getFieldName('gender')?>" title="<?php echo __('Gender') ?>"<?php if ($this->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?> <?php echo $this->getFieldParams() ?>>
-        <?php $options = $this->getGenderOptions(); ?>
-        <?php $value = $this->getGender();?>
-        <?php foreach ($options as $option):?>
-            <option value="<?php echo $option['value'] ?>"<?php if ($option['value'] == $value) echo ' selected="selected"' ?>><?php echo $option['label'] ?></option>
-        <?php endforeach;?>
-    </select>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/name.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/name.phtml
deleted file mode 100644
index a96c443bb399127666db24b9090c45e145e1f3f8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/name.phtml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
-USAGE:
-
-Simple:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
-   ->setObject($this->getAddress())
-   ->toHtml() ?>
-
-For checkout/onepage/shipping.phtml:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
-   ->setObject($this->getAddress())
-   ->setFieldIdFormat('shipping:%s')
-   ->setFieldNameFormat('shipping[%s]')
-   ->setFieldParams('onchange="shipping.setSameAsBilling(false);"')
-   ->toHtml() ?>
-*/
-/* @var $this \Magento\Customer\Block\Widget\Name */
-?>
-<div class="<?php echo $this->getContainerClassName()?>">
-<?php if ($this->showPrefix()): ?>
-    <div class="field name-prefix">
-        <label for="<?php echo $this->getFieldId('prefix')?>"<?php if ($this->isPrefixRequired()) echo ' class="required"' ?>><?php if ($this->isPrefixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('prefix') ?></label>
-        <div class="input-box">
-            <?php if ($this->getPrefixOptions() === false): ?>
-                <input type="text" id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getPrefix()) ?>" title="<?php echo $this->getStoreLabel('prefix') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> />
-            <?php else: ?>
-                <select id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" title="<?php echo $this->getStoreLabel('prefix') ?>" class="<?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
-                <?php foreach ($this->getPrefixOptions() as $_option): ?>
-                    <option value="<?php echo $_option?>"<?php if ($this->getObject()->getPrefix()==$_option):?> selected="selected"<?php endif; ?>><?php echo __($_option)?></option>
-                <?php endforeach; ?>
-                </select>
-            <?php endif; ?>
-        </div>
-    </div>
-<?php endif; ?>
-    <div class="field name-firstname">
-        <label for="<?php echo $this->getFieldId('firstname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('firstname') ?></label>
-        <div class="input-box">
-            <input type="text" id="<?php echo $this->getFieldId('firstname')?>" name="<?php echo $this->getFieldName('firstname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getFirstname()) ?>" title="<?php echo $this->getStoreLabel('firstname') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('firstname') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('firstname') == 'required-entry') echo ' data-validate="{required:true}"' ?> />
-        </div>
-    </div>
-<?php if ($this->showMiddlename()): ?>
-<?php $isMiddlenameRequired = $this->isMiddlenameRequired(); ?>
-    <div class="field name-middlename">
-        <label for="<?php echo $this->getFieldId('middlename')?>"<?php echo $isMiddlenameRequired ? ' class="required"' : '' ?>><?php echo $isMiddlenameRequired ? '<em>*</em>' : '' ?><?php echo $this->getStoreLabel('middlename') ?></label>
-        <div class="input-box">
-            <input type="text" id="<?php echo $this->getFieldId('middlename')?>" name="<?php echo $this->getFieldName('middlename')?>" value="<?php echo $this->escapeHtml($this->getObject()->getMiddlename()) ?>" title="<?php echo $this->getStoreLabel('middlename') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('middlename') ?>" <?php echo $this->getFieldParams() ?> <?php echo $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?> />
-        </div>
-    </div>
-<?php endif; ?>
-    <div class="field name-lastname">
-        <label for="<?php echo $this->getFieldId('lastname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('lastname') ?></label>
-        <div class="input-box">
-            <input type="text" id="<?php echo $this->getFieldId('lastname')?>" name="<?php echo $this->getFieldName('lastname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getLastname()) ?>" title="<?php echo $this->getStoreLabel('lastname') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('lastname') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('lastname') == 'required-entry') echo ' data-validate="{required:true}"' ?> />
-        </div>
-    </div>
-<?php if ($this->showSuffix()): ?>
-    <div class="field name-suffix">
-        <label for="<?php echo $this->getFieldId('suffix')?>"<?php if ($this->isSuffixRequired()) echo ' class="required"' ?>><?php if ($this->isSuffixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('suffix') ?></label>
-        <div class="input-box">
-        <?php if ($this->getSuffixOptions() === false): ?>
-            <input type="text" id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getSuffix()) ?>" title="<?php echo $this->getStoreLabel('suffix') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isSuffixRequired()) echo ' data-validate="{required:true}"' ?> />
-        <?php else: ?>
-            <select id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" title="<?php echo $this->getStoreLabel('suffix') ?>" class="<?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
-            <?php foreach ($this->getSuffixOptions() as $_option): ?>
-                <option value="<?php echo $_option?>"<?php if ($this->getObject()->getSuffix()==$_option):?> selected="selected"<?php endif; ?>><?php echo __($_option)?></option>
-            <?php endforeach; ?>
-            </select>
-        <?php endif; ?>
-        </div>
-    </div>
-<?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml
deleted file mode 100644
index 94af916168c4d6417f590498cf8840e4a1cff418..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<label for="<?php echo $this->getFieldId('taxvat')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo __('Tax/VAT number') ?></label>
-<div class="input-box">
-    <input type="text" id="<?php echo $this->getFieldId('taxvat')?>" name="<?php echo $this->getFieldName('taxvat')?>" value="<?php echo $this->escapeHtml($this->getTaxvat()) ?>" title="<?php echo __('Tax/VAT number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isRequired()) echo ' data-validate="{required:true}"' ?> />
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/currency.phtml b/app/design/frontend/magento_backup/Magento_Directory/currency.phtml
deleted file mode 100644
index 93bda8e1fe48c7a3a00045148beffccb095b2ca9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/currency.phtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Currency switcher
- *
- * @see \Magento\Directory\Block\Currency
- */
-?>
-<?php if($this->getCurrencyCount()>1): ?>
-<div class="block block-currency">
-    <div class="block-title">
-        <strong><span><?php echo __('Select Your Currency') ?></span></strong>
-    </div>
-    <div class="block-content">
-        <select name="currency" title="<?php echo __('Select Your Currency') ?>" onchange="setLocation(this.value)">
-        <?php foreach ($this->getCurrencies() as $_code => $_name): ?>
-            <option value="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"<?php if($_code==$this->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>>
-                <?php echo $_name ?> - <?php echo $_code ?>
-            </option>
-        <?php endforeach; ?>
-        </select>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml b/app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml
deleted file mode 100644
index 8fa890d6df2f4cc6403f8c6f0bbb12e85312bb04..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Currency') ?></h1>
-</div>
-<p><?php echo __('Your current currency is: %1.', $currency->getCode()) ?></p>
-<p><a href="<?php echo $this->getBaseUrl(); ?>"><?php echo __('Continue &raquo;') ?></a></p>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml b/app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml
deleted file mode 100644
index 357a8e3afa6779cc2fd6bfc6e5d7afa52defe2d5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php
-/**
- * JS block for including Countries with Optional Zip
- *
- * @see \Magento\View\Block\Template
- */
-?>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml
deleted file mode 100644
index 9d64de3d1e780b3d4beded3619f50da4e0778930..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="left">
-        <block class="Magento\Directory\Block\Currency" name="currency" before="catalog.leftnav" template="currency.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
deleted file mode 100644
index b0d82dc10a0be3275ab51e861f73f03c81be529c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="left">
-        <block class="Magento\Directory\Block\Currency" name="right_currency" before="-" template="currency.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
deleted file mode 100644
index 7ea5d0eb50cc70b8ced7d44e7b68b14a78bba0b5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="right">
-        <block class="Magento\Directory\Block\Currency" name="right_currency" before="-" template="currency.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml
deleted file mode 100644
index 4c71dc1b48a8338da77610159524ba783840aafb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="left">
-        <block class="Magento\Directory\Block\Currency" name="currency" before="-" template="currency.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js b/app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js
deleted file mode 100644
index 6f9b6cc23168a9f45a6075a2b5a2536916596510..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    gift message options toggle
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.giftOptions', {
-        options: {
-            mageError: 'mage-error',
-            noDisplay: 'no-display',
-            requiredEntry: 'required-entry'
-        },
-
-        /**
-         * Initial toggle of the various gift options after widget instantiation.
-         * @private
-         */
-        _init: function() {
-            this._toggleVisibility();
-        },
-
-        /**
-         * Bind a click handler to the widget's context element.
-         * @private
-         */
-        _create: function() {
-            this.element.on('click', $.proxy(this._toggleVisibility, this));
-            $(this.element.data('selector').id).find('.giftmessage-area')
-                .on('change', $.proxy(this._toggleRequired, this));
-        },
-
-        /**
-         * Toggle the visibility of the widget's context element's selector(s).
-         * @private
-         * @param event {Object} - Click event. Target is a checkbox.
-         */
-        _toggleVisibility: function(event) {
-            var checkbox = event ? $(event.target) : this.element,
-                container = $(checkbox.data('selector').id);
-            if (checkbox.is(':checked')) {
-                container.show()
-                    .find('.giftmessage-area:not(:visible)').each(function(x, element) {
-                        if ($(element).val().length > 0) {
-                            $(element).change();
-                            container.find('a').click();
-                        }
-                    });
-            } else {
-                var _this = this;
-                container.hide()
-                    .find('.input-text:not(.giftmessage-area)').each(function(x, element) {
-                        $(element).val(element.defaultValue).removeClass(_this.options.mageError)
-                            .next('div.' + _this.options.mageError).remove();
-                    }).end()
-                    .find('.giftmessage-area').val('').change().end()
-                    .find('.select').val('').change().end()
-                    .find('.checkbox:checked').prop('checked', false).click().prop('checked', false).end()
-                    .find('.price-box').addClass(this.options.noDisplay).end();
-            }
-        },
-
-        /**
-         * Make the From and To input fields required if a gift message has been written.
-         * @private
-         * @param event {Object} - Change event. Target is a textarea.
-         */
-        _toggleRequired: function(event) {
-            var textArea = $(event.target),
-                length = textArea.val().length;
-            textArea.closest('li').prev('.fields')
-                .find('.input-text').toggleClass(this.options.requiredEntry, length > 0);
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml b/app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml
deleted file mode 100644
index b581f23b0ffe962af5acf03b695097ba453e1d7b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($this->isMessagesAvailable() || $this->isItemsAvailable()): ?>
-<?php switch ($this->getType()): ?>
-<?php case 'onepage_checkout': ?>
-    <div class="gift-messages">
-        <h3><?php echo __('Does your order include gift items?'); ?></h3>
-        <p>
-            <input type="checkbox" name="allow_gift_messages" id="allow_gift_messages" value="1" data-selector='{"id":"#allow-gift-message-container"}'<?php if($this->getItemsHasMesssages() || $this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_messages"><?php echo __('Add gift options.') ?></label>
-        </p>
-    </div>
-    <div class="gift-messages-form" id="allow-gift-message-container">
-        <div class="inner-box">
-            <?php if ($this->isMessagesAvailable()): ?>
-                <h4><?php echo __('Gift Options for the Entire Order'); ?></h4>
-                <p>
-                    <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_messages_for_order" value="1" data-selector='{"id":"#allow-gift-messages-for-order-container"}'<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_messages_for_order"><?php echo __('Add gift options for the Entire Order') ?></label>
-                </p>
-                <div class="allow-gift-messages-for-order-container" id="allow-gift-messages-for-order-container" style="display:none">
-                    <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message for the whole order.') ?></p>
-                    <input type="hidden" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][type]"  value="quote" />
-                    <ul class="form-list">
-                        <li class="fields">
-                            <div class="field">
-                                <label for="gift-message-whole-from"><?php echo __('From') ?></label>
-                                <div class="input-box">
-                                    <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?php echo __('From') ?>"  value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
-                                </div>
-                            </div>
-                            <div class="field">
-                                <label for="gift-message-whole-to"><?php echo __('To') ?></label>
-                                <div class="input-box">
-                                    <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
-                                </div>
-                            </div>
-                        </li>
-                        <li class="wide">
-                            <label for="gift-message-whole-message"><?php echo __('Message') ?></label>
-                            <div class="input-box">
-                                <textarea id="gift-message-whole-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-             <?php endif; ?>
-             <?php if($this->isItemsAvailable()): ?>
-                 <h4><?php echo __('Gift Options for Individual Items'); ?></h4>
-                 <p>
-                    <input type="checkbox" name="allow_gift_messages_for_items" id="allow_gift_messages_for_items" value="1" data-selector='{"id":"#allow-gift-messages-for-items-container"}'<?php if($this->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_messages_for_items"><?php echo __('Add gift options for Individual Items') ?></label>
-                </p>
-                <div id="allow-gift-messages-for-items-container">
-                 <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message to this item.') ?></p>
-                 <ol>
-                 <?php foreach($this->getItems() as $_index=>$_item): ?>
-                 <?php $_product=$_item->getProduct() ?>
-                 <li class="item">
-                     <div class="product-img-box">
-                         <p class="product-image">
-                             <img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" />
-                         </p>
-                         <p class="number"><?php echo __('Item %1 of %2', $_index+1, $this->countItems()) ?></p>
-                     </div>
-                     <div class="details">
-                         <div class="f-fix">
-                             <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
-                             <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_item" />
-                              <ul class="form-list">
-                                 <li class="fields">
-                                     <div class="field">
-                                         <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo __('From') ?></label>
-                                         <div class="input-box">
-                                             <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo __('From') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
-                                         </div>
-                                     </div>
-                                     <div class="field">
-                                         <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo __('To') ?></label>
-                                         <div class="input-box">
-                                             <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
-                                         </div>
-                                     </div>
-                                 </li>
-                                 <li class="wide">
-                                     <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo __('Message') ?></label>
-                                     <div class="input-box">
-                                         <textarea id="gift-message-<?php echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
-                                     </div>
-                                 </li>
-                             </ul>
-                         </div>
-                     </div>
-                 </li>
-                 <?php endforeach; ?>
-             </ol>
-             </div>
-             <?php endif; ?>
-        </div>
-    </div>
-    <script type="text/javascript">
-        head.js("<?php echo $this->getViewFileUrl('Magento_GiftMessage::gift-options.js')?>", function() {
-            jQuery('#allow_gift_messages')
-                .add('#allow_gift_messages_for_order')
-                .add('#allow_gift_messages_for_items').giftOptions();
-        });
-    </script>
-<?php break; ?>
-<?php case 'multishipping_adress_checkbox': ?>
-
-<?php break; ?>
-<?php case 'multishipping_address': ?>
-    <div class="gift-messages">
-        <h3><?php echo __('Does your order include gift items?'); ?></h3>
-        <p>
-            <input type="checkbox" name="allow_gift_messages_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_messages_<?php echo $this->getEntity()->getId() ?>" value="1" data-selector='{"id":"#allow-gift-message-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getItemsHasMesssages() || $this->getEntityHasMessage()): ?> checked="checked"<?php endif ?> class="checkbox" />
-            <label for="allow_gift_messages_<?php echo $this->getEntity()->getId() ?>"><?php echo __('Add gift options') ?></label>
-        </p>
-    </div>
-    <div class="gift-messages-form" id="allow-gift-message-container-<?php echo $this->getEntity()->getId() ?>">
-        <div class="inner-box">
-            <?php if ($this->isMessagesAvailable()): ?>
-            <h4><?php echo __('Gift Options for this address'); ?></h4>
-            <p>
-                 <input type="checkbox" name="allow_gift_messages_for_order_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_messages_for_order_<?php echo $this->getEntity()->getId() ?>" value="1" data-selector='{"id":"#allow-gift-messages-for-order-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                 <label for="allow_gift_messages_for_order"><?php echo __('Add gift options for the Entire Order') ?></label>
-            </p>
-            <div id="allow-gift-messages-for-order-container-<?php echo $this->getEntity()->getId() ?>">
-                <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message for this address.') ?></p>
-                <input type="hidden" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][type]" value="quote_address" />
-                <ul class="form-list">
-                    <li class="fields">
-                        <div class="field">
-                            <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-from"><?php echo __('From') ?></label>
-                            <div class="input-box">
-                                <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-from" title="<?php echo __('From') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
-                            </div>
-                        </div>
-                        <div class="field">
-                            <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-to"><?php echo __('To') ?></label>
-                            <div class="input-box">
-                                <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
-                            </div>
-                        </div>
-                    </li>
-                    <li class="wide">
-                        <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-message"><?php echo __('Message') ?></label>
-                        <div class="input-box">
-                            <textarea id="gift-message-<?php echo $this->getEntity()->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-            <?php endif; ?>
-            <?php if($this->isItemsAvailable()): ?>
-            <h4><?php echo __('Gift Options for Individual Items'); ?></h4>
-            <p>
-                <input type="checkbox" name="allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>" value="1" data-selector='{"id":"#allow-gift-messages-for-items-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                <label for="allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>"><?php echo __('Add gift options for Individual Items') ?></label>
-            </p>
-            <div id="allow-gift-messages-for-items-container-<?php echo $this->getEntity()->getId() ?>">
-             <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message to this item.') ?></p>
-             <ol>
-             <?php foreach($this->getItems() as $_index=>$_item): ?>
-             <?php $_product=$_item->getProduct() ?>
-                 <li class="item">
-                     <div class="product-img-box">
-                         <p class="product-image"><img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" /></p>
-                         <p class="number"><?php echo __('Item %1 of %2', $_index+1, $this->countItems()) ?></p>
-                     </div>
-                     <div class="details">
-                         <div class="f-fix">
-                             <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_address_item" />
-                             <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][address]" value="<?php echo $this->getEntity()->getId()?>" />
-                             <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
-                             <ul class="form-list">
-                                 <li class="fields">
-                                     <div class="field">
-                                         <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo __('From') ?></label>
-                                         <div class="input-box">
-                                             <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo __('From') ?>"  value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
-                                         </div>
-                                     </div>
-                                     <div class="field">
-                                         <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo __('To') ?></label>
-                                         <div class="input-box">
-                                             <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
-                                         </div>
-                                     </div>
-                                 </li>
-                                 <li class="wide">
-                                     <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo __('Message') ?></label>
-                                     <div class="input-box">
-                                         <textarea id="gift-message-<?php echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
-                                     </div>
-                                 </li>
-                             </ul>
-                         </div>
-                     </div>
-                 </li>
-             <?php endforeach; ?>
-             </ol>
-            </div>
-            <?php endif; ?>
-        </div>
-    </div>
-    <script type="text/javascript">
-        (function($) {
-            $(function() {
-                head.js("<?php echo $this->getViewFileUrl('Magento_GiftMessage::gift-options.js')?>", function() {
-                    $('#allow_gift_messages_<?php echo $this->getEntity()->getId() ?>')
-                        .add('#allow_gift_messages_for_order_<?php echo $this->getEntity()->getId() ?>')
-                        .add('#allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>').giftOptions();
-                });
-            });
-        })(jQuery);
-    </script>
-    <?php break; ?>
-<?php endswitch ?>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>", function() {
-            jQuery("#shipping_method_form").validation();
-        });
-</script>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
deleted file mode 100644
index 12efb3136114334eab7b30d69952211a0eb36765..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="checkout.cart.top_methods">
-        <block class="Magento\GoogleCheckout\Block\Link" name="checkout.cart.methods.googlecheckout.top" template="link.phtml" before="-"/>
-    </referenceContainer>
-    <referenceContainer name="checkout.cart.methods">
-        <block class="Magento\GoogleCheckout\Block\Link" name="checkout.cart.methods.googlecheckout.bottom" template="link.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml b/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
deleted file mode 100644
index 694917f178813ce90588b8da74f4865346dd03ad..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php echo $this->getBeforeHtml(); ?>
-<?php if ($this->getIsDisabled()): ?>
-<img src="<?php echo $this->escapeHtml($this->getImageUrl())?>" alt="<?php echo __('Fast checkout through Google');?>" title="<?php echo __('Fast Checkout through Google');?>" />
-<?php else: ?>
-<form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
-    <fieldset>
-        <input type="hidden" name="analyticsdata" value="" />
-        <input type="image" src="<?php echo $this->escapeHtml($this->getImageUrl())?>" title="<?php echo __('Fast checkout through Google');?>" alt="<?php echo __('Fast Checkout through Google');?>" />
-    </fieldset>
-</form>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/customer_account.xml b/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/customer_account.xml
deleted file mode 100644
index 11f782c741666d3a45aa6339853d9047f0b31681..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/customer_account.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="customer_account_navigation">
-        <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-newsletter-subscriptions-link">
-            <arguments>
-                <argument name="path" xsi:type="string">newsletter/manage</argument>
-                <argument name="label" xsi:type="string">Newsletter Subscriptions</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <remove name="newsletter_subscription"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.xml
deleted file mode 100644
index 67b7a5379ddc395bd75160abc01e85e9e494576c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="left">
-        <block class="Magento\Newsletter\Block\Subscribe" name="newsletter_subscription" template="subscribe.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml b/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
deleted file mode 100644
index 13c77ee6f034795bbf3bb7765d3c7846f79a7702..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Customer\Block\Newsletter" name="customer_newsletter">
-            <container name="customer.newsletter.form.before" as="form_before" label="Newsletter Subscription Form Before"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js b/app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js
deleted file mode 100644
index dd738941884275154164e284b1504b7ef4196d0f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    frontend newsletter
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function ($) {
-    $.widget('mage.newsletter', {
-        options: {
-            errorClass: 'mage-error'
-        },
-        _create: function() {
-            $(this.options.formSelector)
-                .validation({errorClass: this.options.errorClass});
-            this.element.on('click', $.proxy(function(e) {
-               if ($(e.target).val() === this.options.placeholder) {
-                   $(e.target).val('');
-               }
-            }, this)).on('focusout', $.proxy(function(e) {
-                setTimeout($.proxy(function() {
-                    if ($.trim($(e.target).val()) === '') {
-                        $(e.target).val(this.options.placeholder);
-                    }
-                }, this), 100);
-            }, this));
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml b/app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml
deleted file mode 100644
index b58a97130dd0e8b35e06aefb3fe1134842ce95d7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="block block-subscribe">
-    <div class="block-title">
-        <strong><span><?php echo __('Newsletter') ?></span></strong>
-    </div>
-    <form action="<?php echo $this->getFormActionUrl() ?>" method="post" id="newsletter-validate-detail">
-        <div class="block-content">
-            <div class="form-subscribe-header">
-                <label for="newsletter"><?php echo __('Sign Up for Our Newsletter:') ?></label>
-            </div>
-            <div class="input-box">
-                <input type="text" name="email" id="newsletter"
-                       title="<?php echo __('Sign up for our newsletter') ?>"
-                       value="<?php echo __('Enter your email address') ?>"
-                       class="input-text" data-validate="{required:true, 'validate-email':true}"/>
-            </div>
-            <div class="actions">
-                <button type="submit" title="<?php echo __('Subscribe') ?>" class="button">
-                    <span><span><?php echo __('Subscribe') ?></span></span></button>
-            </div>
-        </div>
-    </form>
-    <script type="text/javascript">
-        //<![CDATA[
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('Magento_Newsletter::newsletter.js')?>", function() {
-                    $('#newsletter').newsletter({
-                        formSelector: '#newsletter-validate-detail',
-                        placeholder: '<?php echo __('Enter your email address') ?>'
-                    });
-            });
-        })(jQuery);
-        //]]>
-    </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Page/1column.phtml b/app/design/frontend/magento_backup/Magento_Page/1column.phtml
deleted file mode 100644
index 19f3a76a483d271555c28a941e1064035f13e039..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/1column.phtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
-<head>
-<?php echo $this->getChildHtml('head') ?>
-</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
-    <?php echo $this->getChildHtml('global_notices') ?>
-    <div class="page">
-        <?php echo $this->getChildHtml('header') ?>
-        <div class="main-container col1-layout">
-            <div class="main">
-                <?php echo $this->getChildHtml('breadcrumbs') ?>
-                <div class="col-main">
-                    <?php echo $this->getChildHtml('global_messages') ?>
-                    <?php echo $this->getChildHtml('main') ?>
-                </div>
-            </div>
-        </div>
-        <?php echo $this->getChildHtml('footer') ?>
-        <?php echo $this->getChildHtml('before_body_end') ?>
-    </div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml b/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
deleted file mode 100644
index 9047209145d7bda4a2a8c13cdedd6a3c614ece94..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
-<head>
-<?php echo $this->getChildHtml('head') ?>
-</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
-    <?php echo $this->getChildHtml('global_notices') ?>
-    <div class="page">
-        <?php echo $this->getChildHtml('header') ?>
-        <div class="main-container col2-left-layout">
-            <div class="main">
-                <?php echo $this->getChildHtml('breadcrumbs') ?>
-                <div class="col-main">
-                    <?php echo $this->getChildHtml('global_messages') ?>
-                    <?php echo $this->getChildHtml('content') ?>
-                </div>
-                <div class="col-left sidebar"><?php echo $this->getChildHtml('left') ?></div>
-            </div>
-        </div>
-        <?php echo $this->getChildHtml('footer') ?>
-        <?php echo $this->getChildHtml('before_body_end') ?>
-    </div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml b/app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml
deleted file mode 100644
index ea929a0ebbcbffaab2342fad7b1b0b24ffb6540c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
-<head>
-<?php echo $this->getChildHtml('head') ?>
-</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
-    <?php echo $this->getChildHtml('global_notices') ?>
-    <div class="page">
-        <?php echo $this->getChildHtml('header') ?>
-        <div class="main-container col2-right-layout">
-            <div class="main">
-                <?php echo $this->getChildHtml('breadcrumbs') ?>
-                <div class="col-main">
-                    <?php echo $this->getChildHtml('global_messages') ?>
-                    <?php echo $this->getChildHtml('content') ?>
-                </div>
-                <div class="col-right sidebar"><?php echo $this->getChildHtml('right') ?></div>
-            </div>
-        </div>
-        <?php echo $this->getChildHtml('footer') ?>
-        <?php echo $this->getChildHtml('before_body_end') ?>
-    </div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/3columns.phtml b/app/design/frontend/magento_backup/Magento_Page/3columns.phtml
deleted file mode 100644
index ad11e60846eab02e641e83f696e8d6f5da84e429..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/3columns.phtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
-<head>
-<?php echo $this->getChildHtml('head') ?>
-</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
-    <?php echo $this->getChildHtml('global_notices') ?>
-    <div class="page">
-        <?php echo $this->getChildHtml('header') ?>
-        <div class="main-container col3-layout">
-            <div class="main">
-                <?php echo $this->getChildHtml('breadcrumbs') ?>
-                <div class="col-wrapper">
-                    <div class="col-main">
-                        <?php echo $this->getChildHtml('global_messages') ?>
-                        <?php echo $this->getChildHtml('main') ?>
-                    </div>
-                    <div class="col-left sidebar"><?php echo $this->getChildHtml('left') ?></div>
-                </div>
-                <div class="col-right sidebar"><?php echo $this->getChildHtml('right') ?></div>
-            </div>
-        </div>
-        <?php echo $this->getChildHtml('footer') ?>
-        <?php echo $this->getChildHtml('before_body_end') ?>
-    </div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/empty.phtml b/app/design/frontend/magento_backup/Magento_Page/empty.phtml
deleted file mode 100644
index 112112b6795874a99f78e4c3d46c52f7d8bf714e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/empty.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
-<head>
-    <?php echo $this->getChildHtml('head') ?>
-</head>
-<body class="page-empty <?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
-    <div>
-        <?php echo $this->getChildHtml('after_body_start') ?>
-        <?php echo $this->getChildHtml('global_messages') ?>
-        <?php echo $this->getChildHtml('content') ?>
-        <?php echo $this->getChildHtml('before_body_end') ?>
-        <?php echo $this->getAbsoluteFooter() ?>
-    </div>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml b/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
deleted file mode 100644
index b1e9df03aa7ce7470fb4d50329e18b29f601c759..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if($crumbs && is_array($crumbs)): ?>
-<div class="breadcrumbs">
-    <ul>
-        <?php foreach($crumbs as $_crumbName=>$_crumbInfo): ?>
-            <li class="<?php echo $_crumbName ?>">
-            <?php if($_crumbInfo['link']): ?>
-                <a href="<?php echo $_crumbInfo['link'] ?>" title="<?php echo $this->escapeHtml($_crumbInfo['title']) ?>"><?php echo $this->escapeHtml($_crumbInfo['label']) ?></a>
-            <?php elseif($_crumbInfo['last']): ?>
-                <strong><?php echo $this->escapeHtml($_crumbInfo['label']) ?></strong>
-            <?php else: ?>
-                <?php echo $this->escapeHtml($_crumbInfo['label']) ?>
-            <?php endif; ?>
-            <?php if(!$_crumbInfo['last']): ?>
-                <span>/ </span>
-            <?php endif; ?>
-            </li>
-        <?php endforeach; ?>
-    </ul>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/head.phtml b/app/design/frontend/magento_backup/Magento_Page/html/head.phtml
deleted file mode 100644
index d14d1bbde6eb08b925a51dbe90ad4005cfbd640d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/head.phtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Page\Block\Html\Head */
-?>
-<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
-<title><?php echo $this->getTitle() ?></title>
-<meta name="description" content="<?php echo $this->escapeHtml($this->getDescription())?>"/>
-<meta name="keywords" content="<?php echo $this->escapeHtml($this->getKeywords())?>"/>
-<meta name="robots" content="<?php echo $this->escapeHtml($this->getRobots())?>"/>
-<link rel="icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon"/>
-<link rel="shortcut icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon"/>
-<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('Magento_Page::css/validate.css') ?>" type="text/css" media="all"/>
-<?php echo $this->getCssJsHtml() ?>
-<?php echo $this->getChildHtml() ?>
-<?php echo $this->getIncludes() ?>
-<?php echo $this->helper('Magento\Core\Helper\Js')->getTranslatorScript() ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/header.phtml b/app/design/frontend/magento_backup/Magento_Page/html/header.phtml
deleted file mode 100644
index ec10346c9f462a33abb2b52b854ce74305301a46..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/header.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/**
- * @var \Magento\Page\Block\Html\Header $this
- */
-?>
-<div class="header-container">
-    <div class="header">
-        <?php if ($this->getIsHomePage()):?>
-        <h1 class="logo"><strong><?php echo $this->getLogoAlt() ?></strong><a href="<?php echo $this->getUrl('') ?>" title="<?php echo $this->getLogoAlt() ?>" class="logo"><img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /></a></h1>
-        <?php else:?>
-        <a href="<?php echo $this->getUrl('') ?>" title="<?php echo $this->getLogoAlt() ?>" class="logo"><strong><?php echo $this->getLogoAlt() ?></strong><img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /></a>
-        <?php endif?>
-        <div class="quick-access">
-            <?php echo $this->getChildHtml('topSearch') ?>
-            <p class="welcome-msg"><?php echo $this->getWelcome() ?> <?php echo $this->getAdditionalHtml() ?></p>
-            <?php echo $this->getChildHtml('topLinks') ?>
-            <?php echo $this->getChildHtml('store_language') ?>
-        </div>
-        <?php echo $this->getChildHtml('topContainer'); ?>
-    </div>
-</div>
-<?php echo $this->getChildHtml('topMenu') ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml b/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
deleted file mode 100644
index 0df537f82bdbb654f94d3ba102303714dbc04cde..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @var $this \Magento\Page\Block\Html\Notices
- */
-?>
-<?php if ($this->displayNoscriptNotice()): ?>
-    <noscript>
-        <div class="global-site-notice noscript">
-            <div class="notice-inner">
-                <p>
-                    <strong><?php echo __('JavaScript seems to be disabled in your browser.'); ?></strong><br />
-                    <?php echo __('To use this website you must first enable JavaScript in your browser.'); ?>
-                </p>
-            </div>
-        </div>
-    </noscript>
-<?php endif; ?>
-<?php if ($this->displayDemoNotice()): ?>
-    <div class="global-site-notice demo-notice">
-        <div class="notice-inner"><p><?php echo __('This is only a demo store. You can browse and place orders, but nothing will be processed.') ?></p></div>
-    </div>
-<?php endif; ?>
-<?php if ($this->helper('Magento\Core\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
-    <div class="global-site-notice notice-cookie" id="notice-cookie-block" style="display: none">
-        <div class="notice-inner">
-            <p><?php echo __('This store uses cookies to make shopping more enjoyable. Learn how cookies work in our <a href="%1">privacy policy</a>.', $this->getPrivacyPolicyLink()) ?></p>
-            <div class="actions"><button id="btn-cookie-allow" class="button"><span><span><?php echo __('Allow');?></span></span></button></div>
-        </div>
-    </div>
-    <script type="text/javascript">
-        // <![CDATA[
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('mage/cookies.js')?>",
-                "<?php echo $this->getViewFileUrl('Magento_Page::js/notices.js')?>", function() {
-                    $('#notice-cookie-block').cookieBlock({
-                        cookieAllowButtonSelector: '#btn-cookie-allow',
-                        cookieName: '<?php echo \Magento\Core\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>',
-                        cookieValue: '<?php echo $this->helper('Magento\Core\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>',
-                        cookieLifetime: <?php echo $this->helper('Magento\Core\Helper\Cookie')->getCookieRestrictionLifetime()?>,
-                        noCookiesUrl: '<?php echo $this->getUrl('cms/index/noCookies') ?>'
-                    });
-                });
-        })(jQuery);
-        // ]]>
-    </script>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/pager.phtml b/app/design/frontend/magento_backup/Magento_Page/html/pager.phtml
deleted file mode 100644
index 41e7c480ac869ec455baff4602749e4e220ceb78..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/pager.phtml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Pager template
- *
- * @see \Magento\Page\Block\Html\Pager
- */
-?>
-<?php if($this->getCollection()->getSize()): ?>
-
-    <?php if($this->getUseContainer()): ?>
-    <div class="pager">
-    <?php endif ?>
-
-    <?php if($this->getShowAmounts()): ?>
-    <p class="amount">
-        <?php if($this->getLastPageNum()>1): ?>
-            <?php echo __('Items %1 to %2 of %3 total', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
-        <?php else: ?>
-            <strong><?php echo __('%1 Item(s)', $this->getTotalNum()) ?></strong>
-        <?php endif; ?>
-    </p>
-    <?php endif ?>
-
-    <?php if($this->getShowPerPage()): ?>
-    <div class="limiter">
-        <label><?php echo __('Show') ?></label>
-        <select onchange="setLocation(this.value)">
-        <?php foreach ($this->getAvailableLimit() as  $_key=>$_limit): ?>
-            <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
-                <?php echo $_limit ?>
-            </option>
-        <?php endforeach; ?>
-        </select> <?php echo __('per page') ?>
-    </div>
-    <?php endif ?>
-
-    <?php if($this->getLastPageNum()>1): ?>
-    <div class="pages">
-        <strong><?php echo __('Page:') ?></strong>
-        <ol>
-        <?php if (!$this->isFirstPage()): ?>
-            <li>
-                <a class="previous<?php if(!$this->getAnchorTextForPrevious()): ?> i-previous<?php endif;?>" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo __('Previous') ?>">
-                    <?php if(!$this->getAnchorTextForPrevious()): ?>
-                        <img src="<?php echo $this->getViewFileUrl('images/pager_arrow_left.gif') ?>" alt="<?php echo __('Previous') ?>" class="v-middle" />
-                    <?php else: ?>
-                        <?php echo $this->getAnchorTextForPrevious() ?>
-                    <?php endif;?>
-                </a>
-            </li>
-        <?php endif;?>
-
-        <?php if ($this->canShowFirst()): ?>
-            <li><a class="first" href="<?php echo $this->getFirstPageUrl() ?>">1</a></li>
-        <?php endif;?>
-
-        <?php if ($this->canShowPreviousJump()): ?>
-            <li><a class="previous_jump" title="" href="<?php echo $this->getPreviousJumpUrl() ?>">...</a></li>
-        <?php endif;?>
-
-        <?php foreach ($this->getFramePages() as $_page): ?>
-            <?php if ($this->isPageCurrent($_page)): ?>
-                <li class="current"><?php echo $_page ?></li>
-            <?php else: ?>
-                <li><a href="<?php echo $this->getPageUrl($_page) ?>"><?php echo $_page ?></a></li>
-            <?php endif;?>
-        <?php endforeach;?>
-
-
-        <?php if ($this->canShowNextJump()): ?>
-            <li><a class="next_jump" title="" href="<?php echo $this->getNextJumpUrl() ?>">...</a></li>
-        <?php endif;?>
-
-        <?php if ($this->canShowLast()): ?>
-          <li><a class="last" href="<?php echo $this->getLastPageUrl() ?>"><?php echo $this->getLastPageNum() ?></a></li>
-        <?php endif;?>
-
-        <?php if (!$this->isLastPage()): ?>
-            <li>
-                <a class="next<?php if(!$this->getAnchorTextForNext()): ?> i-next<?php endif; ?>" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo __('Next') ?>">
-                    <?php if(!$this->getAnchorTextForNext()): ?>
-                        <img src="<?php echo $this->getViewFileUrl('images/pager_arrow_right.gif') ?>" alt="<?php echo __('Next') ?>" class="v-middle" />
-                    <?php else: ?>
-                        <?php echo $this->getAnchorTextForNext() ?>
-                    <?php endif;?>
-                </a>
-            </li>
-        <?php endif;?>
-        </ol>
-
-    </div>
-    <?php endif; ?>
-
-    <?php if($this->getUseContainer()): ?>
-    </div>
-    <?php endif ?>
-
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml b/app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
deleted file mode 100644
index c14eeceb25dc9357b53d0142b9f62134da559cca..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Page
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Top menu for store
- *
- * @see \Magento\Page\Block\Html\Topmenu
- */
-?>
-<?php $_menu = $this->getHtml('level-top') ?>
-<?php if ($_menu): ?>
-<div class="nav-container">
-    <ul id="nav">
-        <?php echo $_menu ?>
-    </ul>
-</div>
-<script type="text/javascript">
-    (function($) {
-        head.js("<?php echo $this->getViewFileUrl('Magento_Page::js/menu.js') ?>", function() {
-            $('#nav .parent').menu();
-        });
-    })(jQuery);
-</script>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/js/menu.js b/app/design/frontend/magento_backup/Magento_Page/js/menu.js
deleted file mode 100644
index 1daabdcb485debe8a9e6f553a771e6fc96b92d3b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/js/menu.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    frontend home menu
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true */
-(function ($) {
-    $.widget('mage.menu', {
-        options: {
-            showDelay: 100,
-            hideDelay: 100
-        },
-
-        _create: function() {
-            this.element.hover($.proxy(function () {
-                $(this.element).addClass('over');
-                this._show(this.element.children('ul'));
-            }, this), $.proxy(function () {
-                $(this.element).removeClass('over');
-                this._hide(this.element.children('ul'));
-            }, this));
-        },
-
-        /**
-         * Show sub menu by adding shown-sub class
-         * @private
-         * @param subElement
-         */
-        _show: function(subElement) {
-            if (subElement.data('hideTimeId')) {
-                clearTimeout(subElement.data('hideTimeId'));
-            }
-            subElement.data('showTimeId', setTimeout(function () {
-                subElement.addClass('shown-sub');
-            }), this.options.showDelay);
-        },
-
-        /**
-         * Hide sub menu by removing shown-sub class
-         * @private
-         * @param subElement
-         */
-        _hide: function(subElement) {
-            if (subElement.data('showTimeId')) {
-                clearTimeout(subElement.data('showTimeId'));
-            }
-            subElement.data('hideTimeId', setTimeout(function () {
-                subElement.removeClass('shown-sub');
-            }), this.options.hideDelay);
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js b/app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js
deleted file mode 100644
index a4cd598fb3387194118feb951703178db391cb3d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    popup-menu
- * @package     js
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($) {
-    $.widget('mage.popUpMenu', {
-        options: {
-            eventClass: 'faded', // Class applied to popUpMenu with mouseleave/mouseenter events.
-            fadeDuration: 'slow', // Duration for the fade effect when popUpMenu is shown/hidden.
-            hideOnClick: true, // Hides the popUpMenu when click anywhere in the document body.
-            menu: '', // Selector for the popUpMenu (e.g. <ul>).
-            onMouseEnter: null, // Function called when mouseenter event is triggered on popUpMenu.
-            onMouseLeave: null, // Function called when mouseleave event is triggered on popUpMenu.
-            openedClass: 'list-opened', // Class applied to switcher when popUpMenu is shown/hidden.
-            switcher: 'span.switcher', // Selector for the popUpMenu switcher.
-            timeoutDuration: 2000 // Duration before popUpMenu is hidden after mouseleave event.
-        },
-
-        /**
-         * Add click event to the switcher. Add blur, mouseenter/mouseleave events to the
-         * containing element.
-         * @private
-         */
-        _create: function() {
-            this.switcher = this.element.find(this.options.switcher)
-                .on('click', $.proxy(this._toggleMenu, this));
-            var eventMap = {
-                mouseenter: $.proxy(this.options.onMouseEnter, this),
-                mouseleave: $.proxy(this.options.onMouseLeave, this)
-            };
-            if (this.options.hideOnClick) {
-                eventMap.blur = $.proxy(this._hide, this);
-            }
-            this.element.on(eventMap);
-            $(this.options.menu).find('a').on('click', $.proxy(this._hide, this));
-        },
-
-        /**
-         * Custom method for defining options during instantiation. User-provided options
-         * override the options returned by this method which override the default options.
-         * @private
-         * @return {Object} Object containing options for mouseenter/mouseleave events.
-         */
-        _getCreateOptions: function() {
-            return {onMouseEnter: this._onMouseEnter, onMouseLeave: this._onMouseLeave};
-        },
-
-        /**
-         * Hide the popup menu using a fade effect.
-         * @private
-         */
-        _hide: function(){
-            $(this.options.menu).fadeOut(this.options.fadeDuration, $.proxy(this._stopTimer, this));
-            this.switcher.removeClass(this.options.openedClass);
-        },
-
-        /**
-         * Show the popup menu using a fade effect and put focus on the containing element for
-         * the blur event.
-         * @private
-         */
-        _show: function() {
-            $(this.options.menu)
-                .removeClass(this.options.eventClass).fadeIn(this.options.fadeDuration);
-            this.switcher.addClass(this.options.openedClass);
-            if (this.options.hideOnClick) {
-                this.element.focus();
-            }
-        },
-
-        /**
-         * Stop (clear) the timeout.
-         * @private
-         */
-        _stopTimer: function() {
-            clearTimeout(this.timer);
-        },
-
-        /**
-         * Determines whether the popup menu is open (show) or closed (hide).
-         * @private
-         * @return boolean Returns true if open, false otherwise.
-         */
-        _isOpened: function() {
-            return this.switcher.hasClass(this.options.openedClass);
-        },
-
-        /**
-         * Mouseleave event on the popup menu. Add faded class and set appropriate timeout.
-         * @private
-         */
-        _onMouseLeave: function() {
-            if (this._isOpened()) {
-                $(this.options.menu).addClass(this.options.eventClass);
-                this._stopTimer();
-                this.timer = setTimeout($.proxy(this._hide, this), this.options.timeoutDuration);
-            }
-        },
-
-        /**
-         * Mouseenter event on the popup menu. Reset the timer and remove the faded class.
-         * @private
-         */
-        _onMouseEnter: function() {
-            if (this._isOpened()) {
-                this._stopTimer();
-                $(this.options.menu).removeClass(this.options.eventClass);
-            }
-        },
-
-        /**
-         * Toggle the state of the popup menu. Open it (show) or close it (hide).
-         * @private
-         * @return {*}
-         */
-        _toggleMenu: function() {
-            return this[this._isOpened() ? '_hide' : '_show']();
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Page/js/row-builder.js b/app/design/frontend/magento_backup/Magento_Page/js/row-builder.js
deleted file mode 100644
index 201d183f164e27edf1c55b1d5835b8cf75871634..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/js/row-builder.js
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Page
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.rowBuilder', {
-
-        /**
-         * options with default values for setting up the template
-         */
-        options: {
-            //Default template options
-            rowTemplate: '#template-registrant',
-            rowContainer: '#registrant-container',
-            //Row index used by the template rows.
-            rowIndex: 0,
-            //Row count: Should not be set externally
-            rowCount: 0,
-            rowParentElem: '<li></li>',
-            rowContainerClass: 'fields',
-            addRowBtn: '#add-registrant-button',
-            btnRemoveIdPrefix: 'btn-remove',
-            btnRemoveSelector: '.btn-remove',
-            rowIdPrefix: 'row',
-            //This class is added to rows added after the first one. Adds the dotted separator
-            additionalRowClass: 'add-row',
-            /*
-             This is provided during widget instantiation. eg :
-             formDataPost : {"formData":formData,"templateFields":['field1-name','field2-name'] }
-             -"formData" is the multi-dimensional array of form field values : [['a','b'],['c','b']]
-             received from the server and encoded
-             -"templateFields" are the input fields in the template with index suffixed after the field name
-             eg field1-name{index}
-             */
-            formDataPost: null,
-            //Default selectors for add element of a template
-            addEventSelector: 'button',
-            //Default selectors for remove markup elements of a template
-            remEventSelector: 'a',
-            //This option allows adding first row delete option and a row separator
-            hideFirstRowAddSeparator: true,
-            //Max rows - This option should be set when instantiating the widget
-            maxRows: 1000,
-            maxRowsMsg: '#max-registrant-message'
-        },
-
-        /**
-         * Initialize create
-         * @private
-         */
-        _create: function() {
-            this.options.rowCount = this.options.rowIndex = 0;
-            //On document ready related tasks
-            $($.proxy(this.ready, this));
-
-            //Binding template-wide events handlers for adding and removing rows
-            this.element.on('click', this.options.addEventSelector + this.options.addRowBtn, $.proxy(this.handleAdd, this));
-            this.element.on('click', this.options.remEventSelector + this.options.btnRemoveSelector, $.proxy(this.handleRemove, this));
-        },
-
-        /**
-         * Initialize template
-         * @public
-         */
-        ready: function() {
-            if (this.options.formDataPost && this.options.formDataPost.formData && this.options.formDataPost.formData.length) {
-                this.processFormDataArr(this.options.formDataPost);
-            } else if (this.options.rowIndex === 0 && this.options.maxRows !== 0) {
-                //If no form data , then add default row
-                this.addRow(0);
-            }
-        },
-
-        /**
-         * Process and loop through all row data to create preselected values. This is used for any error on submit.
-         * For complex implementations the inheriting widget can override this behavior
-         * @public
-         * @param {Object} formDataArr
-         */
-        processFormDataArr: function(formDataArr) {
-            var formData = formDataArr.formData,
-                templateFields = formDataArr.templateFields;
-            for (var i = this.options.rowIndex = 0; i < formData.length; this.options.rowIndex = i++) {
-                this.addRow(i);
-                var formRow = formData[i];
-                for (var j = 0; j < formRow.length; j++) {
-                    this.setFieldById(templateFields[j] + i, formRow[j]);
-                }
-            }
-
-        },
-
-        /**
-         * Initialize and create markup for template row. Add it to the parent container.
-         * The template processing will substitute row index at all places marked with _index_ in the template
-         * using the template
-         * @public
-         * @param {Number} index - current index/count of the created template. This will be used as the id
-         * @return {*}
-         */
-        addRow: function(index) {
-            var row = $(this.options.rowParentElem);
-            row.addClass(this.options.rowContainerClass).attr('id', this.options.rowIdPrefix + index);
-            $(this.options.rowTemplate).tmpl([
-                {_index_: index}
-            ]).appendTo(row);
-            $(this.options.rowContainer).append(row);
-            row.addClass(this.options.additionalRowClass);
-            //Remove 'delete' link and additionalRowClass for first row
-            if (this.options.rowIndex === 0 && this.options.hideFirstRowAddSeparator) {
-                $('#' + this._esc(this.options.btnRemoveIdPrefix) + '0').remove();
-                $('#' + this._esc(this.options.rowIdPrefix) + '0').removeClass(this.options.additionalRowClass);
-            }
-            this.maxRowCheck(++this.options.rowCount);
-            return row;
-        },
-
-        /**
-         * Remove return item information row
-         * @public
-         * @param {*} rowIndex - return item information row index
-         * @return {boolean}
-         */
-        removeRow: function(rowIndex) {
-            $('#' + this._esc(this.options.rowIdPrefix) + rowIndex).remove();
-            this.maxRowCheck(--this.options.rowCount);
-            return false;
-        },
-
-        /**
-         * Function to check if maximum rows are exceeded and render/hide maxMsg and Add btn
-         * @public
-         * @param rowIndex
-         */
-        maxRowCheck: function(rowIndex) {
-            var addRowBtn = $(this.options.addRowBtn),
-                maxRowMsg = $(this.options.maxRowsMsg);
-            //liIndex starts from 0
-            if (rowIndex >= this.options.maxRows) {
-                addRowBtn.hide();
-                maxRowMsg.show();
-            } else if (addRowBtn.is(":hidden")) {
-                addRowBtn.show();
-                maxRowMsg.hide();
-            }
-        },
-
-        /**
-         * Set the value on given element
-         * @public
-         * @param {string} domId
-         * @param {string} value
-         */
-        setFieldById: function(domId, value) {
-            var x = $('#' + this._esc(domId));
-            if (x.length) {
-                if (x.is(':checkbox')) {
-                    x.attr('checked', true);
-                } else if (x.is('option')) {
-                    x.attr('selected', 'selected');
-                } else {
-                    x.val(value);
-                }
-            }
-        },
-
-        /**
-         * Delegated handler for adding a row
-         * @public
-         * @return {boolean}
-         */
-        handleAdd: function() {
-            this.addRow(++this.options.rowIndex);
-            return false;
-        },
-
-        /**
-         * Delegated handler for removing a selected row
-         * @public
-         * @param {Object} e - Native event object
-         * @return {boolean}
-         */
-        handleRemove: function(e) {
-            this.removeRow($(e.currentTarget).closest("[id^='" + this.options.btnRemoveIdPrefix + "']")
-                .attr('id').replace(this.options.btnRemoveIdPrefix, ''));
-            return false;
-        },
-
-        /*
-         * Utility function to add escape chars for jquery selector strings
-         * @private
-         * @param str - string to be processed
-         * @return {string}
-         */
-        _esc: function(str) {
-            return str ? str.replace(/([ ;&,.+*~\':"!\^$\[\]()=>|\/@])/g, '\\$1') : str;
-        }
-    });
-
-})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Page/link/current.phtml b/app/design/frontend/magento_backup/Magento_Page/link/current.phtml
deleted file mode 100644
index 7ad6578648cf35b6a5fdf5b5ffc8bba61d0ddf7d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/link/current.phtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/**
- * @var $this \Magento\Page\Block\Link\Current
- */
-?>
-<?php if ($this->isCurrent()):?>
-<li class="current">
-    <strong><?php echo $this->escapeHtml(__($this->getLabel()))?></strong>
-</li>
-<?php else:?>
-<li>
-    <a href="<?php echo $this->escapeHtml($this->getHref())?>"
-        <?php if ($title = $this->getTitle()):?> title="<?php echo $this->escapeHtml(__($title))?>"<?php endif;?>
-    >
-        <?php echo $this->escapeHtml(__($this->getLabel()))?>
-    </a>
-</li>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/popup.phtml b/app/design/frontend/magento_backup/Magento_Page/popup.phtml
deleted file mode 100644
index 5d23527f8336022f86308e300e3a066c2d72214c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/popup.phtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
-<head>
-<?php echo $this->getChildHtml('head') ?>
-</head>
-<body class="page-popup<?php echo $this->getBodyClass()?$this->getBodyClass() : ''?>">
-<div>
-    <?php echo $this->getChildHtml('after_body_start') ?>
-    <?php echo $this->getChildHtml('content') ?>
-    <?php echo $this->getChildHtml('before_body_end') ?>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/print.phtml b/app/design/frontend/magento_backup/Magento_Page/print.phtml
deleted file mode 100644
index bc05952d3d18b509b1ad7cc2b946cad60ab5ea4c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/print.phtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
-<head>
-<?php echo $this->getChildHtml('head') ?>
-</head>
-<body class="page-print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div>
-    <div class="print-head">
-        <img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getViewFileUrl('images/logo_print.gif') ?>" class="logo" alt="" />
-        <?php if ($this->getPrintLogoText()):?>
-            <address><?php echo nl2br($this->escapeHtml($this->getPrintLogoText())) ?></address>
-        <?php endif;?>
-    </div>
-    <?php echo $this->getChildHtml('content') ?>
-    <div class="buttons-set">
-        <button type="button" title="<?php echo __('Close Window') ?>" class="button" onclick="window.close();"><span><span><?php echo __('Close Window') ?></span></span></button>
-    </div>
-    <?php echo $this->getAbsoluteFooter() ?>
-</div>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml b/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
deleted file mode 100644
index 95e60198fd52b07aed913d981b68166c0fe60e72..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Language switcher template
- *
- * @see \Magento\Page\Block\Switcher
- */
-?>
-<?php if(count($this->getStores())>1): ?>
-<div class="form-language">
-    <label for="select-language"><?php echo __('Your Language:') ?></label>
-    <select id="select-language" title="<?php echo __('Your Language') ?>" onchange="window.location.href=this.value">
-    <?php foreach ($this->getStores() as $_lang): ?>
-        <?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
-        <option value="<?php echo $_lang->getCurrentUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_lang->getName()) ?></option>
-    <?php endforeach; ?>
-    </select>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml b/app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
deleted file mode 100644
index f6c351034378cb9a96b3b11b694354c9ecc36409..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Store switcher template
- *
- * @see \Magento\Core\Block\Store\Switcher
- */
-?>
-<?php if(count($this->getGroups())>1): ?>
-<div class="store-switcher">
-    <label for="select-store"><?php echo __('Select Store:') ?></label>
-    <select id="select-store" title="<?php echo __('Select Store') ?>" onchange="location.href=this.value">
-    <?php /*foreach ($this->getStores() as $_store): ?>
-        <option value="<?php echo $_store->getUrl('') ?>"<?php if($_store->getId()==$this->getCurrentStoreId()): ?> selected="selected"<?php endif; ?>><?php echo $_store->getName() ?></option>
-    <?php endforeach;*/ ?>
-    <?php foreach ($this->getGroups() as $_group): ?>
-        <?php $_selected = ($_group->getId()==$this->getCurrentGroupId()) ? ' selected="selected"' : '' ?>
-        <option value="<?php echo $_group->getHomeUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_group->getName()) ?></option>
-    <?php endforeach; ?>
-    </select>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml b/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml
deleted file mode 100644
index 8093dce4eb2a051fad330234373c87b35655b7d1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Payment\Block\Catalog\Product\View\Profile
- */
-?>
-<?php if ($dateHtml = $this->getDateHtml()): ?>
-<dl>
-    <dt>
-        <label for="<?php echo $this->getDateHtmlId() ?>"><?php echo __('Recurring Profile Start Date') ?></label>
-    </dt>
-    <dd>
-        <?php echo $dateHtml ?>
-    </dd>
-</dl>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml b/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml
deleted file mode 100644
index 1c41afb6785af78bfacb74c4a15c6505e4687794..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Payment\Block\Catalog\Product\View\Profile
- */
-?>
-<dl>
-<?php foreach($this->getScheduleInfo() as $term => $definitions): ?>
-    <dt><?php echo $this->escapeHtml($term); ?></dt>
-<?php foreach ($definitions as $definition):?>
-    <dd><?php echo $this->escapeHtml($definition)?></dd>
-<?php endforeach;?>
-<?php endforeach;?>
-</dl>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/cc-type.js b/app/design/frontend/magento_backup/Magento_Payment/cc-type.js
deleted file mode 100644
index 4fc0b878e43f5c55477803059d8727ad73d8d6ab..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/cc-type.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    credit card type
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.creditCardType', {
-        options: {
-            typeCodes: ['SS', 'SM', 'SO'] // Type codes for Switch/Maestro/Solo credit cards.
-        },
-
-        /**
-         * Bind change handler to select element and trigger the event to show/hide
-         * the Switch/Maestro or Solo credit card type container for those credit card types.
-         * @private
-         */
-        _create: function() {
-            this.element.on('change', $.proxy(this._toggleCardType, this)).trigger('change');
-        },
-
-        /**
-         * Toggle the Switch/Maestro and Solo credit card type container depending on which
-         * credit card type is selected.
-         * @private
-         */
-        _toggleCardType: function() {
-            $(this.options.creditCardTypeContainer)
-                .toggle($.inArray(this.element.val(), this.options.typeCodes) !== -1);
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml
deleted file mode 100644
index 11e895dc22153f29a6523fcf7d950a8c944809a7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Payment
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($instructions = $this->getInstructions()): ?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
-        <li>
-            <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
-                <?php echo nl2br($instructions) ?>
-            </div>
-        </li>
-    </ul>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml
deleted file mode 100644
index f6581f70ae5d05d74334129a3d1463f077f1afbe..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Payment
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Payment\Block\Form\Cashondelivery
- */
-?>
-<?php if ($this->getInstructions()): ?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
-        <li>
-            <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
-                <?php echo nl2br($this->getInstructions()) ?>
-            </div>
-        </li>
-    </ul>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml
deleted file mode 100644
index 39f14f5862fc2b6ac2d4168f3580641d7449acd0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_code=$this->getMethodCode() ?>
-<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
-<?php /*
-    <li>
-        <div class="input-box">
-            <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo __('Name on Card') ?></label>
-            <input type="text" title="<?php echo __('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
-        </div>
-    </li>
-*/ ?>
-    <li>
-        <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo __('Credit Card Type') ?></label>
-        <div class="input-box">
-            <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}'>
-                <option value=""><?php echo __('--Please Select--')?></option>
-            <?php $_ccType = $this->getInfoData('cc_type') ?>
-            <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                <option value="<?php echo $_typeCode ?>"<?php if($_typeCode==$_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
-            <?php endforeach ?>
-            </select>
-        </div>
-    </li>
-    <li>
-        <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo __('Credit Card Number') ?></label>
-        <div class="input-box">
-            <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
-        </div>
-    </li>
-    <li id="<?php echo $_code ?>_cc_type_exp_div">
-        <label for="<?php echo $_code ?>_expiration" class="required"><em>*</em><?php echo __('Expiration Date') ?></label>
-        <div class="input-box">
-            <div class="v-fix">
-                <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
-                <?php $_ccExpMonth = $this->getInfoData('cc_exp_month') ?>
-                <?php foreach ($this->getCcMonths() as $k=>$v): ?>
-                    <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                <?php endforeach ?>
-                </select>
-            </div>
-            <div class="v-fix">
-                <?php $_ccExpYear = $this->getInfoData('cc_exp_year') ?>
-                <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-validate='{required:true}'>
-                <?php foreach ($this->getCcYears() as $k=>$v): ?>
-                    <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                <?php endforeach ?>
-                </select>
-            </div>
-        </div>
-    </li>
-    <?php echo $this->getChildHtml() ?>
-    <?php if($this->hasVerification()): ?>
-    <li id="<?php echo $_code ?>_cc_type_cvv_div">
-        <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo __('Card Verification Number') ?></label>
-        <div class="input-box">
-            <div class="v-fix">
-                <input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' />
-            </div>
-            <a href="#" class="cvv-what-is-this" data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tool-tip"}}'><?php echo __('What is this?') ?></a>
-            <div class="tool-tip hidden">
-                <div class="btn-close"><a data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tool-tip"}}' href="#" title="<?php echo __('Close') ?>"><img src="<?php echo $this->getViewFileUrl('images/btn_window_close.gif') ?>" alt="<?php echo __('Close') ?>" title="<?php echo __('Close') ?>" /></a></div>
-                <div class="tool-tip-content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
-            </div>
-        </div>
-    </li>
-    <?php endif; ?>
-
-    <?php if ($this->hasSsCardType()): ?>
-    <li id="<?php echo $_code ?>_cc_type_ss_div">
-        <ul class="inner-form">
-            <li class="form-alt"><label for="<?php echo $_code ?>_cc_issue" class="required"><em>*</em><?php echo __('Switch/Solo/Maestro Only') ?></label></li>
-            <li>
-                <label for="<?php echo $_code ?>_cc_issue"><?php echo __('Issue Number') ?>:</label>
-                <span class="input-box">
-                    <input type="text" title="<?php echo __('Issue Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
-                </span>
-            </li>
-
-            <li>
-                <label for="<?php echo $_code ?>_start_month"><?php echo __('Start Date') ?>:</label>
-                <div class="input-box">
-                    <div class="v-fix">
-                        <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="month" data-validate='{"validate-cc-ukss":true}'>
-                        <?php foreach ($this->getCcMonths() as $k=>$v): ?>
-                            <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                        <?php endforeach ?>
-                        </select>
-                    </div>
-                    <div class="v-fix">
-                        <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="year" data-validate='{"validate-cc-ukss":true}'>
-                        <?php foreach ($this->getSsStartYears() as $k=>$v): ?>
-                            <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                        <?php endforeach ?>
-                        </select>
-                    </div>
-                </div>
-            </li>
-            <li class="adv-container" data-validation-msg="validate-cc-ukss">&nbsp;</li>
-        </ul>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Payment::cc-type.js')?>", function() {
-                jQuery('#<?php echo $_code ?>_cc_type').creditCardType({
-                    creditCardTypeContainer: '#<?php echo $_code ?>_cc_type_ss_div'
-                });
-            });
-        </script>
-    </li>
-    <?php endif; ?>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml
deleted file mode 100644
index c93732d4564799b10300e9ef8d53005f598a93ce..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_code=$this->getMethodCode() ?>
-<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
-    <li>
-        <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo __('Name on Card') ?></label>
-        <div class="input-box">
-            <input type="text" title="<?php echo __('Name on Card') ?>" class="input-text" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" data-validate='{required:true}'/>
-        </div>
-    </li>
-    <li>
-        <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo __('Credit Card Type') ?></label>
-        <div class="input-box">
-            <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo __('Credit Card Type') ?>" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}'>
-                <option value=""><?php echo __('--Please Select--') ?></option>
-            <?php $_ccType = $this->getInfoData('cc_type') ?>
-            <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                <option value="<?php echo $_typeCode ?>"<?php if($_typeCode==$_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
-            <?php endforeach ?>
-            </select>
-        </div>
-    </li>
-    <li>
-        <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo __('Credit Card Number') ?></label>
-        <div class="input-box">
-            <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
-        </div>
-    </li>
-    <li>
-        <label for="<?php echo $_code ?>_expiration" class="required"><em>*</em><?php echo __('Expiration Date') ?></label>
-        <div class="input-box">
-            <div class="v-fix">
-                <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
-                <?php $_ccExpMonth = $this->getInfoData('cc_exp_month') ?>
-                <?php foreach ($this->getCcMonths() as $k=>$v): ?>
-                    <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                <?php endforeach ?>
-                </select>
-            </div>
-            <div class="v-fix">
-                <?php $_ccExpYear = $this->getInfoData('cc_exp_year') ?>
-                <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-validate='{required:true}'>
-                <?php foreach ($this->getCcYears() as $k=>$v): ?>
-                    <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                <?php endforeach ?>
-                </select>
-            </div>
-        </div>
-    </li>
-    <?php echo $this->getChildHtml() ?>
-    <?php if($this->hasVerification()): ?>
-    <li>
-        <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo __('Card Verification Number') ?></label>
-        <div class="input-box">
-            <div class="v-fix">
-                <input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}'/>
-            </div>
-            <a href="#" class="cvv-what-is-this" data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}'><?php echo __('What is this?') ?></a>
-            <div class="tool-tip hidden" id="ccv-save-tooltip">
-                <div class="btn-close"><a data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}' href="#" title="<?php echo __('Close') ?>"><img src="<?php echo $this->getViewFileUrl('images/btn_window_close.gif') ?>" alt="<?php echo __('Close') ?>" title="<?php echo __('Close') ?>" /></a></div>
-                <div class="tool-tip-content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
-            </div>
-        </div>
-    </li>
-    <?php endif; ?>
-    <?php if ($this->hasSsCardType()): ?>
-    <li id="<?php echo $_code ?>_cc_type_ss_div">
-        <ul class="inner-form">
-            <li class="form-alt"><label for="<?php echo $_code ?>_cc_issue" class="required"><em>*</em><?php echo __('Switch/Solo/Maestro Only') ?></label></li>
-            <li>
-                <label for="<?php echo $_code ?>_cc_issue"><?php echo __('Issue Number') ?>:</label>
-                <span class="input-box">
-                    <input type="text" title="<?php echo __('Issue Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
-                </span>
-            </li>
-
-            <li>
-                <label for="<?php echo $_code ?>_start_month"><?php echo __('Start Date') ?>:</label>
-                <div class="input-box">
-                    <div class="v-fix">
-                        <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="month" data-validate='{"validate-cc-ukss":true}'>
-                        <?php foreach ($this->getCcMonths() as $k=>$v): ?>
-                            <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                        <?php endforeach ?>
-                        </select>
-                    </div>
-                    <div class="v-fix">
-                        <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="year" data-validate='{"validate-cc-ukss":true}'>
-                        <?php foreach ($this->getSsStartYears() as $k=>$v): ?>
-                            <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
-                        <?php endforeach ?>
-                        </select>
-                    </div>
-                </div>
-            </li>
-            <li class="adv-container" data-validation-msg="validate-cc-ukss">&nbsp;</li>
-        </ul>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Payment::cc-type.js')?>", function() {
-                jQuery('#<?php echo $_code ?>_cc_type').creditCardType({
-                    creditCardTypeContainer: '#<?php echo $_code ?>_cc_type_ss_div'
-                });
-            });
-        </script>
-    </li>
-    <?php endif; ?>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml
deleted file mode 100644
index 1e98b9826fcaebf5467e6804a91b4cb02bdb7240..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($this->getMethod()->getMailingAddress() || $this->getMethod()->getPayableTo()): ?>
-    <ul class="form-list checkmo-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
-        <?php if ($this->getMethod()->getPayableTo()): ?>
-        <li>
-            <label><?php echo __('Make Check payable to:') ?></label>
-            <?php echo $this->escapeHtml($this->getMethod()->getPayableTo()) ?>
-        </li>
-        <?php endif; ?>
-        <?php if ($this->getMethod()->getMailingAddress()): ?>
-        <li>
-            <label><?php echo __('Send Check to:') ?></label>
-            <address class="checkmo-mailing-address">
-                <?php echo nl2br($this->escapeHtml($this->getMethod()->getMailingAddress())) ?>
-            </address>
-        </li>
-        <?php endif; ?>
-    </ul>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml
deleted file mode 100644
index f5fc7ae1b00aead3ab5dcb9dd0e813d4022c1ba1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<ul class="form-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
-    <li>
-        <label for="po_number" class="required"><em>*</em><?php echo __('Purchase Order Number') ?></label>
-        <div class="input-box">
-            <input type="text" id="po_number" name="payment[po_number]" title="<?php echo __('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->escapeHtml($this->getInfoData('po_number')) ?>" />
-        </div>
-    </li>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml
deleted file mode 100644
index 3021359b08a699cd9a6ce32dd9d38a28f88349e9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
-<?php if($this->getInfo()->getAdditionalData()): ?>
-    <?php if($this->getPayableTo()): ?>
-        <p><strong><?php echo __('Make Check payable to:') ?></strong> <?php echo $this->escapeHtml($this->getPayableTo()) ?></p>
-    <?php endif; ?>
-    <?php if($this->getMailingAddress()): ?>
-        <p><strong><?php echo __('Send Check to:') ?></strong></p>
-        <address class="checkmo-mailing-address">
-            <?php echo nl2br($this->escapeHtml($this->getMailingAddress())) ?>
-        </address>
-    <?php endif; ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/default.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/default.phtml
deleted file mode 100644
index aa4e7d58fa4fcb08ccbd7bd7010478aa0ce6feff..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/default.phtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Payment\Block\Info
- */
-?>
-<p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
-
-<?php if ($_specificInfo = $this->getSpecificInformation()):?>
-<table>
-    <tbody>
-    <?php foreach ($_specificInfo as $_label => $_value):?>
-        <tr>
-            <th><strong><?php echo $this->escapeHtml($_label)?>:</strong></th>
-        </tr>
-        <tr>
-            <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
-        </tr>
-    <?php endforeach; ?>
-    </tbody>
-</table>
-<?php endif;?>
-
-<?php echo $this->getChildHtml()?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml
deleted file mode 100644
index 5e66f337d24d9cff5f781055bbf92f0018359fc9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Payment
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Payment\Block\Info
- */
-?>
-<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
-<?php if ($this->getInstructions()): ?>
-<table>
-    <tbody>
-        <tr>
-            <td><?php echo nl2br($this->getInstructions()) ?></td>
-        </tr>
-    </tbody>
-</table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml
deleted file mode 100644
index 22502d154a3089414855655a5f177884a9277ed3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
-<p><strong><?php echo __('Purchase Order Number:') ?></strong> <span class="nobr"><?php echo $this->escapeHtml($this->getInfo()->getPoNumber()) ?></span></p>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml b/app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml
deleted file mode 100644
index 7155d46d9797010d57d821d81539990f47c8c84e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
-        <block class="Magento\Payment\Block\Catalog\Product\View\Profile" name="product.info.additional.recurring.schedule" as="recurring_info" template="catalog/product/view/profile/schedule.phtml" group="detailed_info">
-            <action method="setTitle">
-                <argument translate="true" name="value" xsi:type="string">Recurring Profile</argument>
-            </action>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="product.info.options.wrapper">
-        <block class="Magento\Payment\Block\Catalog\Product\View\Profile" name="product.info.options.recurring" as="recurring_options" template="catalog/product/view/profile/options.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml
deleted file mode 100644
index d02d0dc97ea30e75d0d6c44406d3e784fb1602e0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Paypal\Block\Express\Review */
-
-$billingBlock = $this->getChildBlock('billing')->setFieldNamePrefix('billing')->setHideEmailAddress(true);
-$shippingAddress = $this->getShippingAddress();
-?>
-<div class="page-title">
-    <h1><?php echo __('Review Order') ?></h1>
-</div>
-<?php echo $this->getLayout()->renderElement('messages') ?>
-<h2 class="sub-title">
-    Please confirm your addresses
-</h2>
-<div class="paypal-review-order">
-    <form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>">
-    <?php if(!$billingBlock->isCustomerLoggedIn()): ?>
-        <div class="info-set col2-set">
-            <h2 class="legend"><?php echo __('Customer Information') ?></h2>
-            <ul class="form-list form-list-narrow">
-                <li id="customer-info-form" class="address-form">
-                    <div class="field">
-                        <label for="customer:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="customer-email" id="customer:email" value="<?php echo $this->escapeHtml($billingBlock->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry" />
-                        </div>
-                    </div>
-                </li>
-            </ul>
-        </div>
-    <?php endif ?>
-    <div class="info-set col2-set">
-        <div class="col-1" id="billing-address">
-            <h2 class="legend"><?php echo __('Billing Address') ?></h2>
-            <?php if ($shippingAddress): ?>
-                <?php echo $billingBlock->setShowAsShippingCheckbox(true)->toHtml(); ?>
-            <?php else: ?>
-                <?php echo $billingBlock->toHtml(); ?>
-            <?php endif; ?>
-        </div>
-    <?php if ($shippingAddress): ?>
-        <div class="col-2" id="shipping-address">
-            <h2 class="legend"><?php echo __('Shipping Address') ?></h2>
-            <?php echo $this->getChildBlock('shipping')->setFieldNamePrefix('shipping')->setHideEmailAddress(true)->toHtml(); ?>
-        </div>
-    </div>
-
-    <div class="info-set col2-set">
-        <div class="col-2">
-            <div class="box paypal-shipping-method">
-                <div class="box-title">
-                    <h3><?php echo __('Shipping Method') ?></h3>
-                </div>
-                <div class="box-content">
-                    <?php echo $this->getChildBlock('shipping_method')->toHtml(); ?>
-                </div>
-            </div>
-        </div>
-    <?php endif; ?>
-    </div>
-
-    <div class="info-set">
-        <h2 class="legend"><?php echo __('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Shopping Cart') ?></a></h2>
-        <div id="details-reload">
-            <?php echo $this->getChildHtml('details') ?>
-        </div>
-    </div>
-        <?php echo $this->getChildHtml('agreements'); ?>
-        <div class="buttons-set buttons-set-order" id="review-buttons-container">
-            <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
-            <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
-            <button type="button" id="update-order" class="button btn-checkout"><span><span><?php echo __('Update Order Data') ?></span></span></button>
-            <span class="please-wait" id="review-please-wait" style="display:none;">
-                <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information') ?>" title="<?php echo __('Submitting order information') ?>" class="v-middle" /> <?php echo __('Submitting order information') ?>
-            </span>
-        </div>
-    </form>
-</div>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('Magento_Paypal::order-review.js') ?>",
-        function() {
-            jQuery('#order-review-form').validation().orderReview({
-                shippingMethodUpdateUrl: '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>',
-                updateOrderSubmitUrl: '<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>',
-                isAjax: <?php echo $this->getUseAjax() ? 'true' : 'false' ?>
-            });
-        });
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml
deleted file mode 100644
index 6f282dd71c334d8df35f1de9bdbb939e8bac5675..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Paypal
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $prefix = $this->getFieldNamePrefix();?>
-<fieldset>
-    <ul class="form-list form-list-narrow">
-    <li id="<?php echo $prefix ?>-address-form" class="address-form">
-        <fieldset>
-            <input type="hidden" name="<?php echo $prefix ?>[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="<?php echo $prefix ?>:address_id" />
-            <ul>
-                <li class="fields"><?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat($prefix . ':%s')->setFieldNameFormat($prefix . '[%s]')->toHtml() ?></li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:company"><?php echo __('Company') ?></label>
-                        <div class="input-box">
-                            <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                        </div>
-                    </div>
-        <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry" />
-                        </div>
-                    </div>
-        <?php endif; ?>
-                </li>
-        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                <li class="wide">
-                    <label for="<?php echo $prefix ?>:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" title="<?php echo __('Street Address') ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-        <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-        <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                <li class="add-field">
-                    <div class="input-box">
-                        <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-        <?php endfor; ?>
-                <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
-                <li class="wide">
-                    <label for="<?php echo $prefix ?>:vat_id"><?php echo __('VAT Number') ?></label>
-                    <div class="input-box">
-                        <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
-                    </div>
-                </li>
-                <?php endif; ?>
-                <li class="fields">
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:city" class="required"><em>*</em><?php echo __('City') ?></label>
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('City') ?>" name="<?php echo $prefix ?>[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="<?php echo $prefix ?>:city" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                        <div class="input-box">
-                            <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                                <option value=""><?php echo __('Please select a region, state or province.') ?></option>
-                            </select>
-                            <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>"  title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:postcode" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="<?php echo $prefix ?>[postcode]" id="<?php echo $prefix ?>:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
-                        <div class="input-box">
-                            <?php echo $this->getCountryHtmlSelect($prefix) ?>
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="<?php echo $prefix ?>[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="<?php echo $prefix ?>:telephone" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="<?php echo $prefix ?>:fax"><?php echo __('Fax') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="<?php echo $prefix ?>[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="<?php echo $prefix ?>:fax" />
-                        </div>
-                    </div>
-                </li>
-                <?php echo $this->getChildHtml('form.additional.info'); ?>
-                <?php if ($this->getShowAsShippingCheckbox()): ?>
-                    <li class="control">
-                        <div class="field">
-                            <div class="input-box">
-                                <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1" title="<?php echo __('Same as shipping') ?>" id="<?php echo $prefix ?>:as_shipping" <?php if ($this->getAddress()->getSameAsBilling()):?>checked="checked"<?php endif;?>/>
-                            </div>
-                            <label for="<?php echo $prefix ?>:as_shipping"><?php echo __('Same as shipping') ?></label>
-                        </div>
-                    </li>
-                <?php endif; ?>
-            </ul>
-        </fieldset>
-     </li>
-    </ul>
-</fieldset>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            function() {
-                $('#<?php echo $prefix ?>\\:country_id').regionUpdater({
-                    optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
-                    regionListId: '#<?php echo $prefix ?>\\:region_id',
-                    regionInputId: '#<?php echo $prefix ?>\\:region',
-                    postcodeId: '#<?php echo $prefix ?>\\:postcode',
-                    regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                    defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
-                    countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
deleted file mode 100644
index f6da6571d365b335cfe089f6f170463f761c74f2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Paypal\Block\Express\Review\Details
- */
-?>
-<table id="details-table" class="data-table">
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <col width="1" />
-    <col width="1" />
-    <?php endif; ?>
-    <thead>
-        <tr>
-            <th rowspan="<?php echo $rowspan ?>"><?php echo __('Product Name') ?></th>
-            <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Price') ?></th>
-            <th rowspan="<?php echo $rowspan ?>" class="a-center"><?php echo __('Qty') ?></th>
-            <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Subtotal') ?></th>
-        </tr>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-            <tr>
-                <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-                <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
-                <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
-            </tr>
-        <?php endif; ?>
-    </thead>
-<?php echo $this->getChildHtml('totals'); ?>
-    <tbody>
-        <?php foreach($this->getItems() as $_item): ?>
-            <?php echo $this->getItemHtml($_item) ?>
-        <?php endforeach ?>
-    </tbody>
-</table>
-<script type="text/javascript">(function($) {$('#details-table').decorate('table')})(jQuery)</script>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
deleted file mode 100644
index f98d878c6ff3f2affb38d19f3728bdfab78c7389..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Paypal\Block\Express\Review */
-?>
-<fieldset id="shipping-method-container">
-<?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
-        <?php if ($groups = $this->getShippingRateGroups()):?>
-            <?php $currentRate = $this->getCurrentShippingRate(); ?>
-            <select name="shipping_method" id="shipping_method" style="width:250px;" class="required-entry">
-            <?php if (!$currentRate):?>
-                <option value=""><?php echo __('Please select a shipping method.') ?></option>
-            <?php endif;?>
-            <?php foreach ($groups as $code => $rates):?>
-                <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
-                <?php foreach ($rates as $rate):?>
-                    <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
-                        <?php echo $this->renderShippingRateOption($rate)?>
-                    </option>
-                <?php endforeach;?>
-                </optgroup>
-            <?php endforeach;?>
-            </select>
-        <?php else: ?>
-            <p><strong><?php echo __('Sorry, no quotes are available for this order.') ?></strong></p>
-        <?php endif;?>
-<?php else: ?>
-    <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
-<?php endif; ?>
-</fieldset>
-<div style="display:none" id="shipping_method_update"><p><?php echo __('Please update order data to get shipping methods and rates') ?></p></div>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
deleted file mode 100644
index 8db827ddaa703c70ca9c9069b7571daf2588c3e1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @var $this \Magento\Paypal\Block\Express\Shortcut
- */
-?>
-<p class="paypal-logo">
-    <?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
-    <?php if ($this->isOrPositionBefore()): ?>
-        <span class="paypal-or"><?php echo __('-OR-');?></span>
-    <?php endif; ?>
-    <input type="image" data-action="checkout-form-submit" data-checkout-url="<?php echo $this->getCheckoutUrl()?>"
-           src="<?php echo $this->getImageUrl()?>"
-           alt="<?php echo __('Checkout with PayPal');?>"
-           title="<?php echo __('Checkout with PayPal');?>"/>
-    <?php if ($this->isOrPositionAfter()): ?>
-        <span class="paypal-or"><?php echo __('-OR-');?></span>
-    <?php endif; ?>
-    <?php if ($this->getConfirmationUrl() || $this->getIsInCatalogProduct()): ?>
-        <?php if ($this->getIsInCatalogProduct()): ?>
-            <input type="hidden" id="pp-checkout-url" name="return_url" value=""/>
-        <?php endif; ?>
-
-        <?php
-        $confirmationUrl = $this->getConfirmationUrl();
-        $isInCatalogProduct = $this->getIsInCatalogProduct();
-    endif; ?>
-    <script type="text/javascript">
-        (function($) {
-            head.js(
-                "<?php echo $this->getViewFileUrl('Magento_Paypal::js/paypal-checkout.js') ?>",
-                function() {
-                    $('.paypal-logo').paypalCheckout({
-                        confirmMessage: "<?php echo $this->escapeJsQuote($this->getConfirmationMessage())?>",
-                        confirmUrl: "<?php echo !empty($confirmationUrl) ? $confirmationUrl : false ?>",
-                        isCatalogProduct: "<?php echo !empty($isInCatalogProduct) ? $isInCatalogProduct : false ?>",
-                        paypalCheckoutSelector: '#pp-checkout-url',
-                        productAddToCartForm: '#product_addtocart_form'
-                    });
-                });
-        })(jQuery);
-    </script>
-</p>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml
deleted file mode 100644
index e67b386db86f2d4b9fb8fdc9a8e7c75eb965bddb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Paypal\Block\Payflow\Link\Iframe
- */
-?>
-<html>
-<head>
-    <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
-</head>
-<body>
-    <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
-        <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
-        <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
-        <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
-    </form>
-    <script type="text/javascript">
-        // this is NOT tested.
-        jQuery('#token_form').submit();
-    </script>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml
deleted file mode 100644
index 7c3aa2dfe57c78f8c8f63c73328b244654896a03..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-?>
-<div id="iframe-warning" class="warning-message">
-    <?php echo __('Please do not refresh the page until you complete payment.') ?>
-</div>
-<iframe id="hss-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml
deleted file mode 100644
index 7fffe8e2647df111afe073a7ef24f1796ff00ef9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Paypal\Block\Payflow\Link\Info
- */
-?>
-<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
-    <li>
-    <?php echo __('You will be required to enter your payment details after you place an order.') ?>
-    </li>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml
deleted file mode 100644
index 9a0408fe5246be7ed27e25c72bae61ea24238910..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Paypal\Block\Iframe
- */
-?>
-<div id="checkout-paypaliframe-load" class="authentication"></div>
-
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml
deleted file mode 100644
index 1816db2ed4760413d183305d906cbec48c1fdb9c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Paypal\Block\Iframe
- */
-?>
-<html>
-<head>
-    <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
-</head>
-<body>
-    <script type="text/javascript">
-        // this code is NOT tested!
-        if (window.top == window.self) {
-            window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
-        }
-        <?php if ($this->getGotoSection()): ?>
-            parent.jQuery.each(parent.jQuery('[id^="opc-"]'), function() {
-                var step = parent.jQuery(this).attr('id').substring(4);
-                if (step === '<?php echo $this->getGotoSection() ?>') {
-                    return;
-                }
-                step.addClass('allow');
-            });
-            parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
-            parent.jQuery('#checkout-review-submit').show();
-            parent.jQuery('#iframe-warning').hide();
-            <?php if ($this->getErrorMsg()): ?>
-                alert('<?php echo $this->getErrorMsg() ?>');
-            <?php endif; ?>
-        <?php elseif ($this->getGotoSuccessPage()) : ?>
-            window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
-        <?php else : ?>
-            window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
-        <?php endif; ?>
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml
deleted file mode 100644
index c8781fc4fa731c7215d62d6a0fba8dc7da597a97..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<button type="submit" data-role="review-save" title="<?php echo __('Continue') ?>" class="button btn-checkout"><span><?php echo __('Continue') ?></span></button>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js b/app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js
deleted file mode 100644
index c04d8b80e4861383db88727a258ee4b5622112a2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    CE
- * @package     CE_Paypal
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($, window) {
-    "use strict";
-    $.widget('mage.paypalCheckout', {
-        /**
-         * Initialize store credit events
-         * @private
-         */
-        _create: function() {
-            this.element.on('click', '[data-action="checkout-form-submit"]', $.proxy(function(e) {
-                var returnUrl = $(e.target).data('checkout-url');
-                if (this.options.confirmUrl && this.options.confirmMessage) {
-                    if (window.confirm(this.options.confirmMessage)) {
-                        returnUrl = this.options.confirmUrl;
-                    }
-                }
-                if (this.options.isCatalogProduct) {
-                    $(this.options.paypalCheckoutSelector).val(returnUrl);
-                    $(this.options.productAddToCartForm).submit();
-                } else {
-                    $.mage.redirect(returnUrl);
-                }
-            }, this));
-        }
-    });
-})(jQuery, window);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml
deleted file mode 100644
index 9b50d93483b635c628378ad2609bf1ef40f74abf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.tooltip">
-        <container name="product.info.addtocart.paypal.wrapper" label="PayPal Express Checkout Shortcut Wrapper" htmlTag="div">
-            <block class="Magento\Paypal\Block\Express\Shortcut" name="product.info.addtocart.paypal" template="express/shortcut.phtml">
-                <action method="setIsInCatalogProduct">
-                    <argument name="value" xsi:type="string">1</argument>
-                </action>
-                <action method="setShowOrPosition">
-                    <argument name="value" xsi:type="string">after</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml
deleted file mode 100644
index d44e594ae0f6e92ffe73f64c108c2b1c3c6cee74..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_popup"/>
-    <referenceContainer name="right">
-        <block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
deleted file mode 100644
index 4b92177880b248664fb18f18c18c9bea96c5e993..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="checkout.cart.top_methods">
-        <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.top" before="-" template="express/shortcut.phtml">
-            <action method="setIsQuoteAllowed">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-        </block>
-    </referenceContainer>
-    <referenceContainer name="checkout.cart.methods">
-        <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.bottom" before="-" template="express/shortcut.phtml">
-            <action method="setIsQuoteAllowed">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-        </block>
-    </referenceContainer>
-    <update handle="SHORTCUT_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml
deleted file mode 100644
index 3ba25aeacbdbf66b47ca0a72e8576076ce11f2af..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="checkout.onepage.review.info.items.after">
-        <block class="Magento\Paypal\Block\Iframe" name="paypal.iframe"/>
-    </referenceContainer>
-    <referenceBlock name="checkout.onepage.review.button">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="helper" helper="Magento\Paypal\Helper\Hss::getReviewButtonTemplate">
-                <param name="name">Magento_Paypal::hss/review/button.phtml</param>
-                <param name="block">checkout.onepage.review.button</param>
-            </argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml
deleted file mode 100644
index aa84f5017484e686b629f062112701a1c6283124..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml
deleted file mode 100644
index 7e22740901972b8184aed4a265b2c88208daa49f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="right">
-        <block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml
deleted file mode 100644
index efdf4a64b8ed8217301e8375002945eae451bcab..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="express/review.phtml">
-            <block class="Magento\Paypal\Block\Express\Review\Billing" name="express.review.billing" as="billing" template="express/review/address.phtml"/>
-            <block class="Magento\Paypal\Block\Express\Review\Shipping" name="express.review.shipping" as="shipping" template="express/review/address.phtml"/>
-            <block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="express/review/shipping/method.phtml"/>
-            <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
-            </block>
-            <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="onepage/agreements.phtml"/>
-        </block>
-    </referenceContainer>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml
deleted file mode 100644
index f340c6287044ac02cbf05c40f9695db510518968..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Express\Review\Details" output="1" name="root" template="express/review/details.phtml">
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
-    </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml
deleted file mode 100644
index 41cc25c05ebbe25c4e61cdf0494a1364c465dfa4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Hosted\Pro\Iframe" name="hosted.pro.iframe" output="1" template="hss/redirect.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml
deleted file mode 100644
index 679ab1fc53927fc426fc0abf6490183a3a9cab1b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" output="1" template="payflowlink/redirect.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml
deleted file mode 100644
index 5bd6aff888accf2c980ef4fbb0487028114e5708..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" output="1" template="payflowlink/form.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml
deleted file mode 100644
index 679ab1fc53927fc426fc0abf6490183a3a9cab1b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" output="1" template="payflowlink/redirect.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml
deleted file mode 100644
index 5cced7b711b40a37b67995b6ee6af789d5561778..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" output="1" template="payflowadvanced/redirect.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml
deleted file mode 100644
index 0a7d40e6e3983d4495b37ac19386ccce8b0fa342..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" output="1" template="payflowadvanced/form.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml
deleted file mode 100644
index 5cced7b711b40a37b67995b6ee6af789d5561778..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" output="1" template="payflowadvanced/redirect.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml
deleted file mode 100644
index e0e8e47f62a0556dd9478e9d988d071dc359b4b1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Standard\Redirect" output="1" name="standard.redirect"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml
deleted file mode 100644
index aa84f5017484e686b629f062112701a1c6283124..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml
deleted file mode 100644
index aa84f5017484e686b629f062112701a1c6283124..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml
deleted file mode 100644
index aa84f5017484e686b629f062112701a1c6283124..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/order-review.js b/app/design/frontend/magento_backup/Magento_Paypal/order-review.js
deleted file mode 100644
index 9b1446f7baf3e5f2edd1a24b113f28f45a4ab935..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/order-review.js
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    PayPal Express
- * @package     Mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-/*global alert*/
-(function($) {
-    "use strict";
-
-    $.widget('mage.orderReview', {
-        options: {
-            orderReviewSubmitSelector: '#review-button',
-            shippingSelector: '#shipping_method',
-            shippingSubmitFormSelector: null,
-            updateOrderSelector: '#update-order',
-            billingAsShippingSelector: '#billing\\:as_shipping',
-            updateContainerSelector: '#details-reload',
-            waitLoadingContainer: '#review-please-wait',
-            shippingMethodContainer: '#shipping-method-container',
-            isAjax: false,
-            updateShippingMethodSubmitSelector: "#update-shipping-method-submit",
-            reviewSubmitSelector: "#review-submit",
-            shippingMethodUpdateUrl: null,
-            updateOrderSubmitUrl: null
-        },
-
-        /**
-         * Widget instance properties
-         */
-        triggerPropertyChange: true,
-        isShippingSubmitForm: false,
-
-        _create: function() {
-            //change handler for ajaxEnabled
-            if (this.options.isAjax) {
-                this._submitOrder = this._ajaxSubmitOrder;
-            }
-
-            this.element.on('click', this.options.orderReviewSubmitSelector, $.proxy(this._submitOrder, this))
-                .on('click', this.options.billingAsShippingSelector, $.proxy(this._shippingTobilling, this))
-                .on('change', this.options.shippingSelector, $.proxy(this._submitUpdateOrder, this, this.options.updateOrderSubmitUrl, this.options.updateContainerSelector))
-                .find(this.options.updateOrderSelector).on('click', $.proxy(this._updateOrderHandler, this)).end()
-                .find(this.options.updateShippingMethodSubmitSelector).hide().end()
-                .find(this.options.reviewSubmitSelector).hide();
-            this._shippingTobilling();
-            if ($(this.options.shippingSubmitFormSelector).length) {
-                this.isShippingSubmitForm = true;
-                $(this.options.shippingSubmitFormSelector).find(this.options.updateShippingMethodSubmitSelector).hide().end()
-                    .on('change',
-                    this.options.shippingSelector, $.proxy(this._submitUpdateOrder, this, $(this.options.shippingSubmitFormSelector).prop('action'), this.options.updateContainerSelector));
-                this._updateOrderSubmit(!$(this.options.shippingSubmitFormSelector).find(this.options.shippingSelector).val());
-            } else {
-                this.element.on('input propertychange', ":input[name]", $.proxy(this._updateOrderSubmit, this, true, this._onShippingChange))
-                    .find('select').not(this.options.shippingSelector).on('change', this._propertyChange);
-                this._updateOrderSubmit(!this.element.find(this.options.shippingSelector).val());
-            }
-
-        },
-
-        /**
-         * show ajax loader
-         */
-        _ajaxBeforeSend: function() {
-            this.element.find(this.options.waitLoadingContainer).show();
-        },
-
-        /**
-         * hide ajax loader
-         */
-        _ajaxComplete: function() {
-            this.element.find(this.options.waitLoadingContainer).hide();
-        },
-
-        /**
-         * trigger propertychange for input type select
-         */
-        _propertyChange: function() {
-            $(this).trigger('propertychange');
-        },
-
-        /**
-         * trigger change for the update of shippping methods from server
-         */
-        _updateOrderHandler: function() {
-            $(this.options.shippingSelector).trigger('change');
-        },
-
-        /**
-         * Attempt to submit order
-         */
-        _submitOrder: function() {
-            if (this._validateForm()) {
-                this.element.find(this.options.updateOrderSelector).fadeTo(0, 0.5)
-                    .end().find(this.options.waitLoadingContainer).show()
-                    .end().submit();
-            }
-            this._updateOrderSubmit(true);
-        },
-
-        /**
-         * Attempt to ajax submit order
-         */
-        _ajaxSubmitOrder: function() {
-            if (this.element.find(this.options.waitLoadingContainer).is(":visible")) {
-                return false;
-            }
-            $.ajax({
-                url: this.element.prop('action'),
-                type: 'post',
-                context: this,
-                data: {isAjax: 1},
-                dataType: 'json',
-                beforeSend: this._ajaxBeforeSend,
-                complete: this._ajaxComplete,
-                success: function(response) {
-                    if ($.type(response) === 'object' && !$.isEmptyObject(response)) {
-                        if (response.error_messages) {
-                            this._ajaxComplete();
-                            var msg = response.error_messages;
-                            if (msg) {
-                                if ($.type(msg) === 'array') {
-                                    msg = msg.join("\n");
-                                }
-                            }
-                            alert($.mage.__(msg));
-                            return false;
-                        }
-                        if (response.redirect) {
-                            $.mage.redirect(response.redirect);
-                            return false;
-                        }
-                        else if (response.success) {
-                            $.mage.redirect(this.options.successUrl);
-                            return false;
-                        }
-                        this._ajaxComplete();
-                        alert($.mage.__('Sorry, something went wrong.'));
-                    }
-                },
-                error: function() {
-                    alert($.mage.__('Sorry, something went wrong. Please try again later.'));
-                    this._ajaxComplete();
-                }
-            });
-        },
-
-        /**
-         * Validate Order form
-         */
-        _validateForm: function() {
-            if (this.element.data('validation')) {
-                return this.element.validation().valid();
-            }
-        },
-
-        /**
-         * Check/Set whether order can be submitted
-         * Also disables form submission element, if any
-         * @param shouldDisable - whether should prevent order submission explicitly
-         * @param optional function for shipping change handler
-         * @param optional if true the property change will be set to true
-         */
-        _updateOrderSubmit: function(shouldDisable, fn) {
-            this._toggleButton(this.options.orderReviewSubmitSelector, shouldDisable);
-            if ($.type(fn) === 'function') {
-                fn.call(this);
-            }
-        },
-
-        /**
-         * Enable/Disable button
-         * @param button button selector to be toggled
-         * @param disable  boolean for toggling
-         */
-        _toggleButton: function(button, disable) {
-            $(button).prop({"disabled": disable}).toggleClass('no-checkout', disable).fadeTo(0, disable ? 0.5 : 1);
-        },
-
-        /**
-         * Copy element value from shipping to billing address
-         * @param e optional
-         */
-        _shippingTobilling: function(e) {
-            if (this.options.shippingSubmitFormSelector) {
-                return false;
-            }
-            var isChecked = $(this.options.billingAsShippingSelector).is(':checked'),
-                opacity = isChecked ? 0.5 : 1;
-            if (isChecked) {
-                this.element.validation("clearError", ':input[name^="billing"]');
-            }
-            $(':input[name^="shipping"]', this.element).each($.proxy(function(key, value) {
-                var fieldObj = $(value.id.replace('shipping:', '#billing\\:'));
-                if (isChecked) {
-                    fieldObj = fieldObj.val($(value).val());
-                }
-                fieldObj.prop({"readonly": isChecked, "disabled": isChecked}).fadeTo(0, opacity);
-                if (fieldObj.is("select")) {
-                    this.triggerPropertyChange = false;
-                    fieldObj.trigger('change');
-                }
-            }, this));
-            if (isChecked || e) {
-                this._updateOrderSubmit(true);
-            }
-            this.triggerPropertyChange = true;
-        },
-
-        /**
-         * Dispatch an ajax request of Update Order submission
-         * @param url - url where to submit shipping method
-         * @param resultId - id of element to be updated
-         */
-        _submitUpdateOrder: function(url, resultId) {
-            if (this.element.find(this.options.waitLoadingContainer).is(":visible")) {
-                return false;
-            }
-            var isChecked = $(this.options.billingAsShippingSelector).is(':checked'),
-                formData = null,
-                callBackResponseHandler = null,
-                shippingMethod = $.trim($(this.options.shippingSelector).val());
-            this._shippingTobilling();
-            if (url && resultId && this._validateForm() && shippingMethod) {
-                this._updateOrderSubmit(true);
-                this._toggleButton(this.options.updateOrderSelector, true);
-                // form data and callBack updated based on the shippping Form element
-                if (this.isShippingSubmitForm) {
-                    formData = $(this.options.shippingSubmitFormSelector).serialize() + "&isAjax=true";
-                    callBackResponseHandler = function(response) {
-                        $(resultId).html(response);
-                        this._updateOrderSubmit(false);
-                        this._ajaxComplete();
-                    };
-                } else {
-                    formData = this.element.serialize() + "&isAjax=true";
-                    callBackResponseHandler = function(response) {
-                        $(resultId).html(response);
-                        this._ajaxShippingUpdate(shippingMethod);
-                    };
-                }
-                if (isChecked) {
-                    $(this.options.shippingSelect).prop('disabled', true);
-                }
-                $.ajax({
-                    url: url,
-                    type: 'post',
-                    context: this,
-                    beforeSend: this._ajaxBeforeSend,
-                    data: formData,
-                    success: callBackResponseHandler
-                });
-            }
-        },
-
-        /**
-         * Update Shipping Methods Element from server
-         * @param shippingMethod
-         */
-        _ajaxShippingUpdate: function(shippingMethod) {
-            $.ajax({
-                    url: this.options.shippingMethodUpdateUrl,
-                    data: {isAjax: true, shipping_method: shippingMethod},
-                    type: 'post',
-                    context: this,
-                    success: function(response) {
-                        $(this.options.shippingMethodContainer).parent().html(response);
-                        this._toggleButton(this.options.updateOrderSelector, false);
-                        this._updateOrderSubmit(false);
-                    },
-                    complete: this._ajaxComplete
-                }
-            );
-        },
-
-        /**
-         * Actions on change Shipping Address data
-         */
-        _onShippingChange: function() {
-            if (this.triggerPropertyChange && $.trim($(this.options.shippingSelector).val())) {
-                this.element.find(this.options.shippingSelector).hide().end()
-                    .find(this.options.shippingSelector + '_update').show();
-            }
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml b/app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml
deleted file mode 100644
index 8980cad2e42fada981701a210bbda65bd700fc09..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Paypal\Block\Logo
- */
-?>
-<div class="paypal-logo">
-    <a href="#" title="<?php echo __('Additional Options') ?>" onclick="javascript:window.open('<?php echo $this->getAboutPaypalPageUrl() ?>','paypal','width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->escapeHtml($this->getLogoImageUrl()) ?>" alt="<?php echo __('Additional Options') ?>" title="<?php echo __('Additional Options') ?>" /></a>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml
deleted file mode 100644
index e458fcf9c5960a6615f8f26881847525cfaa7db3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @var $this \Magento\Paypal\Block\Payflow\Advanced\Iframe
- */
-?>
-<html>
-<head>
-    <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
-</head>
-<body>
-    <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
-        <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
-        <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
-        <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
-    </form>
-    <script type="text/javascript">
-        // this is NOT tested.
-        jQuery('#token_form').submit();
-    </script>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml
deleted file mode 100644
index 800b4f167a013050013f78f74d6d07c3645c5289..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Paypal\Block\Payflow\Advanced\Form */
-?>
-<div id="iframe-warning" class="warning-message">
-    <?php echo __('Please do not refresh the page until you complete payment.') ?>
-</div>
-<iframe id="payflow-advanced-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml
deleted file mode 100644
index e281cce7906d4f823a8b33958de50958ff05d775..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @var $this \Magento\Paypal\Block\Payflow\Advanced\Form
- */
-?>
-<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
-    <li>
-    <?php echo __('You will be required to enter your payment details after you place an order.') ?>
-    </li>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml
deleted file mode 100644
index caf7a3ea33955bd8bc5644a040f80809561024e0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @var $this \Magento\Paypal\Block\Payflow\Advanced\Iframe
- */
-?>
-<html>
-<head>
-    <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
-</head>
-<body>
-    <script type="text/javascript">
-        if (window.top == window.self) {
-            window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
-        }
-        <?php if ($this->getGotoSection()): ?>
-            var steps = [];
-            try{
-                steps = parent.jQuery('[id^="opc-"]');
-            }catch(e){
-                window.top.location="<?php echo $this->getUrl('checkout/cart') ?>";
-            }
-            parent.jQuery.each(steps, function() {
-                var step = parent.jQuery(this).attr('id').substring(4);
-                if (step === '<?php echo $this->getGotoSection() ?>') {
-                    return;
-                }
-                parent.jQuery(this).addClass('allow');
-            });
-            parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
-            parent.jQuery('#checkout-review-submit').show();
-            parent.jQuery('#iframe-warning').hide();
-            <?php if ($this->getErrorMsg()): ?>
-                alert('<?php echo $this->getErrorMsg() ?>');
-            <?php endif; ?>
-        <?php elseif ($this->getGotoSuccessPage()) : ?>
-            window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
-        <?php else : ?>
-            window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
-        <?php endif; ?>
-    </script>
-    </body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml
deleted file mode 100644
index e67b386db86f2d4b9fb8fdc9a8e7c75eb965bddb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @see \Magento\Paypal\Block\Payflow\Link\Iframe
- */
-?>
-<html>
-<head>
-    <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
-</head>
-<body>
-    <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
-        <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
-        <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
-        <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
-    </form>
-    <script type="text/javascript">
-        // this is NOT tested.
-        jQuery('#token_form').submit();
-    </script>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml
deleted file mode 100644
index 81294e08878f8cd855e1096561b9c9b02c0e2bb9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Paypal\Block\Payflow\Link\Form */
-?>
-<div id="iframe-warning" class="warning-message">
-    <?php echo __('Please do not refresh the page until you complete payment.') ?>
-</div>
-<iframe id="payflow-link-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml
deleted file mode 100644
index 39cd781e790ed90297f27855cf9f489136fe0b19..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @var $this \Magento\Paypal\Block\Payflow\Link\Form
- */
-?>
-<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
-    <li>
-    <?php echo __('You will be required to enter your payment details after you place an order.') ?>
-    </li>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml
deleted file mode 100644
index 72c0ea59bbda163f87a8efebb3f4db155c67812f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * @var $this \Magento\Paypal\Block\Payflow\Link\Iframe
- */
-?>
-<html>
-<head>
-</head>
-<body>
-<script type="text/javascript">
-    if (window.top == window.self) {
-        window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
-    }
-    <?php if ($this->getGotoSection()): ?>
-        var steps = [];
-        try{
-            steps = parent.jQuery('[id^="opc-"]');
-        }catch(e){
-            window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
-        }
-        parent.jQuery.each(steps, function() {
-            var step = parent.jQuery(this).attr('id').substring(4);
-            if (step === '<?php echo $this->getGotoSection() ?>') {
-                return;
-            }
-            parent.jQuery(this).addClass('allow');
-        });
-        parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
-        parent.jQuery('#checkout-review-submit').show();
-        parent.jQuery('#iframe-warning').hide();
-        <?php if ($this->getErrorMsg()): ?>
-            alert('<?php echo $this->getErrorMsg() ?>');
-        <?php endif; ?>
-    <?php elseif ($this->getGotoSuccessPage()) : ?>
-        window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
-    <?php else : ?>
-        window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
-    <?php endif; ?>
-</script>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml
deleted file mode 100644
index 9206539044d2b8f45328decb3b86bd7fe78a3971..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Note: This mark is a requirement of PayPal
- * @see \Magento\Paypal\Block\Standard\Form
- */
-?>
-<!-- PayPal Logo -->
-<img src="<?php echo $this->escapeHtml($this->getPaymentAcceptanceMarkSrc())?>" alt="<?php echo __('Acceptance Mark') ?>" class="v-middle" />&nbsp;
-<a href="<?php echo $this->getPaymentAcceptanceMarkHref()?>" onclick="javascript:window.open('<?php echo $this->getPaymentAcceptanceMarkHref()?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;"><?php echo __('What is PayPal?') ?></a>
-<!-- PayPal Logo -->
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml
deleted file mode 100644
index 56556be6084f285fa6495234d9c9ca84933b8c5e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\PayPal\Block\Express\Form
- * @see \Magento\PayPal\Block\Standard\Form
- */
-?>
-<ul class="form-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
-    <li class="form-alt"><?php echo $this->getRedirectMessage() ?></li>
-    <?php if ($code = $this->getCreateBACode()): ?>
-        <li class="form-alt">
-            <label for="<?php echo $code ?>"><input type="checkbox" id="<?php echo $code ?>" value="1" name="payment[<?php echo $code ?>]" class="checkbox" />
-            <?php echo __('Sign a billing agreement to streamline further purchases with PayPal.') ?></label>
-        </li>
-    <?php endif; ?>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml b/app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml
deleted file mode 100644
index 2b97afa0f9fb5ea6d8ebac093f42ce78c24abba5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Paypal\Block\Express\Review */
-?>
-<div class="page-title">
-    <h1><?php echo __('Review Order') ?></h1>
-</div>
-<?php echo $this->getLayout()->renderElement('messages') ?>
-
-<?php if ($this->getShippingAddress()): ?>
-<div class="info-set col2-set">
-    <h2 class="legend"><?php echo __('Shipping Information') ?></h2>
-    <div class="col-1">
-        <div class="box">
-            <div class="box-title">
-                <h3><?php echo __('Shipping Address') ?><span class="separator"><?php if ($this->getCanEditShippingAddress()):?> | </span><a href="<?php echo $this->getEditUrl() ?>"><?php echo __('Change Shipping Address') ?></a><?php endif;?></h3>
-            </div>
-            <div class="box-content">
-                <address><?php echo $this->renderAddress($this->getShippingAddress())?></address>
-            </div>
-        </div>
-    </div>
-    <div class="col-2">
-        <div class="box">
-            <div class="box-title">
-                <h3><?php echo __('Shipping Method') ?></h3>
-            </div>
-            <div class="box-content">
-                <form method="post" id="shipping-method-form" action="<?php echo $this->escapeHtml($this->getShippingMethodSubmitUrl()) ?>">
-                    <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
-                    <?php if ($groups = $this->getShippingRateGroups()):?>
-                        <?php $currentRate = $this->getCurrentShippingRate(); ?>
-                        <fieldset>
-                            <select name="shipping_method" id="shipping-method" style="width:250px;" class="required-entry">
-                                <?php if (!$currentRate):?>
-                                <option value=""><?php echo __('Please select a shipping method...') ?></option>
-                                <?php endif;?>
-                                <?php foreach ($groups as $code => $rates):?>
-                                <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
-                                    <?php foreach ($rates as $rate):?>
-                                    <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
-                                        <?php echo $this->renderShippingRateOption($rate)?>
-                                    </option>
-                                    <?php endforeach;?>
-                                </optgroup>
-                                <?php endforeach;?>
-                            </select>
-                        </fieldset>
-                        <p class="actions">
-                            <button id="update-shipping-method-submit" type="submit" class="button"><span><span><?php echo __('Update Shipping Method') ?></span></span></button>
-                        </p>
-                        <?php else: ?>
-                        <p><strong><?php echo __('Sorry, no quotes are available for this order at this time.') ?></strong></p>
-                        <?php endif;?>
-                    <?php else: ?>
-                    <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
-                    <?php endif; ?>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
-<?php endif; ?>
-
-<div class="info-set col2-set">
-    <h2 class="legend"><?php echo __('Billing Information') ?></h2>
-    <div class="col-1">
-        <div class="box">
-            <div class="box-title">
-                <h3><?php echo __('Payment Method') ?> <span class="separator">|</span>
-                    <?php if($this->getEditUrl()):?><a href="<?php echo $this->getEditUrl() ?>"><?php echo __('Change Payment Method') ?></a> <?php endif ?>
-                </h3>
-            </div>
-            <div class="box-content">
-                <?php echo $this->escapeHtml($this->getPaymentMethodTitle()) ?>
-            </div>
-        </div>
-    </div>
-    <div class="col-2">
-        <div class="box">
-            <div class="box-title">
-                <h3><?php echo __('Billing Address') ?></h3>
-            </div>
-            <div class="box-content">
-                <address>
-                    <?php echo $this->renderAddress($this->getBillingAddress()) ?><br />
-                    <?php echo __('Payer Email: %1', $this->getBillingAddress()->getEmail()) ?>
-                </address>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="info-set">
-    <h2 class="legend"><?php echo __('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Shopping Cart') ?></a></h2>
-    <div id="details-reload">
-        <?php echo $this->getChildHtml('details') ?>
-    </div>
-</div>
-<form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>">
-    <?php echo $this->getChildHtml('agreements'); ?>
-    <div class="buttons-set buttons-set-order" id="review-buttons-container">
-        <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
-        <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
-        <span class="please-wait" id="review-please-wait" style="display:none;">
-            <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information...') ?>" title="<?php echo __('Submitting order information...') ?>" class="v-middle" /> <?php echo __('Submitting order information...') ?>
-        </span>
-    </div>
-</form>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('Magento_Paypal::order-review.js') ?>",
-        function() {
-            jQuery('#order-review-form').validation().orderReview({
-                shippingSubmitFormSelector: '#shipping-method-form',
-                shippingSelector:'#shipping-method',
-                shippingMethodUpdateUrl: '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>',
-                updateOrderSubmitUrl: '<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>',
-                isAjax: <?php echo $this->getUseAjax() ? 'true' : 'false' ?>
-            });
-        });
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml
deleted file mode 100644
index 2dfff90ee1e67dfd4c16850228f373ec23f1d4c0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.tooltip">
-        <container name="product.info.addtocart.paypaluk.wrapper" label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="div">
-            <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk" template="Magento_Paypal::express/shortcut.phtml">
-                <action method="setIsInCatalogProduct">
-                    <argument name="value" xsi:type="string">1</argument>
-                </action>
-                <action method="setShowOrPosition">
-                    <argument name="value" xsi:type="string">after</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
deleted file mode 100644
index 1246781afc31d71fb3cce2b07441414a8765c4b0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info.addtocart">
-        <container name="product.info.addtocart.paypaluk.wrapper" label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="p" htmlClass="paypal-logo">
-            <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk" template="Magento_Paypal::express/shortcut.phtml">
-                <action method="setIsInCatalogProduct">
-                    <argument name="value" xsi:type="string">1</argument>
-                </action>
-            </block>
-        </container>
-    </referenceBlock>
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml
deleted file mode 100644
index c856db24932fdbeda3a613038187adab1bf85a27..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="checkout.cart.top_methods">
-        <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.top" before="-" template="Magento_Paypal::express/shortcut.phtml">
-            <action method="setIsQuoteAllowed">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-        </block>
-    </referenceContainer>
-    <referenceContainer name="checkout.cart.methods">
-        <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.bottom" before="-" template="Magento_Paypal::express/shortcut.phtml">
-            <action method="setIsQuoteAllowed">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-        </block>
-    </referenceContainer>
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml
deleted file mode 100644
index 8ccbb0f0f28a4fa468194c1298e5ab7a1a7c3898..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="cart_sidebar.extra_actions">
-        <block class="Magento\PaypalUk\Block\Express\Shortcut" name="paypaluk.partner.cart_sidebar.shortcut" template="Magento_Paypal::express/shortcut.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
deleted file mode 100644
index 2ac04b323fbf9977449c32616dbdd1ffa45a116b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Paypal\Block\Express\Review\Details" name="root" output="1" template="express/review/details.phtml">
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
-        <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
-    </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
deleted file mode 100644
index 8f74e4d8ddea3c6c18d234235276f98dfb50bf82..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="Magento_PaypalUk::express/review.phtml">
-            <action method="setPaypalActionPrefix">
-                <argument name="prefix" xsi:type="string">paypaluk</argument>
-            </action>
-            <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
-                <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
-            </block>
-            <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="onepage/agreements.phtml"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml
deleted file mode 100644
index d9099840a6493f85322e7a174f40a717fc3f7a16..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml b/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml
deleted file mode 100644
index e3ce2c762ac21d857a081ebfaa5377e1cefebfee..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var \Magento\Checkout\Block\Onepage\Billing $this */
-?>
-<form id="co-billing-form" action="">
-<fieldset>
-    <ul class="form-list">
-    <?php if ($this->customerHasAddresses()): ?>
-        <li class="wide">
-            <label for="billing-address-select"><?php echo __('Select a billing address from your address book or enter a new address.') ?></label>
-            <div class="input-box">
-                <?php echo $this->getAddressesHtmlSelect('billing') ?>
-            </div>
-        </li>
-    <?php endif; ?>
-    <li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
-        <fieldset>
-            <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
-            <ul>
-                <li class="fields"><?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:company"><?php echo __('Company') ?></label>
-                        <div class="input-box">
-                            <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                        </div>
-                    </div>
-        <?php if(!$this->isCustomerLoggedIn()): ?>
-                    <div class="field">
-                        <label for="billing:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
-                        </div>
-                    </div>
-        <?php endif; ?>
-                </li>
-        <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                <li class="wide">
-                    <label for="billing:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" title="<?php echo __('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-        <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-        <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                <li class="wide">
-                    <div class="input-box">
-                        <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-        <?php endfor; ?>
-                <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
-                <li class="wide">
-                    <label for="billing:vat_id"><?php echo __('VAT Number') ?></label>
-                    <div class="input-box">
-                        <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
-                    </div>
-                </li>
-                <?php endif; ?>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:city" class="required"><em>*</em><?php echo __('City') ?></label>
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="billing:city" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                        <div class="input-box">
-                            <select id="billing:region_id" name="billing[region_id]" title="<?php echo __('State/Province') ?>" style="display:none;" data-validate="{'validate-select':true}">
-                                <option value=""><?php echo __('Please select a region, state or province.') ?></option>
-                            </select>
-                            <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>"  title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:postcode" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                        <div class="input-box">
-                            <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'validate-zip-international':true}"/>
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
-                        <div class="input-box">
-                            <?php echo $this->getCountryHtmlSelect('billing') ?>
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="billing:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:fax"><?php echo __('Fax') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
-                        </div>
-                    </div>
-                </li>
-                <?php if(!$this->isCustomerLoggedIn()): ?>
-
-        <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
-        <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
-            <?php if ($_dob->isEnabled() || $_gender->isEnabled()): ?>
-                <li class="fields">
-                <?php if ($_dob->isEnabled()): ?>
-                    <div class="field">
-                        <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
-                    </div>
-                <?php endif; ?>
-                <?php if ($_gender->isEnabled()): ?>
-                    <div class="field">
-                        <?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
-                    </div>
-                <?php endif ?>
-                </li>
-            <?php endif ?>
-
-            <?php if ($this->isTaxvatEnabled()):?>
-                <li><?php echo $this->getTaxvatHtml() ?></li>
-            <?php endif; ?>
-
-                <li class="fields" id="register-customer-password">
-                    <div class="field">
-                        <label for="billing:customer_password" class="required"><em>*</em><?php echo __('Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="billing:confirm_password" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="billing[confirm_password]" title="<?php echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true}" />
-                        </div>
-                    </div>
-                </li>
-                <?php echo $this->getChildHtml('persistent.remember.me'); ?>
-                <?php endif; ?>
-                <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
-                    <li class="control">
-                        <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="billing:save_in_address_book" <?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo __('Save in address book') ?></label>
-                    </li>
-                <?php else:?>
-                    <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
-                <?php endif; ?>
-                <?php echo $this->getChildHtml('form.additional.info'); ?>
-            </ul>
-            <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
-        </fieldset>
-     </li>
-    <?php if ($this->canShip()): ?>
-        <li class="control">
-            <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo  __('Ship to this address') ?>" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo  __('Ship to this address') ?></label></li>
-        <li class="control">
-            <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo __('Ship to different address') ?>" class="radio" /><label for="billing:use_for_shipping_no"><?php echo __('Ship to different address') ?></label>
-        </li>
-    <?php endif; ?>
-    </ul>
-    <?php if (!$this->canShip()): ?>
-        <input type="hidden" name="billing[use_for_shipping]" value="1" />
-    <?php endif; ?>
-    <div class="buttons-set" id="billing-buttons-container">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <button type="button" title="<?php echo __('Continue') ?>" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
-        <span class="please-wait" id="billing-please-wait" style="display:none;">
-            <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
-        </span>
-    </div>
-</fieldset>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-            function() {
-                $('#billing\\:country_id').regionUpdater({
-                    optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
-                    regionListId: '#billing\\:region_id',
-                    regionInputId: '#billing\\:region',
-                    postcodeId: '#billing\\:postcode',
-                    regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                    defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
-                    countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/login.phtml b/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/login.phtml
deleted file mode 100644
index 816011751fafb3f14bdef2612f34417c40aca0f7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/login.phtml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Customer onepage checkout login form template
- *
- * @see app/code/Magento/Checkout/view/frontend/onepage/login.phtml
- */
-/** @var $this \Magento\Checkout\Block\Onepage\Login */
-?>
-<div class="col2-set">
-    <?php echo $this->getChildHtml('login_before')?>
-    <div class="col-1">
-        <h3><?php if( $this->isAllowedGuestCheckout() ): ?><?php echo __('Checkout as a Guest or Register') ?><?php else: ?><?php echo __('Register to Create an Account') ?><?php endif; ?></h3>
-        <?php if( $this->isAllowedGuestCheckout() ): ?>
-            <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
-        <?php else: ?>
-            <p><strong><?php echo __('Register and save time!') ?></strong><br />
-            <?php echo __('Sign up with us to save time on your next checkout:') ?></p>
-            <ul>
-                <li><?php echo __('Fast and easy check out') ?></li>
-                <li><?php echo __('Get easy access to your order history and status.') ?></li>
-            </ul>
-        <?php endif; ?>
-        <?php if( $this->isAllowedGuestCheckout() ): ?>
-            <ul class="form-list">
-                <?php if( $this->isAllowedGuestCheckout() ): ?>
-                <li class="control">
-                    <input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo __('Checkout as Guest') ?></label>
-                </li>
-                <?php endif; ?>
-                <li class="control">
-                    <input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER || !$this->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo __('Register') ?></label>
-                </li>
-            </ul>
-            <h4><?php echo __('Register and save time!') ?></h4>
-            <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
-            <ul class="ul">
-                <li><?php echo __('Fast and easy check out') ?></li>
-                <li><?php echo __('Get easy access to your order history and status.') ?></li>
-            </ul>
-        <?php else: ?>
-            <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
-        <?php endif; ?>
-    </div>
-    <div class="col-2">
-        <h3><?php echo __('Login') ?></h3>
-        <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-        <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
-        <fieldset>
-            <h4><?php echo __('Already registered?') ?></h4>
-            <p><?php echo __('Please log in below:') ?></p>
-            <ul class="form-list">
-                <li>
-                    <label for="login-email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" class="input-text" id="login-email" name="login[username]" data-validate="{required:true, 'validate-email':true}" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
-                    </div>
-                </li>
-                <li>
-                    <label for="login-password" class="required"><em>*</em><?php echo __('Password') ?></label>
-                    <div class="input-box">
-                        <input type="password" class="input-text" id="login-password" name="login[password]" data-validate="{required:true}"/>
-                    </div>
-                </li>
-                <?php echo $this->getChildHtml('login.form.additional.info'); ?>
-                <?php echo $this->getChildHtml('persistent.remember.me'); ?>
-            </ul>
-            <input name="context" type="hidden" value="checkout" />
-        </fieldset>
-        </form>
-    </div>
-</div>
-<div class="col2-set">
-    <div class="col-1">
-        <div class="buttons-set">
-            <p class="required">&nbsp;</p>
-            <?php if ($this->isAllowedGuestCheckout()): ?>
-                <button id="onepage-guest-register-button" type="button" class="button" data-checkout='{"isGuestCheckoutAllowed":true}'><span><span><?php echo __('Continue') ?></span></span></button>
-            <?php elseif ($this->helper('Magento\Checkout\Helper\Data')->isCustomerMustBeLogged()): ?>
-                <button id="onepage-guest-register-button" type="button" class="button" data-checkout='{"isGuestCheckoutAllowed":false, "registrationUrl":"<?php echo $this->helper('Magento\Checkout\Helper\Url')->getRegistrationUrl();?>"}'><span><span><?php echo __('Register') ?></span></span></button>
-            <?php else: ?>
-                <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
-                    <button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo __('Register') ?></span></span></button>
-                </form>
-            <?php endif; ?>
-            <span class="please-wait" style="display:none;">
-                <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo __('Loading next step...') ?>
-            </span>
-        </div>
-    </div>
-    <div class="col-2">
-        <div class="buttons-set">
-            <p class="required"><?php echo __('* Required Fields') ?></p>
-            <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo __('Forgot your password?') ?></a>
-            <button type="submit" class="button" data-action='login-form-submit'><span><span><?php echo __('Login') ?></span></span></button>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            function() {
-                $('#login-form').validation();
-            }
-        )}
-    )(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml b/app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml
deleted file mode 100644
index b1fa12389954343900bb567712b2e53c341564c2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Customer login form template
- *
- * @see app/code/Magento/Customer/view/frontend/form/login.phtml
- */
-/** @var $this \Magento\Customer\Block\Form\Login */
-?>
-<div class="account-login">
-    <div class="page-title">
-        <h1><?php echo __('Log in or create an account.') ?></h1>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
-        <div class="col2-set">
-            <div class="col-1 new-users">
-                <div class="content">
-                    <h2><?php echo __('New Customers') ?></h2>
-                    <p><?php echo __('With your own account, you can check out faster, store multiple shipping addesses, see your shopping activity and more.') ?></p>
-                </div>
-            </div>
-            <div class="col-2 registered-users">
-                <div class="content">
-                    <h2><?php echo __('Registered Customers') ?></h2>
-                    <p><?php echo __('If you have an account with us, please log in.') ?></p>
-                    <ul class="form-list">
-                        <li>
-                            <label for="email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                            <div class="input-box">
-                                <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text" title="<?php echo __('Email Address') ?>" data-validate="{required:true, 'validate-email':true}" />
-                            </div>
-                        </li>
-                        <li>
-                            <label for="pass" class="required"><em>*</em><?php echo __('Password') ?></label>
-                            <div class="input-box">
-                                <input type="password" name="login[password]" class="input-text" id="pass" title="<?php echo __('Password') ?>" data-validate="{required:true, 'validate-password':true}" />
-                            </div>
-                        </li>
-                        <?php echo $this->getChildHtml('form.additional.info'); ?>
-                        <?php echo $this->getChildHtml('persistent.remember.me'); ?>
-                    </ul>
-                    <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
-                    <p class="required"><?php echo __('* Required Fields') ?></p>
-                </div>
-            </div>
-        </div>
-        <div class="col2-set">
-            <div class="col-1 new-users">
-                <div class="buttons-set">
-                    <button type="button" title="<?php echo __('Create an Account') ?>" class="button"><span><span><?php echo __('Create an Account') ?></span></span></button>
-                </div>
-            </div>
-            <div class="col-2 registered-users">
-                <div class="buttons-set">
-                    <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo __('Forgot Your Password?') ?></a>
-                    <button type="submit" class="button" title="<?php echo __('Login') ?>" name="send" id="send2"><span><span><?php echo __('Login') ?></span></span></button>
-                </div>
-            </div>
-        </div>
-        <?php if ($this->helper('Magento\Checkout\Helper\Data')->isContextCheckout()): ?>
-            <input name="context" type="hidden" value="checkout" />
-        <?php endif; ?>
-    </form>
-    <script type="text/javascript">
-        (function($) {
-            head.js(
-                "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-                function() {
-                    $('#login-form').validation().find('div.new-users button')
-                        .on('click', function() {window.location='<?php echo $this->helper('Magento\Persistent\Helper\Data')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';});
-                });
-        })(jQuery);
-    </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml b/app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml
deleted file mode 100644
index 642e7a74eb1c77f9420f972bdf5da9ed6087daec..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Create account form template
- *
- * @see app/code/Magento/Customer/view/frontend/form/register.phtml
- */
-/** @var $this \Magento\Customer\Block\Form\Register */
-?>
-<div class="account-create">
-    <div class="page-title">
-        <h1><?php echo __('Create an Account') ?></h1>
-    </div>
-    <?php echo $this->getChildHtml('form_fields_before')?>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
-        <div class="fieldset">
-            <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
-            <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
-            <h2 class="legend"><?php echo __('Personal Information') ?></h2>
-            <ul class="form-list">
-                <li class="fields">
-                    <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
-                </li>
-                <li>
-                    <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
-                    </div>
-                </li>
-                <?php if ($this->isNewsletterEnabled()): ?>
-                <li class="control">
-                    <div class="input-box">
-                        <input type="checkbox" name="is_subscribed" title="<?php echo __('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    </div>
-                    <label for="is_subscribed"><?php echo __('Sign Up for Newsletter') ?></label>
-                </li>
-                <?php endif ?>
-            <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
-            <?php if ($_dob->isEnabled()): ?>
-                <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
-            <?php endif ?>
-            <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
-            <?php if ($_taxvat->isEnabled()): ?>
-                <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
-            <?php endif ?>
-            <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
-            <?php if ($_gender->isEnabled()): ?>
-                <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
-            <?php endif ?>
-            </ul>
-        </div>
-    <?php if($this->getShowAddressFields()): ?>
-        <div class="fieldset">
-            <input type="hidden" name="create_address" value="1" />
-            <h2 class="legend"><?php echo __('Address Information') ?></h2>
-            <ul class="form-list">
-                <li class="fields">
-                    <div class="field">
-                        <label for="company"><?php echo __('Company') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" />
-                        </div>
-                    </div>
-                </li>
-            <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
-                <li class="wide">
-                    <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-            <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
-            <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
-                <li class="wide">
-                    <div class="input-box">
-                        <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
-                    </div>
-                </li>
-            <?php endfor; ?>
-                <li class="fields">
-                    <div class="field">
-                        <label for="city" class="required"><em>*</em><?php echo __('City') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
-                        <div class="input-box">
-                            <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                                <option value=""><?php echo __('Please select a region, state or province.') ?></option>
-                            </select>
-                            <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
-                        </div>
-                    </div>
-                </li>
-                <li class="fields">
-                    <div class="field">
-                        <label for="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
-                        <div class="input-box">
-                            <?php echo $this->getCountryHtmlSelect() ?>
-                        </div>
-                    </div>
-                </li>
-            </ul>
-            <input type="hidden" name="default_billing" value="1" />
-            <input type="hidden" name="default_shipping" value="1" />
-        </div>
-    <?php endif; ?>
-        <div class="fieldset">
-            <h2 class="legend"><?php echo __('Login Information') ?></h2>
-            <ul class="form-list">
-                <li class="fields">
-                    <div class="field">
-                        <label for="password" class="required"><em>*</em><?php echo __('Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="password" id="password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
-                        </div>
-                    </div>
-                    <div class="field">
-                        <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
-                        <div class="input-box">
-                            <input type="password" name="confirmation" title="<?php echo __('Confirm Password') ?>" id="confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}"/>
-                        </div>
-                    </div>
-                </li>
-                <?php echo $this->getChildHtml('form.additional.info'); ?>
-                <?php echo $this->getChildHtml('persistent.remember.me'); ?>
-            </ul>
-            <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
-        </div>
-        <div class="buttons-set">
-            <p class="required"><?php echo __('* Required Fields') ?></p>
-            <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-            <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
-        </div>
-        <?php if ($this->helper('Magento\Checkout\Helper\Data')->isContextCheckout()): ?>
-            <input name="context" type="hidden" value="checkout" />
-        <?php endif; ?>
-    </form>
-    <script type="text/javascript">
-        (function($) {
-            head.js(
-                "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-                "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
-                <?php if ($_dob->isEnabled()): ?>
-                "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
-                <?php endif ?>
-                function() {
-                    var dataForm = $('#form-validate').validation({
-                        <?php if ($_dob->isEnabled()): ?>
-                        errorPlacement: function(error, element) {
-                            if (element.prop('id') === 'dob') {
-                                var dobElement = $('.customer-dob'),
-                                    errorClass = error.prop('class');
-                                error.insertAfter(element.parent());
-                                dobElement.find('.validate-custom').addClass(errorClass)
-                                    .after('<div class="' + errorClass + '"></div>');
-                            }
-                            else {
-                                error.insertAfter(element);
-                            }
-                        },
-                        ignore: ':hidden:not(#dob)'
-                        <?php endif ?>
-                    });
-                    <?php if($this->getShowAddressFields()): ?>
-                    $('#country').regionUpdater({
-                        optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
-                        regionListId: '#region_id',
-                        regionInputId: '#region',
-                        postcodeId: '#zip',
-                        form: dataForm,
-                        regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                        defaultRegion: "<?php echo $this->getFormData()->getRegionId() ?>",
-                        countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
-                    });
-                    <?php endif; ?>
-                });
-        })(jQuery);
-    </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml
deleted file mode 100644
index 9fddb3a4ddb7169a7da433c8fa6c184ac723db95..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="checkout.onepage.login">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">Magento_Persistent::checkout/onepage/login.phtml</argument>
-        </action>
-        block class="Magento\Persistent\Block\Form\Remember" name="checkout.onepage.login.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
-    </referenceBlock>
-    <referenceBlock name="checkout.onepage.billing">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">Magento_Persistent::checkout/onepage/billing.phtml</argument>
-        </action>
-        <block class="Magento\Persistent\Block\Form\Remember" name="checkout.onepage.billing.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
-        <block class="Magento\View\Block\Template" name="checkout.onepage.billing.persistent.remember.me.tooltip" as="persistent.remember.me.tooltip" template="Magento_Persistent::remember_me_tooltip.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml b/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml
deleted file mode 100644
index d6684926c37973b73897f1caef5986efaaeae716..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="customer_form_register">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">Magento_Persistent::customer/form/register.phtml</argument>
-        </action>
-        <block class="Magento\Persistent\Block\Form\Remember" name="customer_form_register.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
-        <block class="Magento\View\Block\Template" name="customer_form_register.persistent.remember.me.tooltip" as="persistent.remember.me.tooltip" template="Magento_Persistent::remember_me_tooltip.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml b/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml
deleted file mode 100644
index d840de5dc3a4c91aa912ef98a0732c77cca6ed0d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="customer_form_login">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">Magento_Persistent::customer/form/login.phtml</argument>
-        </action>
-        <block class="Magento\Persistent\Block\Form\Remember" name="customer_form_login.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
-        <block class="Magento\View\Block\Template" name="customer_form_login.persistent.remember.me.tooltip" as="persistent.remember.me.tooltip" template="Magento_Persistent::remember_me_tooltip.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js b/app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js
deleted file mode 100644
index 2e04ae6ee6cf224dcb4aca0d063b9756ef8206b5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    frontend Persistent remember me popup
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function ($) {
-    $.widget('mage.rememberMePopup', {
-        options: {
-            closeBtn: '.btn-close',
-            windowOverlayTemplate: '<div class="window-overlay"></div>',
-            popupBlockTemplate: '<div class="popup-block block popup-remember-tip active">' +
-                                '<div class="block-title">' +
-                                    '<strong>${title}</strong>' +
-                                    '<div class="btn-close"></div>' +
-                                '</div>' +
-                                '<div class="block-content">' +
-                                    '<p>${content}</p>' +
-                                    '<div class="buttons-set">' +
-                                        '<button class="button btn-close" type="button">' +
-                                            '<span>' +
-                                                '<span>Close</span>' +
-                                            '</span>' +
-                                        '</button>' +
-                                    '</div>' +
-                                '</div>' +
-                            '</div>'
-        },
-
-        _create: function() {
-            this._renderWindowOverLay();
-            this._renderPopupBlock();
-            $('body').append(this.windowOverlay.hide());
-            $('body').append(this.popupBlock.hide());
-            this.element.find('a').on('click', $.proxy(this._showPopUp, this));
-        },
-
-        /**
-         * Add windowOverlay block to body
-         * If windowOverlay is not an option, use default template
-         * @private
-         */
-        _renderWindowOverLay: function() {
-            if (this.options.windowOverlay) {
-                this.windowOverlay = $(this.options.windowOverlay);
-            } else {
-                $.template('windowOverlayTemplate', this.options.windowOverlayTemplate);
-                this.windowOverlay = $.tmpl('windowOverlayTemplate').hide();
-            }
-            this.windowOverlay.height($('body').height());
-        },
-
-        /**
-         * Add popupBlock to body
-         * If popupBlock is not an option, use default template
-         * @private
-         */
-        _renderPopupBlock: function() {
-            if (this.options.popupBlock) {
-                this.popupBlock = $(this.options.popupBlock);
-            } else {
-                $.template('popupBlockTemplate', this.options.popupBlockTemplate);
-                this.popupBlock = $.tmpl('popupBlockTemplate',
-                    {title: this.options.title, content: this.options.content});
-            }
-            this.popupBlock.find(this.options.closeBtn).on('click', $.proxy(this._hidePopUp, this));
-        },
-
-        /**
-         * show windowOverlay and popupBlock
-         * @private
-         */
-        _showPopUp: function() {
-            this.windowOverlay.show();
-            this.popupBlock.show();
-        },
-
-        /**
-         * hide windowOverlay and popupBlock
-         * @private
-         */
-        _hidePopUp: function() {
-            this.windowOverlay.hide();
-            this.popupBlock.hide();
-        }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml b/app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml
deleted file mode 100644
index ec0bfa722f7514afede25d4205e34d9730a119b7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Customer "Remember Me" template
- *
- * @var $this \Magento\Persistent\Block\Form\Remember
- */
-?>
-<li id="remember-me-box" class="control">
-    <?php $rememberMeId = 'remember_me' . $this->helper('Magento\Core\Helper\Data')->getRandomString(10); ?>
-    <div class="input-box">
-        <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php echo $rememberMeId; ?>"<?php if ($this->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo __('Remember Me') ?>" />
-    </div>
-    <label for="<?php echo $rememberMeId; ?>"><?php echo __('Remember Me') ?></label>
-    <a class="link-tip" href="#"><?php echo __('What\'s this?') ?></a>
-</li>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml b/app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml
deleted file mode 100644
index 08cf4d99568835c5c5a94332cb5dd3fe91fc77cf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * "Remember Me" popup template (when click on "What's this?")
- *
- */
-/** @var $this \Magento\View\Block\Template */
-?>
-<div id="window-overlay" class="window-overlay" style="display:none;"></div>
-<div id="remember-me-popup" class="remember-me-popup" style="display:none;">
-    <div class="remember-me-popup-head">
-        <h3>What's this?</h3>
-        <a href="#" class="remember-me-popup-close" title="<?php echo __('Close') ?>"><?php echo __('Close') ?></a>
-    </div>
-    <div class="remember-me-popup-body">
-        <p>Checking &quot;Remember Me&quot; will let you access your shopping cart on this computer when you are logged out</p>
-        <div class="remember-me-popup-close-button a-right">
-            <a href="#" class="remember-me-popup-close button" title="<?php echo __('Close') ?>"><span><?php echo __('Close') ?></span></a>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('Magento_Persistent::remember-me-popup.js') ?>",
-            function() {
-                $('#remember-me-box').rememberMePopup({
-                    windowOverlay: '#window-overlay',
-                    popupBlock: '#remember-me-popup',
-                    closeBtn: '.remember-me-popup-close'
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js b/app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js
deleted file mode 100644
index ef7b137e3dc5fa655f263404bba3b561424c8dcf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Magento_Persistent
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/*jshint browser:true jquery:true*/
-(function($, undefined) {
-    "use strict";
-    $.widget('mage.splitButton', {
-        /**
-         * options with default values
-         */
-        options: {
-            splitButton: '.split-button',
-            arrowButton: '.change',
-            activeClass: 'active'
-        },
-
-        /**
-         * Initialize split button events
-         * @private
-         */
-        _create: function() {
-            $(document).on('click', this.options.splitButton + ' > ' + this.options.arrowButton, $.proxy(this._toggleDropDown, this));
-            $(document).on('click', $.proxy(this._hideDropDown, this));
-        },
-
-        /**
-         * Toggle css class for the split button to hide or show drop down menu
-         * Saves current state of the target. Closes all open drop downs and then
-         * depending on the stored state the target drop down is toggled.
-         * @private
-         * @param {Object} e
-         */
-        _toggleDropDown: function(e) {
-            var state = $(e.target).closest(this.options.splitButton).hasClass(this.options.activeClass);
-            this._hideDropDown();
-            if (state) {
-                this._hideDropDown();
-            } else {
-                $(e.target).closest(this.options.splitButton).addClass(this.options.activeClass);
-            }
-            return false;
-        },
-
-        /**
-         * Hide all the drop down menus when clicked any where on the page
-         * @private
-         */
-        _hideDropDown: function() {
-            $(document).find(this.options.splitButton).removeClass(this.options.activeClass);
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/email/price.phtml b/app/design/frontend/magento_backup/Magento_ProductAlert/email/price.phtml
deleted file mode 100644
index 58a16bc4fa20378eb5452e34b618752d77dc9e6c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/email/price.phtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($_products = $this->getProducts()): ?>
-<p><?php echo __('You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:') ?></p>
-<table>
-<?php foreach ($_products as $_product): ?>
-    <tr>
-        <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $_product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
-        <td>
-            <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
-            <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
-            <p><small><?php echo $shortDescription ?></small></p>
-            <?php endif; ?>
-            <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
-                <?php echo __('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?></strong><br />
-                <strong><?php echo __('Special price:') ?> <span style="color:#FF0000;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getFinalPrice()) ?></span></strong>
-            <?php else: ?>
-                <strong><?php echo __('Price:') ?></strong> <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?>
-            <?php endif; ?></p>
-            <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($_product->getId()) ?>"><?php echo __('Click here not to receive alerts for this product.') ?></a></small></p>
-        </td>
-    </tr>
-<?php endforeach; ?>
-</table>
-<p><a href="<?php echo $this->getUnsubscribeUrl() ?>"><?php echo __('Unsubscribe from all price alerts') ?></a></p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.phtml b/app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.phtml
deleted file mode 100644
index c84f26c042054946e32c1566224510cc8759fca2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.phtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($_products = $this->getProducts()): ?>
-<p><?php echo __('You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:') ?></p>
-<table>
-<?php foreach ($_products as $_product): ?>
-    <tr>
-        <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" border="0" align="left" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
-        <td>
-            <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
-            <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
-            <p><small><?php echo $shortDescription ?></small></p>
-            <?php endif; ?>
-            <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
-                <?php echo __('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?></strong><br />
-                <strong><?php echo __('Special price:') ?> <span style="color:#FF0000;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getFinalPrice()) ?></span></strong>
-            <?php else: ?>
-                <strong><?php echo __('Price:') ?></strong> <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?>
-            <?php endif; ?></p>
-            <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($_product->getId()) ?>"><?php echo __('Click here not to receive alerts for this product.') ?></a></small></p>
-        </td>
-    </tr>
-<?php endforeach; ?>
-</table>
-<p><a href="<?php echo $this->getUnsubscribeUrl() ?>"><?php echo __('Unsubscribe from all stock alerts') ?></a></p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml b/app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml
deleted file mode 100644
index b51304a8eb8259cb9b6381a66aa40246d2c8809c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <referenceBlock name="product.info">
-            <referenceContainer name="alert.urls">
-                <block class="Magento\ProductAlert\Block\Product\View\Price" name="productalert.price" as="productalert_price" template="product/view.phtml">
-                    <action method="setHtmlClass">
-                        <argument name="value" xsi:type="string">alert-price link-price-alert</argument>
-                    </action>
-                    <action method="setSignupLabel">
-                        <argument translate="true" name="value" xsi:type="string">Sign up for price alert</argument>
-                    </action>
-                </block>
-                <block class="Magento\ProductAlert\Block\Product\View\Stock" name="productalert.stock" as="productalert_stock" template="product/view.phtml">
-                    <action method="setHtmlClass">
-                        <argument name="value" xsi:type="string">alert-stock link-stock-alert</argument>
-                    </action>
-                    <action method="setSignupLabel">
-                        <argument translate="true" name="value" xsi:type="string">Sign up to be notified when this product is back in stock.</argument>
-                    </action>
-                </block>
-            </referenceContainer>
-        </referenceBlock>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml b/app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml
deleted file mode 100644
index e4dc918d78b4a6cefe0c065330b3c140b2f6633b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\ProductAlert\Block\Product\View */?>
-<p class="<?php echo $this->getHtmlClass() ?>">
-    <a href="<?php echo $this->escapeHtml($this->getSignupUrl()) ?>" title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>"><?php echo $this->escapeHtml(__($this->getSignupLabel())); ?></a>
-</p>
diff --git a/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml b/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
deleted file mode 100644
index dab3092a6620942b1b23dab10901f8c99037253a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if(!empty($collection) && $collection->getSize()): ?>
-    <table class="ratings-table">
-        <col width="1" />
-        <col />
-        <tbody>
-            <?php foreach ($collection as $_rating): ?>
-                <?php if($_rating->getSummary()): ?>
-                    <tr>
-                        <th><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></th>
-                        <td>
-                            <div class="rating-box">
-                                <div class="rating" style="width:<?php echo ceil($_rating->getSummary()) ?>%;"></div>
-                            </div>
-                        </td>
-                    </tr>
-                <?php endif; ?>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/customer/list.phtml b/app/design/frontend/magento_backup/Magento_Review/customer/list.phtml
deleted file mode 100644
index 9550332092f85850dd77962bf9774e70beec25cf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/customer/list.phtml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="page-title">
-    <h1><?php echo __('My Product Reviews') ?></h1>
-</div>
-<?php if( $this->getCollection() && $this->count()): ?>
-    <?php echo $this->getToolbarHtml() ?>
-        <table class="data-table" id="my-reviews-table">
-            <col width="1" />
-            <col width="210" />
-            <col width="1" />
-            <col />
-            <col width="1" />
-            <tbody>
-                <?php foreach ($this->getCollection() as $_review): ?>
-                <tr>
-                    <td><span class="nobr"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></span></td>
-                    <td><h2 class="product-name"><a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h2></td>
-                    <td>
-                    <?php if($_review->getSum()): ?>
-                        <div class="rating-box">
-                            <div class="rating" style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></div>
-                        </div>
-                    <?php endif; ?>
-                    </td>
-                    <td><?php echo $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?></td>
-                    <td><a href="<?php echo $this->getReviewLink() ?>id/<?php echo $_review->getReviewId() ?>" class="nobr"><?php echo __('View Details') ?></a></td>
-                </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-        <script type="text/javascript">(function($) {$('#my-reviews-table').decorate('table')})(jQuery)</script>
-    <?php echo $this->getToolbarHtml() ?>
-<?php else: ?>
-    <p><?php echo __('You have submitted no reviews.') ?></p>
-<?php endif; ?>
-<div class="buttons-set">
-    <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml b/app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml
deleted file mode 100644
index 89d647e1389a709ae770e925212ecf2ccd5e6d0e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if( $this->getCollection() && $this->count()): ?>
-<div class="box-account box-reviews">
-    <div class="box-head">
-        <h2><?php echo __('My Recent Reviews') ?></h2>
-        <a href="<?php echo $this->getAllReviewsUrl() ?>"><?php echo __('View All Reviews') ?></a>
-    </div>
-    <ol id="my_recent_reviews">
-    <?php $iterator = 0 ?>
-    <?php foreach ($this->getCollection() as $_review): ?>
-        <li class="item">
-            <span class="number"><?php echo ++$iterator ?></span>
-            <div class="details">
-                <h3 class="product-name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h3>
-                <?php if($_review->getSum()): ?>
-                    <div class="ratings">
-                        <strong><?php echo __('Rating:') ?></strong>
-                        <div class="rating-box">
-                            <div class="rating" style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></div>
-                        </div>
-                    </div>
-                <?php endif; ?>
-            </div>
-        </li>
-    <?php endforeach; ?>
-    </ol>
-    <script type="text/javascript">(function($) {$('#my_recent_reviews').decorate('list')})(jQuery)</script>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/customer/view.phtml b/app/design/frontend/magento_backup/Magento_Review/customer/view.phtml
deleted file mode 100644
index fb5ff833437bc1f55eb0817aaeef35be470e9d44..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/customer/view.phtml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if($this->getProductData()->getId()): ?>
-<div class="product-review">
-    <div class="page-title">
-        <h1><?php echo __('Review Details') ?></h1>
-    </div>
-    <div class="product-img-box">
-        <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($this->getProductData()); ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
-        <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
-            <p class="label"><?php echo __('Average Customer Rating:') ?></p>
-            <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
-        <?php endif; ?>
-    </div>
-    <div class="product-details">
-        <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
-        <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
-        <h3><?php echo ($this->isReviewOwner()) ? __('Your Rating:') : __('Rating:'); ?></h3>
-        <table class="ratings-table">
-        <?php foreach ($this->getRating() as $_rating): ?>
-        <?php if($_rating->getPercent()): ?>
-            <tr>
-                <th><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></th>
-                <td>
-                    <div class="rating-box">
-                        <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
-                    </div>
-                </td>
-            </tr>
-        <?php endif; ?>
-        <?php endforeach; ?>
-        </table>
-        <?php endif; ?>
-        <dl>
-            <dt>
-                <?php if ($this->isReviewOwner()): ?>
-                    <?php echo __('Your Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
-                <?php else :?>
-                    <?php echo __('Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
-                <?php endif;?>
-            </dt>
-            <dd>
-                <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
-            </dd>
-        </dl>
-    </div>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to My Reviews') ?></a></p>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/form.phtml b/app/design/frontend/magento_backup/Magento_Review/form.phtml
deleted file mode 100644
index b100e03a94c84874ed38593e7f47136fde78e9cd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/form.phtml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="form-add">
-    <h2><?php echo __('Write Your Own Review') ?></h2>
-    <?php if ($this->getAllowWriteReviewFlag()): ?>
-    <form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
-        <fieldset>
-            <?php echo $this->getChildHtml('form_fields_before')?>
-            <h3><?php echo __("You're reviewing:"); ?> <span><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></span></h3>
-            <?php if( $this->getRatings() && $this->getRatings()->getSize()): ?>
-                <h4><?php echo __('How do you rate this product?') ?> <em class="required">*</em></h4>
-                <span id="input-message-box"></span>
-                <table class="data-table" id="product-review-table">
-                    <col />
-                    <col width="1" />
-                    <col width="1" />
-                    <col width="1" />
-                    <col width="1" />
-                    <col width="1" />
-                    <thead>
-                        <tr>
-                            <th>&nbsp;</th>
-                            <th><span class="nobr"><?php echo __('1 star') ?></span></th>
-                            <th><span class="nobr"><?php echo __('2 stars') ?></span></th>
-                            <th><span class="nobr"><?php echo __('3 stars') ?></span></th>
-                            <th><span class="nobr"><?php echo __('4 stars') ?></span></th>
-                            <th><span class="nobr"><?php echo __('5 stars') ?></span></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    <?php foreach ($this->getRatings() as $_rating): ?>
-                        <tr>
-                            <th><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></th>
-                        <?php foreach ($_rating->getOptions() as $_option): ?>
-                            <td class="value"><input type="radio" name="ratings[<?php echo $_rating->getId() ?>]" id="<?php echo $this->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" value="<?php echo $_option->getId() ?>" class="radio" data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}" /></td>
-                        <?php endforeach; ?>
-                        </tr>
-                    <?php endforeach; ?>
-                    </tbody>
-                </table>
-                <input type="hidden" name="validate_rating" class="validate-rating" value="" />
-                <script type="text/javascript">(function($) {$('#product-review-table').decorate('table')})(jQuery)</script>
-            <?php endif; ?>
-                <ul class="form-list">
-                    <li>
-                        <label for="nickname_field" class="required"><em>*</em><?php echo __('Nickname') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="nickname" id="nickname_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getNickname()) ?>" />
-                        </div>
-                    </li>
-                    <li>
-                        <label for="summary_field" class="required"><em>*</em><?php echo __('Summary of Your Review') ?></label>
-                        <div class="input-box">
-                            <input type="text" name="title" id="summary_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getTitle()) ?>" />
-                        </div>
-                    </li>
-                    <li>
-                        <label for="review_field" class="required"><em>*</em><?php echo __('Review') ?></label>
-                        <div class="input-box">
-                            <textarea name="detail" id="review_field" cols="5" rows="3"  data-validate="{required:true}"><?php echo $this->escapeHtml($data->getDetail()) ?></textarea>
-                        </div>
-                    </li>
-                </ul>
-            </fieldset>
-            <div class="buttons-set">
-                <button type="submit" title="<?php echo __('Submit Review') ?>" class="button"><span><span><?php echo __('Submit Review') ?></span></span></button>
-            </div>
-    </form>
-    <script>
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-                "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-                function() {
-                    $('#review-form').validation({
-                        errorPlacement: function (error, element) {
-                            if (element.parents('#product-review-table').length) {
-                                $('#product-review-table').siblings(this.errorElement + '.' + this.errorClass).remove();
-                                $('#product-review-table').after(error);
-                            } else {
-                                element.after(error);
-                            }
-                        }
-                    });
-                });
-        })(jQuery);
-    </script>
-    <?php else: ?>
-    <p class="review-nologged" id="review-form">
-        <?php echo __('Only registered users can write reviews. Please, <a href="%1">log in</a> or <a href="%2">sign up</a>.', $this->getLoginLink(), $this->helper('Magento\Customer\Helper\Data')->getRegisterUrl()) ?>
-    </p>
-    <?php endif ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml b/app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml
deleted file mode 100644
index 8df9aa10d6e445d5a272dcc40f6a4b60b983104d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($this->getReviewsCount()): ?>
-    <div class="ratings">
-        <?php if ($this->getRatingSummary()):?>
-            <div class="rating-box">
-                <div class="rating" style="width:<?php echo $this->getRatingSummary() ?>%"></div>
-            </div>
-        <?php endif;?>
-        <p class="rating-links">
-            <a href="<?php echo $this->getReviewsUrl() ?>"><?php echo __('%1 Review(s)', $this->getReviewsCount()) ?></a>
-            <span class="separator">|</span>
-            <a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Add Your Review') ?></a>
-        </p>
-    </div>
-<?php elseif ($this->getDisplayIfEmpty()): ?>
-    <p class="no-rating"><a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Be the first to review this product') ?></a></p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml b/app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml
deleted file mode 100644
index 9c36b10f00fd6d91b5b7b7fd930f6619852e8ba6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($this->getReviewsCount()): ?>
-    <div class="ratings">
-        <?php if ($this->getRatingSummary()):?>
-            <div class="rating-box">
-                <div class="rating" style="width:<?php echo $this->getRatingSummary() ?>%"></div>
-            </div>
-        <?php endif;?>
-        <span class="amount"><a href="#" onclick="var t = opener ? opener.window : window; t.location.href='<?php echo $this->getReviewsUrl() ?>'; return false;"><?php echo __('%1 Review(s)', $this->getReviewsCount()) ?></a></span>
-    </div>
-<?php elseif ($this->getDisplayIfEmpty()): ?>
-    <p class="no-rating"><a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Be the first to review this product') ?></a></p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml b/app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml
deleted file mode 100644
index a2a84f9f112d6f533f4468ed411c9da173b613b7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-right.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Review\Block\View" name="review_view"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml b/app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml
deleted file mode 100644
index dda634ca062661e6db5d0b51e7cf6ea7a7859753..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php $_items = $this->getReviewsCollection()->getItems();?>
-<div class="box-collateral box-reviews" id="customer-reviews">
-    <?php if (count($_items)):?>
-        <h2><?php echo __('Customer Reviews') ?></h2>
-        <?php echo $this->getChildHtml('toolbar') ?>
-        <dl>
-        <?php foreach ($_items as $_review):?>
-            <dt>
-                <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"><?php echo $this->escapeHtml($_review->getTitle()) ?></a> <?php echo __('Review by <span>%1</span>', $this->escapeHtml($_review->getNickname())) ?>
-            </dt>
-            <dd>
-                <?php $_votes = $_review->getRatingVotes(); ?>
-                <?php if (count($_votes)): ?>
-                <table class="ratings-table">
-                    <col width="1" />
-                    <col />
-                    <tbody>
-                        <?php foreach ($_votes as $_vote): ?>
-                        <tr>
-                            <th><?php echo $this->escapeHtml($_vote->getRatingCode()) ?></th>
-                            <td>
-                                <div class="rating-box">
-                                    <div class="rating" style="width:<?php echo $_vote->getPercent() ?>%;"></div>
-                                </div>
-                            </td>
-                        </tr>
-                        <?php endforeach; ?>
-                    </tbody>
-                </table>
-                <?php endif; ?>
-                <?php echo nl2br($this->escapeHtml($_review->getDetail())) ?>
-                <small class="date"><?php echo __('(Posted on %1)', $this->formatDate($_review->getCreatedAt())) ?></small>
-            </dd>
-        <?php endforeach; ?>
-        </dl>
-        <?php echo $this->getChildHtml('toolbar') ?>
-    <?php endif;?>
-    <?php echo $this->getChildHtml('review_form') ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Review/view.phtml b/app/design/frontend/magento_backup/Magento_Review/view.phtml
deleted file mode 100644
index 01fa89847fe57a01c153154ed315eef8f2c2b704..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Review/view.phtml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if($this->getProductData()->getId()): ?>
-<div class="product-review">
-    <div class="page-title">
-        <h1><?php echo __('Review Details') ?></h1>
-    </div>
-    <div class="product-img-box">
-        <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($this->getProductData()); ?>" height="125" width="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
-        <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
-             <p class="label"><?php echo __('Average Customer Rating') ?>:</p>
-             <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
-        <?php endif; ?>
-    </div>
-    <div class="product-details">
-        <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
-        <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
-            <h3><?php echo __('Product Rating:') ?></h3>
-            <table class="ratings-table">
-            <?php foreach ($this->getRating() as $_rating): ?>
-                <?php if($_rating->getPercent()): ?>
-                    <tr>
-                        <th><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></th>
-                        <td>
-                            <div class="rating-box">
-                                <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
-                            </div>
-                        </td>
-                    </tr>
-                <?php endif; ?>
-            <?php endforeach; ?>
-            </table>
-            </dl>
-        <?php endif; ?>
-        <dl>
-            <dt>
-                <?php echo __('Product Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
-            </dt>
-            <dd>
-                <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
-            </dd>
-        </dl>
-    </div>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Product Reviews') ?></a></p>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Rss/list.phtml b/app/design/frontend/magento_backup/Magento_Rss/list.phtml
deleted file mode 100644
index 9d5ffcb1ad8f87dadccecd3fc12382a9e1d7feec..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Rss/list.phtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-    $_categories = $this->getRssCatalogFeeds();
-    $_misc = $this->getRssMiscFeeds();
-?>
-<?php if ($_categories || $_misc): ?>
-<?php if($_misc): ?>
-<table class="data table rss">
-    <thead>
-        <tr>
-            <th colspan="2"><?php echo __('Miscellaneous Feeds') ?></th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php foreach ($_misc as $_feed): ?>
-        <tr>
-            <td><?php echo $_feed->getLabel() ?></td>
-            <td><a href="<?php echo $_feed->getUrl() ?>" class="link-rss"><?php echo __('Get Feed'); ?></a></td>
-        </tr>
-        <?php endforeach; ?>
-    </tbody>
-</table>
-<?php endif; ?>
-<?php if($_categories): ?>
-<table class="data table rss">
-    <thead>
-        <tr>
-            <th colspan="2"><?php echo __('Category Feeds') ?></th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php foreach ($_categories as $_category): ?>
-        <tr>
-            <td><?php echo $_category->getLabel() ?></td>
-            <td><a href="<?php echo $_category->getUrl() ?>" class="link-rss"><?php echo __('Get Feed'); ?></a></td>
-        </tr>
-        <?php endforeach; ?>
-    </tbody>
-</table>
-<?php endif; ?>
-<?php else: ?>
-    <p><?php echo __('There are no Rss Feeds.'); ?></p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml b/app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml
deleted file mode 100644
index 65ac7e0519d295ea5042ce223a67f35ab94fd673..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Billing\Agreement\View */ ?>
-<div class="page-title title-buttons">
-    <h1><?php echo __('Billing Agreement # %1', $this->escapeHtml($this->getReferenceId())) ?></h1>
-    <?php if ($this->getCanCancel()): ?>
-        <button type="button" title="<?php echo __('Cancel') ?>" class="button" onclick="if( confirm('<?php echo __('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo __('Cancel') ?></span></span></button>
-    <?php endif; ?>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="billing-agreements">
-    <div class="info-box">
-        <h2 class="box-title"><?php echo __('Agreement Information') ?></h2>
-        <div class="box-content">
-            <table class="info-table">
-                <tbody>
-                    <tr>
-                        <th><?php echo __('Reference ID:') ?></th>
-                        <td><?php echo $this->escapeHtml($this->getReferenceId()); ?></td>
-                    </tr>
-                    <tr>
-                        <th><?php echo __('Status:') ?></th>
-                        <td><?php echo $this->getAgreementStatus() ?></td>
-                    </tr>
-                    <tr>
-                        <th><?php echo __('Created:') ?></th>
-                        <td><?php echo $this->escapeHtml($this->getAgreementCreatedAt()) ?></td>
-                    </tr>
-                    <?php if($this->getAgreementUpdatedAt()): ?>
-                    <tr>
-                        <th><?php echo __('Updated:') ?></th>
-                        <td><?php echo $this->escapeHtml($this->getAgreementUpdatedAt()); ?></td>
-                    </tr>
-                    <?php endif; ?>
-                    <tr>
-                        <th><?php echo __('Payment Method:') ?></th>
-                        <td><?php echo $this->getPaymentMethodTitle() ?></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <?php $relatedOrders = $this->getRelatedOrders() ?>
-    <?php if(count($relatedOrders) > 0): ?>
-    <?php echo $this->getChildHtml('pager'); ?>
-    <h2 class="table-caption"><?php echo __('Related Orders') ?></h2>
-    <table class="data-table" id="related-orders-table">
-        <col width="1" />
-        <col width="1" />
-        <col />
-        <col width="1" />
-        <col width="1" />
-        <col width="1" />
-        <thead>
-            <tr>
-                <th><span class="nobr"><?php echo __('Order #') ?></span></th>
-                <th><?php echo __('Date') ?></th>
-                <th><?php echo __('Ship To') ?></th>
-                <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
-                <th><span class="nobr"><?php echo __('Order Status') ?></span></th>
-                <th>&nbsp;</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($relatedOrders as $order): ?>
-                <tr>
-                    <td><?php echo $this->getOrderItemValue($order, 'order_increment_id') ?></td>
-                    <td><span class="nobr"><?php echo $this->getOrderItemValue($order, 'created_at') ?></span></td>
-                    <td><?php echo $this->getOrderItemValue($order, 'shipping_address') ?></td>
-                    <td><?php echo $this->getOrderItemValue($order, 'order_total') ?></td>
-                    <td><em><?php echo $this->getOrderItemValue($order, 'status_label') ?></em></td>
-                    <td class="a-center">
-                        <span class="nobr">
-                            <a href="<?php echo $this->getOrderItemValue($order, 'view_url') ?>"><?php echo __('View Order') ?></a>
-                        </span>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <script type="text/javascript">(function($) {$('#related-orders-table').decorate('table')})(jQuery)</script>
-    <?php endif; ?>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Billing Agreements') ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml b/app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml
deleted file mode 100644
index 96eae811fce36d60ebb163d8a1280aacda7d3948..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Billing\Agreements */ ?>
-<div class="page-title">
-    <h1><?php echo __('Billing Agreements') ?></h1>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<div class="billing-agreements">
-    <?php $billingAgreements = $this->getBillingAgreements(); ?>
-    <?php if (count($billingAgreements) > 0): ?>
-        <?php echo $this->getChildHtml('pager'); ?>
-        <table id="billing-agreements" class="data-table">
-            <col />
-            <col width="1" />
-            <col />
-            <col />
-            <col />
-            <col width="1" />
-            <thead>
-                <tr>
-                    <th><span class="nobr"><?php echo __('Reference ID'); ?></span></th>
-                    <th><?php echo __('Status'); ?></th>
-                    <th><span class="nobr"><?php echo __('Created At'); ?></span></th>
-                    <th><span class="nobr"><?php echo __('Updated At'); ?></span></th>
-                    <th><span class="nobr"><?php echo __('Payment Method'); ?></span></th>
-                    <th>&nbsp;</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach($billingAgreements as $item): ?>
-                <tr>
-                    <td><span class="nobr"><?php echo $this->getItemValue($item, 'reference_id') ?></span></td>
-                    <td><?php echo $this->getItemValue($item, 'status') ?></td>
-                    <td><span class="nobr"><?php echo $this->getItemValue($item, 'created_at') ?></span></td>
-                    <td><span class="nobr"><?php echo $this->getItemValue($item, 'updated_at') ?></span></td>
-                    <td><?php echo $this->getItemValue($item, 'payment_method_label') ?></td>
-                    <td><a href="<?php echo $this->getItemValue($item, 'edit_url') ?>"><?php echo __('View') ?></a></td>
-                </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-        <script type="text/javascript">(function($) {$('#billing-agreements').decorate('table')})(jQuery)</script>
-    <?php else: ?>
-        <p><?php echo __('There are no billing agreements yet.')?></p>
-    <?php endif; ?>
-
-    <?php $paymentMethods = $this->getWizardPaymentMethodOptions() ?>
-    <?php if ($paymentMethods): ?>
-        <div class="info-box">
-            <h2 class="box-title"><?php echo __('New Billing Agreement') ?></h2>
-            <form action="<?php echo $this->getCreateUrl() ?>" method="post">
-                <div class="box-content">
-                    <p><?php echo __('You will be redirected to the payment system website.') ?></p>
-                    <ul class="form-list">
-                        <li>
-                            <select id="payment_method" name="payment_method">
-                                <option value=""><?php echo __('-- Please Select --') ?></option>
-                                <?php foreach ($paymentMethods as $code => $title): ?>
-                                    <option value="<?php echo $code ?>"><?php echo $title ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                            <button type="submit" class="button"><span><span><?php echo __('Create...') ?></span></span></button>
-                        </li>
-                    </ul>
-                </div>
-            </form>
-        </div>
-    <?php endif; ?>
-
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml
deleted file mode 100644
index 04b959d9046cbbc1369c68f4ea20f1cf9291ee35..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_creditmemo = $this->getCreditmemo() ?>
-<?php $_order      = $this->getOrder() ?>
-<?php if ($_creditmemo && $_order): ?>
-<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
-    <thead>
-        <tr>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
-            <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
-            <th align="right" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Subtotal') ?></th>
-        </tr>
-    </thead>
-
-    <?php $i=0; foreach ($_creditmemo->getAllItems() as $_item): ?>
-    <?php if($_item->getOrderItem()->getParentItem()) continue; else $i++; ?>
-    <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-
-    <tfoot>
-        <?php echo $this->getChildHtml('creditmemo_totals');?>
-    </tfoot>
-</table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml
deleted file mode 100644
index 7d52410527839007d4bcd70e6e450a90189925d7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_invoice = $this->getInvoice() ?>
-<?php $_order   = $this->getOrder() ?>
-<?php if ($_invoice && $_order): ?>
-<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
-    <thead>
-        <tr>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
-            <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
-            <th align="right" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Subtotal') ?></th>
-        </tr>
-    </thead>
-
-    <?php $i=0; foreach ($_invoice->getAllItems() as $_item): ?>
-    <?php if($_item->getOrderItem()->getParentItem()) continue; else $i++; ?>
-    <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-
-    <tfoot>
-        <?php echo $this->getChildHtml('invoice_totals')?>
-    </tfoot>
-</table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items.phtml
deleted file mode 100644
index a065eb81f288dda37e3ca5209ea6d4b1c5b8a4e4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items.phtml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<?php if ($_order): ?>
-<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
-    <thead>
-        <tr>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
-            <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
-            <th align="right" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Subtotal') ?></th>
-        </tr>
-    </thead>
-
-    <?php $i=0; foreach ($_order->getAllItems() as $_item): ?>
-    <?php if($_item->getParentItem()) continue; else $i++; ?>
-    <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-
-    <tbody>
-        <?php echo $this->getChildHtml('order_totals') ?>
-    </tbody>
-</table>
-<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAvailable('order', $_order, $_order->getStore()) && $_order->getGiftMessageId()): ?>
-    <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId()); ?>
-    <?php if ($_giftMessage): ?>
-<br />
-<table cellspacing="0" cellpadding="0" border="0" width="100%" style="border:1px solid #EAEAEA;">
-    <thead>
-        <tr>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><strong><?php echo __('Gift Message for this Order') ?></strong></th>
-        </tr>
-    </thead>
-
-    <tbody>
-
-        <tr>
-            <td colspan="4" align="left" style="padding:3px 9px">
-            <strong><?php echo __('From:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
-            <br /><strong><?php echo __('To:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
-            <br /><strong><?php echo __('Message:'); ?></strong><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
-            </td>
-        </tr>
-    </tbody>
-</table>
-    <?php endif; ?>
-<?php endif; ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml
deleted file mode 100644
index 9830ad8e2b0e21306e1bfb85a78d3f3b73b4ac08..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrder(); ?>
-<tr>
-    <td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($this->getItemOptions()): ?>
-        <dl style="margin:0; padding:0;">
-            <?php foreach ($this->getItemOptions() as $option): ?>
-            <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
-            <dd style="margin:0; padding:0 0 0 9px;"><?php echo nl2br($option['value']) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-    </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
-    <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
-    <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
-                <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-                <br />
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <br />
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
-
-
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-                <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-            <?php endif; ?>
-            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
-                    <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-                <?php else: ?>
-                    <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-                <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-                <br />
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml
deleted file mode 100644
index 9830ad8e2b0e21306e1bfb85a78d3f3b73b4ac08..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrder(); ?>
-<tr>
-    <td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($this->getItemOptions()): ?>
-        <dl style="margin:0; padding:0;">
-            <?php foreach ($this->getItemOptions() as $option): ?>
-            <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
-            <dd style="margin:0; padding:0 0 0 9px;"><?php echo nl2br($option['value']) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-    </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
-    <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
-    <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
-                <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-                <br />
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <br />
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
-
-
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-                <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-            <?php endif; ?>
-            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
-                    <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-                <?php else: ?>
-                    <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-                <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-                <br />
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml
deleted file mode 100644
index e756d28ce81e831fc32e672f432f38ac5ddc0f4a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Sales\Block\Order\Email\Items_Order_Default */
-
-/** @var $_item \Magento\Sales\Model\Order\Item */
-$_item = $this->getItem();
-$_order = $_item->getOrder();
-?>
-<tr>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($this->getItemOptions()): ?>
-        <dl style="margin:0; padding:0;">
-            <?php foreach ($this->getItemOptions() as $option): ?>
-            <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
-            <dd style="margin:0; padding:0 0 0 9px;">
-                <?php echo nl2br($option['value']) ?>
-            </dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item)->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-    </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
-    <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQtyOrdered()*1 ?></td>
-    <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-                <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
-                <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-                <br />
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <br />
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
-
-
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
-                <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-            <?php endif; ?>
-            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
-                    <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-                <?php else: ?>
-                    <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-                <?php endif; ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-                <br />
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-</tr>
-<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
-<tr>
-    <td colspan="4" style=" border-bottom:2px solid #CCCCCC; padding:3px 9px;">
-        <strong style="color:#444444; font-size:11px;"><?php echo __('Gift Message') ?></strong>
-        <?php echo __('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?><br />
-        <?php echo __('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?><br />
-        <strong><?php echo __('Message:'); ?></strong><br /><?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
-    </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml
deleted file mode 100644
index 976391afcf976598f43ecca222fe5d2be012722a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem() ?>
-<tr>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px;">
-        <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($this->getItemOptions()): ?>
-        <dl style="margin:0; padding:0;">
-            <?php foreach ($this->getItemOptions() as $option): ?>
-            <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
-            <dd style="margin:0; padding:0 0 0 9px;"><?php echo nl2br($option['value']) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-    </td>
-    <td align="left" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
-    <td align="center" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $_item->getQty()*1 ?></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml
deleted file mode 100644
index cd07aee2258d5bba636ae326ea7fe51146456a83..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_shipment = $this->getShipment() ?>
-<?php $_order    = $this->getOrder() ?>
-<?php if ($_shipment && $_order): ?>
-<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
-    <thead>
-        <tr>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
-            <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
-        </tr>
-    </thead>
-
-    <?php $i=0; foreach ($_shipment->getAllItems() as $_item): ?>
-    <?php if($_item->getOrderItem()->getParentItem()) continue; else $i++; ?>
-    <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-
-</table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml
deleted file mode 100644
index f27a6fa3aff2287bef2820a73b9aa3d805110979..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_shipment=$this->getShipment() ?>
-<?php $_order=$this->getOrder() ?>
-<?php if ($_shipment && $_order && $_shipment->getAllTracks()): ?>
-<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
-    <thead>
-        <tr>
-            <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Shipped By') ?></th>
-            <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Tracking Number') ?></th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php $i=0; foreach ($_shipment->getAllTracks() as $_item): $i++ ?>
-        <tr <?php echo $i%2?'bgcolor="#F6F6F6"':'' ?>>
-            <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getTitle()) ?></td>
-            <td align="center" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getNumber()) ?></td>
-        </tr>
-    <?php endforeach ?>
-    </tbody>
-</table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/gift-message.js b/app/design/frontend/magento_backup/Magento_Sales/gift-message.js
deleted file mode 100644
index 9c464b246d1674436344e190b816be7ec7f3cdf7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/gift-message.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    gift message
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.giftMessage', {
-        options: {
-            rowPrefix: '#order-item-row-', // Selector prefix for item's row in the table.
-            linkPrefix: '#order-item-gift-message-link-', // Selector prefix for the 'Gift Message' link.
-            duration: 100, // Toggle duration.
-            expandedClass: 'expanded', // Class added/removed to/from the 'Gift Message' link.
-            lastClass: 'last' // Class added/removed to/from the last item's row in the products table.
-        },
-
-        /**
-         * Bind a click handler on the widget's element to toggle the gift message.
-         * @private
-         */
-        _create: function() {
-            this.element.on('click', $.proxy(this._toggleGiftMessage, this));
-        },
-
-        /**
-         * Toggle the display of the item's corresponding gift message.
-         * @private
-         * @param event - {Object} - Click event.
-         */
-        _toggleGiftMessage: function(event) {
-            var element = $(event.target), // Click target. The 'Gift Message' link or 'Close' button.
-                options = this.options, // Cached widget options.
-                itemId = element.data('item-id'), // The individual item's numeric id.
-                link = $(options.linkPrefix + itemId), // The 'Gift Message' expandable link.
-                row = $(options.rowPrefix + itemId), // The item's row in the products table.
-                region = $('#' + element.attr('aria-controls')); // The gift message container region.
-            region.toggle(options.duration, function() {
-                if (region.attr('aria-expanded') === "true") {
-                    region.attr('aria-expanded', "false");
-                    if (region.hasClass(options.lastClass)) {
-                        row.addClass(options.lastClass);
-                    }
-                } else {
-                    region.attr('aria-expanded', "true");
-                    if (region.hasClass(options.lastClass)) {
-                        row.removeClass(options.lastClass);
-                    }
-                }
-                link.toggleClass(options.expandedClass);
-            });
-            event.preventDefault(); // Prevent event propagation and avoid going to the link's href.
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml b/app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml
deleted file mode 100644
index 95208cfcebaf223ae351a024ea36ac3958017688..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     default_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
-    <h1><?php echo __('Orders and Returns') ?></h1>
-</div>
-<form id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
-    <div class="fieldset">
-        <h2 class="legend"><?php echo __('Order Information') ?></h2>
-        <ul class="form-list">
-            <li class="fields">
-                <div class="field">
-                    <label for="oar-order-id" class="required"><em>*</em><?php echo __('Order ID') ?></label>
-                    <div class="input-box">
-                        <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" data-validate="{required:true}"/>
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="oar-billing-lastname" class="required"><em>*</em><?php echo __('Billing Last Name') ?></label>
-                    <div class="input-box">
-                        <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname" data-validate="{required:true}"/>
-                    </div>
-                </div>
-            </li>
-            <li class="fields">
-                <div class="field">
-                    <label for="quick-search-type-id" class="required"><em>*</em><?php echo __('Find Order By:') ?></label>
-                    <div class="input-box">
-                        <select name="oar_type" id="quick-search-type-id" class="select">
-                           <option value="email"><?php echo __('Email Address'); ?></option>
-                           <option value="zip"><?php echo __('ZIP Code'); ?></option>
-                        </select>
-                    </div>
-                </div>
-                <div id="oar-email" class="field">
-                    <label for="oar_email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
-                    <div class="input-box">
-                        <input type="text" class="input-text" id="oar_email" name="oar_email" data-validate="{required:true, 'validate-email':true}"/>
-                    </div>
-                </div>
-                <div id="oar-zip" class="field">
-                    <label for="oar_zip" class="required"><em>*</em><?php echo __('Billing ZIP Code') ?></label>
-                    <div class="input-box">
-                        <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
-                    </div>
-                </div>
-            </li>
-       </ul>
-    </div>
-    <div class="buttons-set form-buttons">
-        <button type="submit" title="<?php echo __('Continue') ?>" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function() {
-            jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
-    });
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml
deleted file mode 100644
index 4a86287bbdf6af1eb4ba29fa5a8e0848c045948e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <remove name="sale.reorder.sidebar"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml
deleted file mode 100644
index 75eef0fe59645b5d25d201e1a4291395d8e89f4c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="customer_account_navigation">
-        <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-billing-agreements-link">
-            <arguments>
-                <argument name="path" xsi:type="string">sales/billing_agreement</argument>
-                <argument name="label" xsi:type="string">Billing Agreements</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-orders-link">
-            <arguments>
-                <argument name="path" xsi:type="string">sales/order/history</argument>
-                <argument name="label" xsi:type="string">My Orders</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-recurring-profiles-link">
-            <arguments>
-                <argument name="path" xsi:type="string">sales/recurring_profile</argument>
-                <argument name="label" xsi:type="string">Recurring Profiles</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <referenceContainer name="left">
-        <block class="Magento\Sales\Block\Reorder\Sidebar" name="sale.reorder.sidebar" as="reorder" template="reorder/sidebar.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml
deleted file mode 100644
index 086f470878203344fa6adc213305bea7ef02949d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-left.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Billing\Agreements" name="customer.account.billing.agreement" template="billing/agreements.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml
deleted file mode 100644
index 0b65274f462afb2c74ad1c6c758c6117961ea0c1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-left.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Billing\Agreement\View" name="customer.account.billing.agreement" template="billing/agreement/view.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml
deleted file mode 100644
index 7ea035f98dab8cd75f5f710878d945587450c48a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Creditmemo Items List" design_abstraction="custom">
-    <block class="Magento\Sales\Block\Order\Email\Creditmemo\Items" name="items" template="email/creditmemo/items.phtml">
-        <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/creditmemo/default.phtml"/>
-        <block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/creditmemo/default.phtml"/>
-        <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
-            <action method="setLabelProperties">
-                <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
-            </action>
-            <action method="setValueProperties">
-                <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
-            </action>
-            <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-        </block>
-    </block>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml
deleted file mode 100644
index 4e00ef875dcb99e4a97094bd9aee2a0001aa5a0c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Invoice Items List" design_abstraction="custom">
-    <block class="Magento\Sales\Block\Order\Email\Invoice\Items" name="items" template="email/invoice/items.phtml">
-        <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/invoice/default.phtml"/>
-        <block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/invoice/default.phtml"/>
-        <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
-            <action method="setLabelProperties">
-                <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
-            </action>
-            <action method="setValueProperties">
-                <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
-            </action>
-            <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-        </block>
-    </block>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml
deleted file mode 100644
index af7fc72ac5426984214a3badbe5d8e3f23b1fa7a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Order Items List" design_abstraction="custom">
-    <block class="Magento\Sales\Block\Order\Email\Items" name="items" template="email/items.phtml">
-        <block class="Magento\Sales\Block\Order\Email\Items\Order\DefaultOrder" as="default" template="email/items/order/default.phtml"/>
-        <block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/order/default.phtml"/>
-        <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
-            <action method="setLabelProperties">
-                <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
-            </action>
-            <action method="setValueProperties">
-                <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
-            </action>
-            <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml">
-                <action method="setIsPlaneMode">
-                    <argument name="value" xsi:type="string">1</argument>
-                </action>
-            </block>
-        </block>
-    </block>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml
deleted file mode 100644
index 4832ea1604f857e4fe6584e04b6b73fb8d2595b3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Shipment Items List" design_abstraction="custom">
-    <block class="Magento\Sales\Block\Order\Email\Shipment\Items" name="items" template="email/shipment/items.phtml">
-        <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/shipment/default.phtml"/>
-    </block>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml
deleted file mode 100644
index c50c9379fff5c396d5d9080690264124566bc2da..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\Creditmemo" name="sales.order.creditmemo" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Creditmemo\Items" name="creditmemo_items" template="order/creditmemo/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
-                    <action method="setLabelProperties">
-                        <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
-                    </action>
-                    <action method="setValueProperties">
-                        <argument name="value" xsi:type="string">class="a-right"</argument>
-                    </action>
-                    <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-                </block>
-                <block class="Magento\Sales\Block\Order\Comments" name="creditmemo_comments" template="order/comments.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_guest_info_links"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml
deleted file mode 100644
index 8d41209b1003eddd40f92d0873436fd6e5bd4767..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Widget\Guest\Form" name="guest.form" template="guest/form.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml
deleted file mode 100644
index e4ccd347f3281d959c79ede56480ad6a3df54f19..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\Invoice" name="sales.order.invoice" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Invoice\Items" name="invoice_items" template="order/invoice/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
-                    <action method="setLabelProperties">
-                        <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
-                    </action>
-                    <action method="setValueProperties">
-                        <argument name="value" xsi:type="string">class="last a-right"</argument>
-                    </action>
-                    <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-                </block>
-                <block class="Magento\Sales\Block\Order\Comments" name="invoice_comments" template="order/comments.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_guest_info_links"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_print.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_print.xml
deleted file mode 100644
index d7fc7d72bf8497d9eab7ede58b2a9104484d9b0d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_print.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="order/print.phtml">
-            <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
-                <action method="setLabelProperties">
-                    <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
-                </action>
-                <action method="setValueProperties">
-                    <argument name="value" xsi:type="string">class="last a-right"</argument>
-                </action>
-                <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml">
-                    <action method="setIsPlaneMode">
-                        <argument name="value" xsi:type="string">1</argument>
-                    </action>
-                </block>
-            </block>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml
deleted file mode 100644
index b5ec83caafc810cdedd1b1b550ea4a7f06b99fc0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\PrintOrder\Creditmemo" name="sales.order.print.creditmemo" template="order/print/creditmemo.phtml">
-            <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
-                <action method="setLabelProperties">
-                    <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
-                </action>
-                <action method="setValueProperties">
-                    <argument name="value" xsi:type="string">class="a-right"</argument>
-                </action>
-                <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printinvoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printinvoice.xml
deleted file mode 100644
index 66526bbbd786e77bfd0830bc5eb1e716e43fb7b1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printinvoice.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="sales.order.print.invoice" template="order/print/invoice.phtml">
-            <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
-                <action method="setLabelProperties">
-                    <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
-                </action>
-                <action method="setValueProperties">
-                    <argument name="value" xsi:type="string">class="last a-right"</argument>
-                </action>
-                <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml
deleted file mode 100644
index 89fe6aa71f0b8893a8717617a266352c5ea6accd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml">
-            <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml
deleted file mode 100644
index fb11d85006ebd504dfe6bd4105d07cc86de01bd1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\View" name="sales.order.view"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml
deleted file mode 100644
index 0fb69339a3ed25a15537ff617c651626fb90e229..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\Shipment" name="sales.order.shipment" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Shipment\Items" name="shipment_items" template="order/shipment/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Comments" name="shipment_comments" template="order/comments.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_guest_info_links"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
deleted file mode 100644
index 1b244284c3b745a5a957563fc446834cdf83bd8e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\View" name="sales.order.view" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Items" name="order_items" template="order/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
-                    <action method="setLabelProperties">
-                        <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
-                    </action>
-                    <action method="setValueProperties">
-                        <argument name="value" xsi:type="string">class="last a-right"</argument>
-                    </action>
-                    <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-                </block>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_guest_info_links"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
deleted file mode 100644
index 33570010113211f035655fe5c9aa01b87ea89f03..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\Creditmemo" name="sales.order.creditmemo" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Creditmemo\Items" name="creditmemo_items" template="order/creditmemo/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
-                    <action method="setLabelProperties">
-                        <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
-                    </action>
-                    <action method="setValueProperties">
-                        <argument name="value" xsi:type="string">class="a-right"</argument>
-                    </action>
-                    <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-                </block>
-                <block class="Magento\Sales\Block\Order\Comments" name="creditmemo_comments" template="order/comments.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_info_links"/>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml
deleted file mode 100644
index d01be782ea8cfcda5cfaab1aa23c81850ea0138a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="sales.order.info">
-        <block class="Magento\Page\Block\Links" as="links" name="sales.order.info.links">
-            <block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.billing-agreements">
-                <arguments>
-                    <argument name="path" xsi:type="string">sales/guest/view</argument>
-                    <argument name="label" xsi:type="string">Order Information</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.invoice">
-                <arguments>
-                    <argument name="key" xsi:type="string">Invoices</argument>
-                    <argument name="path" xsi:type="string">sales/guest/invoice</argument>
-                    <argument name="label" xsi:type="string">Invoices</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.shipment">
-                <arguments>
-                    <argument name="key" xsi:type="string">Shipments</argument>
-                    <argument name="path" xsi:type="string">sales/guest/shipment</argument>
-                    <argument name="label" xsi:type="string">Order Shipments</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.creditmemo">
-                <arguments>
-                    <argument name="key" xsi:type="string">Creditmemos</argument>
-                    <argument name="path" xsi:type="string">sales/guest/creditmemo</argument>
-                    <argument name="label" xsi:type="string">Refunds</argument>
-                </arguments>
-            </block>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml
deleted file mode 100644
index 7cef22b6c457f6e78d480a0270be89b8b875f38c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Order\History" name="sales.order.history">
-            <container name="sales.order.history.info" as="info" label="Order History Info"/>
-        </block>
-        <block class="Magento\Customer\Block\Account\Dashboard" name="customer.account.link.back" template="account/link/back.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
deleted file mode 100644
index cdac844a115cd9603c2f8ce723003241f58ef770..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\Invoice" name="sales.order.invoice" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Invoice\Items" name="invoice_items" template="order/invoice/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
-                    <action method="setLabelProperties">
-                        <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
-                    </action>
-                    <action method="setValueProperties">
-                        <argument name="value" xsi:type="string">class="last a-right"</argument>
-                    </action>
-                    <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-                </block>
-                <block class="Magento\Sales\Block\Order\Comments" name="invoice_comments" template="order/comments.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_info_links"/>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printcreditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printcreditmemo.xml
deleted file mode 100644
index 4621652be32ad439a569a18035680a6fc8cf5b83..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printcreditmemo.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\PrintOrder\Creditmemo" name="sales.order.print.creditmemo" template="order/print/creditmemo.phtml">
-            <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
-                <action method="setLabelProperties">
-                    <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
-                </action>
-                <action method="setValueProperties">
-                    <argument name="value" xsi:type="string">class="a-right"</argument>
-                </action>
-                <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml
deleted file mode 100644
index f6b60f60528790da927697886668781885c96f78..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="sales.order.print.invoice" template="order/print/invoice.phtml">
-            <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
-            <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
-                <action method="setLabelProperties">
-                    <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
-                </action>
-                <action method="setValueProperties">
-                    <argument name="value" xsi:type="string">class="last a-right"</argument>
-                </action>
-                <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml
deleted file mode 100644
index 4804aed2ab7a308241a26499eb675219d026176d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml">
-            <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
-        </block>
-    </referenceContainer>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
deleted file mode 100644
index e3d20d51e694cc2bb4572a29737a4f3687f0dfe0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\Shipment" name="sales.order.shipment" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Shipment\Items" name="shipment_items" template="order/shipment/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Comments" name="shipment_comments" template="order/comments.phtml"/>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_info_links"/>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
deleted file mode 100644
index aa583d3e525b87557d5e995ba45eb41645d65a1e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
-        </block>
-        <block class="Magento\Sales\Block\Order\View" name="sales.order.view" after="sales.order.info">
-            <block class="Magento\Sales\Block\Order\Items" name="order_items" template="order/items.phtml">
-                <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
-                <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
-                    <action method="setLabelProperties">
-                        <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
-                    </action>
-                    <action method="setValueProperties">
-                        <argument name="value" xsi:type="string">class="last a-right"</argument>
-                    </action>
-                    <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
-                </block>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="sales_order_info_links"/>
-    <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml
deleted file mode 100644
index fa41d0ee6117062f1a8a849a4032b264fc3698c2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-left.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Recurring\Profiles" name="sales.recurring.profiles" template="recurring/profiles.phtml">
-            <block class="Magento\Sales\Block\Recurring\Profile\Grid" name="sales.recurring.profiles.grid" as="grid" template="recurring/grid.phtml">
-                <action method="setEmptyGridMessage">
-                    <argument translate="true" name="value" xsi:type="string">There are no recurring profiles yet.</argument>
-                </action>
-                <action method="setGridHtmlId">
-                    <argument name="value" xsi:type="string">recurring_profile_list_view</argument>
-                </action>
-            </block>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml
deleted file mode 100644
index 2b51b67e6a33e165809cf5301bddf88faa401078..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <update handle="sales_recurring_profile_view__tabs"/>
-    <referenceBlock name="sales.recurring.profile.view.tab.orders">
-        <action method="setIsViewCurrent">
-            <argument name="v" xsi:type="string">1</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="sales.recurring.profile.view">
-        <block class="Magento\Sales\Block\Recurring\Profile\Related\Orders\Grid" name="sales.recurring.profile.view.orders" as="table" template="recurring/grid.phtml">
-            <action method="setViewLabel">
-                <argument translate="true" name="value" xsi:type="string">Orders Based on This Profile</argument>
-            </action>
-            <action method="setEmptyGridMessage">
-                <argument translate="true" name="value" xsi:type="string">There are no orders yet.</argument>
-            </action>
-            <action method="setGridHtmlClass">
-                <argument name="value" xsi:type="string">info-box</argument>
-            </action>
-            <action method="setGridHtmlCss">
-                <argument name="value" xsi:type="string">border:0</argument>
-            </action>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml
deleted file mode 100644
index d9775f02ef3a5593595e72288092fa0e8400dbd7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <update handle="sales_recurring_profile_view__tabs"/>
-    <referenceBlock name="sales.recurring.profile.view.tab.profile">
-        <action method="setIsViewCurrent">
-            <argument name="v" xsi:type="string">1</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="sales.recurring.profile.view">
-        <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.general" as="general" template="recurring/profile/view/info.phtml" group="info_blocks_row_1">
-            <action method="setViewColumn">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-            <action method="setViewLabel">
-                <argument translate="true" name="value" xsi:type="string">Reference</argument>
-            </action>
-        </block>
-        <block class="Magento\Sales\Block\Recurring\Profile\View\Item" name="sales.recurring.profile.view.item" as="item" template="recurring/profile/view/info.phtml" group="info_blocks_row_1">
-            <action method="setViewColumn">
-                <argument name="value" xsi:type="string">2</argument>
-            </action>
-            <action method="setViewLabel">
-                <argument translate="true" name="value" xsi:type="string">Purchased Item</argument>
-            </action>
-        </block>
-        <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.schedule" as="profile" template="recurring/profile/view/info.phtml" group="info_blocks_row_2">
-            <action method="setViewColumn">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-            <action method="setViewLabel">
-                <argument translate="true" name="value" xsi:type="string">Profile Schedule</argument>
-            </action>
-        </block>
-        <block class="Magento\Sales\Block\Recurring\Profile\View\Fees" name="sales.recurring.profile.view.fees" as="fees" template="recurring/profile/view/info.phtml" group="info_blocks_row_2">
-            <action method="setViewColumn">
-                <argument name="value" xsi:type="string">2</argument>
-            </action>
-            <action method="setViewLabel">
-                <argument translate="true" name="value" xsi:type="string">Profile Payments</argument>
-            </action>
-        </block>
-        <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.billing" as="billing_address" template="recurring/profile/view/info.phtml" group="info_blocks_row_3">
-            <action method="setViewColumn">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-            <action method="setViewLabel">
-                <argument translate="true" name="value" xsi:type="string">Billing Address</argument>
-            </action>
-        </block>
-        <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.shipping" as="shipping_address" template="recurring/profile/view/info.phtml" group="info_blocks_row_3">
-            <action method="setAddressType">
-                <argument name="value" xsi:type="string">shipping</argument>
-            </action>
-            <action method="setViewColumn">
-                <argument name="value" xsi:type="string">2</argument>
-            </action>
-            <action method="setViewLabel">
-                <argument translate="true" name="value" xsi:type="string">Shipping Address</argument>
-            </action>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml
deleted file mode 100644
index dae17f6f570b2302453e85fc7400f619c441f922..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-left.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Sales\Block\Recurring\Profile\View\Data" name="sales.recurring.profile.view" template="recurring/profile/view.phtml">
-            <action method="setShouldPrepareInfoTabs">
-                <argument name="value" xsi:type="string">1</argument>
-            </action>
-            <block class="Magento\View\Block\Text" as="profile_info" name="sales.recurring.profile.view.tab.profile" group="info_tabs">
-                <action method="setViewLabel">
-                    <argument translate="true" name="value" xsi:type="string">Profile Information</argument>
-                </action>
-                <action method="setViewAction">
-                    <argument name="value" xsi:type="string">view</argument>
-                </action>
-            </block>
-            <!-- not implemented
-            <block class="Magento\View\Block\Text" as="history" name="sales.recurring.profile.view.tab.history">
-                <action method="addToParentGroup">
-                    <argument name="value" xsi:type="string">info_tabs</argument>
-                </action>
-                <action method="setViewLabel" translate="value">
-                    <argument name="value" xsi:type="string">History</argument>
-                </action>
-                <action method="setViewAction">
-                    <argument name="value" xsi:type="string">history</argument>
-                </action>
-            </block>
-            -->
-            <block class="Magento\View\Block\Text" as="related_orders" name="sales.recurring.profile.view.tab.orders" group="info_tabs">
-                <action method="setViewLabel">
-                    <argument translate="true" name="value" xsi:type="string">Related Orders</argument>
-                </action>
-                <action method="setViewAction">
-                    <argument name="value" xsi:type="string">orders</argument>
-                </action>
-            </block>
-            <!-- not implemented
-            <block class="Magento\View\Block\Text" as="vendor_info" name="sales.recurring.profile.view.tab.vendor">
-                <action method="addToParentGroup">
-                    <argument name="value" xsi:type="string">info_tabs</argument>
-                </action>
-                <action method="setViewLabel" translate="value">
-                    <argument name="value" xsi:type="string">Gateway Information</argument>
-                </action>
-                <action method="setViewAction">
-                    <argument name="value" xsi:type="string">vendor</argument>
-                </action>
-            </block>
-            -->
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
deleted file mode 100644
index fcf34f53ce6ce50906b2c2db7211d770ff933147..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @var $this \Magento\Sales\Block\Order\Comments
- * @see \Magento\Sales\Block\Order\Comments
- */
-?>
-<?php if ($this->hasComments()):?>
-    <div class="order-additional order-comments">
-        <h2 class="sub-title"><?php echo $this->getTitle() ?></h2>
-        <dl class="order-about">
-            <?php foreach ($this->getComments() as $_commentItem): ?>
-                <dt><?php echo $this->formatDate($_commentItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
-                <dd><?php echo $this->escapeHtml($_commentItem->getComment()) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-    </div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
deleted file mode 100644
index 3b8c8c263ad2078d69278a4c1f478f71150d8dd6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="order-items order-details">
-    <?php echo $this->getChildHtml('creditmemo_items') ?>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->getBackTitle() ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml
deleted file mode 100644
index 004e32fa503aeb8dd0b2773a9172a6e0148b5087..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<p class="order-links"><a href="<?php echo $this->getPrintAllCreditmemosUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Refunds') ?></a></p>
-<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
-<h2 class="sub-title"><?php echo __('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintCreditmemoUrl($_creditmemo) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Refund') ?></a></h2>
-<h3 class="table-caption"><?php echo __('Items Refunded') ?></h3>
-<table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <thead>
-        <tr>
-            <th><?php echo __('Product Name') ?></th>
-            <th><?php echo __('SKU') ?></th>
-            <th class="a-right"><?php echo __('Price') ?></th>
-            <th class="a-center"><?php echo __('Qty') ?></th>
-            <th class="a-right"><?php echo __('Subtotal') ?></th>
-            <th class="a-center wrap"><?php echo __('Discount Amount') ?></th>
-            <th class="a-right wrap"><?php echo __('Row Total') ?></th>
-        </tr>
-    </thead>
-    <tfoot>
-       <?php echo $this->getTotalsHtml($_creditmemo);?>
-    </tfoot>
-    <?php $_items = $_creditmemo->getAllItems(); ?>
-    <?php $_count = count($_items) ?>
-    <?php foreach ($_items as $_item): ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
-    <tbody>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-</table>
-<script type="text/javascript">(function($) {$('#my-refund-table-<?php echo $_creditmemo->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<?php echo $this->getCommentsHtml($_creditmemo)?>
-<?php endforeach; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
deleted file mode 100644
index d771a7efa8bad4dca336238e43cf09d46fc43eeb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-
-
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-    <td class="last a-right">
-        <?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/history.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/history.phtml
deleted file mode 100644
index 125c387f26f4c2d94c94cdda413d0471775ad49e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/history.phtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php $_orders = $this->getOrders(); ?>
-<div class="page-title">
-    <h1><?php echo __('My Orders') ?></h1>
-</div>
-<?php echo $this->getPagerHtml(); ?>
-<?php if($_orders->getSize()): ?>
-<table class="data-table" id="my-orders-table">
-    <col width="1" />
-    <col width="1" />
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <thead>
-        <tr>
-            <th><?php echo __('Order #') ?></th>
-            <th><?php echo __('Date') ?></th>
-            <th><?php echo __('Ship To') ?></th>
-            <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
-            <th><span class="nobr"><?php echo __('Order Status') ?></span></th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php $_odd = ''; ?>
-        <?php foreach ($_orders as $_order): ?>
-        <tr>
-            <td><?php echo $_order->getRealOrderId() ?></td>
-            <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
-            <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
-            <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
-            <td><em><?php echo $_order->getStatusLabel() ?></em></td>
-            <td class="a-center">
-                <span class="nobr"><a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo __('View Order') ?></a>
-                    <?php /*<span class="separator">|</span><a href="<?php echo $this->getTrackUrl($_order) ?>"><?php echo __('Track Order') ?></a>&nbsp;*/ ?>
-                    <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
-                    <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
-                <?php endif ?>
-                </span>
-            </td>
-        </tr>
-        <?php endforeach; ?>
-    </tbody>
-</table>
-<script type="text/javascript">(function($) {$('#my-orders-table').decorate('table')})(jQuery)</script>
-<?php echo $this->getPagerHtml(); ?>
-<?php else: ?>
-    <p><?php echo __('You have placed no orders.'); ?></p>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/info.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/info.phtml
deleted file mode 100644
index 46a06098ebdc007dd8bdc00902c6bd684e28b384..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/info.phtml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Sales\Block\Order\Info */ ?>
-<?php $_order = $this->getOrder() ?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="page-title title-buttons">
-    <h1><?php echo __('Order #%1 - %2', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
-    <?php echo $this->getChildHtml('buttons') ?>
-</div>
-<?php echo $this->getStatusHistoryRssUrl($_order) ?>
-<dl class="order-info">
-    <dt><?php echo __('About This Order:') ?></dt>
-    <dd>
-        <?php echo $this->getChildHtml('links') ?>
-        <script type="text/javascript">(function($) {$('#order-info-tabs').find('li').decorate('generic', ['first','last'])})(jQuery)</script>
-    </dd>
-</dl>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-<?php if (!$_order->getIsVirtual()): ?>
-<div class="col2-set order-info-box">
-    <div class="col-1">
-        <div class="box">
-            <div class="box-title">
-                <h2><?php echo __('Shipping Address') ?></h2>
-            </div>
-            <div class="box-content">
-                <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
-            </div>
-        </div>
-    </div>
-    <div class="col-2">
-        <div class="box">
-            <div class="box-title">
-                <h2><?php echo __('Shipping Method') ?></h2>
-            </div>
-            <div class="box-content">
-                <?php if ($_order->getShippingDescription()): ?>
-                    <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
-                <?php else: ?>
-                    <p><?php echo __('No shipping information available'); ?></p>
-                <?php endif; ?>
-            </div>
-        </div>
-    </div>
-</div>
-<?php endif; ?>
-<div class="col2-set order-info-box">
-    <div class="col-1">
-        <div class="box">
-            <div class="box-title">
-                <h2><?php echo __('Billing Address') ?></h2>
-            </div>
-            <div class="box-content">
-                <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
-            </div>
-        </div>
-    </div>
-    <div class="col-2">
-        <div class="box box-payment">
-            <div class="box-title">
-                <h2><?php echo __('Payment Method') ?></h2>
-            </div>
-            <div class="box-content">
-                <?php echo $this->getPaymentInfoHtml() ?>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml
deleted file mode 100644
index da314fcbd1b8cbfdf38349a1ecb4188ffac29c3b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php  $_order = $this->getOrder() ?>
-<?php if($this->helper('Magento\Rss\Helper\Order')->isStatusNotificationAllow()): ?>
-    <a href="<?php echo $this->helper('Magento\Rss\Helper\Order')->getStatusHistoryRssUrl($_order) ?>" class="link-rss f-none"><?php echo __('Subscribe to Order Status') ?></a>
-    <span class="separator">|</span>
-<?php endif; ?>
-<?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
-    <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
-    <span class="separator">|</span>
-<?php endif ?>
-<a href="<?php echo $this->getPrintUrl($_order) ?>" class="link-print" onclick="this.target='_blank';"><?php echo __('Print Order') ?></a>
-<?php echo $this->getChildHtml(); ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
deleted file mode 100644
index bef92be00544010f10cb7712dcba6fd2887b5aa9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="order-items order-details">
-    <?php echo $this->getChildHtml('invoice_items') ?>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->getBackTitle() ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
deleted file mode 100644
index dc4c5000e8926e04f8d8c17f3d0632681e4d6c6f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php  $_order = $this->getOrder() ?>
-<p class="order-links"><a href="<?php echo $this->getPrintAllInvoicesUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Invoices') ?></a></p>
-<?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
-<h2 class="sub-title"><?php echo __('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintInvoiceUrl($_invoice) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Invoice') ?></a></h2>
-<h3 class="table-caption"><?php echo __('Items Invoiced') ?></h3>
-<table class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <thead>
-        <tr>
-            <th><?php echo __('Product Name') ?></th>
-            <th><?php echo __('SKU') ?></th>
-            <th class="a-right"><?php echo __('Price') ?></th>
-            <th class="a-center"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
-            <th class="a-right"><?php echo __('Subtotal') ?></th>
-        </tr>
-    </thead>
-    <tfoot>
-        <?php echo $this->getInvoiceTotalsHtml($_invoice)?>
-    </tfoot>
-    <?php $_items = $_invoice->getAllItems(); ?>
-    <?php $_count = count($_items) ?>
-    <?php foreach ($_items as $_item): ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
-    <tbody>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-</table>
-<script type="text/javascript">(function($) {$('#my-invoice-table-<?php echo $_invoice->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<?php echo $this->getInvoiceCommentsHtml($_invoice)?>
-<?php endforeach; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
deleted file mode 100644
index 45313d9463376f21bb6ce32bec1eb89ae09bb0cb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-            
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-
-
-            </span>
-        <?php endif; ?>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/items.phtml
deleted file mode 100644
index d7511c2d2a388ec604f7db7507a949411c92c871..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/items.phtml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<?php $_giftMessage = ''; ?>
-<table class="data-table" id="my-orders-table" summary="<?php echo __('Items Ordered') ?>">
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <thead>
-        <tr>
-            <th><?php echo __('Product Name') ?></th>
-            <th><?php echo __('SKU') ?></th>
-            <th class="a-right"><?php echo __('Price') ?></th>
-            <th class="a-center"><?php echo __('Qty') ?></th>
-            <th class="a-right"><?php echo __('Subtotal') ?></th>
-        </tr>
-    </thead>
-    <tfoot>
-        <?php echo $this->getChildHtml('order_totals') ?>
-    </tfoot>
-        <?php $_items = $_order->getItemsCollection(); ?>
-        <?php $_index = 0; ?>
-        <?php $_count = $_items->count(); ?>
-        <?php foreach ($_items as $_item): ?>
-        <?php if ($_item->getParentItem()) continue; ?>
-        <tbody>
-            <?php echo $this->getItemHtml($_item) ?>
-            <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
-            <tr class="border<?php echo ($_index++ > $_count ?' last':'') ?>" id="order-item-gift-message-<?php echo $_item->getId() ?>" role="region" aria-expanded="false" tabindex="-1" style="display:none;">
-                <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_item); ?>
-                <td class="gift-message-row" colspan="7">
-                    <a href="#" title="<?php echo __('Close') ?>" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>" class="btn-close"><?php echo __('Close') ?></a>
-                    <dl class="gift-message">
-                        <dt><strong><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
-                        <dt><strong><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
-                        <dd><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_item) ?></dd>
-                    </dl>
-                </td>
-            </tr>
-            <?php endif ?>
-        </tbody>
-        <?php endforeach; ?>
-</table>
-<script type="text/javascript">jQuery('#my-orders-table').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})</script>
-<?php if ($_giftMessage): ?>
-    <script type="text/javascript">
-        head.js("<?php echo $this->getViewFileUrl('Magento_Sales::gift-message.js')?>", function() {
-            jQuery('a.gift-message-link').add('a.btn-close').giftMessage();
-        });
-    </script>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
deleted file mode 100644
index 8b96cbcb9fee3dcde78ec562b87bad258eb1b2d2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd>
-                    <?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
-                </dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addtInfoBlock) :?>
-            <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="a-right">
-        <span class="nobr">
-                <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
-            <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyShipped() > 0): ?>
-            <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
-            <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
-            <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
-        <?php endif; ?>
-        </span>
-    </td>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-
-
-            </span>
-        <?php endif; ?>
-    </td>
-    <!--
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-    <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-    <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
-    <?php endif; ?>
-    -->
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
deleted file mode 100644
index 41323417d0f228d2874497caea84859a68a084dd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-<div class="col2-set">
-    <?php if (!$_order->getIsVirtual()): ?>
-    <div class="col-1">
-        <h2><?php echo __('Shipping Address') ?></h2>
-        <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
-    </div>
-    <div class="col-2">
-    <?php else: ?>
-    <div class="col-1">
-    <?php endif; ?>
-        <h2><?php echo __('Billing Address') ?></h2>
-        <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
-    </div>
-<?php if (!$_order->getIsVirtual()): ?>
-</div>
-<div class="col2-set">
-    <div class="col-1">
-        <h2><?php echo __('Shipping Method') ?></h2>
-         <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
-    </div>
-<?php endif; ?>
-    <div class="col-2">
-        <h2><?php echo __('Payment Method') ?></h2>
-        <?php echo $this->getPaymentInfoHtml() ?>
-    </div>
-</div>
-<h2><?php echo __('Items Ordered') ?></h2>
-<table class="data-table" id="my-orders-table">
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-    <thead>
-        <tr>
-            <th><?php echo __('Product Name') ?></th>
-            <th><?php echo __('SKU') ?></th>
-            <th class="a-right"><?php echo __('Price') ?></th>
-            <th class="a-center"><?php echo __('Qty') ?></th>
-            <th class="a-right"><?php echo __('Subtotal') ?></th>
-        </tr>
-    </thead>
-    <tfoot>
-        <?php echo $this->getChildHtml('order_totals') ?>
-    </tfoot>
-    <?php $_items = $_order->getItemsCollection(); ?>
-    <?php $_count = $_items->count(); ?>
-    <?php foreach ($_items as $_item): ?>
-    <?php if ($_item->getParentItem()) continue; ?>
-    <tbody>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-        <?php endforeach; ?>
-</table>
-<script type="text/javascript">(function($) {$('#my-orders-table').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml
deleted file mode 100644
index ceba0157c74ba716d529f2e3c8bcdee2e2db091a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-<?php $_creditmemo = $this->getCreditmemo() ?>
-<?php if($_creditmemo): ?>
-    <?php $_creditmemos = array($_creditmemo); ?>
-<?php else: ?>
-    <?php $_creditmemos = $_order->getCreditmemosCollection() ?>
-<?php endif; ?>
-<?php foreach ($_creditmemos as $_creditmemo): ?>
-    <h2 class="h2"><?php echo __('Refund #%1', $_creditmemo->getIncrementId()) ?></h2>
-    <div class="col2-set">
-        <div class="col-1">
-        <?php if (!$_order->getIsVirtual()): ?>
-            <h3><?php echo __('Shipping Address') ?></h3>
-            <?php $_shipping = $_creditmemo->getShippingAddress() ?>
-            <address><?php echo $_shipping->format('html') ?></address>
-        </div>
-        <div class="col-2">
-        <?php endif; ?>
-            <h3><?php echo __('Billing Address') ?></h3>
-            <?php $_billing = $_creditmemo->getbillingAddress() ?>
-            <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
-        </div>
-    <?php if (!$_order->getIsVirtual()): ?>
-    </div>
-    <div class="col2-set">
-        <div class="col-1">
-            <h3><?php echo __('Shipping Method') ?></h3>
-             <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
-        </div>
-        <?php endif; ?>
-        <div class="col-2">
-            <h3><?php echo __('Payment Method') ?></h3>
-            <?php echo $this->getPaymentInfoHtml() ?>
-        </div>
-    </div>
-    <h3><?php echo __('Items Refunded') ?></h3>
-    <table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
-      <col />
-      <col width="1" />
-      <col width="1" />
-      <col width="1" />
-      <col width="1" />
-      <col width="1" />
-      <col width="1" />
-      <thead>
-          <tr>
-            <th><?php echo __('Product Name') ?></th>
-            <th><?php echo __('SKU') ?></th>
-            <th class="a-right"><?php echo __('Price') ?></th>
-            <th class="a-center"><?php echo __('Qty') ?></th>
-            <th class="a-right"><?php echo __('Subtotal') ?></th>
-            <th class="a-center wrap"><?php echo __('Discount Amount') ?></th>
-            <th class="a-center wrap"><?php echo __('Row Total') ?></th>
-          </tr>
-      </thead>
-      <tfoot>
-        <?php echo $this->getTotalsHtml($_creditmemo);?>
-      </tfoot>
-    <?php $_items = $_creditmemo->getAllItems(); ?>
-    <?php $_count = count($_items); ?>
-    <?php foreach ($_items as $_item): ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
-    <tbody>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-</table>
-<script type="text/javascript">(function($) {$('#my-refund-table-<?php echo $_creditmemo->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<?php endforeach; ?>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml
deleted file mode 100644
index 58817c4e8b4dd6928f93a30fce1835cce2f39427..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-<?php $_invoice = $this->getInvoice() ?>
-<?php if($_invoice): ?>
-    <?php $_invoices = array($_invoice); ?>
-<?php else: ?>
-    <?php $_invoices = $_order->getInvoiceCollection() ?>
-<?php endif; ?>
-<?php foreach ($_invoices as $_invoice): ?>
-    <h2 class="h2"><?php echo __('Invoice #%1', $_invoice->getIncrementId()) ?></h2>
-    <div class="col2-set">
-        <div class="col-1">
-        <?php if (!$_order->getIsVirtual()): ?>
-            <h3><?php echo __('Shipping Address') ?></h3>
-            <?php $_shipping = $_invoice->getShippingAddress() ?>
-            <address><?php echo $_shipping->format('html') ?></address>
-        </div>
-        <div class="col-2">
-        <?php endif; ?>
-            <h3><?php echo __('Billing Address') ?></h3>
-            <?php $_billing = $_invoice->getbillingAddress() ?>
-            <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
-        </div>
-        <?php if (!$_order->getIsVirtual()): ?>
-    </div>
-    <div class="col2-set">
-        <div class="col-1">
-            <h3><?php echo __('Shipping Method') ?></h3>
-             <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
-        </div>
-        <?php endif; ?>
-        <div class="col-2">
-            <h3><?php echo __('Payment Method') ?></h3>
-            <?php echo $this->getPaymentInfoHtml() ?>
-        </div>
-    </div>
-    <h3><?php echo __('Items Invoiced') ?></h3>
-    <table class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
-        <col />
-        <col width="1" />
-        <col width="1" />
-        <col width="1" />
-        <col width="1" />
-        <thead>
-            <tr>
-                <th><?php echo __('Product Name') ?></th>
-                <th><?php echo __('SKU') ?></th>
-                <th class="a-right"><?php echo __('Price') ?></th>
-                <th class="a-center"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
-                <th class="a-right"><?php echo __('Subtotal') ?></th>
-            </tr>
-        </thead>
-        <tfoot>
-            <?php echo $this->getInvoiceTotalsHtml($_invoice)?>
-        </tfoot>
-        <?php $_items = $_invoice->getItemsCollection(); ?>
-        <?php $_count = $_items->count(); ?>
-        <?php foreach ($_items as $_item): ?>
-        <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
-        <tbody>
-            <?php echo $this->getItemHtml($_item) ?>
-        </tbody>
-        <?php endforeach; ?>
-    </table>
-    <script type="text/javascript">(function($) {$('#my-invoice-table-<?php echo $_invoice->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<?php endforeach; ?>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml
deleted file mode 100644
index b42a54d939e9101cbf4660257225f5d779b9bdcd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Order\Print\Shipment */?>
-<?php $order = $this->getOrder(); ?>
-<h1><?php echo __('Order #%1', $this->getObjectData($order, 'real_order_id')); ?></h1>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($this->getObjectData($order, 'created_at_store_date'), 'long')) ?></p>
-<?php if (!$this->getObjectData($order, 'is_virtual')): ?>
-<?php foreach ($this->getShipmentsCollection() as $shipment): ?>
-    <h2 class="h2"><?php echo __('Shipment #%1', $this->getObjectData($shipment, 'increment_id')); ?></h2>
-    <div class="col2-set">
-        <div class="col-1">
-            <h3><?php echo __('Shipping Address') ?></h3>
-            <address><?php echo $this->getShipmentAddressFormattedHtml($shipment); ?></address>
-        </div>
-        <div class="col-2">
-            <h3><?php echo __('Billing Address') ?></h3>
-            <address><?php echo $this->getBillingAddressFormattedHtml($order); ?></address>
-        </div>
-    </div>
-    <div class="col2-set">
-        <div class="col-1">
-            <h3><?php echo __('Shipping Method') ?></h3>
-             <?php echo $this->escapeHtml($this->getObjectData($order, 'shipping_description')); ?>
-             <?php $tracks = $this->getShipmentTracks($shipment); 
-                if ($tracks): ?>
-                <table class="data-table" id="my-shipment-tracking">
-                    <col />
-                    <col />
-                    <thead>
-                        <tr>
-                            <th><?php echo __('Title')?></th>
-                            <th><?php echo __('Number')?></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <?php foreach ($tracks as $track): ?>
-                            <tr>
-                                <td><?php echo $this->escapeHtml($this->getObjectData($track, 'title')); ?></td>
-                                <td><?php echo $this->escapeHtml($this->getObjectData($track, 'number')); ?></td>
-                            </tr>
-                        <?php endforeach; ?>
-                    </tbody>
-                </table>
-                <script type="text/javascript">(function($) {$('#my-shipment-tracking').decorate('table')})(jQuery)</script>
-            <?php endif; ?>
-        </div>
-        <div class="col-2">
-            <h3><?php echo __('Payment Method') ?></h3>
-            <?php echo $this->getPaymentInfoHtml() ?>
-        </div>
-    </div>
-    <h3><?php echo __('Items Shipped') ?></h3>
-    <table class="data-table" id="my-shipment-table-<?php echo $this->getObjectData($shipment, 'id') ?>">
-        <col />
-        <col width="1" />
-        <col width="1" />
-        <thead>
-            <tr>
-                <th><?php echo __('Product Name') ?></th>
-                <th><?php echo __('SKU') ?></th>
-                <th class="a-center"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
-            </tr>
-        </thead>
-        <?php foreach ($this->getShipmentItems($shipment) as $item): ?>
-        <tbody>
-            <?php echo $this->getItemHtml($item) ?>
-        </tbody>
-        <?php endforeach; ?>
-    </table>
-    <script type="text/javascript">(function($) {$('#my-shipment-table-<?php echo $this->getObjectData($shipment, 'id')?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<?php endforeach; ?>
-<?php endif; ?>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml
deleted file mode 100644
index 4fb37abf55272c7c5cd0ce595ad220e9425a09fb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="box-account box-recent">
-<?php $_orders = $this->getOrders(); ?>
-    <div class="box-head">
-        <h2><?php echo __('Recent Orders') ?></h2>
-        <?php if( sizeof($_orders->getItems()) > 0 ): ?><a href="<?php echo $this->getUrl('sales/order/history') ?>"><?php echo __('View All') ?></a><?php endif; ?>
-    </div>
-<?php if( sizeof($_orders->getItems()) > 0 ): ?>
-    <table class="data-table" id="my-orders-table">
-    <col width="1" />
-    <col width="1" />
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <col width="1" />
-        <thead>
-            <tr>
-                <th><?php echo __('Order #') ?></th>
-                <th><?php echo __('Date') ?></th>
-                <th><?php echo __('Ship To') ?></th>
-                <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
-                <th><?php echo __('Status') ?></th>
-                <th>&nbsp;</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($_orders as $_order): ?>
-                <tr>
-                    <td><?php echo $_order->getRealOrderId() ?></td>
-                    <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
-                    <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
-                    <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
-                    <td><em><?php echo $_order->getStatusLabel() ?></em></td>
-                    <td class="a-center">
-                        <span class="nobr">
-                        <a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo __('View Order') ?></a>
-                        <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
-                            <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
-                        <?php endif ?>
-                        </span>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <script type="text/javascript">(function($) {$('#my-orders-table').decorate('table')})(jQuery)</script>
-<?php else: ?>
-    <p><?php echo __('You have placed no orders.'); ?></p>
-<?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
deleted file mode 100644
index b6237c8c2f47caeaef855f51854e1168181d8635..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="order-items order-details">
-    <?php echo $this->getChildHtml('shipment_items') ?>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->getBackTitle() ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml
deleted file mode 100644
index 2f9c3b96527ed945420bdb4f3fd2e2de053b8b34..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php  $_order = $this->getOrder() ?>
-<p class="order-links">
-    <?php  if ($_order->getTracksCollection()->count()) : ?>
-        <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track all shipment(s)') ?>"><?php echo __('Track all shipments') ?></a> <span class="separator">|</span>
-    <?php endif; ?>
-    <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Shipments') ?></a>
-</p>
-<?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
-<h2 class="sub-title"><?php echo __('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Shipment') ?></a></h2>
-<?php $tracks = $_shipment->getTracksCollection(); ?>
-<?php  if ($tracks->count()): ?>
-    <table class="data-table tracking-table" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
-        <tbody>
-            <tr>
-                <td colspan="2">
-                    <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>',windowName:'trackshipment',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track this shipment') ?>"><?php echo __('Track this shipment') ?></a>
-                </td>
-            </tr>
-            <tr>
-                <th class="label"><?php echo __('Tracking Number(s):') ?></th>
-                <td>&nbsp;
-                <?php
-                $i = 1;
-                $_size = $tracks->count();
-                foreach($tracks as $track): ?>
-                <?php if($track->isCustom()): ?>
-                    <?php echo $this->escapeHtml($track->getNumber()) ?>
-                <?php else: ?>
-                    <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>',windowName:'trackorder',width:800,height:600,left:0,top:0,resizable:1,scrollbars:1}}"><?php echo $this->escapeHtml($track->getNumber()) ?></a>
-                <?php endif; ?>
-                <?php if($i!=$_size): ?>, <?php endif; ?>
-                <?php $i++;
-                endforeach; ?>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    <script type="text/javascript">jQuery('#my-tracking-table-<?php echo $_shipment->getId(); ?>').decorate('table')</script>
-<?php  endif; ?>
-<h3 class="table-caption"><?php echo __('Items Shipped') ?></h3>
-<table class="data-table" id="my-shipment-table-<?php echo $_shipment->getId(); ?>">
-    <col />
-    <col width="1" />
-    <col width="1" />
-    <thead>
-        <tr>
-            <th><?php echo __('Product Name') ?></th>
-            <th><?php echo __('SKU') ?></th>
-            <th class="a-center"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
-        </tr>
-    </thead>
-    <?php $_items = $_shipment->getAllItems(); ?>
-    <?php $_count = count($_items) ?>
-    <?php foreach ($_items as $_item): ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
-    <tbody>
-        <?php echo $this->getItemHtml($_item) ?>
-    </tbody>
-    <?php endforeach; ?>
-</table>
-<script type="text/javascript">jQuery('#my-shipment-table-<?php echo $_shipment->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})</script>
-<?php echo $this->getCommentsHtml($_shipment)?>
-<?php endforeach; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml
deleted file mode 100644
index 3ac8fc628ed67a291c5202a94dee9007e609693a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
-    <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml
deleted file mode 100644
index ff3477323e12d3f4acbd720a7ba358dd1962b637..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/**
- * @var $this \Magento\Sales\Block\Order\Totals
- * @see \Magento\Sales\Block\Order\Totals
- */
-?>
-<?php foreach ($this->getTotals() as $_code => $_total): ?>
-    <?php if ($_total->getBlockName()): ?>
-        <?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
-    <?php else:?>
-    <tr class="<?php echo $_code?>">
-        <td <?php echo $this->getLabelProperties()?>>
-            <?php if ($_total->getStrong()):?>
-            <strong><?php echo $this->escapeHtml($_total->getLabel());?></strong>
-            <?php else:?>
-            <?php echo $this->escapeHtml($_total->getLabel());?>
-            <?php endif?>
-        </td>
-        <td <?php echo $this->getValueProperties()?>>
-            <?php if ($_total->getStrong()):?>
-            <strong><?php echo $this->formatValue($_total) ?></strong>
-            <?php else:?>
-            <?php echo $this->formatValue($_total) ?>
-            <?php endif?>
-        </td>
-    </tr>
-    <?php endif?>
-<?php endforeach?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml
deleted file mode 100644
index bc3cf4e0daea1914f139ab5bda22309d7beba528..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<span class="field-row grid" id="shipment_tracking_info">
-
-<?php if($this->getTrackingInfo()): ?>
-    <strong><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></strong> - <?php echo $this->getTrackingInfo()->getTracking() ?>
-    <div class="info">
-        <?php if ($this->getTrackingInfo()->getErrorMessage()): ?>
-            <?php echo $this->escapeHtml($this->getTrackingInfo()->getErrorMessage()) ?>
-        <?php else: ?>
-            <?php if ($this->getTrackingInfo()->getUrl()): ?>
-                Please, visit for more info: <a href="<?php echo $this->getTrackingInfo()->getUrl() ?>" target="_blank"><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></a><br />
-            <?php endif; ?>
-
-            <?php if ($this->getTrackingInfo()->getStatus()): ?>
-                Status: <?php echo $this->getTrackingInfo()->getStatus() ?><br />
-            <?php endif; ?>
-
-            <?php if ($this->getTrackingInfo()->getDeliverydate()): ?>
-                Delivery Date: <?php echo $this->getTrackingInfo()->getDeliverydate() ?><br />
-            <?php endif; ?>
-
-            <?php if ($this->getTrackingInfo()->getDeliverytime()): ?>
-                Delivery Time: <?php echo $this->getTrackingInfo()->getDeliverytime() ?><br />
-            <?php endif; ?>
-
-            <?php if ($this->getTrackingInfo()->getDeliverylocation()): ?>
-                Delivery Location: <?php echo $this->getTrackingInfo()->getDeliverylocation() ?><br />
-            <?php endif; ?>
-
-            <?php if ($this->getTrackingInfo()->getSignedby()): ?>
-                Signed by: <?php echo $this->getTrackingInfo()->getSignedby() ?><br />
-            <?php endif; ?>
-
-            <?php if ($this->getTrackingInfo()->getTrackSummary()): ?>
-                Tracking summary: <?php echo $this->getTrackingInfo()->getTrackSummary() ?><br />
-            <?php endif; ?>
-
-        <?php endif; ?>
-    </div>
-<?php endif; ?>
-
-</span>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/view.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/view.phtml
deleted file mode 100644
index 6022448f69e1f90f52d9b561d3566cdfad556969..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/view.phtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="order-items order-details">
-    <?php $_order = $this->getOrder() ?>
-    <h2 class="table-caption"><?php echo __('Items Ordered') ?>
-        <?php if ($_order->getTracksCollection()->count()) : ?>
-            <span class="separator">|</span> <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',top:0,left:0,width:800,height:600,resizable:1,scrollbars:1}}" title="<?php echo __('Track your order') ?>"><?php echo __('Track your order') ?></a>
-        <?php endif; ?>
-    </h2>
-
-    <?php echo $this->getChildHtml('order_items') ?>
-
-    <?php if($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order', $_order) && $_order->getGiftMessageId()): ?>
-    <div class="order-additional order-gift-message">
-        <h2 class="sub-title"><?php echo __('Gift Message for This Order') ?></h2>
-        <?php $_giftMessage=$this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_order); ?>
-        <dl class="gift-message">
-            <dt><strong><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
-            <dt><strong><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
-            <dd><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
-        </dl>
-    </div>
-    <?php endif; ?>
-    <?php $_history = $this->getOrder()->getVisibleStatusHistory() ?>
-    <?php if (count($_history)): ?>
-    <div class="order-additional order-comments">
-        <h2 class="sub-title"><?php echo __('About Your Order') ?></h2>
-        <dl class="order-about">
-            <?php foreach ($_history as $_historyItem): ?>
-                <dt><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
-                <dd><?php echo $this->escapeHtml($_historyItem->getComment()) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-    </div>
-    <?php endif; ?>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo $this->getBackTitle() ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/orders-returns.js b/app/design/frontend/magento_backup/Magento_Sales/orders-returns.js
deleted file mode 100644
index 79af9c4a9327498a021d52a323e82e7558de80d4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/orders-returns.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Sales Orders and Returns
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true, jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.ordersReturns', {
-        options: {
-            zipCode: '#oar-zip', // Search by zip code.
-            emailAddress: '#oar-email', // Search by email address.
-            searchType: '#quick-search-type-id' // Search element used for choosing between the two.
-        },
-
-        _create: function() {
-            $(this.options.searchType).on('change', $.proxy(this._showIdentifyBlock, this)).trigger('change');
-        },
-
-        /**
-         * Show either the search by zip code option or the search by email address option.
-         * @private
-         * @param e - Change event. Event target value is either 'zip' or 'email'.
-         */
-        _showIdentifyBlock: function(e) {
-            var value = $(e.target).val();
-            $(this.options.zipCode).toggle(value === 'zip');
-            $(this.options.emailAddress).toggle(value === 'email');
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml b/app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml
deleted file mode 100644
index 5d2129cde3a7dbab8ccdfe6889c1b62630cf5e42..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Payment\Form\Billing\Agreement */?>
-<?php $_code=$this->getMethodCode() ?>
-<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
-    <li>
-        <label for="<?php echo $_code ?>_ba_agreement_id" class="required"><em>*</em><?php echo __('Billing Agreement') ?></label>
-        <div class="input-box">
-            <select id="<?php echo $_code ?>_ba_agreement_id" name="payment[<?php echo $this->getTransportName(); ?>]" class="required-entry">
-                <option value=""><?php echo __('-- Please Select Billing Agreement--') ?></option>
-            <?php foreach ($this->getBillingAgreements() as $id => $referenceId): ?>
-                <option value="<?php echo $id ?>"><?php echo $this->escapeHtml($referenceId) ?></option>
-            <?php endforeach ?>
-            </select>
-        </div>
-    </li>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml
deleted file mode 100644
index 29dc6a233eb7f48bb4796d8defa353e15dcf4819..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\View\Block\Template */?>
-<div <?php echo $this->getGridHtmlClass() ? ' class="' . $this->getGridHtmlClass() . '"' : ''?><?php echo $this->getGridHtmlCss() ? ' style="' . $this->getGridHtmlCss() . '"' : ''?>>
-
-<?php if ($caption = $this->getGridCaption()): ?>
-<h2 class="table-caption"><?php echo $this->escapeHtml($caption) ?></h2>
-<?php endif; ?>
-
-<?php $gridElements = $this->getGridElements(); ?>
-<?php if ($gridElements): ?>
-    <?php echo $this->getChildHtml('pager'); ?>
-    <table id="<?php echo $this->getGridHtmlId() ?>" class="data-table">
-<?php foreach ($this->getGridColumns() as $column):?>
-        <col <?php $width = $this->getObjectData($column, 'width'); echo $width ? ' width="' . $width . '"' : '' ?>/>
-<?php endforeach; ?>
-        <thead>
-            <tr>
-<?php foreach ($this->getGridColumns() as $column):
-$nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
-$title = $this->getObjectData($column, 'title');
-?>
-                <th><?php echo $title ? sprintf($nobr, $this->escapeHtml($title)) : '&nbsp;' ?></th>
-<?php endforeach; ?>
-            </tr>
-        </thead>
-        <tbody>
-<?php foreach($gridElements as $row): ?>
-            <tr>
-<?php foreach ($this->getGridColumns() as $column):
-$nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
-$index = $this->getObjectData($column, 'index');
-$value = $this->getObjectData($row, $index);
-$linkUrl = $this->getObjectData($row, "{$index}_link_url");
-$linkAnchorText = $this->getObjectData($row, "{$index}_link_text");
-$linkText = $linkUrl ? ($linkAnchorText ? $linkAnchorText : $value) : '';
-$linkFormat = $linkUrl ? '<a href="%s">%s</a>' : '';
-?>
-                <td<?php $this->getObjectData($row, 'is_amount') ? ' class="a-right"' : '' ?>><?php
-if ($linkFormat) {
-    echo sprintf($nobr, sprintf($linkFormat, $this->escapeHtml($linkUrl), $this->escapeHtml($linkText)));
-} else {
-    echo sprintf($nobr, $this->escapeHtml($value));
-}
-                ?></td>
-<?php endforeach; ?>
-            </tr>
-<?php endforeach; ?>
-        </tbody>
-    </table>
-    <?php echo $this->getChildHtml('pager'); ?>
-    <script type="text/javascript">(function($) {$('#<?php echo $this->getGridHtmlId() ?>').decorate('table')})(jQuery)</script>
-<?php else: ?>
-    <p><?php echo $this->escapeHtml($this->getEmptyGridMessage()); ?></p>
-<?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml
deleted file mode 100644
index ebd21c420e7e1b3dc97cb7b0919e54c4e4b9dde5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Recurring\Profile\View */ ?>
-
-<div class="order-page">
-
-<!-- title 'n' actions -->
-<div class="page-title title-buttons">
-    <h1><?php echo __('Recurring Profile # %1', $this->escapeHtml($this->getReferenceId())) ?></h1>
-    <?php if ($this->getCanCancel()): ?>
-        <button type="button" title="<?php echo __('Cancel') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo __('Cancel') ?></span></span></button>
-    <?php endif; ?>
-    <?php if ($this->getCanSuspend()): ?>
-        <button type="button" title="<?php echo __('Suspend') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo __('Suspend') ?></span></span></button>
-    <?php endif; ?>
-    <?php if ($this->getCanActivate()): ?>
-        <button type="button" title="<?php echo __('Activate') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo __('Activate') ?></span></span></button>
-    <?php endif; ?>
-    <?php if ($this->getCanUpdate()):?>
-        <button type="button" title="<?php echo __('Get Update') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo __('Get Update') ?></span></span></button>
-    <?php endif;?>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<!-- info tabs -->
-<?php $layout = $this->getLayout(); ?>
-<?php $infoTabs = $this->getGroupChildNames('info_tabs'); ?>
-<dl class="order-info">
-    <dt><?php echo __('About This Profile:') ?></dt>
-    <dd>
-        <ul id="order-info-tabs">
-        <?php foreach ($infoTabs as $elementName): ?>
-            <?php $block = $layout->getBlock($elementName); ?>
-            <?php if (!$block) continue; ?>
-            <?php if ($this->getObjectData($block, 'is_view_current')): ?>
-                <li class="current"><strong><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></strong></li>
-            <?php else: ?>
-                <li><a href="<?php echo $this->escapeHtml($this->getObjectData($block, 'view_url')) ?>"><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></a></li>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </ul>
-    </dd>
-</dl>
-
-<!-- info blocks in 2 columns -->
-<?php for ($i = 1; $i <= 5; $i++):?>
-    <?php $infoBlocks = $this->getGroupChildNames("info_blocks_row_{$i}"); ?>
-    <?php if ($infoBlocks):?>
-<div class="col2-set order-info-box">
-        <?php for ($j = 1; $j <= 2; $j++):?>
-            <?php foreach ($infoBlocks as $elementName):?>
-        <?php $block = $layout->getBlock($elementName); ?>
-        <?php if (!$block) continue; ?>
-<?php if ($j == $this->getObjectData($block, 'view_column')):?>
-    <div class="col-<?php echo $j?>">
-        <div class="info-box">
-            <div class="box-title">
-                <h2><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></h2>
-            </div>
-            <div class="box-content">
-                <?php $html = $layout->renderElement($elementName); ?>
-                <?php echo ($html ? $html : __('No information available.')) ; ?>
-            </div>
-        </div>
-    </div>
-<?php endif; ?>
-            <?php endforeach;?>
-        <?php endfor;?>
-</div>
-    <?php endif; ?>
-<?php endfor;?>
-
-<!-- table data block -->
-<?php $table = $this->getChildBlock('table') ?>
-<?php if ($table):?>
-<div>
-    <h2 class="table-caption"><?php echo $this->escapeHtml($this->getObjectData($table, 'view_label')) ?></h2>
-    <?php echo $this->getChildHtml('table') ?>
-</div>
-<?php endif;?>
-
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>&laquo; </small><?php echo __('Back to Recurring Billing Profiles') ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml
deleted file mode 100644
index bbdb4e6455c1d26684c125e743a2053f9736d22c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Recurring\Profile\View */?>
-<?php if ($this->getIsAddress()):?>
-
-<?php foreach ($this->getRenderedInfo() as $row):?>
-<address><?php echo nl2br($this->escapeHtml($this->getObjectData($row, 'value')))?></address>
-<?php endforeach;?>
-
-<?php else:?>
-
-<table class="info-table">
-    <tbody>
-        <?php foreach ($this->getRenderedInfo() as $row):?>
-        <?php $isAmount = $this->getObjectData($row, 'is_amount');?>
-        <tr>
-            <th><?php echo $this->escapeHtml($this->getObjectData($row, 'label'))?>:</th>
-            <td><?php echo $this->renderRowValue($row) ?></td>
-        </tr>
-        <?php endforeach;?>
-    </tbody>
-</table>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
deleted file mode 100644
index 3d5101fcfbbb3c98fe7f99b74c7b97e6a1a5510d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Recurring\Profiles */ ?>
-<div class="page-title">
-    <h1><?php echo __('Recurring Billing Profiles') ?></h1>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<div class="recurring-profiles">
-
-    <?php echo $this->getChildHtml('grid')?>
-
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml b/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
deleted file mode 100644
index 14f0a84ac2a6f7eac75607bf3781de4e494b5abd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Last order sidebar
- *
- * @see \Magento\Sale\Block\Reorder\Sidebar
- */
-?>
-<?php $_items = $this->getItems()?>
-<?php if($_items): ?>
-<div class="block block-reorder">
-    <div class="block-title">
-        <strong><span><?php echo __('My Orders') ?></span></strong>
-    </div>
-    <form method="post" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">
-        <div class="block-content">
-            <p class="block-subtitle"><?php echo __('Last Ordered Items') ?></p>
-            <ol id="cart-sidebar-reorder">
-            <?php $_showAddButtonFlag = false ?>
-            <?php foreach ($_items as $_item): ?>
-                <li class="item">
-                    <?php if ($this->isItemAvailableForReorder($_item)): ?>
-                        <?php $_showAddButtonFlag = true ?>
-                        <input type="checkbox" name="order_items[]" id="reorder-item-<?php echo $_item->getId() ?>" value="<?php echo $_item->getId() ?>" title="<?php echo __('Add to Cart') ?>"
-                               class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
-                    <?php endif; ?>
-                    <p class="product-name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
-                </li>
-            <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#cart-sidebar-reorder').decorate('list', false)})(jQuery)</script>
-            <div id="cart-sidebar-reorder-advice-container"></div>
-            <div class="actions">
-                <?php if ($_showAddButtonFlag): ?>
-                    <button type="submit" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                <?php endif; ?>
-                <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo __('View All'); ?></a>
-            </div>
-        </div>
-    </form>
-</div>
-<?php echo $this->getPagerHtml(); ?>
-<script type="text/javascript">
-    head.js(
-        "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-        function() {
-            jQuery('#reorder-validate-detail').validation({
-                errorPlacement: function(error, element) {
-                    error.appendTo('#cart-sidebar-reorder-advice-container');
-                }
-            });
-        }
-    );
-</script>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml b/app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml
deleted file mode 100644
index 50d6134f034097c2e529e33483527c9528a460dd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Sales\Block\Widget\Guest\Form */
-?>
-<?php if ($this->isEnable()): ?>
-    <div class="widget">
-        <div class="block block-gr-search">
-            <div class="block-title">
-                <h2><?php echo __('Orders and Returns') ?></h2>
-            </div>
-            <div class="block-content">
-               <form id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
-                   <ul class="form-alt">
-                       <li>
-                           <label class="required"><?php echo __('Find Order By:') ?></label>
-                           <div class="input-box">
-                               <select name="oar_type" id="quick-search-type-id" class="select" title="">
-                                   <option value="email"><?php echo __('Email Address') ?></option>
-                                   <option value="zip"><?php echo __('ZIP Code') ?></option>
-                               </select>
-                           </div>
-                       </li>
-                       <li>
-                           <label for="oar-order-id" class="required"><?php echo __('Order ID') ?> <em>*</em></label>
-                           <div class="input-box">
-                               <input type="text" class="input-text" id="oar-order-id" name="oar_order_id"  autocomplete="off" data-validate="{required:true}"/>
-                           </div>
-                       </li>
-                       <li>
-                           <label for="oar-billing-lastname" class="required"><?php echo __('Billing Last Name') ?> <em>*</em></label>
-                           <div class="input-box">
-                               <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname" autocomplete="off" data-validate="{required:true}"/>
-                           </div>
-                       </li>
-                       <li id="oar-email">
-                           <label for="oar_email" class="required"><?php echo __('Email Address') ?> <em>*</em></label>
-                           <div class="input-box">
-                               <input type="text" class="input-text" id="oar_email" name="oar_email" autocomplete="off" data-validate="{required:true, 'validate-email':true}"/>
-                           </div>
-                       </li>
-                       <li id="oar-zip" style="display:none;">
-                           <label for="oar_zip" class="required"><?php echo __('Billing ZIP Code') ?> <em>*</em></label>
-                           <div class="input-box">
-                               <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
-                           </div>
-                       </li>
-                   </ul>
-                   <div class="actions">
-                       <button type="submit" title="Continue" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
-                   </div>
-               </form>
-            </div>
-        </div>
-    </div>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-        "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-        "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function() {
-            jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
-        });
-</script>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Shipping/layout/base/shipping_tracking_popup.xml b/app/design/frontend/magento_backup/Magento_Shipping/layout/base/shipping_tracking_popup.xml
deleted file mode 100644
index 75df863046af48ca937d5793fa839ab6410de6bf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Shipping/layout/base/shipping_tracking_popup.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Shipment Tracking Popup" type="page">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">popup.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="tracking/popup.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml b/app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml
deleted file mode 100644
index 66b76bc24340025fca67344de99d88be9d382258..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Shipping\Block\Tracking\Popup */ ?>
-<?php $_results = $this->getTrackingInfo(); ?>
-<div class="page-title title-buttons">
-    <h1><?php echo __('Tracking Information'); ?></h1>
-    <button class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo __('Close Window') ?></span></span></button>
-</div>
-<?php if(sizeof($_results)>0): ?>
-<?php foreach($_results as $shipid => $_result): ?>
-    <?php if($shipid): ?>
-    <h2 class="sub-title"><?php echo __('Shipment #').$shipid; ?></h2>
-    <?php endif; ?>
-    <?php if(sizeof($_result)>0): ?>
-        <?php $rowCount = sizeof($_result); $counter = 1; ?>
-        <?php $_id = 0; foreach($_result as $track): ?>
-            <table class="tracking-table-popup data-table" id="tracking-table-popup-<?php echo $_id ?>">
-                <col width="15%" />
-                <col />
-                <tbody>
-                <?php if(is_object($track)): ?>
-                    <tr>
-                        <th class="label"><?php echo __('Tracking Number:'); ?></th>
-                        <td class="value"><?php echo $this->escapeHtml($track->getTracking()); ?></td>
-                    </tr>
-                    <?php if ($track->getCarrierTitle()): ?>
-                    <tr>
-                        <th class="label"><?php echo __('Carrier:'); ?></th>
-                        <td class="value"><?php echo $this->escapeHtml($track->getCarrierTitle()); ?></td>
-                    </tr>
-                    <?php endif; ?>
-                    <?php if($track->getErrorMessage()): ?>
-                    <tr>
-                        <th class="label"><?php echo __('Error:'); ?></th>
-                        <td class="error"><?php echo __('Tracking information is not available. Please '); if ($this->getContactUsEnabled()) : ?><a href="<?php echo $this->getContactUs() ?>" title="<?php echo __('contact us') ?>" onclick="this.target='_blank'"><?php echo __('contact us') ?></a><?php echo __(' for more information or '); endif; echo __('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
-                    </tr>
-                    <?php elseif($track->getTrackSummary()): ?>
-                    <tr>
-                        <th class="label"><?php echo __('Info:'); ?></th>
-                        <td class="value"><?php echo $track->getTrackSummary(); ?></td>
-                    </tr>
-                    <?php elseif($track->getUrl()): ?>
-                    <tr>
-                        <th class="label"><?php echo __('Track:'); ?></th>
-                        <td class="value"><a href="<?php echo $this->escapeHtml($track->getUrl()); ?>" onclick="this.target='_blank'"><?php echo $this->escapeHtml($track->getUrl()); ?></a></td>
-                    </tr>
-                    <?php else: ?>
-                        <?php if ($track->getStatus()): ?>
-                        <tr>
-                            <th class="label"><?php echo __('Status:'); ?></th>
-                            <td class="value"><?php echo $track->getStatus(); ?></td>
-                        </tr>
-                        <?php endif; ?>
-
-                        <?php if ($track->getDeliverydate()): ?>
-                        <tr>
-                            <th class="label"><?php echo __('Delivered on:'); ?></th>
-                            <td class="value"><?php echo $this->formatDeliveryDateTime($track->getDeliverydate(),$track->getDeliverytime()); ?></td>
-                        </tr>
-                        <?php endif; ?>
-
-                        <?php if ($track->getSignedby()): ?>
-                        <tr>
-                            <th class="label"><?php echo __('Signed by:'); ?></th>
-                            <td class="value"><?php echo $track->getSignedby(); ?></td>
-                        </tr>
-                        <?php endif; ?>
-
-                        <?php if ($track->getDeliveryLocation()): ?>
-                        <tr>
-                            <th class="label"><?php echo __('Delivered to:'); ?></th>
-                            <td class="value"><?php echo $track->getDeliveryLocation(); ?></td>
-                        </tr>
-                        <?php endif; ?>
-
-                        <?php if ($track->getShippedDate()): ?>
-                        <tr>
-                            <th class="label"><?php echo __('Shipped or billed on:'); ?></th>
-                            <td class="value"><?php echo $track->getShippedDate(); ?></td>
-                        </tr>
-                        <?php endif; ?>
-
-                        <?php if ($track->getService()): ?>
-                        <tr>
-                            <th class="label"><?php echo __('Service Type:'); ?></th>
-                            <td class="value"><?php echo $track->getService(); ?></td>
-                        </tr>
-                        <?php endif; ?>
-
-                        <?php if ($track->getWeight()): ?>
-                        <tr>
-                            <th class="label"><?php echo __('Weight:'); ?></th>
-                            <td class="value"><?php echo $track->getWeight(); ?></td>
-                        </tr>
-                        <?php endif; ?>
-                    <?php endif; ?>
-                <?php elseif(isset($track['title']) && isset($track['number']) && $track['number']): ?>
-                    <!--if the tracking is custom value-->
-                    <tr>
-                        <th class="label"><?php echo ($track['title'] ? $this->escapeHtml($track['title']) : __('N/A')); ?>:</th>
-                        <td class="value"><?php echo (isset($track['number']) ? $this->escapeHtml($track['number']) : ''); ?></td>
-                    </tr>
-                <?php endif; ?>
-                </tbody>
-            </table>
-            <script type="text/javascript">(function($) {$('#tracking-table-popup-<?php echo $_id++ ?>').decorate('table')})(jQuery)</script>
-            <?php if (is_object($track) && sizeof($track->getProgressdetail())>0): ?>
-                <br />
-                <table class="data-table" id="track-history-table-<?php echo $track->getTracking(); ?>">
-                    <col />
-                    <col width="1" />
-                    <col width="1" />
-                    <col />
-                    <thead>
-                        <tr>
-                            <th><?php echo __('Location') ?></th>
-                            <th><?php echo __('Date') ?></th>
-                            <th><?php echo __('Local Time') ?></th>
-                            <th><?php echo __('Description') ?></th>
-                        </tr>
-                   </thead>
-                   <tbody>
-                   <?php foreach($track->getProgressdetail() as $_detail): ?>
-                    <?php $_detailDate = (isset($_detail['deliverydate']) ? $this->formatDeliveryDate($_detail['deliverydate']) : '') ?>
-                    <?php $_detailTime = (isset($_detail['deliverytime']) ? $this->formatDeliveryTime($_detail['deliverytime'], $_detail['deliverydate']) : '') ?>
-                        <tr>
-                            <td><?php echo (isset($_detail['deliverylocation']) ? $_detail['deliverylocation'] : ''); ?></td>
-                            <td><span class="nobr"><?php echo $_detailDate ?></span></td>
-                            <td><span class="nobr"><?php echo $_detailTime ?></span></td>
-                            <td><?php echo (isset($_detail['activity']) ? $_detail['activity'] : '') ?></td>
-                        </tr>
-                   <?php endforeach; ?>
-                   </tbody>
-                </table>
-                <script type="text/javascript">(function($) {$('#track-history-table-<?php echo $track->getTracking(); ?>').decorate('table')})(jQuery)</script>
-            <?php endif; ?>
-            <div class="divider"></div>
-            <?php if($counter!=$rowCount): ?>
-            <?php endif; ?>
-            <?php $counter++; ?>
-        <!--end for each tracking information-->
-        <?php endforeach; ?>
-    <?php else: ?>
-        <p><?php echo __('There is no tracking available for this shipment.'); ?></p>
-    <?php endif; ?>
-
-<?php endforeach; ?>
-<?php else: ?>
-    <p><?php echo __('There is no tracking available.'); ?></p>
-<?php endif; ?>
-<div class="buttons-set">
-    <button type="button" title="<?php echo __('Close Window') ?>" class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo __('Close Window') ?></span></span></button>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml
deleted file mode 100644
index 1752f851ad76aa092222dc4d1459614122718dbb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml
deleted file mode 100644
index 4880152304ddb2919c4f771f984682abb4f61cad..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/**
- * @var $this \Magento\Tax\Block\Checkout\Grandtotal
- * @see \Magento\Tax\Block\Checkout\Grandtotal
- */
-?>
-<?php if ($this->includeTax() && $this->getTotalExclTax()>=0):?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <strong><?php echo __('Grand Total Excl. Tax')?></strong>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotalExclTax()) ?></strong>
-    </td>
-</tr>
-<?php echo $this->renderTotals('taxes', $this->getColspan()); ?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <strong><?php echo __('Grand Total Incl. Tax')?></strong>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
-<?php else:?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <strong><?php echo $this->getTotal()->getTitle() ?></strong>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.phtml
deleted file mode 100644
index 9ca9c4e6adb10585aff79e57ffe0b6a2fb93eea6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/**
- * @var $this \Magento\Tax\Block\Checkout\Shipping
- * @see \Magento\Tax\Block\Checkout\Shipping
- */
-?>
-<?php if ($this->displayBoth()):?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php echo $this->getExcludeTaxLabel() ?>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingExcludeTax()) ?>
-    </td>
-</tr>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php echo $this->getIncludeTaxLabel() ?>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingIncludeTax()) ?>
-    </td>
-</tr>
-<?php elseif($this->displayIncludeTax()) : ?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php echo $this->getTotal()->getTitle() ?>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingIncludeTax()) ?>
-    </td>
-</tr>
-<?php else:?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php echo $this->escapeHtml($this->getTotal()->getTitle()) ?>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingExcludeTax()) ?>
-    </td>
-</tr>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml
deleted file mode 100644
index bebb5a108879bf4b1ee453a98bebb1302702d6a6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/**
- * @var $this \Magento\Tax\Block\Checkout\Subtotal
- * @see \Magento\Tax\Block\Checkout\Subtotal
- */
-?>
-<?php if ($this->displayBoth()):?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php echo __('Subtotal (Excl. Tax)') ?>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValueExclTax()) ?>
-    </td>
-</tr>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php echo __('Subtotal (Incl. Tax)') ?>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValueInclTax()) ?>
-    </td>
-</tr>
-<?php else : ?>
-<tr>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php echo $this->getTotal()->getTitle() ?>
-    </td>
-    <td style="<?php echo $this->getStyle() ?>" class="a-right">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?>
-    </td>
-</tr>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/tax.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/tax.phtml
deleted file mode 100644
index c00c8d788d37e1a9a13b5a1d9d9d603938c213d9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/tax.phtml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/**
- * @var $this \Magento\Tax\Block\Checkout\Tax
- * @see \Magento\Tax\Block\Checkout\Tax
- */
-?>
-<?php
-    $_value = $this->getTotal()->getValue();
-    $_style = $this->getTotal()->getStyle();
-?>
-<?php global $taxIter; $taxIter++; ?>
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value!=0): ?>
-<?php $isTop = 1; ?>
-    <?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
-        <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
-        <?php $percent = $info['percent']; ?>
-        <?php $amount = $info['amount']; ?>
-        <?php $rates = $info['rates']; ?>
-        <?php $isFirst = 1; ?>
-
-        <?php foreach ($rates as $rate): ?>
-        <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-            <td class="a-right" style="<?php echo $_style ?>" colspan="<?php echo $this->getColspan(); ?>">
-                <?php echo $this->escapeHtml($rate['title']); ?>
-                <?php if (!is_null($rate['percent'])): ?>
-                    (<?php echo (float)$rate['percent']; ?>%)
-                <?php endif; ?>
-                <br />
-            </td>
-            <?php if ($isFirst): ?>
-                <td style="<?php echo $_style ?>" class="a-right" rowspan="<?php echo count($rates); ?>">
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount); ?>
-                </td>
-            <?php endif; ?>
-        </tr>
-        <?php $isFirst = 0; ?>
-        <?php $isTop = 0; ?>
-        <?php endforeach; ?>
-    <?php endforeach; ?>
-<?php endif;?>
-<tr <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
-    <td style="<?php echo $_style ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <div class="summary-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
-        <?php else: ?>
-            <?php echo $this->getTotal()->getTitle() ?>
-        <?php endif;?>
-    </td>
-    <td style="<?php echo $_style ?>" class="a-right"><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml b/app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml
deleted file mode 100644
index e18c5909885c963b1a0939264f8fd928778c4b12..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-    $_order  = $this->getOrder();
-    $_source = $this->getSource();
-    $_fullInfo = $_order->getFullTaxInfo();
-    global $taxIter; $taxIter++;
-?>
-<?php  ?>
-
-<?php if ($this->displayFullSummary()): ?>
-<?php $isTop = 1; ?>
-    <?php if ($_fullInfo) foreach ($_fullInfo as $info): ?>
-        <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
-        <?php
-            $percent    = $info['percent'];
-            $amount     = $info['amount'];
-            $rates      = $info['rates'];
-            $isFirst    = 1;
-        ?>
-        <?php foreach ($rates as $rate): ?>
-        <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"<?php if (!$this->getIsPlaneMode()):?> style="display:none;"<?php endif;?>>
-            <td <?php echo $this->getLabelProperties()?>>
-                <?php echo $this->escapeHtml($rate['title']); ?>
-                <?php if (!is_null($rate['percent'])): ?>
-                    (<?php echo (float)$rate['percent']; ?>%)
-                <?php endif; ?>
-                <br />
-            </td>
-            <?php if ($isFirst): ?>
-                <td <?php echo $this->getValueProperties()?> rowspan="<?php echo count($rates); ?>">
-                    <?php echo $_order->formatPrice($amount); ?>
-                </td>
-            <?php endif; ?>
-        </tr>
-        <?php $isFirst = 0; ?>
-        <?php $isTop = 0; ?>
-        <?php endforeach; ?>
-    <?php endforeach; ?>
-<?php endif;?>
-
-<?php if ($this->displayFullSummary() && $_fullInfo && !$this->getIsPlaneMode()): ?>
-<tr class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')">
-<?php elseif ($this->displayFullSummary() && $_fullInfo && $this->getIsPlaneMode()): ?>
-<tr class="show-details">
-<?php else: ?>
-<tr>
-<?php endif; ?>
-    <td <?php echo $this->getLabelProperties()?>>
-        <?php if ($this->displayFullSummary()): ?>
-            <div class="summary-collapse"><?php echo __('Tax'); ?></div>
-        <?php else: ?>
-            <?php echo __('Tax'); ?>
-        <?php endif;?>
-    </td>
-    <td <?php echo $this->getValueProperties()?>><?php echo $_order->formatPrice($_source->getTaxAmount()) ?></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
deleted file mode 100644
index 26fdf1e9b573a44dc79983f4c06ff391daff71b3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Script" name="magento-weee-tax-toggle-js">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Weee::tax-toggle.js</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js b/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
deleted file mode 100644
index 211b1975841d4c80bd5d762e5a6ddd84e940c4da..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Varien
- * @package     js
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function($) {
-    "use strict";
-    $(function() {
-        $('body').on('click', '[data-tax-toggle]', function() {
-            var currElem = $(this),
-                args = currElem.data("tax-toggle"),
-                expandedClassName = args.expandedClassName ? args.expandedClassName : 'cart-tax-total-expanded';
-            currElem.toggleClass(expandedClassName);
-            $(args.itemTaxId).toggle();
-        });
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml
deleted file mode 100644
index d58625467f094b1390bb770cdcd4ca41608a0fe9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-widget-widgets-css">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Widget::widgets.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml b/app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
deleted file mode 100644
index ba0a322322bb483ebe2ed332a0dc12d9e931ecaf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Widget/widgets.css b/app/design/frontend/magento_backup/Magento_Widget/widgets.css
deleted file mode 100644
index 2691267413400f7b9bb204557daa30c96f800d6a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Widget/widgets.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-.widget { display:inline; }
-.widget .widget-title { clear:both; padding:15px 0 0; margin:0 0 7px; }
-.widget .widget-title h2 { font-size:15px; font-weight:bold; color:#e25203; }
-
-/* Widgets: Links Common Styles */
-.top-container .widget a { padding:0 0 0 7px; }
-.bottom-container .widget a { padding:0 3px; }
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml
deleted file mode 100644
index 08efe39a154472bef40990e2063bdf2c3e026b92..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Wishlist\Block\Customer\Wishlist\Button */
-?>
-<?php if($this->getWishlist()->getItemsCount() && $this->getWishlist()->getShared() < $this->getConfig()->getSharingEmailLimit()): ?>
-    <button type="submit" name="save_and_share" title="<?php echo __('Share Wish List') ?>" class="button btn-share"><span><span><?php echo __('Share Wish List') ?></span></span></button>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml
deleted file mode 100644
index 57bd7abb51ee061c69b67c0d1b8947423ac5bc9d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php if($this->getWishlist()->getItemsCount() && $this->getWishlist()->isSalable()): ?>
-    <button type="button" title="<?php echo __('Add All to Cart') ?>" class="button btn-add"><span><span><?php echo __('Add All to Cart') ?></span></span></button>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml
deleted file mode 100644
index 8cca098f602e49304ecfd4344d54ac1233c62b1d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php if($this->getWishlist()->getItemsCount()): ?>
-    <button type="submit" name="do" title="<?php echo __('Update Wish List') ?>" class="button btn-update"><span><span><?php echo __('Update Wish List') ?></span></span></button>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/email/items.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/email/items.phtml
deleted file mode 100644
index 4b3d8c79abefaa4b8617f4193d791d026f6b2cab..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/email/items.phtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Wishlist\Block\Share\Email\Items */
-?>
-<?php $l = $this->getWishlistItemsCount() ?>
-<div style="border:1px solid #E0E0E0; padding:15px; background:#F9F9F9;">
-<table cellspacing="0" cellpadding="0" border="0" width="650">
-    <tr>
-    <?php $i = 0; foreach ($this->getWishlistItems() as $item): $i++ ?>
-        <?php /* @var $item \Magento\Wishlist\Model\Item */ ?>
-        <?php /* @var $_product \Magento\Catalog\Model\Product */ ?>
-        <?php $_product = $item->getProduct(); ?>
-        <td width="32%">
-            <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>"><img src="<?php echo $this->getSmallImageUrl($_product); ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" style="border:1px solid #ccc;" alt="" /></a></p>
-            <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#203548;"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
-            <?php if($this->hasDescription($item)): ?><p align="center" style="font-size:12px;"><?php echo __('Comment') ?>:<br /><?php echo $this->getEscapedDescription($item) ?></p><?php endif; ?>
-            <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#1E7EC8;"><?php echo __('View Product') ?></a> <small>
-            <?php if ($_product->getIsSalable()): ?>|</small> <a href="<?php echo $this->getAddToCartUrl($_product) ?>" style="color:#1E7EC8;"><strong><?php echo __('Add to Cart') ?></strong></a><?php endif;?>
-            </p></td>
-        <?php if ($i%3!=0): ?>
-            <td width="2%"></td>
-        <?php else: ?>
-           </tr>
-            <tr>
-                <td colspan="5">&nbsp;</td>
-            </tr>
-            <?php if ($i<$l): ?>
-               <tr>
-            <?php endif ?>
-        <?php endif ?>
-    <?php endforeach ?>
-</table>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml
deleted file mode 100644
index 35ca825cc58f6750d9edaf8845887d3ed9c8c15f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<p style="font-size:12px; line-height:16px; margin:0 0 16px;">
-    <?php echo __("RSS link to %1's wishlist",$this->helper('Magento\Wishlist\Helper\Data')->getCustomerName()) ?>
-    <br />
-    <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getRssUrl($this->getWishlistId()); ?>"><?php echo $this->helper('Magento\Wishlist\Helper\Data')->getRssUrl($this->getWishlistId()); ?></a>
-</p>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml
deleted file mode 100644
index fca1301056150f34c953c531809fe6b5ad77d466..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* @var $this \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart */
-/* @var \Magento\Wishlist\Model\Item $item */
-$item = $this->getItem();
-$product = $item->getProduct();
-$options = $this->getChildBlock('customer.wishlist.item.options')
-    ->setItem($item)
-    ->getConfiguredOptions();
-?>
-<div class="cart-cell">
-    <?php echo $this->getPriceHtml($product, empty($options));?>
-    <div class="add-to-cart-alt">
-        <?php if ($item->canHaveQty() && $item->getProduct()->isVisibleInSiteVisibility()): ?>
-            <input type="text" class="input-text qty" data-validate="{required:true,'validate-greater-than-zero':true}" name="qty[<?php echo $item->getId() ?>]"
-                   value="<?php echo $this->getAddToCartQty($item) * 1 ?>"/>
-        <?php endif; ?>
-        <?php if ($product->isSaleable()): ?>
-            <button type="button" title="<?php echo __('Add to Cart') ?>" data-item-id="<?php echo $item->getId()?>" class="button btn-cart"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-        <?php else: ?>
-            <?php if ($product->getIsSalable()): ?>
-                <p class="availability in-stock"><span><?php echo __('In stock') ?></span></p>
-            <?php else: ?>
-                <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-            <?php endif; ?>
-        <?php endif; ?>
-    </div>
-    <?php foreach ($this->getChildNames() as $childName): ?>
-        <?php echo $this->getLayout()->renderElement($childName, false); ?>
-    <?php endforeach;?>
-    <?php if ($product->isVisibleInSiteVisibility()): ?>
-        <p><a class="link-edit" href="<?php echo $this->getItemConfigureUrl($item) ?>"><?php echo __('Edit') ?></a>
-    </p>
-    <?php endif ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml
deleted file mode 100644
index b501eb0d40bcf09d4e074a05a024fe352ddad184..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* @var \Magento\Wishlist\Model\Item $item */
-$item = $this->getItem();
-$product = $item->getProduct();
-?>
-<a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>">
-    <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($product, 'small_image')->resize(113, 113); ?>" width="113" height="113" alt="<?php echo $this->escapeHtml($product->getName()) ?>" />
-</a>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml
deleted file mode 100644
index 30c2d1b749d1a64d6739645aa02028bdf88edef1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* @var \Magento\Wishlist\Model\Item $item */
-$item = $this->getItem();
-$product = $item->getProduct();
-?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h3>
-<div class="description std"><div class="inner"><?php echo $this->escapeHtml($this->stripTags($product->getShortDescription()));?></div></div>
-<textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" title="<?php echo __('Comment') ?>"><?php echo ($this->escapeHtml($item->getDescription())) ?></textarea>
-<?php $children = $this->getChildNames(); ?>
-<?php if ($children): ?>
-    <div class="item-manage">
-    <?php foreach($children as $childName):?>
-        <?php echo $this->getLayout()->renderElement($childName, false);?>
-    <?php endforeach;?>
-    </div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml
deleted file mode 100644
index 9ffc7c89a1f409313d1b0b2432da128ef0a4f5f5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-?>
-<a href="<?php echo $this->getItemRemoveUrl($this->getItem()); ?>" title="<?php echo __('Remove Item') ?>"
-    class="btn-remove btn-remove2"><?php echo __('Remove item');?></a>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml
deleted file mode 100644
index 62648935ae2427011ed4ed20726acab73a549242..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php $_wishlistItem = $this->getWishlistItem(); ?>
-<?php $_wishlistSubmitUrl = $this->helper('Magento\Wishlist\Helper\Data')->getUpdateUrl($_wishlistItem); ?>
-<ul class="add-to-links" data-role="add-to-links">
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <li><a href="<?php echo $_wishlistSubmitUrl ?>" class="link-compare"><?php echo __('Update Wish List') ?></a></li>
-<?php endif; ?>
-<?php $_product = $this->getProduct(); ?>
-<?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
-<?php if ($_compareUrl) : ?>
-    <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-<?php endif; ?>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml
deleted file mode 100644
index bf5a7dc7ccb8062eb6a8d776f4868465738d50f3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-    $columns = $this->getColumns();
-?>
-<table class="data-table" id="wishlist-table">
-    <thead>
-        <tr>
-            <?php foreach ($columns as $column): ?>
-                <th><?php echo $column->getTitle();?></th>
-            <?php endforeach; ?>
-        </tr>
-    </thead>
-    <tbody>
-        <?php if (count($this->getItems())): ?>
-            <?php foreach ($this->getItems() as $item): ?>
-                <tr id="item_<?php echo $item->getId();?>">
-                    <?php foreach ($columns as $column): ?>
-                        <td><?php $column->setItem($item); echo $column->toHtml($item);?></td>
-                    <?php endforeach; ?>
-                </tr>
-            <?php endforeach ?>
-        <?php else: ?>
-            <td colspan="<?php echo count($columns);?>" class="wishlist-empty"><?php echo __('This Wish List has no Items');?></td>
-        <?php endif; ?>
-    </tbody>
-</table>
-<?php foreach ($columns as $column): ?>
-    <?php echo $column->getAdditionalHtml();?>
-<?php endforeach; ?>
-<script type="text/javascript">
-    jQuery('#wishlist-table').decorate('table');
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js b/app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js
deleted file mode 100644
index 1c90f128567cec12404d77cca32640c0a39e4b3c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function ($) {
-    $.widget('mage.addToWishlist', {
-        options: {
-            bundleInfo: '[id^=bundle-option-]',
-            configurableInfo: '.super-attribute-select',
-            groupedInfo: '#super-product-table input',
-            downloadableInfo: '.options-list input',
-            customOptionsInfo: '.product-custom-option'
-        },
-        _create: function () {
-            this.addToWishlist();
-        },
-        addToWishlist: function () {
-            this._on({
-                'click [data-action="add-to-wishlist"]': function (event) {
-                    var url = $(event.target).closest('a').attr('href'),
-                        productInfo = this.options[this.options.productType + 'Info'],
-                        additionalData = $(this.options.customOptionsInfo).serialize();
-                    if (productInfo !== undefined) {
-                        additionalData += $(productInfo).serialize();
-                    }
-                    $(event.target).closest('a').attr('href', url + (url.indexOf('?') == -1 ? '?' : '&') + additionalData);
-                }
-            });
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/js/search.js b/app/design/frontend/magento_backup/Magento_Wishlist/js/search.js
deleted file mode 100644
index b7d812993a088dbb126b5a0d458a74a495873876..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/js/search.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    frontend wishlist search
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/*jshint browser:true jquery:true*/
-(function($) {
-    "use strict";
-    $.widget('mage.wishlistSearch', {
-
-        /**
-         * Bind handlers to events
-         */
-        _create: function() {
-            this.element.on('change', $.proxy(this._toggleForm, this));
-        },
-
-        /**
-         * Toggle Form
-         * @private
-         */
-        _toggleForm: function() {
-            switch (this.element.val()) {
-                case 'name':
-                    $(this.options.emailFormSelector).hide();
-                    $(this.options.nameFormSelector).show();
-                    break;
-                case 'email':
-                    $(this.options.nameFormSelector).hide();
-                    $(this.options.emailFormSelector).show();
-                    break;
-                default:
-                    $(this.options.emailFormSelector).add(this.options.nameFormSelector).hide();
-            }
-        }
-    });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.xml
deleted file mode 100644
index 7d7127d1ab09e8fea47ab9ff3df1521e2e6b7040..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="customer_account_navigation">
-        <block class="Magento\Page\Block\Link\Current" ifconfig="wishlist/general/active" name="customer-account-navigation-wish-list-link">
-            <arguments>
-                <argument name="path" xsi:type="string">wishlist</argument>
-                <argument name="label" xsi:type="string">My Wish List</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml
deleted file mode 100644
index 38984fd880687ec918e672e8bc7a96760533d6e7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="top.links">
-        <block class="Magento\Wishlist\Block\Link" name="wish-list-link" after="my-account-link"/>
-    </referenceBlock>
-    <referenceContainer name="right">
-        <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" after="cart_sidebar" template="sidebar.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml
deleted file mode 100644
index 417ae117e714cd2da5fd3721bf9a6a0b42af62e1..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
-        <block class="Magento\Wishlist\Block\Item\Configure" name="product.info.addto" as="addto" template="item/configure/addto.phtml"/>
-    </referenceBlock>
-    <referenceBlock name="product.info.options.wrapper.bottom">
-        <action method="unsetChild">
-            <argument name="name" xsi:type="string">product.info.addto.additional</argument>
-        </action>
-        <action method="append">
-            <argument name="element" xsi:type="string">product.info.addto.additional</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
deleted file mode 100644
index 83752c4c834c591ed98e8e26c2c08ce9ca35ba3e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-bundle-js">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Bundle::bundle.js</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-js-product-summary-js">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Bundle::js/product-summary.js</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="product.info">
-        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
-            <action method="addPriceBlockType">
-                <argument name="type" xsi:type="string">bundle</argument>
-                <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-                <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
-            </action>
-            <block class="Magento\Bundle\Block\Catalog\Product\Price" name="bundle.prices" as="bundle_prices" template="catalog/product/view/price.phtml">
-                <action method="setMAPTemplate">
-                    <argument name="tmpl" xsi:type="string">Magento_Catalog::product/price_msrp_item.phtml</argument>
-                </action>
-            </block>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="product.info.options.wrapper">
-        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="product.info.options.wrapper.bottom">
-        <remove name="product.tierprices"/>
-        <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.tierprices" as="tierprices" before="-" template="Magento_Bundle::catalog/product/view/tierprices.phtml"/>
-        <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/>
-    </referenceBlock>
-    <referenceBlock name="product.clone_prices">
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">bundle</argument>
-            <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-            <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml
deleted file mode 100644
index 2bad362d01d06d4c53b90df177e8e4fea3b3e12b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info">
-        <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.configurable" as="product_type_data" template="product/view/type/default.phtml">
-            <container name="product.info.configurable.extra" as="product_type_data_extra" label="Product Extra Info"/>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="product.info.options.wrapper">
-        <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="product/view/type/options/configurable.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
deleted file mode 100644
index c596eec47d5bd966050034d30d807d0888a90c50..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Grouped)" type="page">
-    <referenceBlock name="product.info">
-        <block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" as="product_type_data" template="product/view/type/grouped.phtml">
-            <container name="product.info.grouped.extra" as="product_type_data_extra" label="Product Extra Info"/>
-        </block>
-        <block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped.grid" as="product_type_data_grid" template="product/view/type/grouped.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml
deleted file mode 100644
index 23daddbc2fcfacaf607d46c47ab9d07156735cd3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Simple)" type="page">
-    <update handle="catalog_product_view_type_simple"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
deleted file mode 100644
index 83fe9d8cc4fa3b922bdd17bdeda48a2b5f663902..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Wishlist\Block\Customer\Wishlist" name="customer.wishlist" template="view.phtml">
-            <action method="setTitle">
-                <argument translate="true" name="title" xsi:type="string">My Wish List</argument>
-            </action>
-            <block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="item/list.phtml">
-                <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="item/column/image.phtml"/>
-                <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Comment" name="customer.wishlist.item.info" template="item/column/info.phtml">
-                    <action method="setTitle">
-                        <argument translate="true" name="title" xsi:type="string">Product Details and Comment</argument>
-                    </action>
-                </block>
-                <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.cart" template="item/column/cart.phtml">
-                    <action method="setTitle">
-                        <argument translate="true" name="title" xsi:type="string">Add to Cart</argument>
-                    </action>
-                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Options" name="customer.wishlist.item.options"/>
-                </block>
-                <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove" name="customer.wishlist.item.remove" template="item/column/remove.phtml"/>
-            </block>
-            <container name="customer.wishlist.buttons" as="control_buttons" label="Wishlist Control Buttons">
-                <block class="Magento\Wishlist\Block\Customer\Wishlist\Button" name="customer.wishlist.button.share" template="button/share.phtml"/>
-                <block class="Magento\Wishlist\Block\Customer\Wishlist\Button" name="customer.wishlist.button.toCart" template="button/tocart.phtml"/>
-                <block class="Magento\Wishlist\Block\Customer\Wishlist\Button" name="customer.wishlist.button.update" template="button/update.phtml"/>
-            </container>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml
deleted file mode 100644
index a5d2536a2a912098ebc1f227f1a878151c021d27..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Wish List Sharing Form" type="page">
-    <update handle="customer_account"/>
-    <referenceContainer name="my.account.wrapper">
-        <block class="Magento\Wishlist\Block\Customer\Sharing" name="wishlist.sharing" template="sharing.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml
deleted file mode 100644
index 5514a660d280a55ddd2245e809b8a829c01d47bf..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Wishlist\Block\Share\Wishlist" name="customer.wishlist" template="shared.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml
deleted file mode 100644
index 680c0e6079fc9133e42def081b20df642bb395e2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Wishlist\Block\Customer\Wishlist\Item\Options */
-?>
-
-<?php $options = $this->getOptionList(); ?>
-<?php if ($options): ?>
-<div class="truncated" data-mage-init="{truncateOptions:[]}">
-  <div class="truncated_full_value">
-      <div class="item-options">
-          <p><?php echo __('Options Details'); ?></p>
-          <dl>
-              <?php foreach ($options as $option): ?>
-              <dt><?php echo $this->escapeHtml($option['label']) ?></dt>
-              <dd>
-                  <?php if (is_array($option['value'])): ?>
-                  <?php echo nl2br(implode("\n", $option['value'])) ?>
-                  <?php else: ?>
-                  <?php echo $option['value'] ?>
-                  <?php endif; ?>
-              </dd>
-              <?php endforeach; ?>
-          </dl>
-      </div>
-  </div>
-  <a href="#" onclick="return false;" class="details"><?php echo __('View Details') ?></a>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml
deleted file mode 100644
index 7f21d63b3f844b9dc832b01b3cefbcc08f6b5a7e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Wishlist\Block\Customer\Wishlist_Render_Item_Price */
-?>
-
-<?php echo $this->getCleanProductPriceHtml(); ?>
-
-<?php /* @var $product \Magento\Catalog\Model\Product */ ?>
-<?php $product = $this->getProduct(); ?>
-<?php $finalPrice = $product->getFinalPrice(1); ?>
-<?php if ($product->canConfigure()): ?>
-    <p class="configured-price">
-        <span class="price-label"><?php echo __('Configured Price:') ?></span>
-        <span class="price"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($finalPrice, true, false); ?></span>
-    </p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml
deleted file mode 100644
index 760bdecc9fe09bee363a205afa8691be3e426d56..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php
-/**
- * Template for displaying product price at product view page, gift registry and wishlist
- *
- * @var $this \Magento\Catalog\Block\Product\Price
- */
-?>
-<?php
-    /** @var $_coreHelper \Magento\Core\Helper\Data */
-    $_coreHelper = $this->helper('Magento\Core\Helper\Data');
-    /** @var $_catalogHelper \Magento\Catalog\Helper\Data */
-    $_catalogHelper = $this->helper('Magento\Catalog\Helper\Data');
-
-    /** @var $_product \Magento\Catalog\Model\Product */
-    $_product = $this->getProduct();
-    $_id = $_product->getId();
-    $_msrpPrice = '';
-?>
-    <div class="price-box map-info">
-    <?php $_price = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getMsrp()) ?>
-        <?php if($_product->getMsrp()): ?>
-            <?php $_msrpPrice = $_coreHelper->currency($_product->getMsrp(),true,true) ?>
-            <span class="old-price" ><?php echo $_msrpPrice ?></span>
-        <?php endif; ?>
-        <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
-            <?php $priceElementId = 'product-price-' . $_id . $this->getIdSuffix(); ?>
-            <span id="<?php echo $priceElementId ?>" style="display:none"></span>
-            <?php $popupId = 'msrp-popup-' . $_id . $this->getRandomString(20); ?>
-            <a href="#" id="<?php echo($popupId);?>"><?php echo __('Click for price'); ?></a>
-        <?php else: ?>
-            <span class="msrp-price-hide-message">
-                <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
-            </span>
-        <?php endif; ?>
-        <?php $helpLinkId = 'msrp-help-' . $_id . $this->getRandomString(20); ?>
-        <a href="#" id="<?php echo($helpLinkId);?>"><?php echo __("What's this?"); ?></a>
-    </div>
-    <script type="text/javascript">
-    (function ($) {
-        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>",
-            function () {
-            <?php if ($this->helper('Magento\Catalog\Helper\Data')->isShowPriceOnGesture($_product)): ?>
-                $('#<?php echo($popupId);?>').addToCart({
-                    cartForm: "#wishlist-view-form",
-                    popupId: "#<?php echo($popupId);?>",
-                    productName: '<?php echo $_product->getName() ?>',
-                    realPrice: '<?php echo $this->getRealPriceJs($_product) ?>',
-                    msrpPrice: '<?php echo $_msrpPrice ?>',
-                    priceElementId: '<?php echo $priceElementId ?>',
-                    closeButtonId: '#map-popup-close',
-                    popupCartButtonId: "#map-popup-button"
-                });
-                <?php endif; ?>
-                $("#<?php echo($helpLinkId);?>").addToCart({
-                    helpLinkId: "#<?php echo($helpLinkId);?>",
-                    productName: '<?php echo $_product->getName() ?>'
-                });
-            });
-        })(jQuery);
-    </script>
-
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml
deleted file mode 100644
index 010547daeb93b5d51e36a5c6d3654a9fd3c7f3ef..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for displaying wishlist item price at rss feeds pages
- *
- * @var $this \Magento\Catalog\Block\Product\Price
- */
-?>
-<div class="price-box map-info">
-    <?php if ($this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($this->getProduct())): ?>
-        <a href="<?php echo $this->getProduct()->getProductUrl() ?>"><?php echo __('Click for price'); ?></a>
-    <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml
deleted file mode 100644
index 4b8bde4e6c0d7c21a815b21541589d06833fe1c5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Wishlist\Block\Share\Wishlist */
-?>
-<div class="my-wishlist">
-    <div class="page-title">
-        <h1><?php echo $this->escapeHtml($this->getHeader()) ?></h1>
-    </div>
-    <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-    <?php if ($this->hasWishlistItems()): ?>
-    <form action="<?php echo $this->getUrl('*/*/update') ?>" method="post">
-        <fieldset>
-            <table class="data-table" id="wishlist-table">
-            <col width="1" />
-            <col />
-            <col width="1" />
-            <thead>
-                <tr>
-                    <th><?php echo __('Product') ?></th>
-                    <th><?php echo __('Comment') ?></th>
-                    <th>&nbsp;</th>
-                </tr>
-            </thead>
-            <tbody>
-            <?php foreach($this->getWishlistItems() as $item): ?>
-                <?php
-                    $product = $item->getProduct();
-                    $isVisibleProduct = $product->isVisibleInSiteVisibility();
-                ?>
-                <tr>
-                    <td>
-                        <a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><img src="<?php echo $this->getImageUrl($product); ?>" width="<?php echo $this->getImageSize()?>" height="<?php echo $this->getImageSize()?>" alt="<?php echo $this->escapeHtml($item->getName()) ?>" /></a>
-                        <h2 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h2>
-                        <?php echo $this->getPriceHtml($product) ?>
-                        <?php echo $this->getDetailsHtml($item) ?>
-                    </td>
-                    <td><?php echo $this->getEscapedDescription($item) ?></td>
-                    <td class="a-center">
-                    <?php if ($product->isSaleable()): ?>
-                        <?php if ($isVisibleProduct): ?>
-                            <button type="button" title="<?php echo __('Add to Cart') ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo __('Add to Cart') ?></span></span></button>
-                        <?php endif ?>
-                    <?php endif; ?>
-                        <p><a href="<?php echo $this->getAddToWishlistUrl($item) ?>" onclick="setLocation(this.href); return false;" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></p>
-                    </td>
-                </tr>
-            <?php endforeach ?>
-            </tbody>
-            </table>
-            <script type="text/javascript">(function($) {$('#wishlist-table').decorate('table')})(jQuery)</script>
-        </fieldset>
-        <div class="buttons-set">
-            <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-            <?php if($this->isSaleable()):?>
-                <button type="button" title="<?php echo __('Add All to Cart') ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo __('Add All to Cart') ?></span></span></button>
-            <?php endif;?>
-        </div>
-    </form>
-    <?php else: ?>
-        <p><?php echo __('Wish List is empty now.') ?></p>
-    <?php endif ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/sharing.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/sharing.phtml
deleted file mode 100644
index c421eff73394afa6b5b830709b9347a64ad6b8b7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/sharing.phtml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Wishlist\Block\Customer\Sharing */
-?>
-<div class="page-title">
-    <h1><?php echo __('Share Your Wish List') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getSendUrl() ?>" id="form-validate" method="post">
-    <div class="fieldset">
-        <?php echo $this->getBlockHtml('formkey')?>
-        <h2 class="legend"><?php echo __('Sharing Information') ?></h2>
-        <ul class="form-list">
-            <li class="wide">
-                <label for="email_address" class="required"><em>*</em><?php echo __('Email addresses, separated by commas (max %1 addresses)', $this->getEmailSharingLimit()); ?></label>
-                <div class="input-box">
-                    <textarea name="emails" cols="60" rows="5" id="email_address" data-validate="{required:true,'validate-emails':true}"><?php echo $this->getEnteredData('emails') ?></textarea>
-                </div>
-            </li>
-            <li class="wide">
-                <label for="message"><?php echo __('Message') ?></label>
-                <div class="input-box">
-                    <textarea id="message" name="message" cols="60" rows="5" class="validate-length maximum-length-<?php echo $this->getTextSharingLimit();?>"><?php echo $this->getEnteredData('message') ?></textarea>
-                </div>
-            </li>
-            <?php if($this->helper('Magento\Wishlist\Helper\Data')->isRssAllow()): ?>
-            <li class="control">
-                <div class="input-box">
-                    <input type="checkbox" name="rss_url" id="rss_url" value="1" title="<?php echo __('Check this checkbox if you want to add a link to an rss feed to your wishlist.') ?>" class="checkbox" />
-                </div>
-                <label for="rss_url"><?php echo __('Check this checkbox if you want to add a link to an rss feed to your wishlist.') ?></label>
-            </li>
-            <?php endif; ?>
-        </ul>
-    </div>
-    <div class="buttons-set form-buttons">
-        <p class="required"><?php echo __('* Required Fields') ?></p>
-        <p class="back-link"><a href="<?php echo $this->getBackUrl(); ?>"><small>&laquo; </small><?php echo __('Back')?></a></p>
-        <button type="submit" title="<?php echo __('Share Wish List') ?>" class="button"><span><span><?php echo __('Share Wish List') ?></span></span></button>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>", function() {
-                $('#form-validate').validation();
-            })
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml
deleted file mode 100644
index 2e84cde15eef566722b5d0544c56d2d89e35db3e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Wishlist\Block\Customer\Sidebar */
-?>
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-<div class="block block-wishlist">
-    <div class="block-title">
-        <strong><span><?php echo $this->getTitle(); ?></span></strong>
-    </div>
-    <div class="block-content">
-    <p class="block-subtitle"><?php echo __('Last Added Items') ?></p>
-    <?php if ($this->hasWishlistItems()): ?>
-    <ol class="mini-products-list" id="wishlist-sidebar">
-     <?php foreach ($this->getWishlistItems() as $_item): ?>
-        <?php $product = $_item->getProduct(); ?>
-        <li class="item">
-            <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>" class="product-image"><img src="<?php echo $this->getThumbnailSidebarUrl($product); ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
-            <div class="product-details">
-                <a href="<?php echo $this->getItemRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>" onclick="return confirm('<?php echo __('Are you sure you would like to remove this item from the wishlist?') ?>');" class="btn-remove"><?php echo __('Remove This Item') ?></a>
-                <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></p>
-                <?php echo $this->getPriceHtml($product, false, '-wishlist') ?>
-                <?php if ($product->isSaleable() && $product->isVisibleInSiteVisibility()): ?>
-                    <a href="<?php echo $this->getItemAddToCartUrl($_item) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
-                <?php endif; ?>
-            </div>
-        </li>
-    <?php endforeach; ?>
-    </ol>
-    <script type="text/javascript">(function($) {$('#wishlist-sidebar').decorate('list', false)})(jQuery)</script>
-    <div class="actions">
-        <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getListUrl() ?>"><?php echo __('Go to Wish List') ?></a>
-    </div>
-    <?php else: ?>
-        <p class="empty"><?php echo __('You have no items in your wishlist.') ?></p>
-    <?php endif ?>
-    </div>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/view.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/view.phtml
deleted file mode 100644
index ca2f8f10112b1d59852f1956344c2f98bce2febd..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/view.phtml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Wishlist\Block\Customer\Wishlist */
-?>
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <div class="my-wishlist">
-        <div class="page-title title-buttons">
-            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isRssAllow() && $this->hasWishlistItems()): ?>
-                <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getRssUrl($this->getWishlistInstance()->getId()); ?>" class="link-rss"><?php echo __('RSS Feed') ?></a>
-            <?php endif; ?>
-            <h1><?php echo $this->getTitle(); ?></h1>
-        </div>
-        <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-        <form id="wishlist-view-form" action="<?php echo $this->getUrl('*/*/update', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>" method="post">
-            <?php echo $this->getChildHtml('top'); ?>
-            <fieldset>
-                <?php if ($this->hasWishlistItems()): ?>
-                        <?php echo $this->getBlockHtml('formkey');?>
-                        <?php $this->getChildBlock('items')->setItems($this->getWishlistItems()); ?>
-                        <?php echo $this->getChildHtml('items');?>
-                <?php else: ?>
-                    <p class="wishlist-empty"><?php echo __('You have no items in your wish list.') ?></p>
-                <?php endif ?>
-                <div class="buttons-set buttons-set2">
-                    <?php echo $this->getChildHtml('control_buttons');?>
-                </div>
-            </fieldset>
-        </form>
-        <script id="form-tmpl" type="text/x-jQuery-tmpl">
-            <form id="wishlist-hidden-form" method="post" action="${url}" class="no-display">
-                {{if itemId}}<input name="item_id" value="${itemId}"/>{{/if}}
-                {{if wishlistId}}<input name="wishlist_id" value="${wishlistId}"/>{{/if}}
-                {{if qty}}<input name="qty" value="${qty}"/>{{/if}}
-                {{if item}}<input name="item" value="${item}"/>{{/if}}
-                {{if entity}}<input name="entity" value="${entity}"/>{{/if}}
-            </form>
-        </script>
-        <script>
-            (function($) {
-                head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-                    "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-                    "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-                    "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-                    "<?php echo $this->getViewFileUrl('Magento_Persistent::splitbutton.js') ?>",
-                    "<?php echo $this->getViewFileUrl('Magento_Wishlist::wishlist.js')?>", function() {
-                        $('#wishlist-view-form').wishlist({
-                            addToCartUrl: '<?php echo $this->getItemAddToCartUrl('%item%');?>' ,
-                            confirmRemoveMessage: '<?php echo __('Are you sure you want to remove this product from your wish list?') ?>',
-                            addAllToCartUrl : '<?php echo $this->getUrl('*/*/allcart', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>',
-                            commentString : '<?php echo $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString()?>'
-                        });
-                        $('body').splitButton();
-                    });
-            })(jQuery);
-        </script>
-    </div>
-    <?php echo $this->getChildHtml('bottom'); ?>
-    <div class="buttons-set">
-        <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo __('Back') ?></a></p>
-    </div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js b/app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js
deleted file mode 100644
index 757fc80231c159752e6fbc880c570de28a52b3f6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    frontend product msrp
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/*jshint browser:true jquery:true sub:true*/
-/*global alert*/
-(function($, window) {
-    "use strict";
-    $.widget('mage.wishlist', {
-        options: {
-            dataAttribute: 'item-id',
-            nameFormat: 'qty[{0}]',
-            btnRemoveSelector: '.btn-remove',
-            qtySelector: '.qty',
-            addToCartSelector: '.btn-cart',
-            addAllToCartSelector: '.btn-add',
-            commentInputType: 'textarea',
-            infoList: false
-        },
-
-        /**
-         * Bind handlers to events.
-         */
-        _create: function() {
-            var _this = this;
-            if (!this.options.infoList) {
-                this.element
-                    .on('click', this.options.addToCartSelector, function() {
-                        $.proxy(_this._addItemsToCart($(this)), _this);
-                    })
-                    .on('addToCart', function(event, context) {
-                        $.proxy(_this._addItemsToCart($(context).parents('.cart-cell').find(_this.options.addToCartSelector)), _this);
-                    })
-                    .on('click', this.options.btnRemoveSelector, $.proxy(this._confirmRemoveWishlistItem, this))
-                    .on('click', this.options.addAllToCartSelector, $.proxy(this._addAllWItemsToCart, this))
-                    .on('focusin focusout', this.options.commentInputType, $.proxy(this._focusComment, this));
-            }
-        },
-
-        /**
-         * Validate and Redirect.
-         * @private
-         * @param {string} url
-         */
-        _validateAndRedirect: function(url) {
-            if (this.element.validation({
-                errorPlacement: function(error, element) {
-                    error.insertAfter(element.next());
-                }
-            }).valid()) {
-                this.element.prop('action', url);
-                window.location.href = url;
-            }
-        },
-
-        /**
-         * Add wish list items to cart.
-         * @private
-         * @param {jQuery object} elem - clicked 'add to cart' button
-         */
-        _addItemsToCart: function(elem) {
-            if (elem.data(this.options.dataAttribute)) {
-                var itemId = elem.data(this.options.dataAttribute),
-                    url = this.options.addToCartUrl.replace('%item%', itemId),
-                    inputName = $.validator.format(this.options.nameFormat, itemId),
-                    inputValue = elem.parent().find('[name="' + inputName + '"]').val(),
-                    separator = (url.indexOf('?') >= 0) ? '&' : '?';
-                url += separator + inputName + '=' + encodeURIComponent(inputValue);
-                this._validateAndRedirect(url);
-                return;
-            }
-
-        },
-
-        /**
-         * Confirmation window for removing wish list item.
-         * @private
-         */
-        _confirmRemoveWishlistItem: function() {
-            return window.confirm(this.options.confirmRemoveMessage);
-        },
-
-        /**
-         * Add all wish list items to cart
-         * @private
-         */
-        _addAllWItemsToCart: function() {
-            var url = this.options.addAllToCartUrl,
-                separator = (url.indexOf('?') >= 0) ? '&' : '?';
-            this.element.find(this.options.qtySelector).each(function(index, element) {
-                url += separator + $(element).prop('name') + '=' + encodeURIComponent($(element).val());
-                separator = '&';
-            });
-            this._validateAndRedirect(url);
-        },
-
-        /**
-         * Toggle comment string.
-         * @private
-         * @param {event} e
-         */
-        _focusComment: function(e) {
-            var commentInput = e.currentTarget;
-            if (commentInput.value === '' || commentInput.value === this.options.commentString) {
-                commentInput.value = commentInput.value === this.options.commentString ?
-                    '' : this.options.commentString;
-            }
-        }
-    });
-
-    // Extension for mage.wishlist - Select All checkbox
-    $.widget('mage.wishlist', $.mage.wishlist, {
-        options: {
-            selectAllCheckbox: '#select-all',
-            parentContainer: '#wishlist-table'
-        },
-
-        _create: function() {
-            this._super();
-            var selectAllCheckboxParent = $(this.options.selectAllCheckbox).parents(this.options.parentContainer),
-                checkboxCount = selectAllCheckboxParent.find('input:checkbox:not(' + this.options.selectAllCheckbox + ')').length;
-            // If Select all checkbox is checked, check all item checkboxes, if unchecked, uncheck all item checkboxes
-            $(this.options.selectAllCheckbox).on('click', function() {
-                selectAllCheckboxParent.find('input:checkbox').attr('checked', $(this).is(':checked'));
-            });
-            // If all item checkboxes are checked, check select all checkbox,
-            // if not all item checkboxes are checked, uncheck select all checkbox
-            selectAllCheckboxParent.on('click', 'input:checkbox:not(' + this.options.selectAllCheckbox + ')', $.proxy(function() {
-                var checkedCount = selectAllCheckboxParent.find('input:checkbox:checked:not(' + this.options.selectAllCheckbox + ')').length;
-                $(this.options.selectAllCheckbox).attr('checked', checkboxCount === checkedCount);
-            }, this));
-        }
-    });
-    // Extension for mage.wishlist info add to cart
-    $.widget('mage.wishlist', $.mage.wishlist, {
-        _create: function() {
-            this._super();
-            if (this.options.infoList) {
-                this.element.on('addToCart', $.proxy(function(event, context) {
-                    this.element.find('input:checkbox').attr('checked', false);
-                    $(context).closest('tr').find('input:checkbox').attr('checked', true);
-                    this.element.submit();
-                }, this));
-                this._checkBoxValidate();
-            }
-        },
-
-        /**
-         * validate checkbox selection.
-         * @private
-         */
-        _checkBoxValidate: function() {
-            this.element.validation({
-                submitHandler: $.proxy(function(form) {
-                    if ($(form).find('input:checkbox:checked').length) {
-                        form.submit();
-                    } else {
-                        alert(this.options.checkBoxValidationMessage);
-                    }
-                }, this)
-            });
-        }
-    });
-    
-    // Extension for mage.wishlist - Add Wishlist item to Gift Registry
-    $.widget('mage.wishlist', $.mage.wishlist, {
-        options: {
-            formTmplSelector: '#form-tmpl',
-            formTmplId: '#wishlist-hidden-form'
-        },
-
-        _create: function() {
-            this._super();
-            var _this = this;
-            this.element.on('click', '[data-wishlist-to-giftregistry]', function() {
-                var json = $(this).data('wishlist-to-giftregistry'),
-                    tmplJson = {
-                        item: json['itemId'],
-                        entity: json['entity'],
-                        url: json['url']
-                    };
-                $(_this.options.formTmplSelector).tmpl(tmplJson).appendTo('body');
-                $(_this.options.formTmplId).submit();
-            });
-        }
-    });
-})(jQuery, window);
diff --git a/app/design/frontend/magento_backup/css/print.css b/app/design/frontend/magento_backup/css/print.css
deleted file mode 100644
index 557b9cc01434c25200cc2b3218bebebc494674eb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/css/print.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-*     { background:none !important; text-align:left !important; }
-body  { background:#fff !important; font-size:9pt !important; margin:15px !important; }
-
-.header-container,
-.footer-before-container,
-.footer-container,
-.widget,
-.pager,
-.toolbar,
-.actions,
-.buttons-set { display:none !important; }
-
-.page-print .data-table .cart-tax-total { background-position:100% -54px; }
-.page-print .data-table .cart-tax-info { display:block !important; }
diff --git a/app/design/frontend/magento_backup/media/preview_image.jpg b/app/design/frontend/magento_backup/media/preview_image.jpg
deleted file mode 100644
index 3c9b11dae2719b47bf95d41e69136f1e56ce2904..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_backup/media/preview_image.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_backup/theme.xml b/app/design/frontend/magento_backup/theme.xml
deleted file mode 100644
index 8109c440bc4da98f5fc0341381dd0cd8b76771b3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_backup/theme.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<theme>
-    <title>Magento Backup</title>
-    <version>1.0.0.0</version>
-    <media>
-        <preview_image>media/preview.jpg</preview_image>
-    </media>
-</theme>
diff --git a/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_in.gif b/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_in.gif
deleted file mode 100644
index 5a8d72e2a4223419617fc3ab7e949b26eceaa2b1..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_in.gif and /dev/null differ
diff --git a/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_out.gif b/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_out.gif
deleted file mode 100644
index feffd3247c851e282eb701f9a825fc506c5bdd96..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_out.gif and /dev/null differ
diff --git a/app/design/frontend/magento_blank/theme.xml b/app/design/frontend/magento_blank/theme.xml
index ec930d7cab09bb8a01c50dbd53a7503577c72ec2..1fdcf0f50319b1b1896f305be671bcb87f6fd3a3 100644
--- a/app/design/frontend/magento_blank/theme.xml
+++ b/app/design/frontend/magento_blank/theme.xml
@@ -27,7 +27,6 @@
 <theme>
     <title>Magento Blank</title>
     <version>2.0.0.0</version>
-    <parent>magento_demo</parent>
     <media>
         <preview_image>media/preview_image.jpg</preview_image>
     </media>
diff --git a/app/design/frontend/magento_blank/view.xml b/app/design/frontend/magento_blank/view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bdad3bdb43e124ed2ce8916faad4676eb6d8e93f
--- /dev/null
+++ b/app/design/frontend/magento_blank/view.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Design
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<view>
+    <vars module="Magento_Catalog">
+        <var name="product_small_image_sidebar_size">100</var>  <!-- Override for small product image -->
+        <var name="product_base_image_size">275</var>           <!-- Override for base product image -->
+        <var name="product_base_image_icon_size">48</var>       <!-- Base product image icon size -->
+
+        <var name="product_list_image_size">166</var>           <!-- New Product image size used in product list -->
+        <var name="product_zoom_image_size">370</var>           <!-- New Product image size used for zooming -->
+
+        <var name="product_image_white_borders">0</var>
+
+        <var name="review_page_product_image:type">small_image</var>
+        <var name="review_page_product_image:width">285</var>
+        <var name="review_page_product_image:ratio">1</var>
+        <var name="review_page_product_image:height">285</var>
+
+        <var name="customer_account_product_review_page:type">image</var>
+        <var name="customer_account_product_review_page:width">285</var>
+        <var name="customer_account_product_review_page:ratio">1</var>
+        <var name="customer_account_product_review_page:height">285</var>
+
+        <var name="category_page_list:type">small_image</var>
+        <var name="category_page_list:width">180</var>
+        <var name="category_page_list:ratio">1</var>
+        <var name="category_page_list:height">230</var>
+
+        <var name="category_page_grid:type">small_image</var>
+        <var name="category_page_grid:width">180</var>
+        <var name="category_page_grid:ratio">1</var>
+        <var name="category_page_grid:height">230</var>
+
+        <var name="product_comparison_list:type">small_image</var>
+        <var name="product_comparison_list:width">140</var>
+        <var name="product_comparison_list:ratio">1</var>
+        <var name="product_comparison_list:height">140</var>
+
+        <var name="related_products_list:type">small_image</var>
+        <var name="related_products_list:width">140</var>
+        <var name="related_products_list:ratio">1</var>
+        <var name="related_products_list:height">140</var>
+
+        <var name="upsell_products_list:type">small_image</var>
+        <var name="upsell_products_list:width">140</var>
+        <var name="upsell_products_list:ratio">1</var>
+        <var name="upsell_products_list:height">140</var>
+
+        <var name="product_page_main_image:type">image</var>
+        <var name="product_page_main_image:width">400</var>
+        <var name="product_page_main_image:ratio">1</var>
+        <var name="product_page_main_image:height">495</var>
+
+        <var name="product_page_main_image_default:type">image</var>
+        <var name="product_page_main_image_default:width">400</var>
+        <var name="product_page_main_image_default:ratio">1</var>
+        <var name="product_page_main_image_default:height">495</var>
+
+        <var name="product_page_more_views:type">thumbnail</var>
+        <var name="product_page_more_views:width">90</var>
+        <var name="product_page_more_views:ratio">1</var>
+        <var name="product_page_more_views:height">90</var>
+
+        <var name="side_column_widget_product_thumbnail:type">thumbnail</var>
+        <var name="side_column_widget_product_thumbnail:width">50</var>
+        <var name="side_column_widget_product_thumbnail:ratio">1</var>
+        <var name="side_column_widget_product_thumbnail:height">50</var>
+
+        <var name="new_products_content_widget_list:type">small_image</var>
+        <var name="new_products_content_widget_list:width">166</var>
+        <var name="new_products_content_widget_list:ratio">1</var>
+        <var name="new_products_content_widget_list:height">166</var>
+
+        <var name="new_products_content_widget_grid:type">small_image</var>
+        <var name="new_products_content_widget_grid:width">166</var>
+        <var name="new_products_content_widget_grid:ratio">1</var>
+        <var name="new_products_content_widget_grid:height">166</var>
+
+        <var name="recently_compared_products_images_names_widget:type">thumbnail</var>
+        <var name="recently_compared_products_images_names_widget:width">50</var>
+        <var name="recently_compared_products_images_names_widget:ratio">1</var>
+        <var name="recently_compared_products_images_names_widget:height">50</var>
+
+        <var name="recently_viewed_products_images_names_widget:type">small_image</var>
+        <var name="recently_viewed_products_images_names_widget:width">50</var>
+        <var name="recently_viewed_products_images_names_widget:ratio">1</var>
+        <var name="recently_viewed_products_images_names_widget:height">50</var>
+
+        <var name="recently_compared_products_images_only_widget:type">thumbnail</var>
+        <var name="recently_compared_products_images_only_widget:width">76</var>
+        <var name="recently_compared_products_images_only_widget:ratio">1</var>
+        <var name="recently_compared_products_images_only_widget:height">76</var>
+
+        <var name="recently_viewed_products_images_only_widget:type">small_image</var>
+        <var name="recently_viewed_products_images_only_widget:width">76</var>
+        <var name="recently_viewed_products_images_only_widget:ratio">1</var>
+        <var name="recently_viewed_products_images_only_widget:height">76</var>
+
+        <var name="bundled_product_customization_page:type">thumbnail</var>
+        <var name="bundled_product_customization_page:width">140</var>
+        <var name="bundled_product_customization_page:ratio">1</var>
+        <var name="bundled_product_customization_page:height">140</var>
+
+        <var name="recently_compared_products_grid_content_widget:type">small_image</var>
+        <var name="recently_compared_products_grid_content_widget:width">135</var>
+        <var name="recently_compared_products_grid_content_widget:ratio">1</var>
+        <var name="recently_compared_products_grid_content_widget:height">135</var>
+
+        <var name="recently_compared_products_list_content_widget:type">small_image</var>
+        <var name="recently_compared_products_list_content_widget:width">166</var>
+        <var name="recently_compared_products_list_content_widget:ratio">1</var>
+        <var name="recently_compared_products_list_content_widget:height">166</var>
+
+        <var name="recently_viewed_products_grid_content_widget:type">small_image</var>
+        <var name="recently_viewed_products_grid_content_widget:width">135</var>
+        <var name="recently_viewed_products_grid_content_widget:ratio">1</var>
+        <var name="recently_viewed_products_grid_content_widget:height">135</var>
+
+        <var name="recently_viewed_products_list_content_widget:type">small_image</var>
+        <var name="recently_viewed_products_list_content_widget:width">166</var>
+        <var name="recently_viewed_products_list_content_widget:ratio">1</var>
+        <var name="recently_viewed_products_list_content_widget:height">166</var>
+
+        <var name="customer_shared_wishlist:type">small_image</var>
+        <var name="customer_shared_wishlist:width">113</var>
+        <var name="customer_shared_wishlist:ratio">1</var>
+        <var name="customer_shared_wishlist:height">113</var>
+
+        <var name="wishlist_thumbnail:type">small_image</var>
+        <var name="wishlist_thumbnail:width">113</var>
+        <var name="wishlist_thumbnail:ratio">1</var>
+        <var name="wishlist_thumbnail:height">113</var>
+
+        <var name="wishlist_sidebar_block:type">thumbnail</var>
+        <var name="wishlist_sidebar_block:width">50</var>
+        <var name="wishlist_sidebar_block:ratio">1</var>
+        <var name="wishlist_sidebar_block:height">50</var>
+
+        <var name="shared_wishlist_email:type">small_image</var>
+        <var name="shared_wishlist_email:width">135</var>
+        <var name="shared_wishlist_email:ratio">1</var>
+        <var name="shared_wishlist_email:height">135</var>
+
+        <var name="customer_account_my_tags_tag_view:type">small_image</var>
+        <var name="customer_account_my_tags_tag_view:width">100</var>
+        <var name="customer_account_my_tags_tag_view:ratio">1</var>
+        <var name="customer_account_my_tags_tag_view:height">100</var>
+
+        <var name="cart_cross_sell_products:type">thumbnail</var>
+        <var name="cart_cross_sell_products:width">140</var>
+        <var name="cart_cross_sell_products:ratio">1</var>
+        <var name="cart_cross_sell_products:height">140</var>
+
+        <var name="gift_messages_checkout_thumbnail:type">thumbnail</var>
+        <var name="gift_messages_checkout_thumbnail:width">75</var>
+        <var name="gift_messages_checkout_thumbnail:ratio">1</var>
+        <var name="gift_messages_checkout_thumbnail:height">75</var>
+
+        <var name="gift_messages_checkout_small_image:type">small_image</var>
+        <var name="gift_messages_checkout_small_image:width">75</var>
+        <var name="gift_messages_checkout_small_image:ratio">1</var>
+        <var name="gift_messages_checkout_small_image:height">75</var>
+
+        <var name="mini_cart_product_thumbnail:type">thumbnail</var>
+        <var name="mini_cart_product_thumbnail:width">78</var>
+        <var name="mini_cart_product_thumbnail:ratio">1</var>
+        <var name="mini_cart_product_thumbnail:height">78</var>
+
+        <var name="new_products_images_only_widget:type">small_image</var>
+        <var name="new_products_images_only_widget:width">78</var>
+        <var name="new_products_images_only_widget:ratio">1</var>
+        <var name="new_products_images_only_widget:height">78</var>
+
+        <var name="cart_page_product_thumbnail:type">thumbnail</var>
+        <var name="cart_page_product_thumbnail:width">80</var>
+        <var name="cart_page_product_thumbnail:ratio">1</var>
+        <var name="cart_page_product_thumbnail:height">80</var>
+
+        <var name="product_stock_alert_email_product_image:type">small_image</var>
+        <var name="product_stock_alert_email_product_image:width">76</var>
+        <var name="product_stock_alert_email_product_image:ratio">1</var>
+        <var name="product_stock_alert_email_product_image:height">76</var>
+    </vars>
+    <vars module="Magento_Bundle">
+        <var name="product_summary_image_size">58</var>         <!-- New Product image size used for summary block-->
+    </vars>
+    <vars module="Magento_DesignEditor">
+        <var name="store-name:font-picker">"marvel"</var>
+        <var name="store-name:color-picker">#837d75</var>
+        <var name="store-name:logo-uploader"></var>
+        <var name="header-background:color-picker">#d6d7d2</var>
+        <var name="header-background:image-uploader">header-bg.jpg</var>
+        <var name="header-background:tile">repeat</var>
+
+        <var name="menu-background">#f8f8f8</var>
+        <var name="menu-stroke">#c2c2c2</var>
+        <var name="menu-links">#675f55</var>
+        <var name="menu-links-hover">#f47a1f</var>
+
+        <var name="header-links">#837d75</var>
+        <var name="header-links-hover">#675f55</var>
+        <var name="header-scroll-bar-background">#ffffff</var>
+        <var name="header-scroll-bar-handle">#e5e5e5</var>
+        <var name="search-field">#ffffff</var>
+        <var name="search-field-text">#675f55</var>
+        <var name="search-field-stroke">#c2c2c2</var>
+
+        <var name="page-background:color-picker">#ffffff</var>
+        <var name="page-background:image-uploader"></var>
+        <var name="page-background:tile">no-repeat</var>
+
+        <var name="form-background">#f8f8f8</var>
+        <var name="form-stroke">#c2c2c2</var>
+        <var name="form2-background">#e5e5e5</var>
+        <var name="form2-stroke">#c2c2c2</var>
+
+        <var name="form-field-stroke">#c2c2c2</var>
+        <var name="form-field-stroke-clicked">#999999</var>
+        <var name="image-stroke-keylines">#e5e5e5</var>
+        <var name="scroll-bar-background">#f8f8f8</var>
+        <var name="scroll-bar-handle">#c2c2c2</var>
+
+        <var name="radio-checkbox-icon">#675f55</var>
+        <var name="radio-checkbox-background">#e5e5e5</var>
+        <var name="radio-checkbox-stroke">#999999</var>
+
+        <var name="button-background">#f47a1f</var>
+        <var name="button-text">#ffffff</var>
+        <var name="button-hover">#ff953b</var>
+        <var name="icons">#c2c2c2</var>
+        <var name="icons-hover">#999999</var>
+        <var name="icons2">#837d75</var>
+
+        <var name="accents">#55c2e6</var>
+        <var name="size-swatches">#f8f8f8</var>
+        <var name="size-swatches-unavailable">#e5e5e5</var>
+        <var name="size-swatches-hover">#675f55</var>
+
+        <var name="tooltip-text">#675f55</var>
+        <var name="tooltip-box">#ffffff</var>
+        <var name="tooltip-stroke">#c2c2c2</var>
+        <var name="tooltip2-text">#ffffff</var>
+        <var name="tooltip2-box">#000000</var>
+        <var name="tooltip2-stroke">#c2c2c2</var>
+
+        <var name="error-box">#ff3200</var>
+        <var name="error-icon">#ffffff</var>
+        <var name="success-box">#d3edd5</var>
+        <var name="success-icon">#ffffff</var>
+        <var name="notice-box">#ffedb8</var>
+        <var name="notice-icon">#ffffff</var>
+
+        <var name="banner-text:font-picker">"marvel", Arial, sans-serif</var>
+        <var name="banner-text:color-picker">#675f55</var>
+        <var name="page-headings:font-picker">"sourcesanspro", Arial, sans-serif</var>
+        <var name="page-headings:color-picker">#675f55</var>
+        <var name="menu:font-picker">"sourcesanspro", Arial, sans-serif</var>
+        <var name="menu:color-picker">#675f55</var>
+
+        <var name="body-text:font-picker">"sourcesanspro", Arial, sans-serif</var>
+        <var name="body-text:color-picker">#675f55</var>
+
+        <var name="buttons:font-picker">"sourcesanspro", Arial, sans-serif</var>
+        <var name="buttons:color-picker">#ffffff</var>
+
+        <var name="text-links">#675f55</var>
+        <var name="text-links-hover">#f47a1f</var>
+        <var name="text-links-active">#f47a1f</var>
+        <var name="text-links-product">#675f55</var>
+        <var name="small-links">#675f55</var>
+        <var name="small-links-hover">#c2c2c2</var>
+    </vars>
+</view>
diff --git a/app/design/frontend/magento_demo/Magento_Page/layout/default.xml b/app/design/frontend/magento_demo/Magento_Page/layout/default.xml
deleted file mode 100644
index 029d5a1b469364c10fc89dfa25c7ff318b6ddd1d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_demo/Magento_Page/layout/default.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="css-styles-css">
-            <arguments>
-                <argument name="file" xsi:type="string">css/styles.css</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="css-styles-ie-css">
-            <arguments>
-                <argument name="file" xsi:type="string">css/styles-ie.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string"/>
-                    <item name="ie_condition" xsi:type="string">lt IE 8</item>
-                </argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="css-print-css">
-            <arguments>
-                <argument name="file" xsi:type="string">css/print.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string">media="print"</item>
-                </argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_demo/Magento_Page/layout/print.xml b/app/design/frontend/magento_demo/Magento_Page/layout/print.xml
deleted file mode 100644
index 029d5a1b469364c10fc89dfa25c7ff318b6ddd1d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_demo/Magento_Page/layout/print.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="css-styles-css">
-            <arguments>
-                <argument name="file" xsi:type="string">css/styles.css</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="css-styles-ie-css">
-            <arguments>
-                <argument name="file" xsi:type="string">css/styles-ie.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string"/>
-                    <item name="ie_condition" xsi:type="string">lt IE 8</item>
-                </argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="css-print-css">
-            <arguments>
-                <argument name="file" xsi:type="string">css/print.css</argument>
-                <argument name="properties" xsi:type="array">
-                    <item name="attributes" xsi:type="string">media="print"</item>
-                </argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_demo/css/print.css b/app/design/frontend/magento_demo/css/print.css
deleted file mode 100644
index 4910319f7025f5affdc13ffc91ecd387a3b5e1d4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_demo/css/print.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-*     { background:none !important; text-align:left !important; }
-html  { margin:0 !important; padding:0 !important; }
-body  { background:#fff !important; font-size:9pt !important; padding:0 !important; margin:10px !important; }
-a     { color:#2976c9 !important; }
-th,td { color:#2f2f2f !important;  border-color:#ccc !important; }
-
-.header-container,
-.nav-container,
-.footer-container,
-.pager,
-.toolbar,
-.actions,
-.buttons-set { display:none !important; }
-
-.page-print .data-table .cart-tax-total { background-position:100% -54px; }
-.page-print .data-table .cart-tax-info { display:block !important; }
diff --git a/app/design/frontend/magento_demo/css/styles-ie.css b/app/design/frontend/magento_demo/css/styles-ie.css
deleted file mode 100644
index 6c4a3efe0e4c70b21d59450c8b868528270b029a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_demo/css/styles-ie.css
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     default_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* IE 6 only */
-* html .validation-advice { height:13px; }
-* html .error-msg,
-* html .success-msg,
-* html .note-msg,
-* html .notice-msg { height:24px; }
-* html .main { height:400px; }
-* html .account-login .content { height:240px; }
-.block li.item,
-.opc li.section { vertical-align:top; }
-* html .window-overlay { background:#ccc; filter:alpha(opacity=50); }
-
-/* Doubled Margin Fixes */
-.product-view .product-img-box .more-views li,
-.product-view .box-tags .form-add .input-box,
-.sp-methods select.month { display:inline; }
-
-/********** < Navigation styles */
-#nav li,
-#nav li a { zoom:1; }
-#nav li { vertical-align:top; }
-/********** < Navigation styles */
-
-select { margin-bottom:1px; }
-input.radio { width:13px; height:13px; }
-input.checkbox { width:13px; height:13px; }
-button.button { height:21px; }
-button.button span { position:relative; }
-button.btn-checkout { height:40px; }
-#opc-review .sp-methods .input-box { float:left; }
-.form-list label { position:relative; z-index:0; }
-.form-list label.required em { position:absolute; top:0; right:-8px; }
-
-table { scrollbar-face-color:expression(runtimeStyle.scrollbarFaceColor = '#fff', cellSpacing = 0); }
-
-.product-view .product-img-box .zoom.disabled { filter:alpha(opacity=30); }
-
-.gift-messages-form { position:relative; zoom:1; }
-
-.tool-tip .btn-close a { margin:0; }
-
-.product-view .box-tags .product-tags li,
-.footer li { padding:0 4px 0 7px; }
-
-.product-options dd .time-picker select { margin:0; padding:0; }
-
-/* Clearer */
-.clearer { display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden; }
-
-/* Clears and hasLayout fixes */
-.header-container,
-.header-container .top-container,
-.header,
-.header .quick-access,
-#nav,
-.main,
-.footer,
-.footer-container .bottom-container,
-.col-main,
-.col2-set,
-.col3-set,
-.col3-layout .product-options-bottom .price-box,
-.col4-set,
-.messages li,
-.search-autocomplete li,
-.block,
-.block .block-content,
-.block .actions,
-.block li.item,
-.block-layered-nav .currently li,
-.block-account .block-content li a,
-.mini-products-list .product-details,
-.page-title,
-.rss-title h1,
-.products-grid,
-.products-list li.item,
-.box-account .box-head,
-.dashboard .box .box-title,
-.box-reviews li.item,
-.box-tags li.item,
-.pager,
-.sorter,
-.ratings,
-.add-to-box,
-.add-to-cart,
-.product-essential,
-.product-collateral,
-.product-view .product-img-box .more-views ul,
-.product-view .box-tags .form-add,
-.product-view .product-shop .short-description,
-.product-view .box-description,
-.product-options .options-list li,
-.product-options,
-.product-options-bottom,
-.truncated,
-.truncated .truncated_full_value,
-.product-review,
-.cart,
-.cart-collaterals,
-.cart .crosssell li.item,
-.cart .discount,
-.opc .step-title,
-.opc .step,
-.multiple-checkout,
-.sp-methods,
-.checkout-progress,
-.multiple-checkout .place-order,
-.form-list li,
-.form-list .field,
-.group-select li,
-.buttons-set,
-.page-print .print-head,
-.cart-tax-total,
-.advanced-search-summary,
-.advanced-search-summary p,
-.gift-messages-form .item,
-.send-friend .form-list li p,
-.centinel .authentication { zoom:1; }
-
-/* Hover Fix */
-iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
diff --git a/app/design/frontend/magento_demo/css/styles.css b/app/design/frontend/magento_demo/css/styles.css
deleted file mode 100644
index 637be01922d3bd5825b2fff10af76de5e9e8f942..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_demo/css/styles.css
+++ /dev/null
@@ -1,1765 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     default_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* Reset ================================================================================= */
-* { margin:0; padding:0; }
-
-body          { background:#496778 url(../images/bkg_body.gif) 50% 0 repeat-y; font:12px/1.55 Arial, Helvetica, sans-serif; color:#2f2f2f; text-align:center; }
-
-img           { border:0; vertical-align:top; }
-
-a,.l          { color:#1e7ec8; text-decoration:underline; }
-a:hover       { text-decoration:none; }
-:focus        { outline:0; }
-
-/* Headings */
-h1,h2,h3,
-h4,h5,h6      { margin:0 0 5px; line-height:1.35; color:#0a263c; }
-h1            { font-size:20px; font-weight:normal; }
-h2            { font-size:18px; font-weight:normal; }
-h3            { font-size:16px; font-weight:bold; }
-h4            { font-size:14px; font-weight:bold; }
-h5            { font-size:12px; font-weight:bold; }
-h6            { font-size:11px; font-weight:bold; }
-
-/* Forms */
-form          { display:inline; }
-fieldset      { border:0; }
-legend        { display:none; }
-
-/* Table */
-table         { border:0; /*border-collapse:collapse;*/ border-spacing:0; empty-cells:show; font-size:100%; }
-caption,th,td { vertical-align:top; text-align:left; font-weight:normal; }
-
-/* Content */
-p             { margin:0 0 10px; }
-strong        { font-weight:bold; }
-address       { font-style:normal; line-height:1.35; }
-cite          { font-style:normal; }
-q,
-blockquote    { quotes:none; }
-q:before,
-q:after       { content:''; }
-small,big     { font-size:1em; }
-/*sup           { font-size:1em; vertical-align:top; }*/
-
-/* Lists */
-ul,ol         { list-style:none; }
-
-/* Tools */
-.hidden       { display:block !important; border:0 !important; margin:0 !important; padding:0 !important; font-size:0 !important; line-height:0 !important; width:0 !important; height:0 !important; overflow:hidden !important; }
-.nobr         { white-space:nowrap !important; }
-.wrap         { white-space:normal !important; }
-.a-left       { text-align:left !important; }
-.a-center     { text-align:center !important; }
-.a-right      { text-align:right !important; }
-.v-top        { vertical-align:top; }
-.v-middle     { vertical-align:middle; }
-.f-left,
-.left         { float:left !important; }
-.f-right,
-.right        { float:right !important; }
-.f-none       { float:none !important; }
-.f-fix        { float:left; width:100%; }
-.no-display   { display:none; }
-.no-margin    { margin:0 !important; }
-.no-padding   { padding:0 !important; }
-.no-bg        { background:none !important; }
-.clear        { clear: both; }
-/* ======================================================================================= */
-
-
-/* Layout ================================================================================ */
-.wrapper { min-width:954px; }
-.page {}
-.page-print { background:#fff; padding:25px 30px; text-align:left; }
-.page-empty { background:#fff; padding:20px; text-align:left; }
-.page-popup { background:#fff; padding:25px 30px; text-align:left; }
-.main-container { background:#fbfaf6 url(../images/bkg_main1.gif) 50% 0 no-repeat; }
-.main { width:900px; margin:0 auto; min-height:400px; padding:25px 25px 80px; background:#fffffe url(../images/bkg_main2.gif) 0 0 no-repeat; text-align:left; }
-
-/* Base Columns */
-.col-left { float:left; width:195px; padding:0 0 1px; }
-.col-main { float:left; width:685px; padding:0 0 1px; }
-.col-right { float:right; width:195px; padding:0 0 1px; }
-
-/* 1 Column Layout */
-.col1-layout .col-main { float:none; width:auto; }
-
-/* 2 Columns Layout */
-.col2-left-layout .col-main { float:right; }
-.col2-right-layout .col-main {}
-
-/* 3 Columns Layout */
-.col3-layout .col-main { width:475px; margin-left:17px; }
-.col3-layout .col-wrapper { float:left; width:687px; }
-.col3-layout .col-wrapper .col-main { float:right; }
-
-/* Content Columns */
-.col2-set .col-1 { float:left; width:48.5%; }
-.col2-set .col-2 { float:right; width:48.5%; }
-.col2-set .col-narrow { width:32%; }
-.col2-set .col-wide { width:65%; }
-
-.col3-set .col-1 { float:left; width:32%; }
-.col3-set .col-2 { float:left; width:32%; margin-left:2%; }
-.col3-set .col-3 { float:right; width:32%; }
-
-.col4-set .col-1 { float:left; width:23.5%; }
-.col4-set .col-2 { float:left; width:23.5%; margin:0 2%; }
-.col4-set .col-3 { float:left; width:23.5%; }
-.col4-set .col-4 { float:right; width:23.5%; }
-
-/* ======================================================================================= */
-
-
-/* Global Styles ========================================================================= */
-/* Form Elements */
-input,select,textarea,button { font:12px/15px Arial, Helvetica, sans-serif; vertical-align:middle; color:#2f2f2f; }
-input.input-text,select,textarea { background:#fff; border:1px solid #b6b6b6; }
-input.input-text,textarea { padding:2px; }
-select { padding:1px; }
-select option { padding-right:10px; }
-select.multiselect option { border-bottom:1px solid #b6b6b6; padding:2px 5px; }
-select.multiselect option:last-child { border-bottom:0; }
-textarea { overflow:auto; }
-input.radio { margin-right:3px; }
-input.checkbox { margin-right:3px; }
-input.qty { width:2.5em !important; }
-button.button::-moz-focus-inner { padding:0; border:0; } /* FF Fix */
-button.button { -webkit-border-fit:lines; } /* <- Safari & Google Chrome Fix */
-button.button { overflow:visible; width:auto; border:0; padding:0; margin:0; background:transparent; cursor:pointer; }
-button.button span { display:block; height:19px; border:1px solid #de5400; background:#f18200; padding:0 8px; font:bold 12px/19px Arial, Helvetica, sans-serif; text-align:center; white-space:nowrap; color:#fff; }
-button.button span span { border:0; padding:0; }
-button.disabled span { border-color:#bbb !important; background:#bbb !important; }
-
-button.btn-checkout span { height:40px; border:0; background:url(../images/btn_checkout.gif) 0 0 no-repeat; padding:0 0 0 9px; font:bold 15px/40px Arial, Helvetica, sans-serif; color:#fff; }
-button.btn-checkout span span { background-position:100% 0; padding:0 25px 0 16px; }
-button.btn-checkout.no-checkout span { background-position:0 100%; color:#b8baba; }
-button.btn-checkout.no-checkout span span { background-position:100% 100%; }
-
-p.control input.checkbox,
-p.control input.radio { margin-right:6px; }
-/* Form Highlight */
-input.input-text:focus,select:focus,textarea:focus { background-color:#edf7fd; }
-/*.highlight { background:#efefef; }*/
-
-/* Form lists */
-/* Grouped fields */
-/*.form-list { width:535px; margin:0 auto; overflow:hidden; }*/
-.form-list li { margin:0 0 8px; }
-.form-list label { float:left; color:#666; font-weight:bold; position:relative; z-index:0; }
-.form-list label.required {}
-.form-list label.required em { float:right; font-style:normal; color:#eb340a; position:absolute; top:0; right:-8px; }
-.form-list li.control label { float:none; }
-.form-list li.control input.radio,
-.form-list li.control input.checkbox { margin-right:6px; }
-.form-list li.control .input-box { clear:none; display:inline; width:auto; }
-/*.form-list li.fields { margin-right:-15px; }*/
-.form-list .input-box { display:block; clear:both; width:260px; }
-.form-list .field { float:left; width:275px; }
-.form-list input.input-text { width:254px; }
-.form-list textarea { width:254px; height:10em; }
-.form-list select { width:260px; }
-.form-list li.wide .input-box { width:535px; }
-.form-list li.wide input.input-text { width:529px; }
-.form-list li.wide textarea { width:529px; }
-.form-list li.wide select { width:535px; }
-.form-list li.additional-row { border-top:1px solid #ccc; margin-top:10px; padding-top:7px; }
-.form-list li.additional-row .btn-remove { float:right; margin:5px 0 0; }
-.form-list .input-range input.input-text { width:74px; }
-
-.form-list-narrow li  { margin-bottom:0; } 
-.form-list-narrow li .input-box { margin-bottom:6px; }
-.form-list-narrow li.wide .input-box { width:260px; } 
-.form-list-narrow li.wide input.input-text, 
-.form-list-narrow li.wide textarea { width:254px } 
-.form-list-narrow li.wide select { width:260px; }
-
-/* Customer */
-.form-list .customer-name-prefix .input-box,
-.form-list .customer-name-suffix .input-box,
-.form-list .customer-name-prefix-suffix .input-box,
-.form-list .customer-name-prefix-middlename .input-box,
-.form-list .customer-name-middlename-suffix .input-box,
-.form-list .customer-name-prefix-middlename-suffix .input-box { width:auto; }
-
-.form-list .name-prefix { width:65px; }
-.form-list .name-prefix select { width:55px; }
-.form-list .name-prefix input.input-text { width:49px; }
-
-.form-list .name-suffix { width:65px; }
-.form-list .name-suffix select { width:55px; }
-.form-list .name-suffix input.input-text { width:49px; }
-
-.form-list .name-middlename { width:70px; }
-.form-list .name-middlename input.input-text { width:49px; }
-
-.form-list .customer-name-prefix-middlename-suffix .name-firstname,
-.form-list .customer-name-prefix-middlename .name-firstname { width:140px; }
-.form-list .customer-name-prefix-middlename-suffix .name-firstname input.input-text,
-.form-list .customer-name-prefix-middlename .name-firstname input.input-text { width:124px; }
-.form-list .customer-name-prefix-middlename-suffix .name-lastname { width:205px; }
-.form-list .customer-name-prefix-middlename-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-name-prefix-suffix .name-firstname { width:210px; }
-.form-list .customer-name-prefix-suffix .name-lastname { width:205px; }
-.form-list .customer-name-prefix-suffix .name-firstname input.input-text,
-.form-list .customer-name-prefix-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-name-prefix-suffix .name-firstname { width:210px; }
-.form-list .customer-name-prefix-suffix .name-lastname { width:205px; }
-.form-list .customer-name-prefix-suffix .name-firstname input.input-text,
-.form-list .customer-name-prefix-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-name-prefix .name-firstname,
-.form-list .customer-name-middlename .name-firstname { width:210px; }
-
-.form-list .customer-name-suffix .name-lastname,
-.form-list .customer-name-middlename .name-firstname,
-.form-list .customer-name-middlename-suffix .name-firstname,
-.form-list .customer-name-middlename-suffix .name-lastname { width:205px; }
-
-.form-list .customer-name-prefix .name-firstname input.input-text,
-.form-list .customer-name-suffix .name-lastname input.input-text,
-.form-list .customer-name-middlename .name-firstname input.input-text,
-.form-list .customer-name-middlename-suffix .name-firstname input.input-text,
-.form-list .customer-name-middlename-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-dob .dob-month,
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-year { float:left; width:85px; }
-.form-list .customer-dob input.input-text { display:block; width:74px; }
-.form-list .customer-dob label { font-size:10px; font-weight:normal; color:#888; }
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-month { width:60px; }
-.form-list .customer-dob .dob-day input.input-text,
-.form-list .customer-dob .dob-month input.input-text { width:46px; }
-.form-list .customer-dob .dob-year { width:140px; }
-.form-list .customer-dob .dob-year input.input-text { width:134px; }
-
-/* Independent fields */
-/*.form-list li { margin:0 0 8px; }
-.form-list li.fields { margin:0; }
-.form-list .field { display:block; margin:0 0 8px; }
-.form-list li.control {}
-.form-list label { float:left; width:150px; padding:2px 10px 0 0; text-align:right; }
-.form-list label.required { font-weight:bold; }
-.form-list label.required em { font-variant:normal; color:#eb340a; margin-right:3px; }
-.form-list .input-box { float:left; width:260px; }
-.form-list input.input-text,
-.form-list textarea { width:254px; }
-.form-list select { width:260px; }
-.form-list li.additional-row { border-top:1px solid #ddd; margin-top:10px; }
-.form-list li.additional-row .btn-remove { float:right; margin:5px 5px 0 0; }
-.form-list .input-range input.input-text { width:96px; }*/
-/* Customer */
-/*.form-list .customer-dob .dob-month,
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-year { float:left; width:85px; }
-.form-list .customer-dob input.input-text { display:block; width:74px; }
-.form-list .customer-dob label { font-size:11px; font-weight:normal; color:#777; text-align:left; }
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-month { width:60px; }
-.form-list .customer-dob .dob-day input.input-text,
-.form-list .customer-dob .dob-month input.input-text { width:46px; }
-.form-list .customer-dob .dob-year { width:140px; }
-.form-list .customer-dob .dob-year input.input-text { width:134px; }*/
-
-.buttons-set { clear:both; margin:4em 0 0; padding:8px 0 0; border-top:1px solid #e4e4e4; text-align:right; }
-.buttons-set p.required { margin:0 0 10px; }
-.buttons-set .back-link { float:left; margin:0; }
-.buttons-set button.button { float:right; margin-left:5px; }
-
-.buttons-set-order { margin:10px 0 0; }
-.buttons-set-order .please-wait { padding:12px 7px 0 0; }
-
-.fieldset { border:1px solid #bbafa0; background:#fbfaf6; padding:22px 25px 12px 33px; margin:28px 0; }
-.fieldset .legend { float:left; font-weight:bold; font-size:13px; border:1px solid #f19900; background:#f9f3e3; color:#e76200; margin:-33px 0 0 -10px; padding:0 8px; position:relative; }
-
-/* Form Validation */
-.validation-advice { clear:both; min-height:13px; margin:3px 0 0; padding-left:17px; font-size:11px; font-weight:bold; line-height:13px; background:url(../images/validation_advice_bg.gif) 2px 0 no-repeat; color:#eb340a; }
-.validation-failed { border:1px dashed #eb340a !important; background:#faebe7 !important; }
-.validation-passed {}
-p.required { font-size:11px; text-align:right; color:#EB340A; }
-/* Expiration date and CVV number validation fix */
-.v-fix { float:left; }
-.v-fix .validation-advice { display:block; width:12em; margin-right:-12em; position:relative; }
-
-/* Global Messages  */
-.success { color:#3d6611; font-weight:bold; }
-.error { color:#df280a; font-weight:bold; }
-.notice { color:#e26703; }
-
-.messages,
-.messages ul { list-style:none !important; margin:0 !important; padding:0 !important; }
-.messages { width:100%; overflow:hidden; }
-.messages li { margin:0 0 10px !important; }
-.messages li li { margin:0 0 3px !important; }
-.error-msg,
-.success-msg,
-.note-msg,
-.notice-msg { border-style:solid !important; border-width:1px !important; background-position:10px 9px !important; background-repeat:no-repeat !important; min-height:24px !important; padding:8px 8px 8px 32px !important; font-size:11px !important; font-weight:bold !important; }
-.error-msg { border-color:#f16048; background-color:#faebe7; background-image:url(../images/i_msg-error.gif); color:#df280a; }
-.success-msg { border-color:#446423; background-color:#eff5ea; background-image:url(../images/i_msg-success.gif); color:#3d6611; }
-.note-msg,
-.notice-msg { border-color:#fcd344; background-color:#fafaec; background-image:url(../images/i_msg-note.gif); color:#3d6611; }
-
-/* BreadCrumbs */
-.breadcrumbs { font-size:11px; line-height:1.25; margin:0 0 13px; }
-.breadcrumbs li { display:inline; }
-.breadcrumbs li strong { font-weight:bold; }
-
-/* Page Heading */
-.page-title { width:100%; overflow:hidden; border-bottom:1px solid #ccc; margin:0 0 25px; }
-.page-title h1,
-.page-title h2 { margin:0; font-size:20px; color:#0a263c; }
-.page-title .separator { margin:0 3px; }
-.page-title .link-rss { float:right; margin:7px 0 0; }
-.title-buttons { text-align:right; }
-.title-buttons h1,
-.title-buttons h2,
-.title-buttons h3,
-.title-buttons h4,
-.title-buttons h5,
-.title-buttons h6 { float:left; }
-
-.subtitle,
-.sub-title { clear:both; padding:15px 0 0; font-size:15px; font-weight:bold; margin:0 0 6px; color:#e25203; }
-
-/* Pager */
-.pager { font-size:11px; background:#fff url(../images/bkg_toolbar.gif) 0 100% repeat-x; padding:4px 8px; border-top:1px solid #e2e2e2; text-align:center; }
-.pager .amount { float:left; margin:0; }
-.pager .limiter { float:right; }
-.pager .limiter label { vertical-align:middle; }
-.pager .limiter select { padding:0; margin:0 0 1px; vertical-align:middle; }
-.pager .pages { margin:0 140px; }
-.pager .pages ol { display:inline; }
-.pager .pages li { display:inline; margin:0 2px; }
-.pager .pages .current {}
-
-/* Sorter */
-.sorter { font-size:11px; background:#fff url(../images/bkg_toolbar.gif) 0 100% repeat-x; padding:3px 8px; border-top:1px solid #e2e2e2; }
-.sorter .view-mode { float:left; margin:0; }
-.sorter .sort-by { float:right; padding-right:36px; }
-.sorter .sort-by label { vertical-align:middle; }
-.sorter .sort-by select { padding:0; margin:0 0 1px; vertical-align:middle; }
-.sorter .link-feed {}
-
-/* Toolbar */
-.toolbar {}
-.toolbar .pager { padding:3px 8px; border-bottom:1px solid #fff; }
-.toolbar .sorter { border-bottom:1px solid #fff; }
-.toolbar-bottom {}
-
-/* Data Table */
-.data-table { width:100%; border:1px solid #bebcb7; }
-.data-table .odd  { background:#f8f7f5 }
-.data-table .even { background:#eeeded; }
-/*.data-table tr.odd:hover,
-.data-table tr.even:hover { background:#ebf1f6; }*/
-.data-table td.last,
-.data-table th.last { border-right:0; }
-.data-table tr.last th,
-.data-table tr.last td { border-bottom:0 !important; }
-.data-table th { padding:3px 8px; font-weight:bold; }
-.data-table td { padding:3px 8px; }
-
-.data-table thead th { font-weight:bold; border-right:1px solid #c2d3e0; padding:2px 8px; color:#0a263c; white-space:nowrap; vertical-align:middle; }
-.data-table thead th.wrap { white-space:normal; }
-.data-table thead th a,
-.data-table thead th a:hover { color:#fff; }
-.data-table thead th { background:url(../images/bkg_th.gif) repeat-x 0 100% #d9e5ee; }
-.data-table thead th .tax-flag { font-size:11px; white-space:nowrap; }
-
-.data-table tfoot { border-bottom:1px solid #d9dde3; }
-.data-table tfoot tr.first td { background:url(../images/bkg_tfoot.gif) 0 0 repeat-x; }
-.data-table tfoot tr { background-color:#dee5e8 !important; }
-.data-table tfoot td { padding-top:1px; padding-bottom:1px; border-bottom:0; border-right:1px solid #d9dde3; }
-.data-table tfoot strong { font-size:16px; }
-
-.data-table tbody th,
-.data-table tbody td { border-bottom:1px solid #d9dde3; border-right:1px solid #d9dde3; }
-/* Bundle products tables */
-.data-table tbody.odd tr { background:#f8f7f5 !important; }
-.data-table tbody.even tr { background:#f6f6f6 !important; }
-.data-table tbody.odd tr td,
-.data-table tbody.even tr td { border-bottom:0; }
-.data-table tbody.odd tr.border td,
-.data-table tbody.even tr.border td { border-bottom:1px solid #d9dde3; }
-
-.data-table tbody td .option-label { font-weight:bold; font-style:italic; }
-.data-table tbody td .option-value { padding-left:10px; }
-
-/* Generic Info Box */
-.info-box { background:#fff url(../images/bkg_block-title.gif) 0 0 repeat-x; border:1px solid #d0cbc1; padding:12px 15px; margin:0 0 15px; }
-.info-box h2 { font-weight:bold; font-size:13px; }
-
-.info-table th { font-weight:bold; padding:2px 15px 2px 0; }
-.info-table td { padding:2px 0; }
-
-/* Shopping cart total summary row expandable to details */
-tr.summary-total { cursor:pointer; }
-tr.summary-total td {}
-tr.summary-total .summary-collapse { float:right; text-align:right; padding-left:20px; background:url(../images/bkg_collapse.gif) 0 5px no-repeat; cursor:pointer; }
-tr.show-details .summary-collapse { background-position:0 -52px; }
-tr.show-details td {}
-tr.summary-details td { font-size:11px; background-color:#dae1e4; color:#626465; }
-tr.summary-details-first td { border-top:1px solid #d2d8db; }
-tr.summary-details-excluded { font-style:italic; }
-
-/* Shopping cart tax info */
-.cart-tax-info { display:block; }
-.cart-tax-info,
-.cart-tax-info .cart-price { padding-right:20px; }
-.cart-tax-total { display:block; padding-right:20px; background:url(../images/bkg_collapse.gif) 100% 5px no-repeat; cursor:pointer; }
-.cart-tax-info .price,
-.cart-tax-total .price { display:inline !important; font-weight:normal !important; }
-.cart-tax-total-expanded { background-position:100% -52px; }
-
-/* Class: std - styles for admin-controlled content */
-.std .subtitle { padding:0; }
-.std ol.ol { list-style:decimal outside; padding-left:1.5em; }
-.std ul.disc { list-style:disc outside; padding-left:18px; margin:0 0 10px; }
-.std dl dt { font-weight:bold; }
-.std dl dd { margin:0 0 10px; }
-.std ul,
-.std ol,
-.std dl,
-.std p,
-.std address,
-.std blockquote { margin:0 0 1em; padding:0; }
-.std ul { list-style:disc outside; padding-left:1.5em; }
-.std ol { list-style:decimal outside; padding-left:1.5em; }
-.std ul ul { list-style-type:circle; }
-.std ul ul,
-.std ol ol,
-.std ul ol,
-.std ol ul { margin:.5em 0; }
-.std dt { font-weight:bold; }
-.std dd { padding:0 0 0 1.5em; }
-.std blockquote { font-style:italic; padding:0 0 0 1.5em; }
-.std address { font-style:normal; }
-.std b,
-.std strong { font-weight:bold; }
-.std i,
-.std em { font-style:italic; }
-
-/* Misc */
-.links li { display:inline; }
-.links li.first { padding-left:0 !important; }
-.links li.last { background:none !important; padding-right:0 !important; }
-
-.link-cart { color:#dc6809 !important; font-weight:bold; }
-.link-wishlist { color:#dc6809 !important; font-weight:bold; }
-.link-reorder { font-weight:bold; color:#dc6809 !important; }
-.link-compare { font-weight:bold; }
-.link-print { /*background:url(../images/i_print.gif) 0 2px no-repeat; padding:2px 0 2px 25px;*/ font-weight:bold; color:#dc6809; }
-.link-rss { background:url(../images/i_rss.gif) 0 2px no-repeat; padding-left:18px; line-height:14px; white-space:nowrap; }
-.btn-remove  { display:block; width:11px; height:11px; font-size:0; line-height:0; background:url(../images/btn_remove.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.btn-previous  { display:block; width:11px; height:11px; font-size:0; line-height:0; background:url(../images/btn_previous.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.btn-remove2 { display:block; width:16px; height:16px; font-size:0; line-height:0; background:url(../images/btn_trash.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.btn-edit    { display:block; width:11px; height:11px; font-size:0; line-height:0; background:url(../images/btn_edit.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-
-.cards-list dt { margin:5px 0 0; }
-.cards-list .offset { padding:2px 0 2px 20px; }
-
-.separator { margin:0 3px; }
-
-.divider { clear:both; display:block; font-size:0; line-height:0; height:1px; margin:10px 0; background:url(../images/bkg_divider1.gif) 0 50% repeat-x; text-indent:-999em; overflow:hidden; }
-
-/* Global site notices */
-.global-site-notice { border:1px solid #cfcfcf; border-width:0 0 1px; background:#ffff90; font-size:12px; line-height:1.25; text-align:center; color:#2f2f2f; }
-.global-site-notice .notice-inner { width:860px; margin:0 auto; padding:12px 0 12px 80px; background:url(../images/i_notice.gif) 20px 25px no-repeat; text-align:left; }
-.global-site-notice .notice-inner p { margin:0; border:1px dotted #cccc73; padding:10px; }
-.global-site-notice .notice-inner .actions { padding-top:10px; }
-
-/* Cookie Notice */
-.notice-cookie { }
-
-/* Noscript Notice */
-.noscript {}
-
-/* Demo Notice */
-.demo-notice { margin:0; padding:6px 10px; background:#d75f07; font-size:12px; line-height:1.15; border:0; text-align:center; color:#fff; }
-.demo-notice .notice-inner { width:auto; padding:0; background:none; text-align:center; }
-.demo-notice .notice-inner p { padding:0; border:0; }
-
-/* ======================================================================================= */
-
-
-/* Header ================================================================================ */
-.logo { float:left; }
-.header-container { border-top:5px solid #0d2131; border-bottom:1px solid #415966; background:url(../images/bkg_header.jpg) 50% 0 repeat; }
-.header { width:930px; margin:0 auto; padding:10px; text-align:right; position:relative; z-index:10; }
-.header .logo { float:left; margin:3px 0 10px 12px; text-decoration:none !important; }
-.header .logo strong { position:absolute; top:-999em; left:-999em; width:0; height:0; font-size:0; line-height:0; text-indent:-999em; overflow:hidden; }
-.header h1.logo { margin:0; }
-.header .quick-access { float:right; width:600px; padding:28px 10px 0 0; }
-.header .welcome-msg { margin:0; color:#fff; text-align:right; }
-.header .welcome-msg a { color:#ebbc58; }
-.header .form-search { position:absolute; top:0; right:29px; width:315px; height:30px; background:url(../images/bkg_form-search.gif) 0 0 no-repeat; padding:1px 0 0 16px; }
-.header .form-search label { float:left; width:24px; height:21px; text-align:left; text-indent:-999em; overflow:hidden; }
-.header .form-search input.input-text { float:left; border-color:#5c7989; width:209px; margin-right:4px; }
-.header .form-search button.button { float:left; }
-.header .form-search button.button span { border:0; height:21px; background:url(../images/btn_search.gif) 0 0 no-repeat; padding:0 0 0 3px; font:bold 11px/21px Tahoma, Verdana, Arial, sans-serif; }
-.header .form-search button.button span span { background-position:100% 0; padding:0 6px 0 3px; }
-.header .form-search .search-autocomplete { z-index:999; left:40px !important; top:22px !important; }
-.header .form-search .search-autocomplete ul { border:1px solid #5c7989; background-color:#f9f5f0; }
-.header .form-search .search-autocomplete li { text-align:left; border-bottom:1px solid #f4eee7; padding:2px 8px 1px 8px; cursor:pointer; }
-.header .form-search .search-autocomplete li .amount { float:right; font-weight:bold; }
-.header .form-search .search-autocomplete li.odd { background-color:#fffefb; }
-.header .form-search .search-autocomplete li.selected { background-color:#f7e8dd; }
-.header .form-language { clear:both; padding:5px 0 0; text-align:right; }
-.header .form-language label { font-weight:bold; padding-right:5px; color:#a7c6dd; vertical-align:middle; }
-.header .form-language select { padding:0; }
-.header .form-language select.flags option { background-position:4px 50%; background-repeat:no-repeat; padding-left:25px; }
-.header .links { float:right; margin:0 0 6px; }
-.header .links li { float:left; font-size:11px; background:url(../images/bkg_pipe1.gif) 100% 60% no-repeat; padding:0 8px 0 7px; }
-.header .links a { color:#ebbc58; }
-.header-container .top-container { clear:both; padding:5px 10px 0 12px; text-align:right; }
-.header-container .top-container a { font-size:11px; color:#ebbc58; }
-
-/********** < Navigation */
-.nav-container { background:#0a263d url(../images/bkg_nav0.jpg) 50% 0 repeat-y; }
-#nav { width:918px; margin:0 auto; padding:0 16px; font-size:13px; }
-
-/* All Levels */ /* Style consistent throughout all nav levels */
-#nav li { position:relative; text-align:left; }
-#nav li.over { z-index:998; }
-#nav a,
-#nav a:hover { display:block; line-height:1.3em; text-decoration:none; }
-#nav span { display:block; cursor:pointer; white-space:nowrap; }
-#nav li ul span {white-space:normal; }
-#nav ul li.parent a { background:url(../images/bkg_nav2.gif) 100% 100% no-repeat; }
-#nav ul li.parent li a { background-image:none; }
-
-/* 0 Level */
-#nav li { float:left; }
-#nav li.active a { color:#d96708; }
-#nav a { float:left; padding:5px 12px 6px 8px; color:#a7c6dd; font-weight:bold; }
-#nav li.over a,
-#nav a:hover { color:#d96708; }
-
-/* 1st Level */
-#nav ul li,
-#nav ul li.active { float:none; margin:0; padding-bottom:1px; background:#ecf3f6 url(../images/bkg_nav1.gif) 0 100% repeat-x; }
-#nav ul li.last { background:#ecf3f6; padding-bottom:0; }
-
-#nav ul a,
-#nav ul a:hover { float:none; padding:0; background:none; }
-#nav ul li a { font-weight:normal !important; }
-
-/* 2nd Level */
-#nav ul,
-#nav div { position:absolute; width:15em; top:27px; left:-10000px; border:1px solid #899ba5; }
-#nav div ul { position:static; width:auto; border:none; }
-
-/* 3rd+ Level */
-#nav ul ul,
-#nav ul div { top:5px; }
-
-#nav ul li a { background:#ecf3f6; }
-#nav ul li a:hover { background:#d5e4eb; }
-#nav ul li a,
-#nav ul li a:hover { color:#2f2f2f !important; }
-#nav ul span,
-#nav ul li.last li span { padding:3px 15px 4px 15px; }
-
-/* Show menu */
-#nav li ul.shown-sub,
-#nav li div.shown-sub { left:0; z-index:999; }
-#nav li .shown-sub ul.shown-sub,
-#nav li .shown-sub li div.shown-sub { left:100px; }
-/********** Navigation > */
-/* ======================================================================================= */
-
-
-/* Sidebar =============================================================================== */
-.block { border:1px solid #c4c1bc; margin:0 0 15px; }
-.block .block-title { background:url(../images/bkg_block-title.gif) 0 0 repeat-x; border-bottom:1px solid #ddd; padding:2px 9px; }
-.block .block-title strong { display:block; font:bold 12px/16px Arial, Helvetica, sans-serif; min-height:16px; padding:1px 0 1px; text-transform:uppercase; color:#e26703; }
-.block .block-title strong span {}
-.block .block-title a { text-decoration:none !important; }
-.block .block-subtitle { margin:0; padding:5px 9px; font-size:1em; font-weight:bold; color:#0a263c; }
-.block .block-content { background:#f8f7f5; }
-.block .block-content li.item { padding:7px 9px; }
-.block .block-content .product-name { color:#1e7ec8; }
-.block .btn-remove,
-.block .btn-edit { float:right; margin:1px 0 2px 5px; }
-.block .actions { background:#dee5e8 url(../images/bkg_block-actions.gif) 0 0 repeat-x; padding:6px 9px; text-align:right; }
-.block .actions a { float:left; }
-.block .actions button.button { float:right; }
-.block .empty { margin:0; padding:5px 9px; }
-
-.block li.odd { background-color:#f4f3f3; }
-.block li.even { background-color:#fafafa; }
-
-/* Mini Blocks */
-.block-cart,
-.block-wishlist,
-.block-subscribe,
-.block-compare,
-.block-reorder,
-.block-viewed,
-.block-compared,
-.block-related,
-.block-tags,
-.block-login { font-size:11px; line-height:1.25; }
-.block-cart .block-title strong,
-.block-wishlist .block-title strong,
-.block-subscribe .block-title strong,
-.block-compare .block-title strong,
-.block-reorder .block-title strong,
-.block-viewed .block-title strong,
-.block-compared .block-title strong,
-.block-related .block-title strong,
-.block-tags .block-title strong,
-.block-login .block-title strong {  background-position:0 0; background-repeat:no-repeat; padding-left:21px; }
-
-/* Mini Products List */
-.mini-products-list .product-image { float:left; width:50px; border:1px solid #a9a9a9; }
-.mini-products-list .product-details { margin-left:60px; }
-.block-cart .mini-products-list .product-details .product-name,
-.block-cart .mini-products-list .product-details .nobr small { word-wrap:break-word; }
-.block-cart .mini-products-list .product-details .nobr { white-space:normal !important; }
-
-/* Block: Account */
-.block-account { border-color:#bbb; }
-.block-account .block-title { background:#fc9d36 url(../images/bkg_block-title-account.gif) 0 100% repeat-x; border:0; padding:3px 10px; }
-.block-account .block-title strong { font-size:13px; color:#fff; }
-.block-account .block-content { background:#fbfaf6; padding:7px 10px 7px; }
-.block-account .block-content li a { display:block; border-bottom:1px solid #ddd; padding:3px 0; color:#5f5d5c; text-decoration:none !important; }
-.block-account .block-content li a:hover { color:#ea7900; }
-.block-account .block-content li.last a { border-bottom:0; }
-.block-account .block-content li.current { border-bottom:1px solid #ddd; padding:3px 0; color:#ea7900; }
-.block-account .block-content li.current.last { border-bottom:0; }
-
-/* Block: Currency Switcher */
-.block-currency { border:0; background:url(../images/bkg_block-currency.gif) 0 0 no-repeat; padding:7px 12px 10px; height:51px; }
-.block-currency .block-title { background:none; border:0; padding:0; margin:0 0 5px; }
-.block-currency .block-title strong { font:bold 13px/21px Arial, Helvetica, sans-serif; background:url(../images/i_block-currency.gif) 0 50% no-repeat; padding:0 0 0 21px; text-transform:none; color:#fff; }
-.block-currency .block-content { background:none; padding:0; }
-.block-currency .block-content select { width:100%; padding:0; }
-
-/* Block: Layered Navigation */
-.block-layered-nav { border:0; }
-.block-layered-nav .block-title { border:0; padding:0; height:24px; background:url(../images/bkg_block-layered-title.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.block-layered-nav .block-subtitle { line-height:1.35; background:#d5e8ff url(../images/bkg_block-layered1.gif) 0 50% repeat; padding:3px 9px; border:1px solid #b9ccdd; border-width:1px 0; text-transform:uppercase; color:#1f5070; }
-.block-layered-nav .block-content { border:1px solid #a0b3c3; background:#e7f1f4; }
-.block-layered-nav dt { background:url(../images/bkg_block-layered-dt.gif) 9px 11px no-repeat; padding:7px 10px 0 25px; font-weight:bold; text-transform:uppercase; }
-.block-layered-nav dd { padding:0 12px 12px; background:url(../images/bkg_block-layered-dd.gif) 0 100% repeat-x; }
-.block-layered-nav dd.last { background:none; }
-.block-layered-nav .currently li { background:#fff url(../images/bkg_block-layered-li.gif) 0 100% repeat-x; padding:6px 24px 6px 10px; position:relative; z-index:1; line-height:1.5; }
-.block-layered-nav .currently .label { font-weight:bold; padding-left:15px; background:url(../images/bkg_block-layered-label.gif) 0 4px no-repeat; text-transform:uppercase; display:inline-block; vertical-align:top; }
-.block-layered-nav .currently .value { display:inline-block; vertical-align:top; }
-.block-layered-nav .currently .btn-previous,
-.block-layered-nav .currently .btn-remove { position:absolute; right:4px; top:9px; margin:0; }
-.block-layered-nav .currently .btn-previous { right:17px; }
-.block-layered-nav .actions { font-size:11px; padding:4px 5px 4px 9px; background:#cad6e4; border:1px solid #dee5e8; border-width:1px 0; text-align:right; }
-.block-layered-nav .actions a { float:none; }
-
-/* Block: Cart */
-.block-cart .block-title { /*border-bottom:0;*/ }
-.block-cart .block-title strong { background-image:url(../images/i_block-cart.gif); }
-.block-cart .summary { background:#fff; padding:2px 8px 8px; margin:-1px 0 0; position:relative; z-index:1; }
-.block-cart .amount { margin:0; }
-.block-cart .amount a { font-weight:bold; }
-.block-cart .subtotal { margin:5px 0 0; padding:2px 0; background:#fbebd9; text-align:center; }
-.block-cart .subtotal .price { font-weight:bold; }
-.block-cart .actions { border-bottom:1px solid #c2c2c2; }
-.block-cart .actions .paypal-logo { float:left; width:100%; margin:3px 0 0; text-align:right; }
-.block-cart .actions .paypal-logo .paypal-or { clear:both; display:block; padding:0 55px 8px 0; }
-
-/* Block: Wishlist */
-.block-wishlist .block-title strong { background-image:url(../images/i_block-wishlist.gif); }
-.block-wishlist .actions { text-align:right; }
-.block-wishlist .actions a { float:none; }
-
-/* Block: Related */
-.block-related .block-title strong { background-image:url(../images/i_block-related.gif); background-position:0 1px; }
-.block-related input.checkbox { float:left; }
-.block-related .product { margin-left:20px; }
-
-/* Block: Compare Products */
-.block-compare .block-title strong { background-image:url(../images/i_block-list.gif); background-position:0 1px; }
-.block-compare button.button span { border-color:#406a83; background:#618499; }
-.page-popup .link-print { background:url(../images/i_print.gif) 0 2px no-repeat; padding:2px 0 2px 25px; font-weight:bold; color:#1e7ec8; }
-.compare-table { border:0; }
-.compare-table thead tr.first th,
-.compare-table thead tr.first td { border:0; background:none; padding:0; font-size:0; line-height:0; }
-.compare-table .btn-remove { float:right; background-image:url(../images/btn_remove2.gif); width:72px; height:15px; }
-.compare-table tbody th { background:#d9e5ee url(../images/bkg_th-v.gif) 100% 0 repeat-y; }
-.compare-table tbody th,
-.compare-table tbody td { padding:10px; border:0; border-top:1px solid #ccc; border-left:1px solid #ccc; }
-.compare-table tbody td.last { border-right:1px solid #ccc; }
-.compare-table tbody tr.last th,
-.compare-table tbody tr.last td { border-bottom:1px solid #ccc !important; }
-.compare-table tr.add-to-row td { background:#fffada; text-align:center; }
-.compare-table tr.first td { text-align:center; }
-.compare-table tr.first td .product-name { font-size:13px; font-weight:bold; margin:0 0 5px; color:#203548; }
-.compare-table tr.first td .product-name a { color:#203548; }
-.compare-table tr.first td .ratings { width:69px; margin:0 auto; }
-.compare-table tr.first td p,
-.compare-table tr.add-to-row td p { margin:0; }
-
-/* Block: Recently Viewed */
-.block-viewed .block-title strong { background-image:url(../images/i_block-viewed.gif); }
-
-/* Block: Recently Compared */
-.block-compared .block-title strong { background-image:url(../images/i_block-list.gif); background-position:0 1px; }
-
-/* Block: Tags */
-.block-tags .block-title strong { background-image:url(../images/i_block-tags.gif); }
-.block-tags .block-content .tags-list { background:none; border:0; font-size:12px; }
-.block-tags .block-content a { color:#1b2d3b; }
-.block-tags .actions { text-align:right; }
-.block-tags .actions a { float:none; }
-
-/* Block: Subscribe */
-.block-subscribe .block-content { padding:5px 10px; }
-.block-subscribe .block-title strong { background-image:url(../images/i_block-subscribe.gif); }
-.block-subscribe label { font-weight:bold; color:#666; }
-.block-subscribe input.input-text { display:block; width:167px; margin:3px 0; }
-.block-subscribe .actions { background:none; padding:0; margin:3px 0 0; text-align:left; }
-.block-subscribe .actions button.button { float:none; }
-.block-subscribe .actions button.button span { border-color:#406a83; background:#618499; }
-
-/* Block: Reorder */
-.block-reorder .block-title strong { background-image:url(../images/i_block-list.gif); }
-.block-reorder input.checkbox { float:left; margin:2px -20px 0 0; }
-.block-reorder .product-name { margin-left:20px; }
-.block-reorder .validation-advice { margin:3px 9px 7px; }
-
-/* Block: Banner */
-.block-banner { border:0; }
-.block-banner .block-content { padding:0; text-align:center; }
-
-/* Block: Login */
-.block-login .block-title strong { background-image:url(../images/i_ma-info.gif); }
-.block-login .block-content { padding:5px 10px; }
-.block-login label { font-weight:bold; color:#666; }
-.block-login input.input-text { display:block; width:167px; margin:3px 0; }
-.block-login .actions { background:none; padding:0; margin:3px 0 0; }
-.block-login .actions button.button span { border-color:#406a83; background:#618499; }
-
-/* Paypal */
-.sidebar .paypal-logo { display:block; margin:10px 0; text-align:center; }
-.sidebar .paypal-logo a { float:none; }
-/* ======================================================================================= */
-
-
-/* Category Page ========================================================================= */
-.category-title { border:0; margin:0 0 7px; }
-.category-image { width:100%; overflow:hidden; margin:0 0 10px; text-align:center; }
-.category-image img {}
-.category-description { margin:0 0 10px; }
-.category-products {}
-
-/* View Type: Grid */
-.products-grid { border-bottom:1px solid #d9ddd3; background:url(../images/bkg_grid.gif) 0 0 repeat; position:relative; }
-.products-grid.last { border-bottom:0; }
-.products-grid li.item { float:left; width:138px; padding:12px 10px 80px; }
-.products-grid .product-image { display:block; width:135px; height:135px; margin:0 0 10px; }
-.products-grid .product-name { /*min-height:2.7em;*/ margin:0 0 5px; font-weight:bold; font-size:13px; color:#203548; }
-.products-grid .product-name a { color:#203548; }
-.products-grid .price-box { margin:5px 0; }
-.products-grid .availability { line-height:21px; }
-.products-grid .actions { position:absolute; bottom:12px; }
-.col2-left-layout .products-grid,
-.col2-right-layout .products-grid { width:632px; margin:0 auto; }
-.col1-layout .products-grid { width:790px; margin:0 auto; }
-
-/* View Type: List */
-.products-list li.item { border-bottom:1px solid #d9ddd3; padding:12px 10px; }
-.products-list li.item.last { border-bottom:0; }
-.products-list .product-image { float:left; width:135px; height:135px; margin:0 0 10px; }
-.products-list .product-shop { margin-left:150px; }
-.products-list .product-name { margin:0 0 5px; font-weight:bold; font-size:13px; color:#203548; }
-.products-list .product-name a { color:#203548; }
-.products-list .price-box { float:left; margin:3px 13px 5px 0; }
-.products-list .availability { float:left; margin:3px 0 0; }
-.products-list .desc { clear:both; padding:6px 0 0; margin:0 0 15px; line-height:1.35; }
-.products-list .desc .link-learn { font-size:11px; }
-.products-list .add-to-links { clear:both; }
-.products-list .add-to-links li { display:inline; }
-.products-list .add-to-links .separator { display:inline; margin:0 2px; }
-/* ======================================================================================= */
-
-
-/* Product View ========================================================================== */
-/* Rating */
-.no-rating { margin:0; }
-
-.ratings { font-size:11px; line-height:1.25; margin:7px 0; }
-.ratings strong { float:left; margin:1px 3px 0 0; }
-.ratings .rating-links { margin:0; }
-.ratings .rating-links .separator { margin:0 2px; }
-.ratings dt {}
-.ratings dd {}
-.rating-box { width:69px; height:13px; font-size:0; line-height:0; background:url(../images/bkg_rating.gif) 0 0 repeat-x; text-indent:-999em; overflow:hidden; }
-.rating-box .rating { float:left; height:13px; background:url(../images/bkg_rating.gif) 0 100% repeat-x; }
-.ratings .rating-box { float:left; margin-right:3px; }
-.ratings .amount {}
-
-.ratings-table th,
-.ratings-table td { font-size:11px; line-height:1.15; padding:3px 0; }
-.ratings-table th { font-weight:bold; padding-right:8px; }
-
-/* Availability */
-.availability { margin:0; }
-.availability span { font-weight:bold; }
-.availability.in-stock span {}
-.availability.out-of-stock span { color:#d83820; }
-
-.availability-only { margin:10px 0 7px; line-height:16px; background:url(../images/i_availability_only.gif) 0 50% no-repeat; padding-left:15px; }
-.availability-only span,
-.availability-only a { border-bottom:1px dashed #751d02; color:#000; }
-.availability-only a { background:url(../images/i_availability_only_arrow.gif) 100% 0 no-repeat; cursor:pointer; padding-right:15px; text-decoration:none; }
-.availability-only .expanded { background-position:100% -15px; }
-.availability-only strong { color:#be2c00; }
-
-.availability-only-details { margin:0 0 7px; }
-.availability-only-details th { background:#d2d6d9; font-size:10px; padding:0 8px; }
-.availability-only-details td { background:#ebf0f3; border-bottom:1px solid #fff; font-size:11px; padding:2px 8px 1px; }
-.availability-only-details tr.odd td.last { color:#d95e00; font-weight:bold; }
-
-.product-view .product-shop .availability { font-size:11px; }
-.product-view .product-shop .availability span { font-weight:normal; }
-
-/* Email to a Friend */
-.email-friend { margin:0; }
-
-/* Alerts */
-.alert-price { margin:0; font-size:11px; }
-.alert-stock { margin:0; font-size:11px; }
-
-/********** < Product Prices */
-.price { white-space:nowrap !important; }
-
-.price-box { margin:5px 0; }
-.price-box .price { font-weight:bold; color:#c76200; }
-
-/* Regular price */
-.regular-price { color:#c76200; }
-.regular-price .price { font-weight:bold; font-size:13px; color:#c76200; }
-.block .regular-price,
-.block .regular-price .price { color:#2f2f2f; }
-
-/* Old price */
-.old-price { margin:0; }
-.old-price .price-label { white-space:nowrap; color:#999; }
-.old-price .price { font-weight:bold; color:#c76200; text-decoration:line-through; }
-
-/* Special price */
-.special-price { margin:0; padding:3px 0; }
-.special-price .price-label { font-size:13px; font-weight:bold; white-space:nowrap; color:#cd5033; }
-.special-price .price { font-size:13px; font-weight:bold; color:#c76200; }
-
-/* Minimal price (as low as) */
-.minimal-price { margin:0; }
-.minimal-price .price-label { font-weight:bold; white-space:nowrap; }
-
-.minimal-price-link { display:block; }
-.minimal-price-link .label {color:#1e7ec8;}
-.minimal-price-link .price { font-weight:normal; color:#1e7ec8; }
-
-/* Excluding tax */
-.price-excluding-tax { display:block; color:#999; }
-.price-excluding-tax .label { white-space:nowrap; color:#999; }
-.price-excluding-tax .price { font-size:13px; font-weight:normal; color:#c76200; }
-
-/* Including tax */
-.price-including-tax { display:block; color:#999; }
-.price-including-tax .label { white-space:nowrap; color:#999; }
-.price-including-tax .price { font-size:13px; font-weight:bold; color:#c76200; }
-
-/* Configured price */
-.configured-price { margin:0; }
-.configured-price .price-label { font-weight:bold; white-space:nowrap; }
-.configured-price .price { font-weight:bold; }
-
-/* FPT */
-.weee { display:block; font-size:11px; color:#444; }
-.weee .price { font-size:11px; font-weight:normal; }
-
-/* Excl tax (for order tables) */
-.price-excl-tax  { display:block; }
-.price-excl-tax .label { display:block; white-space:nowrap; }
-.price-excl-tax .price { display:block; }
-
-/* Incl tax (for order tables) */
-.price-incl-tax { display:block; }
-.price-incl-tax .label { display:block; white-space:nowrap; }
-.price-incl-tax .price { display:block; font-weight:bold; }
-
-/* Price range */
-.price-from { margin:0; }
-.price-from .price-label { font-weight:bold; white-space:nowrap; }
-
-.price-to { margin:0; }
-.price-to .price-label { font-weight:bold; white-space:nowrap; }
-
-/* Price notice next to the options */
-.price-notice { padding-left:10px; color:#999; }
-.price-notice .price { font-weight:bold; color:#2f2f2f; }
-
-/* Price as configured */
-.price-as-configured { margin:0; }
-.price-as-configured .price-label { font-weight:bold; white-space:nowrap; }
-
-.price-box-bundle { padding:0 0 10px 0; }
-.price-box-bundle .price-box { margin:0 !important; padding:0 !important; }
-.price-box-bundle .price { color:#555; }
-/********** Product Prices > */
-
-/* Tier Prices */
-.product-pricing,
-.tier-prices { margin:10px 0; padding:10px; background-color:#f4f7f7; border:1px solid #dadddd; color:#424242; }
-.tier-prices li { line-height:1.4; background:url(../images/i_tier.gif) no-repeat 0 3px; padding:2px 0 2px 10px; }
-.tier-prices .benefit { font-style:italic; font-weight:bold; color:#2f2f2f; }
-.tier-prices .price { font-weight:bold; color:#2f2f2f; }
-
-.tier-prices-grouped li { padding:2px 0; color:#e26703; }
-.tier-prices-grouped li .price { font-weight:bold; }
-
-/* Add to Links */
-.add-to-links { font-size:11px; margin:5px 0 0; }
-.add-to-links .separator { display:none; }
-
-/* Add to Cart */
-.add-to-cart label { float:left; margin-right:5px; font-weight:bold; color:#666; }
-.add-to-cart .qty { float:left; margin-right:5px; }
-.add-to-cart button.button { float:left; }
-.add-to-cart .paypal-logo { clear:left; margin:0; text-align:right; }
-.add-to-cart .paypal-logo .paypal-or { clear:both; display:block; margin:5px 60px 5px 0; }
-.product-view .add-to-cart .paypal-logo { margin:0; }
-
-/* Add to Links + Add to Cart */
-.add-to-box { margin:10px 0; }
-.add-to-box .add-to-cart { float:left; }
-.add-to-box .or { float:left; font-weight:bold; margin:0 7px; color:#666; }
-.add-to-box .add-to-links { float:left; margin:0; font-size:12px !important; line-height:1.25 !important; text-align:left !important; }
-.add-to-box .add-to-links li { display:block !important; }
-.add-to-box .add-to-links li .separator { display:none !important; }
-
-
-.product-view { border:1px solid #c4c6c8; }
-
-.product-essential { padding:25px; background:#fff url(../images/bkg_product-view.gif) 100% 0 no-repeat; }
-.product-essential h2 { font:bold 13px/1.35 Arial, Helvetica, sans-serif; }
-
-.product-collateral { background:#faf7ee url(../images/bkg_product_collateral.gif) 0 0 repeat-x; padding:25px; }
-.product-collateral h2 { font-weight:bold; font-size:15px; color:#e26703; border-bottom:1px solid #e5dcc3; padding:0 0 1px; margin:0 0 15px; }
-.product-collateral .box-collateral { margin:0 0 25px; }
-
-/* Product Images */
-.product-view .product-img-box { float:left; width:267px; }
-.col3-layout .product-view .product-img-box { float:none; margin:0 auto; }
-.product-view .product-img-box .product-image { margin:0 0 13px; }
-.product-view .product-img-box .product-image-zoom { position:relative; width:265px; height:265px; overflow:hidden; z-index:9; }
-.product-view .product-img-box .product-image-zoom img { position:absolute; left:0; top:0; cursor:move; }
-.product-view .product-img-box .zoom-notice { font-size:11px; margin:0 0 5px; text-align:center; }
-.product-view .product-img-box .zoom { position:relative; z-index:9; height:18px; margin:0 auto 13px; padding:0 28px; background:url(../images/slider_bg.gif) 50% 50% no-repeat; cursor:pointer; }
-.product-view .product-img-box .zoom.disabled { -moz-opacity:.3; -webkit-opacity:.3; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";/*IE8*/ opacity:.3; }
-.product-view .product-img-box .zoom #track { position:relative; height:18px; }
-.product-view .product-img-box .zoom #handle { position:absolute; left:0; top:-1px; width:9px; height:22px; background:url(../images/magnifier_handle.gif) 0 0 no-repeat;  }
-.product-view .product-img-box .zoom .btn-zoom-out { position:absolute; left:2px; top:0; }
-.product-view .product-img-box .zoom .btn-zoom-in { position:absolute; right:2px; top:0; }
-.product-view .product-img-box .more-views h2 { font-size:11px; border-bottom:1px solid #ccc; margin:0 0 8px; text-transform:uppercase; }
-.product-view .product-img-box .more-views ul { margin-left:-9px }
-.product-view .product-img-box .more-views li { float:left; margin:0 0 8px 9px; }
-.product-view .product-img-box .more-views li a { float:left; width:56px; height:56px; border:2px solid #ddd; overflow:hidden; }
-
-.product-image-popup { margin:0 auto; }
-.product-image-popup .buttons-set { float:right; clear:none; border:0; margin:0; padding:0; }
-.product-image-popup .nav { font-weight:bold; margin:0 100px; text-align:center; }
-.product-image-popup .image { display:block; margin:10px 0;  }
-.product-image-popup .image-label { font-size:13px; font-weight:bold; margin:0 0 10px; color:#2f2f2f; }
-
-/* Product Shop */
-.product-view .product-shop { float:right; width:330px; }
-.col1-layout .product-view .product-shop { float:right; width:545px; }
-.col3-layout .product-view .product-shop { float:none; width:auto; }
-.product-view .product-shop .product-name { margin:0 0 5px; }
-.product-view .product-shop .product-name h1 { margin:0; font:bold 15px/1.35 Arial, Helvetica, sans-serif; }
-.product-view .product-shop .availability { margin:10px 0; }
-.product-view .product-shop .short-description { margin:10px 0; background:url(../images/bkg_divider1.gif) 0 0 repeat-x; padding:10px 0 0; }
-.product-view .product-shop .price-box { margin:10px 0; }
-.product-view .product-shop .add-to-links { margin:0; }
-.product-view .product-shop .add-to-links { font-size:12px; text-align:right; }
-.product-view .product-shop .add-to-links li,
-.product-view .product-shop .add-to-links li .separator { display:inline; }
-.product-view .product-shop .add-to-links a { color:#1E7EC8 !important; font-weight:normal !important; }
-
-/* Product Options */
-.product-options { margin:20px 0 0; padding:10px 15px 20px; position:relative; background-color:#f6f6f6; border:1px solid #e4e4e4; }
-.product-options dt { padding:10px 0 0; font-weight:normal; }
-.product-options dt label { font-weight:bold; color:#2f2f2f; }
-.product-options dt label.required em { color:#eb340a; margin-left:5px; }
-.product-options dd .qty-holder { display:block; padding:10px 0 0; }
-.product-options dd .qty-holder label { vertical-align:middle; }
-.product-options dt .qty-disabled { background:none; border:0; padding:3px; color:#2f2f2f; }
-.product-options dd { padding:5px 10px 15px; margin:0 0 5px; border-bottom:1px solid #e4e4e4; }
-.product-options dl.last dd.last { border-bottom:0; padding-bottom:5px; margin-bottom:0; }
-.product-options dd input.input-text { width:98%; }
-.product-options dd input.datetime-picker { width:150px; }
-.product-options dd .time-picker { display:-moz-inline-box; display:inline-block; padding:2px 0; vertical-align:middle; }
-.product-options dd textarea { width:98%; height:8em; }
-.product-options dd select { width:99%; }
-.product-options dd .multiselect option { border-bottom:1px dotted #d9e5ee; padding:2px 4px; }
-.product-options ul.options-list { margin-right:5px; }
-.product-options ul.options-list li { line-height:1.5; padding:2px 0; }
-.product-options ul.options-list input.radio { float:left; margin-top:3px; }
-.product-options ul.options-list input.checkbox { float:left; margin-top:3px; }
-.product-options ul.options-list .label { display:block; margin-left:18px; }
-.product-options ul.options-list label { font-weight:normal; }
-.product-options ul.validation-failed { padding:0 7px; }
-.product-options p.note { margin:0; font-size:11px; }
-.product-options p.required { position:absolute; right:20px; top:20px; }
-
-.product-options-bottom { background-color:#fffada; padding:15px 20px; border:1px solid #e4e4e4; border-top:0; }
-.product-options-bottom .product-pricing,
-.product-options-bottom .tier-prices { margin:0; padding:0 0 10px; border:0; background:0; color:#e26703; }
-.product-options-bottom .tier-prices li { background:0; padding:2px 0; }
-.product-options-bottom .tier-prices .price,
-.product-options-bottom .tier-prices .benefit { color:#e26703; }
-.product-options-bottom .price-box { float:left; margin:0; padding:0; }
-.product-options-bottom .add-to-links { clear:both; padding:5px 0 0; text-align:right; }
-.col3-layout .product-options-bottom .price-box { float:none; padding:0 0 5px; }
-.product-options-bottom .price-label { float:left; padding-right:5px; }
-.product-options-bottom .price-tax { float:left; }
-.product-options-bottom .add-to-cart { float:right; }
-.product-shop .product-options-bottom { margin:0 0 10px; }
-.product-shop .product-options-bottom .price-box { float:none; margin:0 0 5px; }
-.product-shop .product-options-bottom .price-label { float:none; padding-right:0; }
-.product-shop .product-options-bottom .price-tax { float:none; }
-.product-shop .product-options-bottom .add-to-cart-box { clear:both; float:left; padding-top:12px; }
-.product-shop .product-options-bottom .add-to-links { clear:both; padding:5px 0 0; text-align:right; }
-
-/* Grouped Product */
-.product-view .grouped-items-table .price-box { margin:0; padding:0; }
-
-/* Block: Description */
-.product-view .box-description {}
-
-/* Block: Additional */
-.product-view .box-additional .data-table th,
-.product-view .box-additional .data-table td { line-height:1.25; }
-
-/* Block: Upsell */
-.product-view .box-up-sell h2 { border-bottom:0; padding:0; margin:0 0 8px; }
-.product-view .box-up-sell .products-grid { width:100%; border:1px solid #e5dcc3; }
-.product-view .box-up-sell .products-grid td { width:25%; background:#f6f2e7; border-right:1px solid #e5dcc3; border-bottom:1px solid #e5dcc3; padding:15px 10px 12px; line-height:1.6em; }
-.product-view .box-up-sell .products-grid tr.last td { border-bottom:0; }
-.product-view .box-up-sell .products-grid td.last { border-right:0; }
-.product-view .box-up-sell .products-grid td img { border:1px solid #e5dcc3; }
-.product-view .box-up-sell .products-grid .product-image { text-align:center; }
-.product-view .box-up-sell .products-grid td.empty { border-right:0; background:#f1ecdb; }
-.product-view .box-up-sell .products-grid .ratings .rating-box { float:none; display:block; margin:0 0 3px; }
-
-/* Block: Tags */
-.product-view .box-tags { margin:0; }
-.product-view .box-tags h3 { font-size:13px; }
-.product-view .box-tags .product-tags { display:block; margin:0 0 15px; }
-.product-view .box-tags .product-tags li { display:inline; background:url(../images/bkg_pipe3.gif) 100% 4px no-repeat; padding:0 7px 0 4px; }
-.product-view .box-tags .product-tags li.first { padding-left:0; }
-.product-view .box-tags .product-tags li.last { background:none; padding-right:0; }
-.product-view .box-tags .form-add label { display:block; font-size:13px; font-weight:bold; margin:0 0 5px; color:#0a263c;}
-.product-view .box-tags .form-add .input-box { float:left; width:305px; margin:0 5px 0 0; background:url(../images/i_tag_add.gif) 0 2px no-repeat; padding:0 0 0 23px; }
-.product-view .box-tags .form-add input.input-text { width:299px; }
-.product-view .box-tags .form-add button.button span { border-color:#406a83; background:#618499; }
-.product-view .box-tags .note { margin:3px 0 0; padding:0 0 0 23px; font-size:11px; }
-
-/* Block: Reviews */
-.product-view .box-reviews dl { margin:15px 0; }
-.product-view .box-reviews dt a,
-.product-view .box-reviews dt span { font-weight:bold; }
-.product-view .box-reviews dd { margin:0 0 15px; }
-.product-view .box-reviews dd small { font-style:italic; }
-.product-view .box-reviews .form-add { margin:15px 0 0; }
-.product-view .box-reviews .form-add h3 { font-size:13px; font-weight:normal; }
-.product-view .box-reviews .form-add h3 span { font-weight:bold; }
-.product-view .box-reviews .form-add h4 { font-size:12px; }
-.product-view .box-reviews .form-add .data-table td { text-align:center; }
-.product-view .box-reviews .form-add .form-list { margin:15px 0 0; }
-.product-view .box-reviews .form-add .form-list .input-box { width:360px; }
-.product-view .box-reviews .form-add .form-list input.input-text,
-.product-view .box-reviews .form-add .form-list textarea { width:354px; }
-
-/* Send a Friend */
-.send-friend .form-list { width:615px; overflow:hidden; }
-.send-friend .form-list li { margin-right:-15px; }
-.send-friend .form-list li p { margin:0 15px 0 0; }
-.send-friend .form-list .field { width:315px; }
-.send-friend .form-list .input-box { width:300px; }
-.send-friend .form-list input.input-text,
-.send-friend .form-list textarea { width:294px; }
-.send-friend .form-list li.wide .input-box { width:612px; }
-.send-friend .form-list li.wide textarea { width:609px; }
-.send-friend .buttons-set .limit { float:right; margin:0 7px 0 0; font-size:11px; line-height:21px; }
-/* ======================================================================================= */
-
-
-/* Content Styles ================================================================= */
-.product-name { margin:0; font-size:1em; font-weight:normal; }
-.product-name a { color:#1e7ec8; }
-
-/* Product Tags */
-.tags-list { display:block; font-size:13px; border:1px solid #c1c4bc; background:#f8f7f5; padding:10px; }
-.tags-list li { display:inline !important; margin:0 4px 0 0; }
-.tags-list li a { color:#1b2d3b; }
-
-/* Advanced Search */
-.advanced-search .form-list label { width:160px; padding-right:10px; }
-.advanced-search .form-list .input-box,
-.advanced-search .form-list .input-range { float:left; clear:none; }
-.advanced-search-amount { margin:0 0 10px; }
-.advanced-search-summary { margin:10px 0; border:1px solid #e9d7c9; background:#fff6f1; padding:10px; }
-.advanced-search-summary ul { float:left; width:49%; }
-.advanced-search-summary strong { color:#E17C24; padding-left:15px; background:url(../images/i_search_criteria.gif) 0 3px no-repeat; }
-.advanced-search-summary p { clear:both; font-weight:bold; margin:0; }
-
-/* CMS Home Page */
-.cms-home .subtitle {}
-.cms-index-index .subtitle {}
-
-/* RSS */
-.rss-title h1 { background:url(../images/i_rss-big.png) 0 4px no-repeat; padding-left:27px; }
-.rss-table .link-rss { display:block; line-height:1.55; background-position:0 4px; }
-/* ======================================================================================= */
-
-
-/* Shopping Cart ========================================================================= */
-.cart .page-title { border-bottom:0; margin:0 0 12px; }
-.cart .page-title h1 { margin:10px 0 0; }
-
-/* Checkout Types */
-.cart .page-title .checkout-types li { margin:0 0 5px; }
-.cart .title-buttons .checkout-types { float:right; }
-.cart .title-buttons .checkout-types li { float:left; margin:0 0 5px 5px; }
-.cart .checkout-types .paypal-or { margin:0 8px; line-height:2.3; }
-.cart .totals .checkout-types .paypal-or { clear:both; display:block; padding:8px 55px 0 0; line-height:1.0; font-size:11px; }
-
-/* Shopping Cart Table */
-.cart-table th { padding:2px 10px; }
-.cart-table td { padding:10px; }
-.cart-table .product-name { font-weight:bold; margin:0 0 5px; color:#2f2f2f; }
-.cart-table .item-msg { margin:5px 0; font-size:11px; font-weight:bold; color:#df280a; }
-.cart-table tfoot td { padding:5px 10px; }
-.cart-table .btn-continue { float:left; }
-.cart-table .btn-empty span,
-.cart-table .btn-continue span,
-.cart-table .btn-update span { border-color:#406a83; background:#618499; }
-.cart-table .btn-update,
-.cart-table .btn-empty { float:right; }
-.cart-table .btn-update { margin-left:10px; }
-
-/* Shopping Cart Collateral boxes */
-.cart .cart-collaterals { padding:25px 0 0; }
-.cart .cart-collaterals .col2-set { float:left; width:605px; }
-.cart .cart-collaterals .col2-set .col-2 { width:294px; }
-
-.cart .crosssell { border:1px solid #cec3b6; background:#fafaec; padding:12px 15px; }
-.cart .crosssell h2 { font-size:13px; font-weight:bold; }
-.cart .crosssell .product-image { float:left; width:75px; height:75px; border:1px solid #d0cdc9; }
-.cart .crosssell .product-details { margin-left:90px; }
-.cart .crosssell .product-name { font-weight:bold; }
-.cart .crosssell li.item { margin:12px 0; }
-.cart .crosssell .link-compare { font-weight:normal; }
-
-/* Discount Codes & Estimate Shipping and Tax Boxes */
-.cart .discount,
-.cart .shipping { border:1px solid #d0cbc1; background:#fff url(../images/bkg_block-title.gif) 0 0 repeat-x; padding:12px 15px; margin:0 0 18px; }
-.cart .discount h2,
-.cart .shipping h2 { background-position:0 0; background-repeat:no-repeat; font:bold 13px/16px Arial, Helvetica, sans-serif; padding:0 0 0 21px; color:#e26703; text-transform:uppercase; }
-.cart .discount button span,
-.cart .shipping button span { border-color:#406a83; background:#618499; }
-.cart .discount .buttons-set,
-.cart .shipping .buttons-set { margin:10px 0 0; border:0; padding:0; text-align:left; }
-.cart .discount .buttons-set button.button,
-.cart .shipping .buttons-set button.button { float:none; margin-left:0; }
-
-.cart .discount h2 { background-image:url(../images/i_discount.gif); }
-.cart .discount .input-box { margin:8px 0 0; width:260px; }
-.cart .discount input.input-text { width:254px; }
-
-.cart .shipping h2 { background-image:url(../images/i_shipping.gif); }
-.cart .shipping .sp-methods { margin:10px 0 0; padding:5px 0 0; background:url(../images/bkg_divider1.gif) 0 0 repeat-x; }
-
-/* Shopping Cart Totals */
-.cart .totals { float:right; width:268px; background:#dee5e8; border:1px solid #bebcb7; }
-.cart .totals table { width:100%; margin:7px 0; }
-.cart .totals td { padding:1px 15px 1px 7px; }
-.cart .totals tr.last td {}
-.cart .totals tfoot th { padding:5px 15px 5px 7px; }
-.cart .totals tfoot td { padding-top:5px; padding-bottom:5px; }
-.cart .totals tfoot th strong,
-.cart .totals tfoot td strong { font-size:15px; }
-.cart .totals .checkout-types { font-size:13px; padding:8px 15px 15px; text-align:right; }
-.cart .totals .checkout-types li { clear:both; margin:10px 0; }
-
-/* Options Tool Tip */
-.item-options dt { font-weight:bold; font-style:italic; }
-.item-options dd { padding-left:10px; margin:0 0 6px; }
-.truncated { cursor:help; }
-.truncated a.dots { cursor:help; }
-.truncated a.details { cursor:help; }
-.truncated .truncated_full_value { position:relative; z-index:999; }
-.truncated .truncated_full_value .item-options { position:absolute; top:-99999em; left:-99999em; z-index:999; width:250px; padding:8px; border:1px solid #ddd; background-color:#f6f6f6; }
-.truncated .truncated_full_value .item-options > p { font-weight:bold; text-transform:uppercase; }
-.truncated .show .item-options { top:-20px; left:50%; }
-.col-left .truncated .show .item-options { left:15px; top:7px; }
-.col-right .truncated .show .item-options { left:-240px; top:7px; }
-/* ======================================================================================= */
-
-
-/* Checkout ============================================================================== */
-/********** < Common Checkout Styles */
-/* Shipping and Payment methods */
-.sp-methods { margin:0 0 8px; }
-.sp-methods dt { margin:13px 0 5px; font-weight:bold; }
-.sp-methods dd {}
-.sp-methods dd li { margin:5px 0; position: relative;}
-.sp-methods label { font-weight:bold; color:#666; }
-.sp-methods .price { font-weight:bold; }
-.sp-methods .form-list { padding-left:20px; }
-.sp-methods .form-list li { margin:0 0 8px; }
-.sp-methods select.month { width:154px; margin-right:10px; }
-.sp-methods select.year { width:96px; }
-.sp-methods input.cvv { width:3em !important; }
-
-.sp-methods .checkmo-list li { margin:0 0 5px; }
-.sp-methods .checkmo-list label { width:135px; padding-right:10px; text-align:right; }
-.sp-methods .checkmo-list address { float:left; }
-
-.sp-methods .centinel-logos a { margin-right:3px; }
-.sp-methods .centinel-logos img { vertical-align:middle; }
-
-.sp-methods .release-amounts { margin:0.5em 0; }
-.sp-methods .release-amounts button { float:left; margin:5px 10px 0 0; }
-
-.please-wait { float:right; }
-.please-wait img { vertical-align:middle; }
-.cvv-what-is-this { font-size:11px; cursor:help; margin-left:10px; }
-
-/* Tooltip */
-.tool-tip { border:1px solid #7BA7C9; background:#EAF6FF; padding:15px 20px; position:absolute; z-index:9999; }
-.tool-tip .btn-close { margin:-9px -14px 0; text-align:right; }
-.tool-tip .btn-close a { display:block; margin:0 0 0 auto; width:15px; height:15px; background:url(../images/btn_window_close.gif) 100% 0 no-repeat; text-align:left; text-indent:-999em; overflow:hidden; }
-.tool-tip .tool-tip-content { padding:5px; }
-
-/* Gift Messages */
-.gift-messages h3 { font-size:12px; font-weight:bold; color:#e87403; }
-.gift-messages p.control { color:#8e8d8b; }
-.gift-messages-form { position:relative; }
-.gift-messages-form label { float:none !important; position:static !important; }
-.gift-messages-form h4 { font-size:12px; font-weight:bold; color:#e87403; }
-.gift-messages-form .whole-order { margin:0 0 25px; }
-.gift-messages-form .item { margin:0 0 10px; }
-.gift-messages-form .item .product-img-box { float:left; width:75px; }
-.gift-messages-form .item .product-image { margin:0 0 7px; }
-.gift-messages-form .item .number { margin:0; font-weight:bold; text-align:center; color:#8a8987; }
-.gift-messages-form .item .details { margin-left:90px; }
-.gift-messages-form .item .details .product-name { font-size:13px; font-weight:bold; margin:0 0 10px; }
-.gift-messages-form .item .details .form-list .field { width:255px; }
-.gift-messages-form .item .details .form-list .input-box { width:240px; }
-.gift-messages-form .item .details .form-list input.input-text { width:234px; }
-.gift-messages-form .item .details .form-list li.wide .input-box { width:500px; }
-.gift-messages-form .item .details .form-list li.wide textarea { width:494px; }
-
-.gift-message-link { font-size:11px; background:url(../images/bkg_collapse-gm.gif) 100% 6px no-repeat; padding-right:7px; }
-.gift-message-link.expanded { background-position:100% -40px; }
-.gift-message-row { background:#f2efe9; }
-.gift-message-row .btn-close { float:right; width:16px; height:16px; background:url(../images/btn_gm-close.gif) 0 0 no-repeat; font-size:0; line-height:0; text-indent:-999em; overflow:hidden; }
-
-/* Checkout Agreements */
-.checkout-agreements li { margin:30px 0; }
-.checkout-agreements .agreement-content { overflow:auto; height:12em; padding:10px; background-color:#fbfaf6; border:1px solid #bbb6a5; }
-.checkout-agreements .agree { margin:0; padding:10px 0 10px 11px; }
-.checkout-agreements .agree input.checkbox { margin-right:6px; }
-.checkout-agreements .agree label { font-weight:bold; color:#666; }
-
-.opc .checkout-agreements { border:1px solid #d9dde3; border-width:0 1px; padding:5px 30px; }
-.opc .checkout-agreements li { margin:20px 0 0; }
-.opc .checkout-agreements .agreement-content { background-color:#fff; border-color:#e4e4e4; padding:5px; }
-.opc .checkout-agreements .agree { padding-left:6px; }
-
-/* Centinel */
-.centinel {}
-.centinel .authentication { border:1px solid #ddd; background:#fff; }
-.centinel .authentication iframe { width:99%; height:400px; background:transparent !important; margin:0 !important; padding:0 !important; border:0 !important; }
-
-.opc .centinel { border:1px solid #bbb6a5; border-width:0 1px 1px; padding:10px 30px; }
-
-/* Generic Info Set */
-.info-set { background:#fbfaf6 url(../images/bkg_checkout.gif) 0 0 repeat-x; border:1px solid #bbb6a5; margin:0 0 25px; padding:20px; }
-.info-set h2 { font-size:13px; font-weight:bold; margin:0 0 10px; }
-.info-set h3,
-.info-set h4 { font-size:13px; font-weight:bold; color:#E26703; }
-.info-set h2 a,
-.info-set h3 a,
-.info-set h4 a { font-weight:normal; }
-.info-set h2.legend { margin:-20px -20px 15px; padding:5px 10px; background:#f9f3e3; border-bottom:1px solid #bbafa0; position:relative; }
-.info-set h3.legend { margin:0 0 10px; color:#0a263c; }
-.info-set .divider { margin:0 -20px; padding:25px 0; position:relative; }
-.info-set .box { margin:0 0 15px; }
-.info-set .box h2 { color:#e26703; }
-.info-set .data-table .product-name { font-size:1em !important; font-weight:bold !important; color:#1e7ec8 !important; }
-.info-set .data-table .product-name a { font-weight:bold !important; }
-.info-set .data-table .item-options { margin:5px 0 0; }
-/********** Common Checkout Styles > */
-
-/* One Page Checkout */
-.block-progress { border:0; margin:0; }
-.block-progress .block-title { background:none; border:0; padding:0; margin:0 0 5px; }
-.block-progress .block-title strong { font-size:13px; color:#0a263c; }
-.block-progress .block-content { background:none; }
-.block-progress dt { font-size:13px; font-weight:bold; line-height:1.35; background:#eee; border:1px solid #a3aeb3; margin:0 0 6px; padding:2px 8px; color:#999; }
-.block-progress dd { background:#eee; border:1px solid #a3aeb3; border-top:0; padding:8px 13px; margin:0 0 6px; }
-.block-progress dt.complete { margin:0; background:#d0dce1; color:#5e8ab4; }
-.block-progress dd.complete {}
-.block-progress p { margin:0; }
-.block-progress .cards-list dt { background:none; border:0 none; color:inherit; font-size:12px; margin:5px 0; padding:0; }
-.block-progress .cards-list dd { border:0 none; margin:0; padding:0; }
-.block-progress .cards-list .info-table th { font-weight:normal; }
-
-.opc .buttons-set { margin-top:0; padding-top:2em; }
-.opc .buttons-set p.required { margin:0; padding:0 0 10px; }
-.opc .buttons-set .back-link small { display:none; }
-.opc .buttons-set .back-link a { background:url(../images/i_arrow-top.gif) 0 50% no-repeat; padding-left:16px; }
-.opc .buttons-set.disabled button.button { display:none; }
-.opc .buttons-set .please-wait { height:21px; line-height:21px; }
-.opc .ul { list-style:disc outside; padding-left:18px; }
-
-.opc { position:relative; }
-.opc li.section {}
-
-.opc .step-title { border-width:0 1px; border-style:solid; border-color:#fff #d9dde3 #d9dde3; background:#eee url(../images/bkg_opc-title-off.gif) 0 100% repeat-x; padding:4px 8px 6px; text-align:right; }
-.opc .step-title .number { float:left; background:#fff; border:1px solid #fff; padding:0 4px; margin:0 5px 0 0; font:bold 11px/14px arial, helvetica, sans-serif; color:#999; }
-.opc .step-title h2 { float:left; margin:0; font:bold 13px/16px Arial, Helvetica, sans-serif; color:#999; }
-.opc .step-title a { display:none; float:right; font-size:11px; line-height:16px; }
-
-.opc .allow .step-title { background:#d0dce1; border:1px solid #a3aeb3; border-bottom:0; color:#a4b3b9; cursor:pointer; }
-.opc .allow .step-title .number { background:#dbe6eb; border-color:#dbe6eb; color:#a4b3b9; }
-.opc .allow .step-title h2 { color:#a4b3b9; }
-/*.opc .allow .step-title a { display:block; }*/
-
-.opc .active .step-title { background:#f9f3e3; border:1px solid #bbafa0; padding-bottom:5px; color:#f18200; cursor:default; }
-.opc .active .step-title .number { background:#f18200; border-color:#f19900; color:#fff; }
-.opc .active .step-title h2 { color:#f18200; }
-/*.opc .active .step-title a { display:none; }*/
-
-.opc .step { border:1px solid #bbafa0; border-top:0; background:#fbfaf6 url(../images/bkg_checkout.gif) 0 0 repeat-x; padding:15px 30px; position:relative; }
-.opc .step .tool-tip { right:20px; bottom: 0; margin: 0 0 30px 0; }
-
-#opc-login .buttons-set { border-top:0; }
-#opc-login h3 { font-size:13px; border-bottom:1px solid #e4e4e4; padding-bottom:2px; text-transform:uppercase; }
-#opc-login h4 { font-size:1em; font-weight:bold; margin:0; color:#2f2f2f; }
-
-#opc-shipping_method .buttons-set { border-top:0; }
-.opc .gift-messages-form { margin:0 -30px; background:#f6f1eb; border:1px solid #e9e4de; border-width:1px 0; padding:22px 24px 22px 30px; }
-.opc .gift-messages-form .inner-box { padding:5px; height:260px; overflow:auto; }
-
-#opc-review .step { border:0; padding:0; }
-#opc-review .product-name { font-weight:bold; color:#0a263c; }
-#opc-review .item-options { margin:5px 0 0; }
-#opc-review .buttons-set { padding:20px 30px; border:1px solid #d9dde3; border-width:0 1px 1px; }
-#opc-review .buttons-set p { margin:0; line-height:40px; }
-#opc-review .buttons-set .please-wait { height:40px; line-height:40px; }
-#opc-review .authentication { margin:0 auto; width:570px; }
-#opc-review .warning-message { color:#222; font-weight:bold; text-align:center; padding:10px 10px 0; }
-
-/* Multiple Addresses Checkout */
-.checkout-progress { padding:0 90px; margin:0 0 20px; }
-.checkout-progress li { float:left; width:19%; margin:0 3px 0 0; border-top:10px solid #999; padding:2px 0 0; font-weight:bold; text-align:center; color:#abb5ba; }
-.checkout-progress li.active { border-top-color:#e96200; color:#e96200; }
-
-.multiple-checkout h2 { font-size:13px; font-weight:bold; margin:0 0 10px; }
-.multiple-checkout h3,
-.multiple-checkout h4 { font-size:13px; font-weight:bold; color:#E26703; }
-.multiple-checkout h2 a,
-.multiple-checkout h3 a,
-.multiple-checkout h4 a { font-weight:normal; }
-.multiple-checkout .data-table .product-name { font-size:1em !important; font-weight:bold !important; color:#1e7ec8 !important; }
-.multiple-checkout .data-table .product-name a { font-weight:bold !important; }
-.multiple-checkout .data-table .item-options { margin:5px 0 0; }
-
-.multiple-checkout .gift-messages { margin:15px 0 0; }
-
-.multiple-checkout .tool-tip { top:50%; margin-top:-230px; right:20px; }
-
-.multiple-checkout .col2-set,
-.multiple-checkout .col3-set { background:#fbfaf6 url(../images/bkg_checkout.gif) 0 0 repeat-x; border:1px solid #bbb6a5; margin:0 0 25px; padding:20px; }
-.multiple-checkout .col2-set h2.legend { margin:-20px -20px 15px; padding:5px 10px; background:#f9f3e3; border-bottom:1px solid #bbafa0; position:relative; }
-.multiple-checkout .col2-set h3.legend { margin:0 0 10px; color:#0a263c; }
-.multiple-checkout .col2-set .divider { margin:0 -20px; padding:25px 0; position:relative; }
-.multiple-checkout .box { margin:0 0 15px; }
-.multiple-checkout .box h2 { color:#e26703; }
-
-.multiple-checkout .place-order .please-wait { float:right; padding:27px 7px 0 0; }
-.multiple-checkout .place-order .grand-total { float:right; height:71px; font-size:1.5em; padding:0 0 0 21px; background:url(../images/bkg_grand-total.gif) 0 0 no-repeat; overflow:hidden; }
-.multiple-checkout .place-order .grand-total .inner { float:left; height:57px; padding:14px 21px 0 0; background:url(../images/bkg_grand-total.gif) 100% 0 no-repeat; }
-.multiple-checkout .place-order .grand-total .inner div { display:inline; }
-.multiple-checkout .place-order .grand-total big { display:inline; margin-right:12px; }
-.multiple-checkout .place-order .grand-total .price { color:#E26703; }
-.multiple-checkout .place-order .grand-total button.button span { font-size:16px; }
-.multiple-checkout .place-order .grand-total button.button span span { padding:0 45px 0 36px; }
-
-/* Step 1 */
-.multiple-checkout .title-buttons button.button span { border-color:#406a83; background:#618499; }
-#multiship-addresses-table td { padding:10px; }
-#multiship-addresses-table tfoot td { padding:5px 10px; }
-#multiship-addresses-table tfoot button.button span { border-color:#406a83; background:#618499; }
-
-/* Step 2 */
-.multiple-checkout .gift-messages-form .item .details .form-list { width:100%; overflow:hidden; }
-.multiple-checkout .gift-messages-form .item .details .form-list li { margin-right:-15px; }
-.multiple-checkout .gift-messages-form .item .details .form-list .field { width:230px; }
-.multiple-checkout .gift-messages-form .item .details .form-list .input-box { width:215px; }
-.multiple-checkout .gift-messages-form .item .details .form-list input.input-text { width:209px; }
-.multiple-checkout .gift-messages-form .item .details .form-list li.wide .input-box { width:445px; }
-.multiple-checkout .gift-messages-form .item .details .form-list li.wide textarea { width:439px; }
-.checkout-multishipping-shipping .box-sp-methods { border:1px solid #d9d2be; background:#f9f3e3; padding:13px; position:relative; }
-.checkout-multishipping-shipping .box-sp-methods .pointer { position:absolute; top:-20px; right:-40px; width:178px; height:41px; background:url(../images/bkg_sp-methods.gif) 0 0 no-repeat; overflow:hidden; }
-
-/* Step 3 */
-.checkout-multishipping-billing .multiple-checkout { position:relative; }
-/* ======================================================================================= */
-
-
-/* Account Login/Create Pages ============================================================ */
-.account-login .content { min-height:345px; padding:14px 21px; background:#faf7ee url(../images/bkg_login-box.gif) 0 0 repeat-x; border:1px solid #bbb6a5; border-bottom:0; }
-.account-login .content h2 { font-weight:bold; font-size:13px; margin:0 0 14px; padding:0 0 5px 23px; border-bottom:1px solid #ddd; background-position:0 1px; background-repeat:no-repeat; text-transform:uppercase; color:#e76200; }
-.account-login .new-users h2 { background-image:url(../images/i_page1.gif)}
-.account-login .registered-users h2 { background-image:url(../images/i_page2.gif); }
-.account-login .buttons-set { border:1px solid #bbb6a5; border-top:0; margin:0; padding:8px 13px; background:#dee5e8 url(../images/bkg_buttons-set1.gif) 0 0 repeat-x; }
-
-.account-create {}
-
-/* Captcha ================================================================================ */
-.captcha-note      { clear:left; padding-top:5px; }
-.captcha-image     { float:left; display:inline;  margin:0; position:relative; width:258px; }
-.captcha-image .captcha-img { border:1px solid #b6b6b6; vertical-align:bottom; width:100%; }
-.registered-users .captcha-image { margin:0;}
-.captcha-reload { cursor:pointer; position:absolute; top:2px; right:2px;}
-.captcha-reload.refreshing  { animation:rotate 1.5s infinite linear; -webkit-animation:rotate 1.5s infinite linear; -moz-animation:rotate 1.5s infinite linear; }
-
-@-webkit-keyframes rotate {
-    0% { -webkit-transform:rotate(0); }
-    0% { -webkit-transform:rotate(-360deg); }
-}
-@-moz-keyframes rotate {
-    0% { -moz-transform:rotate(0); }
-    0% { -moz-transform:rotate(-360deg); }
-}
-@keyframes rotate {
-    0% { transform:rotate(0); }
-    0% { transform:rotate(-360deg); }
-}
-
-/* Remember Me Popup ===================================================================== */
-.window-overlay { background:rgba(0, 0, 0, 0.35); position:absolute; top:0; left:0; height:100%; width:100%; z-index:990; }
-
-.remember-me label { float:none; margin:0 6px; }
-.remember-me-popup { background:#fff; border:1px solid #ccc; left:50%; top:50%; position:absolute; margin:-85px 0 0 -200px; width:400px; text-align:left; -moz-box-shadow:0 0 6px #ccc; -webkit-box-shadow:0 0 6px #ccc; -box-shadow:0 0 6px #ccc; z-index:1000; }
-.remember-me-popup h3 { background:#d9e5ee; border-bottom:1px solid #ccc; font-size:14px; padding:5px 10px; }
-.remember-me-popup .remember-me-popup-head { position:relative; }
-.remember-me-popup .remember-me-popup-head .remember-me-popup-close { background:url(../images/btn_window_close.gif) no-repeat; display:block; position:absolute; top:7px; right:7px; height:15px; width:15px; text-indent:-9999em; }
-.remember-me-popup .remember-me-popup-body { padding:10px; }
-.remember-me-popup .remember-me-popup-body a { display:inline-block; height:19px; border:1px solid #de5400; background:#f18200; padding:0 8px; font:bold 12px/19px Arial, Helvetica, sans-serif; text-align:center; text-decoration:none; white-space:nowrap; color:#fff; }
-/* Remember Me Popup ===================================================================== */
-
-
-/* My Account ============================================================================= */
-.my-account .title-buttons .link-rss { float:none; margin:0; }
-
-/********** < Dashboard */
-.dashboard .welcome-msg { margin:0 8em 1.5em 0; }
-.dashboard .welcome-msg p { margin:0; }
-.dashboard .col2-set { margin:0 0 15px; }
-
-/* General Box */
-.box-account { background:#fff url(../images/bkg_account_box.gif) 0 0 repeat-x; border:1px solid #ccc; border-color:#ccc #999 #999 #ccc; padding:15px; margin: 0 0 20px; }
-.box-account .box-head { border-bottom:1px solid #d9dde3; margin:0 0 10px; text-align:right; }
-.box-account .box-head h2 { float:left; margin:0; font-size:13px; font-weight:bold; text-transform:uppercase; background-position:0 0; background-repeat:no-repeat; padding-left:21px; color:#e65505; }
-
-.dashboard .box .box-title { background:url(../images/bkg_divider1.gif) 0 100% repeat-x; padding:0 0 2px; margin:0 0 8px; text-align:right; }
-.dashboard .box .box-title h3,
-.dashboard .box .box-title h4 { float:left; font-size:13px; font-weight:bold; margin:0; }
-
-/* Block: Recent Orders */
-.dashboard .box-recent .box-head h2 { background-image:url(../images/i_folder-table.gif); }
-
-/* Block: Account Information */
-.dashboard .box-info .box-head h2 { background-image:url(../images/i_ma-info.gif); }
-.dashboard .box-info h4 { font-size:11px; font-weight:bold; text-transform:uppercase; }
-
-/* Block: Reviews */
-.dashboard .box-reviews .box-head h2 { background-image:url(../images/i_ma-reviews.gif); }
-.dashboard .box-reviews .number { float:left; font-size:10px; font-weight:bold; line-height:1; color:#fff; margin:3px -20px 0 0; padding:2px 3px; background:#0a263c; }
-.dashboard .box-reviews .details { margin-left:20px; }
-.dashboard .box-reviews li.item { margin:0 0 7px; }
-.dashboard .box-reviews li.item.last { margin:0; }
-.dashboard .box-reviews .ratings { margin:7px 0 0; }
-
-/* Block: Tags */
-.dashboard .box-tags .box-head h2 { background-image:url(../images/i_ma-tags.gif); }
-.dashboard .box-tags .number { float:left; font-size:10px; font-weight:bold; line-height:1; color:#fff; margin:3px -20px 0 0; padding:2px 3px; background:#0a263c; }
-.dashboard .box-tags .details { margin-left:20px; }
-.dashboard .box-tags li.item { margin:0 0 7px; }
-.dashboard .box-tags li.item.last { margin:0; }
-.dashboard .box-tags .tags strong,
-.dashboard .box-tags .tags ul,
-.dashboard .box-tags .tags ul li { display:inline; }
-/********** Dashboard > */
-
-/* Address Book */
-.addresses-list h2 { font-weight:bold; font-size:13px; color:#e26703; text-transform:uppercase; }
-.addresses-list h3 { font-weight:bold; font-size:13px; }
-.addresses-list address { margin:0 0 3px; }
-.addresses-list p { margin:0; }
-.addresses-list a { font-weight:bold; }
-.addresses-list .link-remove { color:#646464; }
-.addresses-list .separator { margin:0 3px; }
-.addresses-list li.item { background:#fff url(../images/bkg_account_box.gif) 0 0 repeat-x; border:1px solid #ccc; padding:10px 13px; margin:0 0 10px; }
-.addresses-list li.empty { background:none; border:0; padding:0; }
-.addresses-list li.empty p { font-weight:bold; }
-.addresses-list .addresses-additional li.item { background:none; border:0; padding:0; }
-
-/* Order View */
-.order-info { background:#dee5e8; border:1px solid #d0cbc1; padding:4px 8px; margin:0 0 8px; }
-.order-info dt,
-.order-info dd,
-.order-info ul,
-.order-info li { display:inline; }
-.order-info .current { font-weight:bold; }
-.order-info li { margin:0 3px; }
-
-.order-date { margin:10px 0; }
-
-.order-info-box { background:#fff url(../images/bkg_block-title.gif) 0 0 repeat-x; border:1px solid #d0cbc1; padding:12px 15px; margin:0 0 15px; }
-.order-info-box h2 { font-weight:bold; font-size:13px; }
-.order-info-box .box-payment p { margin:0 0 3px; }
-.order-info-box .box-payment th { font-weight:bold; padding-right:7px; }
-
-.order-items { width:100%; overflow-x:auto; }
-.order-items h2,
-.order-items h3 { clear:none; font-weight:bold; font-size:13px; padding:0; margin:0 0 5px; color:#0a263c; }
-.order-items .product-name { font-size:1em !important; font-weight:bold !important; }
-.order-items .link-print { color:#1e7ec8; font-weight:normal; }
-.order-items .order-links { text-align:right; }
-
-.order-additional { margin:15px 0; }
-/* Order Gift Message */
-.gift-message dt strong { color:#666; }
-.gift-message dd { font-size:13px; margin:5px 0 0; }
-/* Order Comments */
-.order-about dt { font-weight:bold; }
-.order-about dd { font-size:13px; margin:0 0 7px; }
-
-.tracking-table { margin:0 0 15px; }
-.tracking-table th { font-weight:bold; white-space:nowrap; }
-
-.tracking-table-popup { width:100%; }
-.tracking-table-popup th { font-weight:bold; white-space:nowrap; }
-.tracking-table-popup th,
-.tracking-table-popup td { padding:1px 8px; }
-
-/* Order Print Pages */
-.page-print .print-head { margin:0 0 15px; }
-.page-print .print-head .logo { float:left; }
-.page-print .print-head address { float:left; margin-left:15px; }
-.page-print h1 { font-size:16px; font-weight:bold; }
-.page-print h2,
-.page-print h3 { font-size:13px; font-weight:bold; }
-.page-print h2.h2 { font-size:16px; font-weight:bold; }
-.page-print .order-date { background:url(../images/bkg_divider1.gif) 0 100% repeat-x; padding:0 0 10px; margin:0 0 10px; }
-.page-print .col2-set { margin:0 0 10px; }
-/* Price Rewrites */
-.page-print .gift-message-link { display:none; }
-.page-print .price-excl-tax,
-.page-print .price-incl-tax { display:block; white-space:nowrap; }
-.page-print .cart-price,
-.page-print .price-excl-tax .label,
-.page-print .price-incl-tax .label,
-.page-print .price-excl-tax .price,
-.page-print .price-incl-tax .price { display:inline; }
-
-/* My Wishlist */
-.my-wishlist .data-table td { padding:10px; }
-.my-wishlist .product-image { display:block; width:113px; height:113px; margin:0 0 5px; }
-.my-wishlist textarea { display:block; width:97%; height:109px; }
-.my-wishlist .buttons-set { margin-top:2em; }
-.my-wishlist .buttons-set button.button { float:none; }
-.my-wishlist .buttons-set .btn-add span,
-.my-wishlist .buttons-set .btn-share span { border-color:#406a83; background:#618499; }
-#wishlist-table .add-to-links { white-space:nowrap; }
-
-/* My Tags */
-.my-tag-edit { float:left; margin:0 0 10px; }
-.my-tag-edit .btn-remove { float:right; margin:4px 0 0 5px; }
-#my-tags-table { clear:both; }
-#my-tags-table td { padding:10px; }
-#my-tags-table .add-to-links { white-space:nowrap; }
-
-/* My Reviews */
-#my-reviews-table td { padding:10px; }
-
-.product-review .product-img-box { float:left; width:140px;  }
-.product-review .product-img-box .product-image { display:block; width:125px; height:125px; }
-.product-review .product-img-box .label { font-size:11px; margin:0 0 3px; }
-.product-review .product-img-box .ratings .rating-box { float:none; display:block; margin:0 0 3px; }
-.product-review .product-details { margin-left:150px; }
-.product-review .product-name { font-size:16px; font-weight:bold; margin:0 0 10px; }
-.product-review h3 { font-size:12px; margin:0 0 3px; color:#2f2f2f; }
-.product-review .ratings-table { margin:0 0 10px; }
-.product-review dt { font-weight:bold; }
-.product-review dd { font-size:13px; margin:5px 0 0; }
-
-/* Billing Agreements */
-.billing-agreements .info-box{ margin:15px 0; }
-.billing-agreements .form-list li select { float:left; }
-.billing-agreements .form-list li button.button { float:left; margin-left:10px; }
-.billing-agreements .table-caption { font-weight:bold; font-size:13px; }
-/* ======================================================================================= */
-
-
-/* MAP Popup============================================================================== */
-.cart-msrp-totals { color:red; font-size:12px !important; font-weight:bold; margin:10px 10px 0; padding:10px; text-align:right; text-transform:uppercase;}
-.map-cart-sidebar-total { color:red; display:block; font-size:10px; font-weight:bold; text-align:left; padding:2px 5px; text-shadow:0 1px 0 #fff; }
-
-.map-popup { background:#fff; border:1px solid #aaa; margin:12px 0 0; position:absolute; -moz-box-shadow:0 0 6px #ccc; -webkit-box-shadow:0 0 6px #ccc; box-shadow:0 0 6px #ccc; text-align:left; width:300px; z-index:100; }
-.map-popup-heading { background:#d9e5ee; border-bottom:1px solid #ccc; padding:5px 30px 5px 10px; width:260px; }
-.map-popup-heading h2 { font-size:16px; margin:0; text-shadow:0 1px 0 #f6f6f6; overflow:hidden; white-space:nowrap; word-wrap:break-word; text-align:left; text-overflow:ellipsis; }
-.map-popup-arrow { background:url(../images/map_popup_arrow.gif) no-repeat; position:absolute; left:50%; top:-10px; height:10px; width:19px; }
-.map-popup-close { background:url(../images/btn_window_close.gif) no-repeat; display:block; position:absolute; top:8px; right:10px; height:15px; width:15px; text-indent:-9999em; -moz-box-shadow:0 0 3px #999; -webkit-box-shadow:0 0 3px #999; box-shadow:0 0 3px #999; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-.map-popup-content { border-top:1px solid #eee; padding:10px; overflow:hidden; text-align:left; width:280px; }
-.map-popup-checkout { display:inline; float:right; text-align:right; }
-.map-popup-checkout span { display:block; padding-right:30px; }
-.map-popup-checkout .paypal-logo { margin:0 0 5px; }
-.map-popup-price .price-box,
-.map-popup-price .price-box .special-price { margin:0; padding:0; }
-.map-popup-price { margin:5px 0 0; }
-.map-popup-text { clear:right; margin:0 10px; padding:10px 0; text-align:left; word-wrap:break-word; }
-.map-popup-only-text { border-top:1px solid #ddd; }
-/* ======================================================================================= */
-
-
-/* Footer ================================================================================ */
-.footer-container { border-top:15px solid #b6d1e2; }
-.footer { width:930px; margin:0 auto; padding:10px 10px 50px; }
-.footer .store-switcher { display:inline; margin:0 5px 0 0; color:#fff; }
-.footer .store-switcher label { font-weight:bold; vertical-align:middle; }
-.footer .store-switcher select { padding:0; vertical-align:middle; }
-.footer a { color:#fff; text-decoration:none; }
-.footer a:hover { text-decoration:underline; }
-.footer .bugs { margin:13px 0 0; color:#ecf3f6; }
-.footer .bugs a { color:#ecf3f6; text-decoration:underline; }
-.footer .bugs a:hover { text-decoration:none; }
-.footer address { margin:0 0 20px; color:#ecf3f6; }
-.footer address a { color:#ecf3f6; text-decoration:underline; }
-.footer address a:hover { text-decoration:none; }
-.footer ul { display:inline; }
-.footer ul.links { display:block; }
-.footer li { display:inline; background:url(../images/bkg_pipe2.gif) 100% 60% no-repeat; padding:0 7px 0 4px; }
-.footer li.last { background:none !important; padding-right:0 !important; }
-.footer-container .bottom-container { margin:0 0 5px; }
-/* ======================================================================================= */
-
-/* Sample Data============================================================================ */
-.home-callout { margin-bottom:12px; }
-.home-callout img { display:block }
-.home-spot { float:left; width:470px; margin-left:20px; }
-.best-selling h3 { margin:12px 0 6px 0; color:#e25203; font-size:1.2em; }
-.best-selling table { border-top:1px solid #ccc; }
-.best-selling tr.odd { background:#eee url(../images/best_selling_tr_odd_bg.gif) 0 100% repeat-x; }
-.best-selling tr.even { background:#fff url(../images/best_selling_tr_even_bg.gif) 0 100% repeat-x; }
-.best-selling td { width:50%; border-bottom:1px solid #ccc; padding:8px 10px 8px 8px; font-size:11px; }
-.best-selling .product-img { float:left; border:2px solid #dcdcdc; }
-.best-selling .product-description { margin-left:107px; line-height:1.3em; }
-.best-selling a.product-name,
-.home-spot .best-selling a.product-name:hover { color:#203548; }
-/* ======================================================================================= */
-
-
-/* Clears ================================================================================ */
-.clearer:after,
-.header-container:after,
-.header-container .top-container:after,
-.header:after,
-.header .quick-access:after,
-#nav:after,
-.main:after,
-.footer:after,
-.footer-container .bottom-container:after,
-.col-main:after,
-.col2-set:after,
-.col3-set:after,
-.col3-layout .product-options-bottom .price-box:after,
-.col4-set:after,
-.search-autocomplete li:after,
-.block .block-content:after,
-.block .actions:after,
-.block li.item:after,
-.block-layered-nav .currently li:after,
-.page-title:after,
-.products-grid:after,
-.products-list li.item:after,
-.box-account .box-head:after,
-.dashboard .box .box-title:after,
-.box-reviews li.item:after,
-.box-tags li.item:after,
-.pager:after,
-.sorter:after,
-.ratings:after,
-.add-to-box:after,
-.add-to-cart:after,
-.product-essential:after,
-.product-collateral:after,
-.product-view .product-img-box .more-views ul:after,
-.product-view .box-tags .form-add:after,
-.product-view .product-shop .short-description:after,
-.product-view .box-description:after,
-.product-options .options-list li:after,
-.product-options-bottom:after,
-.product-review:after,
-.cart:after,
-.cart-collaterals:after,
-.cart .crosssell li.item:after,
-.opc .step-title:after,
-.checkout-progress:after,
-.multiple-checkout .place-order:after,
-.group-select li:after,
-.form-list li:after,
-.form-list .field:after,
-.buttons-set:after,
-.page-print .print-head:after,
-.advanced-search-summary:after,
-.gift-messages-form .item:after,
-.send-friend .form-list li p:after { display:block; content:"."; clear:both; font-size:0; line-height:0; height:0; overflow:hidden; }
-/* ======================================================================================= */
-
-.guest-select {width:305px !important;}
diff --git a/app/design/frontend/magento_demo/i18n/de_DE/Magento_Core/logo_email.gif b/app/design/frontend/magento_demo/i18n/de_DE/Magento_Core/logo_email.gif
deleted file mode 100644
index c6d6d5a74a064a3129cca7b790ae0f330d3cd0cf..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/i18n/de_DE/Magento_Core/logo_email.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/i18n/de_DE/images/logo.gif b/app/design/frontend/magento_demo/i18n/de_DE/images/logo.gif
deleted file mode 100644
index 864917ba95948d6583bbfe131c85d42a0d729b5b..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/i18n/de_DE/images/logo.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/i18n/de_DE/images/logo_print.gif b/app/design/frontend/magento_demo/i18n/de_DE/images/logo_print.gif
deleted file mode 100644
index c6d6d5a74a064a3129cca7b790ae0f330d3cd0cf..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/i18n/de_DE/images/logo_print.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/i18n/en_US.csv b/app/design/frontend/magento_demo/i18n/en_US.csv
deleted file mode 100644
index ab952f2ca681b21c7b5f5f343b9ff14e2b78e2c9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_demo/i18n/en_US.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Keep your eyes open for our special Back to School items and save A LOT!","Keep your eyes open for our special Back to School items and save A LOT!"
diff --git a/app/design/frontend/magento_demo/i18n/fr_FR/Magento_Core/logo_email.gif b/app/design/frontend/magento_demo/i18n/fr_FR/Magento_Core/logo_email.gif
deleted file mode 100644
index abf7a9abbf615c58c924f4924710f47825bb2546..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/i18n/fr_FR/Magento_Core/logo_email.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/i18n/fr_FR/images/logo.gif b/app/design/frontend/magento_demo/i18n/fr_FR/images/logo.gif
deleted file mode 100644
index 25d8d17374ee07fae20c9df253e972e2d1ad3746..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/i18n/fr_FR/images/logo.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/i18n/fr_FR/images/logo_print.gif b/app/design/frontend/magento_demo/i18n/fr_FR/images/logo_print.gif
deleted file mode 100644
index abf7a9abbf615c58c924f4924710f47825bb2546..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/i18n/fr_FR/images/logo_print.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/best_selling_tr_even_bg.gif b/app/design/frontend/magento_demo/images/best_selling_tr_even_bg.gif
deleted file mode 100644
index 7477020bcae2587b249df5f07b7c28a6f9c02bec..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/best_selling_tr_even_bg.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/best_selling_tr_odd_bg.gif b/app/design/frontend/magento_demo/images/best_selling_tr_odd_bg.gif
deleted file mode 100644
index ee3e1880d2fd7f8747b72c1bb585bf08bbcaad8c..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/best_selling_tr_odd_bg.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_account_box.gif b/app/design/frontend/magento_demo/images/bkg_account_box.gif
deleted file mode 100644
index 2f828a44659020e79300c112d53187af245362cb..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_account_box.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-actions.gif b/app/design/frontend/magento_demo/images/bkg_block-actions.gif
deleted file mode 100644
index 8670b13b6e5bd36a2a9c93240c44022b8d8c7700..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-actions.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-currency.gif b/app/design/frontend/magento_demo/images/bkg_block-currency.gif
deleted file mode 100644
index ea08e6402d6c67dc371a843424b71ed71ad0bedf..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-currency.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-dd.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-dd.gif
deleted file mode 100644
index 5168a3a24645063ac5c5714ec004c34749d56278..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-layered-dd.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-dt.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-dt.gif
deleted file mode 100644
index 079d48b69f3451797abc9ea429d921545c11b2c3..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-layered-dt.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-label.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-label.gif
deleted file mode 100644
index 2f69c8d6481fd05f3f73662bf0317f371d1489e0..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-layered-label.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-li.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-li.gif
deleted file mode 100644
index 326022a3c6a47a633abef8f47773df34006ee374..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-layered-li.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-title.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-title.gif
deleted file mode 100644
index bf007e10bcfd8c32bfa347f2a2d01c49e8bf0482..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-layered-title.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered1.gif b/app/design/frontend/magento_demo/images/bkg_block-layered1.gif
deleted file mode 100644
index f13567889d693a5cf779e4e1521eed98df6c414d..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-layered1.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-title-account.gif b/app/design/frontend/magento_demo/images/bkg_block-title-account.gif
deleted file mode 100644
index f69cd50834949e746c80e96ff6e31d0055c8288c..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-title-account.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_block-title.gif b/app/design/frontend/magento_demo/images/bkg_block-title.gif
deleted file mode 100644
index f944949b711eaa2b214b674c05c9027e3baa6366..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_block-title.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_body.gif b/app/design/frontend/magento_demo/images/bkg_body.gif
deleted file mode 100644
index c5c6902182f936465fb3bdf007b705b7d9ec0a4b..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_body.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_buttons-set1.gif b/app/design/frontend/magento_demo/images/bkg_buttons-set1.gif
deleted file mode 100644
index e385e98d3bb0efc52227156cd6d34b0334dd5d10..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_buttons-set1.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_checkout.gif b/app/design/frontend/magento_demo/images/bkg_checkout.gif
deleted file mode 100644
index b580873fcfafc7c56dd0fc2dfeaad7b5a783641a..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_checkout.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_collapse-gm.gif b/app/design/frontend/magento_demo/images/bkg_collapse-gm.gif
deleted file mode 100644
index 6e626e9543de438c81d7f9bc3c920535680df3d3..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_collapse-gm.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_collapse.gif b/app/design/frontend/magento_demo/images/bkg_collapse.gif
deleted file mode 100644
index 5d21686469609c21366b9fdf80e6bc92c65279fe..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_collapse.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_divider1.gif b/app/design/frontend/magento_demo/images/bkg_divider1.gif
deleted file mode 100644
index f819157589babea159f9445dcbb6b42f6c78379a..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_divider1.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_form-search.gif b/app/design/frontend/magento_demo/images/bkg_form-search.gif
deleted file mode 100644
index 27d429778a54e84a31c9cd01308426d4772076ef..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_form-search.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_grand-total.gif b/app/design/frontend/magento_demo/images/bkg_grand-total.gif
deleted file mode 100644
index 9143c44c66baeed3e953a240cad3e6efe072371d..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_grand-total.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_grid.gif b/app/design/frontend/magento_demo/images/bkg_grid.gif
deleted file mode 100644
index decda510da065447d514eee1d3a6d8d0f4bd1f23..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_grid.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_header.jpg b/app/design/frontend/magento_demo/images/bkg_header.jpg
deleted file mode 100644
index 36f3b7412d8188587cce87529f2a288c227559e0..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_header.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_login-box.gif b/app/design/frontend/magento_demo/images/bkg_login-box.gif
deleted file mode 100644
index 380b0664a660d5d260e21536fc820b705d8fdad2..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_login-box.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_main1.gif b/app/design/frontend/magento_demo/images/bkg_main1.gif
deleted file mode 100644
index 65664ffa9be41fd80bf34777b734302611556c97..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_main1.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_main2.gif b/app/design/frontend/magento_demo/images/bkg_main2.gif
deleted file mode 100644
index 5a358b5e10a7ced8eb0bf2b3fd495d00761f38fc..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_main2.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_nav0.jpg b/app/design/frontend/magento_demo/images/bkg_nav0.jpg
deleted file mode 100644
index f00945e272c0b20985ced191eec7880c37dfc0ca..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_nav0.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_nav1.gif b/app/design/frontend/magento_demo/images/bkg_nav1.gif
deleted file mode 100644
index 6ba5fda00614e156d0e941f3614c91f5b763bbf5..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_nav1.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_nav2.gif b/app/design/frontend/magento_demo/images/bkg_nav2.gif
deleted file mode 100644
index d7c3c13b8ed23273d50238412e3dd11826c1ca6a..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_nav2.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_opc-title-off.gif b/app/design/frontend/magento_demo/images/bkg_opc-title-off.gif
deleted file mode 100644
index a4145c5bcc04b28b6ae1bcf93683bc9d02477f60..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_opc-title-off.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_pipe1.gif b/app/design/frontend/magento_demo/images/bkg_pipe1.gif
deleted file mode 100644
index a6b386c39ce1d76f7964e89ee4f23e37e3ff6c8a..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_pipe1.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_pipe2.gif b/app/design/frontend/magento_demo/images/bkg_pipe2.gif
deleted file mode 100644
index 81d13b63be184806527c970812b7fb292dd47a5e..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_pipe2.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_pipe3.gif b/app/design/frontend/magento_demo/images/bkg_pipe3.gif
deleted file mode 100644
index cc5fdd51b9d0923172b0684d3e420f7f58e1b365..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_pipe3.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_product-view.gif b/app/design/frontend/magento_demo/images/bkg_product-view.gif
deleted file mode 100644
index 74bd39685a1f5dc893d895fa80036efb769d19e1..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_product-view.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_product_collateral.gif b/app/design/frontend/magento_demo/images/bkg_product_collateral.gif
deleted file mode 100644
index 60719f4780c4da5e264b3760ec059f1947620bbf..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_product_collateral.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_rating.gif b/app/design/frontend/magento_demo/images/bkg_rating.gif
deleted file mode 100644
index fcebdc71af4138f7efe5b5d71ed8186e4a94ca6a..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_rating.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_sp-methods.gif b/app/design/frontend/magento_demo/images/bkg_sp-methods.gif
deleted file mode 100644
index c6908f5510100229565f61249f474deef5b06dd4..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_sp-methods.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_tfoot.gif b/app/design/frontend/magento_demo/images/bkg_tfoot.gif
deleted file mode 100644
index 8670b13b6e5bd36a2a9c93240c44022b8d8c7700..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_tfoot.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_th-v.gif b/app/design/frontend/magento_demo/images/bkg_th-v.gif
deleted file mode 100644
index 5a6544b9ad91ae836cca02cb2eca46eeb5c75a47..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_th-v.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_th.gif b/app/design/frontend/magento_demo/images/bkg_th.gif
deleted file mode 100644
index 479a8571e0b4f4b95078105d2a932c6f7dff3110..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_th.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/bkg_toolbar.gif b/app/design/frontend/magento_demo/images/bkg_toolbar.gif
deleted file mode 100644
index 79b2c8379270450d9de0791e8394ae9dce069278..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/bkg_toolbar.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_checkout.gif b/app/design/frontend/magento_demo/images/btn_checkout.gif
deleted file mode 100644
index 1b6485e2da3790b58d1ab46d8f030601dc0830c5..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_checkout.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_edit.gif b/app/design/frontend/magento_demo/images/btn_edit.gif
deleted file mode 100644
index a5df1cd1ecb9f71d10d731a02800f968ff5ade21..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_edit.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_gm-close.gif b/app/design/frontend/magento_demo/images/btn_gm-close.gif
deleted file mode 100644
index 29e64760c3483e100426e8818303f7cd2f6c5d6b..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_gm-close.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_place_order.gif b/app/design/frontend/magento_demo/images/btn_place_order.gif
deleted file mode 100644
index c2b805f7ce2db159f56c73d908312bdb17ac219f..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_place_order.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_previous.gif b/app/design/frontend/magento_demo/images/btn_previous.gif
deleted file mode 100644
index 90561b6864b1d3880859f6d87a1742a7f11e711f..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_previous.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_proceed_to_checkout.gif b/app/design/frontend/magento_demo/images/btn_proceed_to_checkout.gif
deleted file mode 100644
index 70fbef32d30932f27835a664fbd36b2e18a7cbdd..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_proceed_to_checkout.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_proceed_to_checkout_dis.gif b/app/design/frontend/magento_demo/images/btn_proceed_to_checkout_dis.gif
deleted file mode 100644
index 90782978b76c8c0210c8c805bfca4bb24b71c05a..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_proceed_to_checkout_dis.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_remove2.gif b/app/design/frontend/magento_demo/images/btn_remove2.gif
deleted file mode 100644
index 8d31b24a62aa728f4808308d3cc86dabb7e03010..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_remove2.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_search.gif b/app/design/frontend/magento_demo/images/btn_search.gif
deleted file mode 100644
index d1e994cac00db237426a4382ceca0a1d1692fbad..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_search.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_trash.gif b/app/design/frontend/magento_demo/images/btn_trash.gif
deleted file mode 100644
index 5c604abb2f385f9c08f76a4b76b523f926467e53..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_trash.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/btn_window_close.gif b/app/design/frontend/magento_demo/images/btn_window_close.gif
deleted file mode 100644
index 18aced2020b289845d7251bbda1403aa14822648..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/btn_window_close.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/calendar.gif b/app/design/frontend/magento_demo/images/calendar.gif
deleted file mode 100644
index d0235c7e023cab8100e0916375dabeca2f4b478c..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/calendar.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/fam_book_open.png b/app/design/frontend/magento_demo/images/fam_book_open.png
deleted file mode 100644
index 7d863f949741ff83fd8373a77c0d95a3d95e441f..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/fam_book_open.png and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/free_shipping_callout.jpg b/app/design/frontend/magento_demo/images/free_shipping_callout.jpg
deleted file mode 100644
index f3b44e5b2051947d61ab0f6cd8a6f3f3ce130e53..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/free_shipping_callout.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/grid-cal.gif b/app/design/frontend/magento_demo/images/grid-cal.gif
deleted file mode 100644
index d0235c7e023cab8100e0916375dabeca2f4b478c..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/grid-cal.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/home_left_callout.jpg b/app/design/frontend/magento_demo/images/home_left_callout.jpg
deleted file mode 100644
index 38863421b6d47a3dc85a3ded79e8dd642f40d9d8..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/home_left_callout.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/home_main_callout.jpg b/app/design/frontend/magento_demo/images/home_main_callout.jpg
deleted file mode 100644
index 7cb3d356caf0d951c16d72d8ee29b10e11d21ed4..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/home_main_callout.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_arrow-top.gif b/app/design/frontend/magento_demo/images/i_arrow-top.gif
deleted file mode 100644
index 8aefbe05e6cf56f6fc4459034290090127beb438..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_arrow-top.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_availability_only.gif b/app/design/frontend/magento_demo/images/i_availability_only.gif
deleted file mode 100644
index 1b6d8640e2ba35812c71f794220a8fed83030891..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_availability_only.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_availability_only_arrow.gif b/app/design/frontend/magento_demo/images/i_availability_only_arrow.gif
deleted file mode 100644
index 1d949264be1e3f55d162bf34e1dd2f1ac826bae9..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_availability_only_arrow.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-cart.gif b/app/design/frontend/magento_demo/images/i_block-cart.gif
deleted file mode 100644
index 99bd8f296abeadc63a490f6488b90881df240f93..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-cart.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-currency.gif b/app/design/frontend/magento_demo/images/i_block-currency.gif
deleted file mode 100644
index 6603cc0b911a78d13ca038a26b030c18ac1d1364..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-currency.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-list.gif b/app/design/frontend/magento_demo/images/i_block-list.gif
deleted file mode 100644
index df990aba0267a24083d299711fe22497b8605c1d..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-list.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-poll.gif b/app/design/frontend/magento_demo/images/i_block-poll.gif
deleted file mode 100644
index bef3d22b9c7909ec88fd9b1b339dcff38481763a..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-poll.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-related.gif b/app/design/frontend/magento_demo/images/i_block-related.gif
deleted file mode 100644
index 505c3f8ef35c2170a9680677c3cb8a1e72b092e0..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-related.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-subscribe.gif b/app/design/frontend/magento_demo/images/i_block-subscribe.gif
deleted file mode 100644
index a0d25bb53601a303a26be755fef08ea991f3a685..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-subscribe.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-tags.gif b/app/design/frontend/magento_demo/images/i_block-tags.gif
deleted file mode 100644
index 567598542cbc319f7cd9aa63e51ae2c93bca4887..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-tags.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-viewed.gif b/app/design/frontend/magento_demo/images/i_block-viewed.gif
deleted file mode 100644
index 567598542cbc319f7cd9aa63e51ae2c93bca4887..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-viewed.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_block-wishlist.gif b/app/design/frontend/magento_demo/images/i_block-wishlist.gif
deleted file mode 100644
index a0b4b3fb4c4eda592cffaf852ca3df9b03b4e730..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_block-wishlist.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_discount.gif b/app/design/frontend/magento_demo/images/i_discount.gif
deleted file mode 100644
index 46d8baecbcc17c8899d6545c1779d367bee92167..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_discount.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_folder-table.gif b/app/design/frontend/magento_demo/images/i_folder-table.gif
deleted file mode 100644
index 625773049e9925f9ec96a3cd680f308591631d9b..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_folder-table.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_ma-info.gif b/app/design/frontend/magento_demo/images/i_ma-info.gif
deleted file mode 100644
index 855b00aa047a15cf76e39104a3dd0f46a405cbd9..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_ma-info.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_ma-reviews.gif b/app/design/frontend/magento_demo/images/i_ma-reviews.gif
deleted file mode 100644
index 4ce27ddee89ffeb7ac9c6515f8e6d8c97131e7e9..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_ma-reviews.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_ma-tags.gif b/app/design/frontend/magento_demo/images/i_ma-tags.gif
deleted file mode 100644
index 61ce410b32a78891bec9ec3efe6fec0011fa3809..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_ma-tags.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_msg-error.gif b/app/design/frontend/magento_demo/images/i_msg-error.gif
deleted file mode 100644
index 9db2351303341d36bef063d1ca7a926be5981aac..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_msg-error.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_msg-note.gif b/app/design/frontend/magento_demo/images/i_msg-note.gif
deleted file mode 100644
index c9cacc27ae2553a59993d9702953dc19c53c679b..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_msg-note.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_msg-success.gif b/app/design/frontend/magento_demo/images/i_msg-success.gif
deleted file mode 100644
index 611faffbc5f4254d54bd031f87470be3b32b28cf..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_msg-success.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_notice.gif b/app/design/frontend/magento_demo/images/i_notice.gif
deleted file mode 100644
index 17733eff3fa73171ffbce8254fa0b368d940b74d..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_notice.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_page1.gif b/app/design/frontend/magento_demo/images/i_page1.gif
deleted file mode 100644
index 443a8ddc02d095fc273695cac7988c2a06d63d59..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_page1.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_page2.gif b/app/design/frontend/magento_demo/images/i_page2.gif
deleted file mode 100644
index 9cb74dbf5677fc47fd0e7a1aa9c45e1fe5c27d8e..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_page2.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_pager-next.gif b/app/design/frontend/magento_demo/images/i_pager-next.gif
deleted file mode 100644
index 5dff444a2b9db9b4a9457264c548ec1ff5d1c9d9..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_pager-next.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_pager-prev.gif b/app/design/frontend/magento_demo/images/i_pager-prev.gif
deleted file mode 100644
index 179871aff27b60ce027548bf73cd153fb7f2165f..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_pager-prev.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_print.gif b/app/design/frontend/magento_demo/images/i_print.gif
deleted file mode 100644
index 328751770212227cc1b28efabf8475d433eee910..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_print.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_rss-big.png b/app/design/frontend/magento_demo/images/i_rss-big.png
deleted file mode 100644
index 4f6d5c1ab06fe5b13065565c4857ab22163621a7..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_rss-big.png and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_rss.gif b/app/design/frontend/magento_demo/images/i_rss.gif
deleted file mode 100644
index 6c28e66b058d542781ede26a01b7fbbe3b5c9182..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_rss.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_search_criteria.gif b/app/design/frontend/magento_demo/images/i_search_criteria.gif
deleted file mode 100644
index 54513fee177c8d5f4c94d65517b8f45f2c953005..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_search_criteria.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_shipping.gif b/app/design/frontend/magento_demo/images/i_shipping.gif
deleted file mode 100644
index ec109220aab15a1e694d1cc49468e0def56229e5..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_shipping.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_tag_add.gif b/app/design/frontend/magento_demo/images/i_tag_add.gif
deleted file mode 100644
index 7cfe38581811773e47ad7ad6708d46124c20656e..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_tag_add.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_tier.gif b/app/design/frontend/magento_demo/images/i_tier.gif
deleted file mode 100644
index b906a4c35ab6e3fe5358026474c3eb5d1be04536..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_tier.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_type_grid.gif b/app/design/frontend/magento_demo/images/i_type_grid.gif
deleted file mode 100644
index e52118209c2cf7cb54193c2cb23565dc64ae0e73..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_type_grid.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/i_type_list.gif b/app/design/frontend/magento_demo/images/i_type_list.gif
deleted file mode 100644
index 680d8cbdcc6f9e6d20c2fd548f43a03e3b3c858d..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/i_type_list.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/magnifier_handle.gif b/app/design/frontend/magento_demo/images/magnifier_handle.gif
deleted file mode 100644
index cab1a4728c64a13501c48ce4cc667559f0d8ef43..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/magnifier_handle.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/map_popup_arrow.gif b/app/design/frontend/magento_demo/images/map_popup_arrow.gif
deleted file mode 100644
index 43600dcc5eed5e17d2140c9ce3e921d308e57d02..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/map_popup_arrow.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/404_callout1.jpg b/app/design/frontend/magento_demo/images/media/404_callout1.jpg
deleted file mode 100644
index 6a7d7ef477959b119100c5233c0c87c34a85cc09..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/404_callout1.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/404_callout2.jpg b/app/design/frontend/magento_demo/images/media/404_callout2.jpg
deleted file mode 100644
index c238a86799d36c92bd90312015fa2bfe496aba02..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/404_callout2.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img01.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img01.jpg
deleted file mode 100644
index 3d8ac72d8b42980ddfc60014108fbd975c3df5f9..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/best_selling_img01.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img02.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img02.jpg
deleted file mode 100644
index 24118a6b4545bfb0d860ce95a8bdf37d6067c626..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/best_selling_img02.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img03.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img03.jpg
deleted file mode 100644
index 2a5d8deb704c01de2e0ea1df9f622f93e851c375..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/best_selling_img03.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img04.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img04.jpg
deleted file mode 100644
index b01cb1fedb06d94197aad3860442acb753f57b61..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/best_selling_img04.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img05.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img05.jpg
deleted file mode 100644
index 70e5840a912cdbbfec2f45ced74384b1c2bcce67..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/best_selling_img05.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img06.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img06.jpg
deleted file mode 100644
index 8f7de3681cb6a682ef5e14a5063c1984d21a97d9..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/best_selling_img06.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/cell_phone_landing_banner1.jpg b/app/design/frontend/magento_demo/images/media/cell_phone_landing_banner1.jpg
deleted file mode 100644
index 8c123db9fc9ae06d52e470fa80d6b75be3b994bb..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/cell_phone_landing_banner1.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/electronics_cellphones.jpg b/app/design/frontend/magento_demo/images/media/electronics_cellphones.jpg
deleted file mode 100644
index b92f9d05f102b6c946506b6bee20294442fb58cb..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/electronics_cellphones.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/electronics_digitalcameras.jpg b/app/design/frontend/magento_demo/images/media/electronics_digitalcameras.jpg
deleted file mode 100644
index 3c6e36e3559cb5e71efcd23468d1b11a8eb50477..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/electronics_digitalcameras.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/electronics_laptops.jpg b/app/design/frontend/magento_demo/images/media/electronics_laptops.jpg
deleted file mode 100644
index 602338e491e001c83673429c9d6d90179fe162b3..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/electronics_laptops.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/furniture_callout_spot.jpg b/app/design/frontend/magento_demo/images/media/furniture_callout_spot.jpg
deleted file mode 100644
index 656cb3e1567013c1ddd5bac26d7f4002da88ac40..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/furniture_callout_spot.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/furnitures_bed_room.jpg b/app/design/frontend/magento_demo/images/media/furnitures_bed_room.jpg
deleted file mode 100644
index b9a0916edb99239326c351ff3b4866ab7dd17243..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/furnitures_bed_room.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/furnitures_living_room.jpg b/app/design/frontend/magento_demo/images/media/furnitures_living_room.jpg
deleted file mode 100644
index 4850a83949ce39d7326cb807b11bdd9d1372ec66..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/furnitures_living_room.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/head_electronics_cellphones.gif b/app/design/frontend/magento_demo/images/media/head_electronics_cellphones.gif
deleted file mode 100644
index 99edee24686c5faac28d096b6a5cc41b64461e6b..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/head_electronics_cellphones.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/head_electronics_digicamera.gif b/app/design/frontend/magento_demo/images/media/head_electronics_digicamera.gif
deleted file mode 100644
index b2b0d60121ba6d1a2a47143a23ca90f86be81657..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/head_electronics_digicamera.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/head_electronics_laptops.gif b/app/design/frontend/magento_demo/images/media/head_electronics_laptops.gif
deleted file mode 100644
index 3c57abe0a8238503b7d4974e09b62debc429a546..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/head_electronics_laptops.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_mid1.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_mid1.jpg
deleted file mode 100644
index bee781cde3a0eb635396c6f0b86c4f976201a6d9..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/laptop_callout_mid1.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_mid2.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_mid2.jpg
deleted file mode 100644
index 31a5724081b291c3f74dfef653a1945ba1f14d37..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/laptop_callout_mid2.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_mid3.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_mid3.jpg
deleted file mode 100644
index 321fa48d674335a8cf6230a54f5b7fc9ef9d68ce..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/laptop_callout_mid3.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_spot.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_spot.jpg
deleted file mode 100644
index 7652e5392423c237b5bb11914dcca0836f3d0335..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/laptop_callout_spot.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/media/shirts_landing_banner1.jpg b/app/design/frontend/magento_demo/images/media/shirts_landing_banner1.jpg
deleted file mode 100644
index 2adc5531ef15e5de9e0b12c7c154c07f1c900890..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/media/shirts_landing_banner1.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/np_cart_thumb.gif b/app/design/frontend/magento_demo/images/np_cart_thumb.gif
deleted file mode 100644
index 53bcfa522089634aca66bbf1592ddf9d372f1e28..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/np_cart_thumb.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/np_more_img.gif b/app/design/frontend/magento_demo/images/np_more_img.gif
deleted file mode 100644
index 1c131aac80f5058be6b83ae327c4a7d2fe2b4c32..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/np_more_img.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/np_product_main.gif b/app/design/frontend/magento_demo/images/np_product_main.gif
deleted file mode 100644
index 3d41fce4fd29fa31d5d7365864cefca63367f475..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/np_product_main.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/np_thumb.gif b/app/design/frontend/magento_demo/images/np_thumb.gif
deleted file mode 100644
index b56c1ea6281e1860bc57ceb6fb9c8a34bbf73bc8..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/np_thumb.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/np_thumb2.gif b/app/design/frontend/magento_demo/images/np_thumb2.gif
deleted file mode 100644
index f400d153fc4afdfa98e56f9aa8ce1dc81f2b783f..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/np_thumb2.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/ph_callout_left_rebel.jpg b/app/design/frontend/magento_demo/images/ph_callout_left_rebel.jpg
deleted file mode 100644
index 0a4c6d369078c0270d969aa1537d200173d03b84..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/ph_callout_left_rebel.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/ph_callout_left_top.gif b/app/design/frontend/magento_demo/images/ph_callout_left_top.gif
deleted file mode 100644
index 68e4df8b85092b5e69d0c3896f87deac858ed526..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/ph_callout_left_top.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/product_zoom_overlay_magnif.gif b/app/design/frontend/magento_demo/images/product_zoom_overlay_magnif.gif
deleted file mode 100644
index 7d9bcf29b408ca07306907f9931743955cdff775..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/product_zoom_overlay_magnif.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/slider_bg.gif b/app/design/frontend/magento_demo/images/slider_bg.gif
deleted file mode 100644
index 92b4e8c84b681122bda47df464715572f5321fd1..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/slider_bg.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/images/validation_advice_bg.gif b/app/design/frontend/magento_demo/images/validation_advice_bg.gif
deleted file mode 100644
index 46b1a2267ba5ad31f59a9c6cd8eaac9ee3b0f8ce..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/images/validation_advice_bg.gif and /dev/null differ
diff --git a/app/design/frontend/magento_demo/media/preview_image.jpg b/app/design/frontend/magento_demo/media/preview_image.jpg
deleted file mode 100644
index 3c9b11dae2719b47bf95d41e69136f1e56ce2904..0000000000000000000000000000000000000000
Binary files a/app/design/frontend/magento_demo/media/preview_image.jpg and /dev/null differ
diff --git a/app/design/frontend/magento_demo/theme.xml b/app/design/frontend/magento_demo/theme.xml
deleted file mode 100644
index ef6fad5d654f133c9b7525fc8bfe771969fb9e8a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_demo/theme.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    Magento
- * @package     Design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<theme>
-    <title>Magento Demo</title>
-    <version>2.0.0.0</version>
-    <parent>magento_backup</parent>
-    <media>
-        <preview_image>media/preview_image.jpg</preview_image>
-    </media>
-</theme>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml
deleted file mode 100644
index 63eb6350d4590917f9b71744321e9d2d926bd830..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php $_product = $this->getProduct() ?>
-<div id="customizeTitle" class="page-title title-buttons">
-    <h1><?php echo __('Customize %1', $_helper->productAttribute($_product, $_product->getName(), 'name')) ?></h1>
-    <a href="#" class="bundle-slide-back"><small>&lsaquo;</small> Go back to product detail</a>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml
deleted file mode 100644
index 6874d318387082eb129661c16b5aa68dc787fca0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */
-?>
-<?php $_product = $this->getProduct() ?>
-<?php if($_product->isSaleable()): ?>
-<script type="text/javascript">
-    (function ($) {
-        head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::/bundle.js') ?>", function() {
-            $('#product_addtocart_form').bundleOption({
-                bundleConfig: <?php echo $this->getJsonConfig() ?>,
-                bundleOptionQtyPrefix: "#bundle-option-",
-                bundleOptionQtySuffix: "-qty-input",
-                priceSelectors: {
-                    "product-price": "#product-price-<?php echo $_product->getId()?>",
-                    "bundle-price": "#bundle-price-<?php echo $_product->getId()?>",
-                    "price-including-tax": "#price-including-tax-<?php echo $_product->getId()?>",
-                    "price-excluding-tax": "#price-excluding-tax-<?php echo $_product->getId()?>"
-                }
-            });
-        });
-    })(jQuery);
-</script>
-<?php endif; ?>
-<?php if ($this->displayProductStockStatus()): ?>
-    <?php if ($_product->isAvailable()): ?>
-        <p class="stock available" title="<?php echo __('Availability:') ?>">
-            <span><?php echo __('In stock') ?></span>
-        </p>
-    <?php else: ?>
-        <p class="stock unavailable" title="<?php echo __('Availability:') ?>">
-            <span><?php echo __('Out of stock') ?></span>
-        </p>
-    <?php endif; ?>
-<?php endif; ?>
-<?php echo $this->getChildHtml('bundle_prices') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml
deleted file mode 100644
index 56646524696b60a54a19192188c175ce227a12e7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-?>
-
-<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Checkbox */ ?>
-<?php $_option = $this->getOption() ?>
-<?php $_selections = $_option->getSelections() ?>
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
-    <label class="label">
-        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
-    </label>
-    <div class="control">
-        <div class="nested options-list">
-        <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-            <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
-        <?php else:?>
-            <?php foreach($_selections as $_selection): ?>
-                <div class="field choice">
-                    <input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>  name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>"/>
-                    <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
-                        <span><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></span>
-                    </label>
-                </div>
-            <?php endforeach; ?>
-            <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
-        <?php endif; ?>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.phtml
deleted file mode 100644
index 50e74d9111e9bbf2dbb6a0979b89ef0bc370b438..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.phtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-?>
-
-<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Multi */ ?>
-<?php $_option = $this->getOption() ?>
-<?php $_selections = $_option->getSelections() ?>
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
-    <label class="label">
-        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
-    </label>
-    <div class="control">
-    <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-        <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
-        <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
-    <?php else: ?>
-        <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>][]" class="bundle-option-<?php echo $_option->getId() ?> multiselect change-container-classname product-bundle-option" <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
-        <?php if(!$_option->getRequired()): ?>
-            <option value=""><?php echo __('None') ?></option>
-        <?php endif; ?>
-        <?php foreach ($_selections as $_selection): ?>
-            <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
-        <?php endforeach; ?>
-        </select>
-    <?php endif; ?>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.phtml
deleted file mode 100644
index 5c9b0991dba6739cfdaa724dfa5ac0b337f4f8d8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.phtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-?>
-
-<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Radio */ ?>
-<?php $_option = $this->getOption(); ?>
-<?php $_selections  = $_option->getSelections(); ?>
-<?php $_default     = $_option->getDefaultSelection(); ?>
-<?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
-
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
-    <label class="label">
-        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
-    </label>
-    <div class="control">
-        <div class="nested options-list">
-        <?php if ($this->showSingle()): ?>
-            <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" />
-        <?php else:?>
-            <?php if (!$_option->getRequired()): ?>
-                <div class="field choice">
-                    <input type="radio" class="radio product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?> value=""/>
-                    <label class="label" for="bundle-option-<?php echo $_option->getId() ?>"><span><?php echo __('None') ?></span></label>
-                </div>
-            <?php endif; ?>
-            <?php foreach ($_selections as $_selection): ?>
-                <div class="field choice">
-                    <input type="radio" class="radio change-container-classname product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>  name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>"/>
-                    <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
-                        <span><?php echo $this->getSelectionTitlePrice($_selection) ?></span>
-                    </label>
-                </div>
-            <?php endforeach; ?>
-                <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
-        <?php endif; ?>
-            <div class="field qty qty-holder">
-                <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
-                    <span><?php echo __('Qty') ?></span>
-                </label>
-                <div class="control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml
deleted file mode 100644
index 30109f6040619451df27d3d8da1a045b911631c2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-?>
-
-<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Select */ ?>
-<?php $_option      = $this->getOption(); ?>
-<?php $_selections  = $_option->getSelections(); ?>
-<?php $_default     = $_option->getDefaultSelection(); ?>
-<?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
-
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
-    <label class="label">
-        <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
-    </label>
-    <div class="control">
-    <?php if ($this->showSingle()): ?>
-        <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
-        <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
-    <?php else:?>
-        <select id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?> bundle-option-select product-bundle-option change-container-classname" <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
-            <option value=""><?php echo __('Choose a selection...') ?></option>
-        <?php foreach ($_selections as $_selection): ?>
-            <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
-        <?php endforeach; ?>
-        </select>
-    <?php endif; ?>
-        <div class="nested">
-            <div class="field qty qty-holder">
-                <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
-                    <span><?php echo __('Qty') ?></span>
-                </label>
-                <div class="control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml
deleted file mode 100644
index d09c2cb900e446ed50a700fb7e80d092bcc28f92..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php 
-$_product = $this->getProduct();
-$_helper = $this->helper('Magento\Catalog\Helper\Output');
-?>
-<?php $_options = $this->decorateArray($this->getOptions()); ?>
-<?php if ($_product->isSaleable()):?>
-    <?php if (count($_options)): ?>
-    <script type="text/javascript">
-        (function ($) {
-            head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function () {
-                $('#product_addtocart_form').bundleOption({'optionConfig':<?php echo $this->getJsonConfig()?>}).trigger('changeSelection');
-            });
-        })(jQuery);
-    </script>
-        <fieldset class="fieldset bundle options">
-            <legend id="customizeTitle" class="legend">
-                <span><?php echo __('Customize %1', $_helper->productAttribute($_product, $_product->getName(), 'name')) ?></span>
-            </legend><br />
-        <?php foreach ($_options as $_option): ?>
-            <?php if (!$_option->getSelections()): ?>
-                <?php continue; ?>
-            <?php endif; ?>
-            <?php echo $this->getOptionHtml($_option) ?>
-        <?php endforeach; ?>
-        </fieldset>
-    <?php else: ?>
-        <p><?php echo __('No options of this product are available.') ?></p>
-    <?php endif; ?>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js b/app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js
deleted file mode 100644
index 69e8678d33937c5f914cd6b4c7f3f42fc3f8b659..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    frontend bundle product slide
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true expr:true*/
-(function($) {
-    $.widget('mage.slide', {
-        options: {
-            slideSpeed: 1500,
-            slideSelector: '#bundle-slide',
-            slideBackSelector: '.bundle-slide-back',
-            bundleProductSelector: '#bundleProduct',
-            bundleOptionsContainer: '#options-container',
-            productViewContainer: '#productView',
-            slidedown: true
-
-        },
-
-        _create: function() {
-            if(this.options.slidedown === true) {
-                $(this.options.slideSelector).on('click', $.proxy(this._show, this));
-                $(this.options.slideBackSelector).on('click', $.proxy(this._hide, this));
-                this.options.autostart && this._show();
-            } else {
-                $(this.options.slideSelector).on('click', $.proxy(this._slide, this));
-                $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this));
-                this.options.autostart && this._slide();
-            }
-        },
-
-        /**
-         * slide bundleOptionsContainer over to the main view area
-         * @private
-         */
-        _slide: function() {
-            $(this.options.bundleProductSelector).css('top', '0px');
-            $(this.options.bundleOptionsContainer).show();
-            this.element.css('height',$(this.options.productViewContainer).height() + 'px');
-            $(this.options.bundleProductSelector).css('left', '0px').animate(
-                {'left': '-' + this.element.width() + 'px'},
-                this.options.slideSpeed,
-                $.proxy(function() {
-                    this.element.css('height','auto');
-                    $(this.options.productViewContainer).hide();
-                }, this)
-            );
-        },
-
-        /**
-         * slideback productViewContainer to main view area
-         * @private
-         */
-        _slideBack: function() {
-            $(this.options.bundleProductSelector).css('top', '0px');
-            $(this.options.productViewContainer).show();
-            this.element.css('height', $(this.options.bundleOptionsContainer).height() + 'px');
-            $(this.options.bundleProductSelector).animate(
-                {'left': '0px'},
-                this.options.slideSpeed,
-                $.proxy(function() {
-                    $(this.options.bundleOptionsContainer).hide();
-                    this.element.css('height','auto');
-                }, this)
-            );
-        },
-        _show: function  () {
-            $(this.options.bundleOptionsContainer).slideDown(800);
-            $('html, body').animate({
-                scrollTop: $(this.options.bundleOptionsContainer).offset().top
-            }, 600);
-        },
-        _hide: function  () {
-            $('html, body').animate({
-                scrollTop: 0
-            }, 600);
-            $(this.options.bundleOptionsContainer).slideUp(function(){800});
-        }
-    });
-}(jQuery));
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml
deleted file mode 100644
index 3e1666e39a95774fe8b6a5c4e4fc16545ec16e62..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-bundle-js">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Bundle::bundle.js</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-js-product-summary-js">
-            <arguments>
-                <argument name="file" xsi:type="string">Magento_Bundle::js/product-summary.js</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="root">
-        <action method="addBodyClass">
-            <argument name="value" xsi:type="string">type-bundle</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="product.info">
-        <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.summary" as="form_top" template="catalog/product/view/summary.phtml">
-            <block class="Magento\Bundle\Block\Catalog\Product\Price" name="bundle.prices" as="bundle_prices" template="catalog/product/view/price.phtml">
-                <action method="setMAPTemplate">
-                    <argument name="tmpl" xsi:type="string">Magento_Catalog::product/price_msrp_item.phtml</argument>
-                </action>
-            </block>
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.bundle" as="addtocart" template="product/view/addtocart.phtml"/>
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.addto.bundle" as="addto" template="product/view/addto.phtml"/>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="product.info.options.wrapper">
-        <block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/>
-        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
-            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
-        </block>
-    </referenceBlock>
-    <referenceBlock name="product.info.options.wrapper.bottom">
-        <remove name="product.tierprices"/>
-        <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.tierprices" as="tierprices" before="-" template="Magento_Bundle::catalog/product/view/tierprices.phtml"/>
-        <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/>
-        <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.back.button" as="backButton" after="-" template="catalog/product/view/backbutton.phtml"/>
-        <action method="unsetChild">
-            <argument name="block" xsi:type="string">product.info.addtocart</argument>
-        </action>
-        <action method="setHideRequiredNotice">
-            <argument name="flag" xsi:type="string">1</argument>
-        </action>
-        <action method="unsetChild">
-            <argument name="block" xsi:type="string">product.info.addto</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle options container" after="product.info.media"/>
-        <move element="product.info" destination="bundle.options.container" before="-"/>
-    </referenceContainer>
-    <referenceContainer name="product.info.type">
-        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
-            <action method="addPriceBlockType">
-                <argument name="type" xsi:type="string">bundle</argument>
-                <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-                <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
-            </action>
-        </block>
-        <container name="product.info.bundle.extra" after="product.info.bundle" as="product_type_data_extra" label="Product Extra Info"/>
-        <block class="Magento\Bundle\Block\Catalog\Product\View" name="customize.button" as="customize_button" template="catalog/product/view/customize.phtml"/>
-    </referenceContainer>
-    <referenceBlock name="product.clone_prices">
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">bundle</argument>
-            <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-            <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml
deleted file mode 100644
index f56f9a2b65b5b449cf0c2ce2281116761fe5abcb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="checkout.cart.form">
-        <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml"/>
-    </referenceBlock>
-    <referenceBlock name="checkout.cart.crosssell">
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">bundle</argument>
-            <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-            <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml
deleted file mode 100644
index 30de3dbeb470c1527c2183e718d662dcde3ca0d4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="wishlist_sidebar">
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">bundle</argument>
-            <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-            <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="catalog_product_price_template">
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">bundle</argument>
-            <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
-            <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="minicart">
-        <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml
deleted file mode 100644
index 23199f3a6a5473297ca7ee455b8b35e2b18426a8..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $parentItem = $this->getItem() ?>
-
-<?php $items = $this->getChilds($parentItem) ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr>
-        <td class="col label" colspan="7"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
-    <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
-    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td class="col name">
-        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-    </td>
-    <?php else: ?>
-    <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
-    <?php endif; ?>
-    <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
-    <td class="col price">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <td class="col qty">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-            <?php echo $_item->getQty()*1 ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <td class="col subtotal">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-                <span class="price-excl-tax">
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                        <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <span class="cart-price">
-                        <?php endif; ?>
-                            <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                        <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            </span>
-                        <?php endif; ?>
-                    <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                    <?php else: ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                        <?php else: ?>
-                            <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                        <?php endif; ?>
-
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                        <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                                <small>
-                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                                <?php endforeach; ?>
-                                </small>
-                            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                    <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                                <?php endforeach; ?>
-                            <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                                <small>
-                                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                    <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                                <?php endforeach; ?>
-                                </small>
-                            <?php endif; ?>
-                        </span>
-
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                                <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                            </span>
-                        <?php endif; ?>
-                    <?php endif; ?>
-                </span>
-                <br />
-            <?php endif; ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-                <span class="price-incl-tax">
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                       <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <span class="cart-price">
-                        <?php endif; ?>
-                            <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                        <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            </span>
-                        <?php endif; ?>
-                        <?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item)); ?>
-                    <?php endif; ?>
-                 </span>
-            <?php else: ?>
-                &nbsp;
-            <?php endif; ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <td class="col discount">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-            <?php echo $this->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-   </td>
-    <td class="col rowtotal">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-            <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endforeach; ?>
-
-<?php if ($_showlastRow): ?>
-<tr>
-    <td class="col options" colspan="7">
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml
deleted file mode 100644
index 49fe7219b4a2d73fee110599f5499b6381d0c640..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $parentItem = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-
-<?php $items = $this->getChilds($parentItem) ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr>
-        <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
-    <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
-    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-    <td class="col name">
-        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-    </td>
-    <?php else: ?>
-    <td class="col value"><div class="option value"><?php echo $this->getValueHtml($_item) ?></div></td>
-    <?php endif; ?>
-    <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
-    <td class="col price">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <td class="col qty">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-            <?php echo $_item->getQty()*1 ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <td class="col subtotal">
-        <?php if ($this->canShowPriceInfo($_item)): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-            </span>
-        <?php endif; ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endforeach; ?>
-
-<?php if ($_showlastRow): ?>
-<tr>
-    <td class="col options" colspan="5">
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml
deleted file mode 100644
index 45b77530802aef9ec7a482c37f001902782abc38..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Bundle\Block\Sales\Order\Items\Renderer */
-?>
-<?php $parentItem = $this->getItem() ?>
-<?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
-        <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
-    <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
-    <?php if (!$_item->getParentItem()): ?>
-        <td class="col name">
-            <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        </td>
-    <?php else: ?>
-        <td class="col value"><div class="option value"><?php echo $this->getValueHtml($_item)?></div></td>
-    <?php endif; ?>
-    <td class="col sku"><?php echo $this->prepareSku($_item->getSku()) ?></td>
-    <td class="col price">
-        <?php if (!$_item->getParentItem()): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <td class="col qty">
-        <?php if (($_item->getParentItem() && $this->isChildCalculated()) ||
-                (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
-            <span class="nobr">
-            <?php if ($_item->getQtyOrdered() > 0): ?>
-                <?php echo __('Ordered'); ?>: <strong><?php echo $_item->getQtyOrdered()*1 ?></strong><br />
-            <?php endif; ?>
-            <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
-                <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong><br />
-            <?php endif; ?>
-            <?php if ($_item->getQtyCanceled() > 0): ?>
-                <?php echo __('Canceled'); ?>: <strong><?php echo $_item->getQtyCanceled()*1 ?></strong><br />
-            <?php endif; ?>
-            <?php if ($_item->getQtyRefunded() > 0): ?>
-                <?php echo __('Refunded'); ?>: <strong><?php echo $_item->getQtyRefunded()*1 ?></strong>
-            <?php endif; ?>
-            </span>
-        <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $this->isShipmentSeparately()): ?>
-            <span class="nobr"><?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong></span>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <td class="col subtotal">
-        <?php if (!$_item->getParentItem()): ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-            </span>
-        <?php endif; ?>
-        <?php else: ?>
-            &nbsp;
-        <?php endif; ?>
-    </td>
-    <!--
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-    <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-    <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
-    <?php endif; ?>
-    -->
-</tr>
-<?php endforeach; ?>
-<?php if ($_showlastRow): ?>
-<tr>
-    <td class="col options" colspan="5">
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId()?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml
deleted file mode 100644
index b7867220326051c1ac437b8467e2d4b04861a846..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $parentItem = $this->getItem() ?>
-<?php $items = array_merge(array($parentItem->getOrderItem()), $parentItem->getOrderItem()->getChildrenItems()) ?>
-<?php $shipItems = $this->getChilds($parentItem) ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-    <?php $_showlastRow = true ?>
-<?php else: ?>
-    <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getParentItem()): ?>
-    <?php $attributes = $this->getSelectionAttributes($_item) ?>
-    <?php if ($_prevOptionId != $attributes['option_id']): ?>
-    <tr>
-        <td colspan="3" class="col label"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
-    </tr>
-    <?php $_prevOptionId = $attributes['option_id'] ?>
-    <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
-    <?php if (!$_item->getParentItem()): ?>
-    <td class="col name">
-        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-    </td>
-    <?php else: ?>
-    <td class="col value"><div class="option value"><?php echo $this->getValueHtml($_item) ?></div></td>
-    <?php endif; ?>
-    <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
-    <td class="col price">
-        <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
-            <?php if (isset($shipItems[$_item->getId()])): ?>
-                <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
-            <?php elseif ($_item->getIsVirtual()): ?>
-                <?php echo __('N/A') ?>
-            <?php else: ?>
-                0
-            <?php endif; ?>
-        <?php else: ?>
-        &nbsp;
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endforeach; ?>
-
-<?php if ($_showlastRow): ?>
-<tr>
-    <td class="col options" colspan="3">
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml
deleted file mode 100644
index ac3fc02f0b8c3494a279486c069743d6e71fa159..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Category title template
- *
- * @see \Magento\Catalog\Block\Category\View
- */
-?>
-<?php
-    $_helper    = $this->helper('Magento\Catalog\Helper\Output');
-    $_category  = $this->getCurrentCategory();
-?>
-<hgroup class="page category title yyy">
-    <h1 class="title"><?php echo $_helper->categoryAttribute($_category, $this->getCurrentCategory()->getName(), 'name') ?></h1>
-    <?php if($this->IsRssCatalogEnable()): ?>
-        <a href="<?php echo $this->getRssLink() ?>" title="<?php echo __('Subscribe to RSS Feed') ?>" class="action rss"><?php echo __('Subscribe to RSS Feed') ?></a>
-    <?php endif; ?>
-</hgroup>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/view.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/view.phtml
deleted file mode 100644
index 4d40df3d1f65dff31de319812694a45db987e799..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/view.phtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Category view template
- *
- * @see \Magento\Catalog\Block\Category\View
- */
-?>
-<?php
-    $_helper    = $this->helper('Magento\Catalog\Helper\Output');
-    $_category  = $this->getCurrentCategory();
-    $_imgHtml   = '';
-    if ($_imgUrl = $_category->getImageUrl()) {
-        $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->escapeHtml($_category->getName()).'" title="'.$this->escapeHtml($_category->getName()).'" /></p>';
-        $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
-    }
-?>
-<div class="category-view">
-    <?php if($_imgUrl): ?>
-        <?php echo $_imgHtml ?>
-    <?php endif; ?>
-
-    <?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
-        <div class="category description std">
-            <?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?>
-        </div>
-    <?php endif; ?>
-
-    <?php if($this->isContentMode()): ?>
-        <?php echo $this->getCmsBlockHtml() ?>
-
-    <?php elseif($this->isMixedMode()): ?>
-        <?php echo $this->getCmsBlockHtml() ?>
-        <?php echo $this->getProductListHtml() ?>
-
-    <?php else: ?>
-        <?php echo $this->getProductListHtml() ?>
-    <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml
deleted file mode 100644
index f57a72063c9a6ce3b5a9e7c0ed9637bff337330d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml
deleted file mode 100644
index 4d36857a8510719416877b58df0ef739ba7f03f0..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<span class="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/js/list.js b/app/design/frontend/magento_plushe/Magento_Catalog/js/list.js
deleted file mode 100644
index 1ed2bc052077107496523c986854f1a83d72ef0d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/js/list.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    mage compare list
- * @package     mage
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/*jshint browser:true jquery:true*/
-(function ($, window) {
-    $.widget('mage.compareList', {
-        _create: function() {
-
-            var elem = this.element,
-                products = $('thead td', elem);
-
-            if (products.length > this.options.productsInRow) {
-                var headings = $('<table/>')
-                    .addClass('comparison headings data table')
-                    .insertBefore(elem.closest('.container'));
-                elem.addClass('scroll');
-
-                $('th', elem).each(function(){
-                    var th = $(this),
-                        thCopy = th.clone();
-
-                    th.animate({
-                        top: '+=0'
-                    }, 50, function(){
-                        var height;
-                        if ($.browser.mozilla && $.browser.version <= '11.0') {
-                            height = th.outerHeight();
-                        }
-                        else {
-                            height = th.height();
-                        }
-                        thCopy.css('height', height)
-                            .appendTo(headings)
-                            .wrap('<tr />');
-                    });
-                });
-            }
-
-            $(this.options.windowPrintSelector).on('click', function(e) {
-                e.preventDefault();
-                window.print();
-            });
-
-            $.each(this.options.selectors, function(i, selector) {
-                $(selector).on('click', function(e) {
-                    e.preventDefault();
-                    window.location.href = $(this).data('url');
-                });
-            });
-
-        }
-    });
-})(jQuery, window);
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml
deleted file mode 100644
index 4a504db5622552e70a0dd189f2ebf7253db30142..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for filter items block
- *
- * @see \Magento\Catalog\Block\Layer\Filter
- */
-?>
-
-<ol class="items">
-<?php foreach ($this->getItems() as $_item): ?>
-    <li class="item">
-        <?php if ($_item->getCount() > 0): ?>
-        <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
-        <?php else: echo $_item->getLabel() ?>
-        <?php endif; ?>
-        <?php if ($this->shouldDisplayProductCount()): ?>
-        <span class="count"><?php echo $_item->getCount() ?></span>
-        <?php endif; ?>
-    </li>
-<?php endforeach ?>
-</ol>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml
deleted file mode 100644
index 5a896c8ce712562370d3030c2c23e2869c45ed3d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Category layered navigation state
- *
- * @see \Magento\Catalog\Block\Layer\State
- */
-?>
-<?php $_filters = $this->getActiveFilters() ?>
-<?php if(!empty($_filters)): ?>
-<div class="filtered">
-    <strong class="subtitle"><?php echo __('Currently Shopping by:') ?></strong>
-    <ol class="items">
-    <?php foreach ($_filters as $_filter): ?>
-        <li class="item">
-            <span class="label"><?php echo __($_filter->getName()) ?>:</span>
-            <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
-            <?php
-                $clearLinkUrl = $_filter->getClearLinkUrl();
-                if ($clearLinkUrl):
-            ?>
-                <a  class="action previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Previous') ?>">
-                    <span><?php echo __('Previous') ?></span>
-                </a>
-                <a  class="action remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>">
-                    <span><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
-                </a>
-            <?php else: ?>
-                <a  class="action remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Remove This Item') ?>">
-                    <span><?php echo __('Remove This Item') ?></span>
-                </a>
-            <?php endif; ?>
-        </li>
-    <?php endforeach; ?>
-    </ol>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml
deleted file mode 100644
index 6216489ee8b5891ef808d44e84819fcc12cc57c7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright  Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Category layered navigation
- *
- * @deprecated since 1.12.0.0
- */
-?>
-<?php if($this->canShowBlock()): ?>
-<div class="block filter">
-    <div class="title">
-        <strong><?php echo __('Shop By') ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getStateHtml() ?>
-        <?php if ($this->getLayer()->getState()->getFilters()): ?>
-        <div class="actions">
-            <a href="<?php echo $this->getClearUrl() ?>" class="action reset"><?php echo __('Clear All') ?></a>
-        </div>
-        <?php endif; ?>
-        <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
-        <dl class="options" id="narrow-by-list">
-            <?php $_filters = $this->getFilters() ?>
-            <?php foreach ($_filters as $_filter): ?>
-            <?php if($_filter->getItemsCount()): ?>
-                <dt><?php echo __($_filter->getName()) ?></dt>
-                <dd><?php echo $_filter->getHtml() ?></dd>
-            <?php endif; ?>
-            <?php endforeach; ?>
-        </dl>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml
deleted file mode 100644
index b40295454ee0ac27d2fb11d8cc3c2f212cd28191..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="page_one_column"/>
-    <referenceBlock name="page.main.title">
-        <action method="setPageTitle">
-            <argument translate="true" name="page_title" xsi:type="string">Compare Products</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml
index f61f99f435fda95f03d900e525a2b36ad4d882ee..1efc4fc24a7dc7ff68cc9d4773e8977a18440e89 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml
@@ -24,12 +24,6 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="product.info.overview">
-        <arguments>
-            <argument name="at_label" xsi:type="string">none</argument>
-            <argument name="title" translate="true" xsi:type="string">Overview</argument>
-        </arguments>
-    </referenceBlock>
     <move element="product.info" destination="product.info.main" after="product.tierprices"/>
     <move element="page.main.title" destination="product.info.main" before="-"/>
     <!-- <remove name="product.info.sku"/> -->
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
deleted file mode 100644
index 250c158981569b9d1426cacf402245d1c6bfe64c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">2columns-left.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Catalog\Block\Category\View" name="category.products" template="category/view.phtml">
-            <block class="Magento\Catalog\Block\Product\ListProduct" name="product_list" template="product/list.phtml">
-                <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
-                    <block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
-                    <!-- The following code shows how to set your own pager increments -->
-                    <!--
-                        <action method="setDefaultListPerPage">
-                        <argument name="limit" xsi:type="string">4</argument>
-                    </action>
-                    <action method="setDefaultGridPerPage">
-                        <argument name="limit" xsi:type="string">3</argument>
-                    </action>
-                    <action method="addPagerLimit">
-                        <argument name="mode" xsi:type="string">list</argument>
-                        <argument name="limit" xsi:type="string">2</argument>
-                    </action>
-                    <action method="addPagerLimit">
-                        <argument name="mode" xsi:type="string">list</argument>
-                        <argument name="limit" xsi:type="string">4</argument>
-                    </action>
-                    <action method="addPagerLimit">
-                        <argument name="mode" xsi:type="string">list</argument>
-                        <argument name="limit" xsi:type="string">6</argument>
-                    </action>
-                    <action method="addPagerLimit">
-                        <argument name="mode" xsi:type="string">list</argument>
-                        <argument name="limit" xsi:type="string">8</argument>
-                    </action>
-                    <action method="addPagerLimit" translate="label">
-                        <argument name="mode" xsi:type="string">list</argument>
-                        <argument name="limit" xsi:type="string">all</argument>
-                        <argument name="label" xsi:type="string">All</argument>
-                    </action>
-                    <action method="addPagerLimit">
-                        <argument name="mode" xsi:type="string">grid</argument>
-                        <argument name="limit" xsi:type="string">3</argument>
-                    </action>
-                    <action method="addPagerLimit">
-                        <argument name="mode" xsi:type="string">grid</argument>
-                        <argument name="limit" xsi:type="string">6</argument>
-                    </action>
-                    <action method="addPagerLimit">
-                        <argument name="mode" xsi:type="string">grid</argument>
-                        <argument name="limit" xsi:type="string">9</argument>
-                    </action>
-                    <action method="addPagerLimit" translate="label">
-                        <argument name="mode" xsi:type="string">grid</argument>
-                        <argument name="limit" xsi:type="string">all</argument>
-                        <argument name="label" xsi:type="string">All</argument>
-                    </action>
-                    -->
-                </block>
-                <action method="setToolbarBlockName">
-                    <argument name="name" xsi:type="string">product_list_toolbar</argument>
-                </action>
-            </block>
-        </block>
-    </referenceContainer>
-    <update handle="MAP_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml
deleted file mode 100644
index dabf708b5197530a931ff98058c199254e7b04ac..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="left">
-        <block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" before="-" template="navigation/left.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml
deleted file mode 100644
index 5d2abe78c9cd96130fb772d5b48c3e203daea27b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="left">
-        <block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" before="-" template="layer/view.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
deleted file mode 100644
index 41d6a853f6edfc6a3609ee9253c8b41c623d69ab..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="content">
-        <block class="Magento\Catalog\Block\Product\Compare\ListCompare" name="catalog.compare.list" template="product/compare/list.phtml"/>
-    </referenceContainer>
-    <update handle="MAP_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
deleted file mode 100644
index 30838b8f2b0c223cb8d9b7ceaddfeaea97be0f4f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="setTemplate">
-            <argument name="template" xsi:type="string">1column.phtml</argument>
-        </action>
-    </referenceBlock>
-    <referenceBlock name="page.main.title">
-        <arguments>
-            <argument name="css_class" xsi:type="string">product</argument>
-        </arguments>
-    </referenceBlock>
-    <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Script" name="mage-zoom-js">
-            <arguments>
-                <argument name="file" xsi:type="string">mage/zoom.js</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Page\Block\Html\Head\Css" name="mage-gallery-css">
-            <arguments>
-                <argument name="file" xsi:type="string">mage/gallery.css</argument>
-            </arguments>
-        </block>
-    </referenceBlock>
-    <update handle="page_calendar"/>
-    <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view/form.phtml">
-        <container name="product.info.form.content" label="invisible" as="product_info_form_content">
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
-        </container>
-        <block class="Magento\View\Block\Template" name="product.info.form.options" as="options_container">
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
-                <block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
-                    <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
-                    <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
-                    <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
-                    <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
-                    <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
-                </block>
-                <block class="Magento\View\Block\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Page::js/calendar.phtml"/>
-            </block>
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
-                <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="product/view/addtocart.phtml"/>
-                <block class="Magento\Catalog\Block\Product\View" name="product.clone_prices" as="prices" template="product/view/price_clone.phtml"/>
-            </block>
-        </block>
-    </block>
-    <referenceContainer name="content">
-        <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product info main" before="-">
-            <block class="Magento\Catalog\Block\Product\View" name="product.price" template="product/view/price.phtml"/>
-            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml">
-                <arguments>
-                    <argument name="at_call" xsi:type="string">getSku</argument>
-                    <argument name="at_code" xsi:type="string">sku</argument>
-                    <argument name="css_class" xsi:type="string">sku</argument>
-                    <argument name="at_label" xsi:type="string">default</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.rating" template="product/view/rating.phtml"/>
-            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="product/view/attribute.phtml" group="detailed_info">
-                <arguments>
-                    <argument name="at_call" xsi:type="string">getShortDescription</argument>
-                    <argument name="at_code" xsi:type="string">short_description</argument>
-                    <argument name="css_class" xsi:type="string">overview</argument>
-                    <argument name="at_label" translate="true" xsi:type="string">Overview</argument>
-                    <argument name="title" translate="true" xsi:type="string">Details</argument>
-                </arguments>
-            </block>
-            <container name="alert.urls" as="alert_urls" label="Alert Urls"/>
-            <container name="product.info.type" label="invisible"/>
-            <block class="Magento\Catalog\Block\Product\View" name="product.tierprices" as="tierprices" template="product/view/tierprices.phtml"/>
-            <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
-            <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/>
-            <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="social links product">
-                <block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/>
-            </container>
-        </container>
-        <container name="product.info.media" label="invisible" htmlTag="div" htmlClass="product media" after="product.info.main">
-            <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="product/view/base-image.phtml">
-                <block class="Magento\Catalog\Block\Product\Image" name="product.image.main"/>
-                <block class="Magento\Catalog\Block\Product\Image" name="product.image.thumbs"/>
-            </block>
-        </container>
-        <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="product/view/details.phtml">
-            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="product/view/attribute.phtml" group="detailed_info">
-                <arguments>
-                    <argument name="at_call" xsi:type="string">getDescription</argument>
-                    <argument name="at_code" xsi:type="string">description</argument>
-                    <argument name="css_class" xsi:type="string">description</argument>
-                    <argument name="at_label" xsi:type="string">none</argument>
-                    <argument name="title" translate="true" xsi:type="string">Details</argument>
-                </arguments>
-            </block>
-            <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="product/view/attributes.phtml" group="detailed_info">
-                <arguments>
-                    <argument translate="true" name="title" xsi:type="string">Additional Information</argument>
-                </arguments>
-            </block>
-        </block>
-    </referenceContainer>
-    <referenceContainer name="content.aside">
-        <block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" template="Magento_Catalog::product/list/items.phtml">
-            <arguments>
-                <argument name="type" xsi:type="string">related</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" template="Magento_Catalog::product/list/items.phtml">
-            <arguments>
-                <argument name="type" xsi:type="string">upsell</argument>
-            </arguments>
-        </block>
-        <block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.additional" as="product_additional_data"/>
-    </referenceContainer>
-    <update handle="MAP_popup"/>
-    <update handle="MAP_price_msrp_item"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml
deleted file mode 100644
index baf5f2d8391c7f9ec80d56ee3fc1253a5ee57811..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="root">
-        <action method="addBodyClass">
-            <argument name="value" xsi:type="string">type-configurable</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="product.info.type">
-        <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.configurable" as="product_type_data" template="product/view/type/default.phtml"/>
-        <container name="product.info.configurable.extra" after="product.info.configurable" as="product_type_data_extra" label="Product Extra Info"/>
-    </referenceContainer>
-    <referenceBlock name="product.info.options.wrapper">
-        <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="product/view/type/options/configurable.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml
deleted file mode 100644
index e86dc99138ff6bf2203603a5a1ec70282997479e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="product.info.form.content">
-        <block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="product/view/type/grouped.phtml"/>
-        <container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml
deleted file mode 100644
index b39d1f7329a16135cf1bc5a0edc0b5f52e88f111..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="product.info.type">
-        <block class="Magento\Catalog\Block\Product\View\Type\Simple" name="product.info.simple" as="product_type_data" template="product/view/type/default.phtml"/>
-        <container name="product.info.simple.extra" after="product.info.simple" as="product_type_data_extra" label="Product Extra Info"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
deleted file mode 100644
index 3f0089174f9d47eef86e7c920efd94dc8c635805..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="product.info.type">
-        <block class="Magento\Catalog\Block\Product\View\Type\Virtual" name="product.info.virtual" as="product_type_data" template="product/view/type/default.phtml"/>
-        <container name="product.info.virtual.extra" after="product.info.virtual" as="product_type_data_extra" label="Product Extra Info"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml
deleted file mode 100644
index c22c8528c0d924b27d81112f3be9daadecc2498d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="right">
-        <block class="Magento\Catalog\Block\Product\Compare\Sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
-    </referenceContainer>
-    <block class="Magento\Catalog\Block\Product\Price\Template" name="catalog_product_price_template"/>
-    <referenceBlock name="catalog_product_price_template">
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">msrp</argument>
-            <argument name="block" xsi:type="string">Magento\Catalog\Block\Product\Price</argument>
-            <argument name="template" xsi:type="string">product/price_msrp.phtml</argument>
-        </action>
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">msrp_item</argument>
-            <argument name="block" xsi:type="string">Magento\Catalog\Block\Product\Price</argument>
-            <argument name="template" xsi:type="string">product/price_msrp_item.phtml</argument>
-        </action>
-        <action method="addPriceBlockType">
-            <argument name="type" xsi:type="string">msrp_noform</argument>
-            <argument name="block" xsi:type="string">Magento\Catalog\Block\Product\Price</argument>
-            <argument name="template" xsi:type="string">product/price_msrp_noform.phtml</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml
deleted file mode 100644
index 200d38687e64e0b0a218af543241aa2a7d1f0b56..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Category left navigation
- *
- * @see \Magento\Catalog\Block\Navigation
- */
-?>
-<?php if (!$this->getCategory()) return ?>
-<?php $_categories = $this->getCurrentChildCategories() ?>
-<?php $_count = is_array($_categories)?count($_categories):$_categories->count(); ?>
-<?php if($_count): ?>
-<div class="block filter">
-    <div class="title">
-        <strong><?php echo __('Shop By') ?></strong>
-    </div>
-    <div class="content">
-        <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
-        <dl class="options" id="narrow-by-list2">
-            <dt><?php echo __('Category') ?></dt>
-            <dd>
-                <ol class="items">
-                <?php foreach ($_categories as $_category): ?>
-                    <?php if($_category->getIsActive()): ?>
-                    <li class="item">
-                        <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a>
-                        <span class="count"><?php echo $_category->getProductCount() ?></span>
-                    </li>
-                    <?php endif; ?>
-                <?php endforeach ?>
-                </ol>
-            </dd>
-        </dl>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml
deleted file mode 100644
index f959e3087b402e6e44f431edcc64f601a0f452d4..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_total=$this->getItems()->getSize() ?>
-<?php if($_total): ?>
-<a href="#" class="action print" title="<?php echo __('Print This Page') ?>">
-    <span><?php echo __('Print This Page') ?></span>
-</a>
-<?php $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
-<div class="comparison wrapper">
-<div class="comparison container">
-    <table class="data-table data table comparison" id="product-comparison">
-        <thead>
-            <tr>
-            <?php $_i=0 ?>
-            <?php foreach($this->getItems() as $_item): ?>
-                <?php if($_i++==0): ?>
-                    <th class="cell label remove">&nbsp;</th>
-                <?php endif; ?>
-                <td class="cell remove product">
-                    <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getRemoveUrl($_item) ?>" class="action delete" title="<?php echo __('Remove Product') ?>">
-                        <span><?php echo __('Remove Product') ?></span>
-                    </a>
-                </td>
-            <?php endforeach; ?>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-            <?php $_i = 0; ?>
-            <?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
-            <?php foreach($this->getItems() as $_item): ?>
-                <?php if($_i++==0): ?>
-                    <th class="cell label product">&nbsp;</th>
-                <?php endif; ?>
-                <td class="cell product info">
-                    <a class="product photo" href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
-                        <!-- product_comparison_list -->
-                        <?php echo $imageBlock->init($_item, 'product_comparison_list')->toHtml() ?>
-                    </a>
-                    <strong class="product name">
-                        <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
-                            <?php echo $_helper->productAttribute($_item, $_item->getName(), 'name') ?>
-                        </a>
-                    </strong>
-                    <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
-                    <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
-                    <div class="product actions">
-                        <div class="primary">
-                    <?php if($_item->isSaleable()): ?>
-                        <button type="button" class="action tocart" data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>">
-                            <span><?php echo __('Add to Cart') ?></span>
-                        </button>
-                    <?php else: ?>
-                        <?php if ($_item->getIsSalable()): ?>
-                            <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                        <?php else: ?>
-                            <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                        <?php endif; ?>
-                    <?php endif; ?>
-                        </div>
-                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-                        <div class="secondary addto links">
-                            <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist">
-                                <span><?php echo __('Add to Wishlist') ?></span>
-                            </a>
-                        </div>
-                    <?php endif; ?>
-                    </div>
-                </td>
-            <?php endforeach; ?>
-            </tr>
-        </tbody>
-        <tbody>
-        <?php foreach ($this->getAttributes() as $_attribute): ?>
-            <tr>
-                <?php $_i = 0 ?>
-                <?php foreach($this->getItems() as $_item): ?>
-                <?php if($_i++==0): ?>
-                <th class="cell label">
-                    <span class="attribute label">
-                        <?php echo $_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel()) ?>
-                    </span>
-                </th>
-                <?php endif; ?>
-                <td class="cell product attribute">
-                    <div class="attibute value">
-                    <?php switch ($_attribute->getAttributeCode()) {
-                        case "price": ?>
-                            <?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
-                            <?php break;
-                        case "small_image": ?>
-                            <img src="<?php echo $this->getSmallImageUrl($_item); ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_item->getName(), null, true) ?>" />
-                            <?php break;
-                        default: ?>
-                            <?php echo $_helper->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
-                            <?php break;
-                    } ?>
-                    </div>
-                </td>
-                <?php endforeach; ?>
-            </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-</div>
-<?php else: ?>
-    <p class="empty"><?php echo __('You have no items to compare.') ?></p>
-<?php endif; ?>
-
-<script type="text/javascript">
-    (function($, window) {
-    <?php if ($_total): ?>
-        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/list.js')?>", function() {
-            $('#product-comparison').compareList({
-                windowPrintSelector: '.action.print',
-                productsInRow: 5,
-                selectors: {
-                    productAddToCartSelector: 'button.action.tocart'
-                }
-            });
-        });
-    <?php endif; ?>
-    })(jQuery, window);
-</script>
-
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml
deleted file mode 100644
index 1b873ba6d41d46c55c06de771c8e2c8581d307f9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Catalog\Block\Product\Compare\Sidebar */
-?>
-<?php
-$_helper = $this->helper('Magento\Catalog\Helper\Product\Compare');
-$_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
-?>
-<div class="block compare">
-    <div class="title">
-        <strong>
-            <span class="text"><?php echo __('Compare Products') ?></span>
-            <?php if($_helper->getItemCount() > 0): ?>
-                <span class="qty"><?php echo __('%1', $_helper->getItemCount()) ?></span>
-            <?php endif; ?>
-        </strong>
-    </div>
-    <div class="content">
-        <?php if($_helper->getItemCount() > 0): ?>
-        <ol id="compare-items" class="items compare">
-            <?php foreach($_items as $_index => $_item): ?>
-            <li class="item">
-                <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>" />
-                <strong class="product name">
-                    <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
-                </strong>
-                <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>" class="action delete"><span><?php echo __('Remove This Item') ?></span></a>
-            </li>
-            <?php endforeach; ?>
-        </ol>
-        <div class="actions">
-            <div class="primary">
-                <a href="<?php echo $_helper->getListUrl() ?>" class="action compare"><span><?php echo __('Compare') ?></span></a>
-            </div>
-            <div class="secondary">
-                <a id='compare-clear-all' href="<?php echo $_helper->getClearListUrl() ?>" class="action clear"><span><?php echo __('Clear All') ?></span></a>
-            </div>
-        </div>
-        <script type="text/javascript">
-            (function($) {
-                head.js("<?php echo $this->getViewFileUrl('jquery/jquery.popupwindow.js') ?>",
-                    "<?php echo $this->getViewFileUrl('mage/popup-window.js') ?>",
-                    "<?php echo $this->getViewFileUrl('Magento_Catalog::js/compare.js') ?>", function() {
-                        $('#compare-items').compareItems({
-                            removeConfirmMessage: '<?php echo __('Are you sure you would like to remove this item from the compare products?') ?>',
-                            removeSelector: '#compare-items a.action.delete',
-                            clearAllConfirmMessage: '<?php echo __('Are you sure you would like to remove all products from your comparison?') ?>',
-                            clearAllSelector: '#compare-clear-all'
-                        });
-                    });
-            })(jQuery);
-        </script>
-        <?php else: ?>
-        <p class="empty"><?php echo __('You have no items to compare.') ?></p>
-        <?php endif; ?>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml
deleted file mode 100644
index 363f3e4b4bb365e727ca58df03b248dfd258a426..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Catalog\Block\Product\Image */ ?>
-
-<img class="photo image" style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
-     height:<?php echo $this->getProductImageView()->getHeight()?>px;"
-     src="<?php echo $this->getProductImageView()->getUrl() ?>"
-     alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml
deleted file mode 100644
index 1aa7f4e151f553df41a32e4450ba393205b10aa7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Catalog\Block\Product\Image */ ?>
-
-<span class="img photo container" style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
-    height:<?php echo $this->getProductImageView()->getHeight()?>px; display: block; position: relative;
-    overflow: hidden"><img class="photo image" style="display: block; position: absolute; top: 0; bottom: 0; left: 0; right: 0;
-    margin: auto;" src="<?php echo $this->getProductImageView()->getUrl() ?>"
-    alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/></span>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml
deleted file mode 100644
index c5cec832a6e92c1abf422fa8241349b35510b976..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Product list template
- *
- * @see \Magento\Catalog\Block\Product\ListProduct
- */
-?>
-<?php
-$_productCollection = $this->getLoadedProductCollection();
-$_helper = $this->helper('Magento\Catalog\Helper\Output');
-$imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-?>
-<?php if (!$_productCollection->count()): ?>
-<p class="message note"><?php echo __('There are no products matching the selection.') ?></p>
-<?php else: ?>
-<?php echo $this->getToolbarHtml() ?>
-<?php echo $this->getAdditionalHtml() ?>
-<?php if ($this->getMode() == 'grid') {
-    $viewMode ='grid';
-    $image = 'category_page_grid';
-    $showDescription = false;
-    $rating = 'short';
-} else {
-    $viewMode ='list';
-    $image = 'category_page_list';
-    $showDescription = true;
-    $rating = 'full';
-}
-/**
-* Position for actions regarding image size changing in vde if needed
-*/
-$pos = $this->getPositioned();
-$position = '';
-if ($pos != null) {
-    $position = ' style="left:' . $this->getVar("{$image}:width") . 'px;'
-                .'top:' . $this->getVar("{$image}:height") . 'px;"';
-}
-?>
-<div class="products wrapper <?php echo $viewMode; ?>">
-    <?php $iterator = 1; ?>
-    <ol class="products list items">
-        <?php foreach ($_productCollection as $_product): ?>
-        <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-            <div class="product">
-                <?php // Product Image ?>
-                <a href="<?php echo $_product->getProductUrl() ?>" class="product photo">
-                    <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
-                </a>
-                <div class="product details">
-                    <?php $_productNameStripped = $this->stripTags($_product->getName(), null, true); ?>
-                    <strong class="product name">
-                        <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped; ?>">
-                            <?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
-                        </a>
-                    </strong>
-                    <?php echo $this->getPriceHtml($_product, true) ?>
-                    <?php if ($_product->getRatingSummary()): ?>
-                    <?php echo $this->getReviewsSummaryHtml($_product,$rating) ?>
-                    <?php endif; ?>
-                    <?php if ($showDescription):?>
-                    <div class="product description">
-                        <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-                        <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
-                           class="action more"><?php echo __('Learn More') ?></a>
-                    </div>
-                    <?php endif; ?>
-                    <div class="product actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
-                        <div class="primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position: ''; ?>>
-                            <?php if ($_product->isSaleable()): ?>
-                            <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart"
-                                    data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
-                                <span><?php echo __('Add to Cart') ?></span>
-                            </button>
-                            <?php else: ?>
-                            <?php if ($_product->getIsSalable()): ?>
-                                <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                                <?php else: ?>
-                                <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                                <?php endif; ?>
-                            <?php endif; ?>
-                        </div>
-                        <div class="secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
-                            <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
-                               class="action towishlist" data-action="add-to-wishlist">
-                               <span><?php echo __('Add to Wishlist') ?></span>
-                           </a>
-                            <a href="<?php echo $this->getAddToCompareUrl($_product) ?>" class="action tocompare">
-                                <span><?php echo __('Add to Compare') ?></span>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        <?php echo ($iterator==count($_productCollection)+1) ? '</li>' : '' ?>
-        <?php endforeach; ?>
-    </ol>
-</div>
-<div class="toolbar bottom">
-    <?php echo $this->getToolbarHtml() ?>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.phtml
deleted file mode 100644
index 4dbf3286a34da0dd7d7963180ce09f0cfdc6074d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.phtml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Product list toolbar
- *
- * @see Magento\Catalog\Block\Product\ProductList\Toolbar
- */
-?>
-<?php if ($this->getCollection()->getSize()): ?>
-<div class="toolbar">
-    <?php if ($this->isExpanded()): ?>
-    <div class="settings">
-
-        <?php if ($this->isEnabledViewSwitcher()): ?>
-        <div class="modes">
-            <?php $_modes = $this->getModes(); ?>
-            <?php if ($_modes && count($_modes) > 1): ?>
-            <strong class="label"><?php echo __('View as') ?></strong>
-            <?php foreach ($this->getModes() as $_code => $_label): ?>
-                <?php if ($this->isModeActive($_code)): ?>
-                    <strong class="mode active <?php echo strtolower($_code); ?>" title="<?php echo $_label ?>">
-                        <span><?php echo $_label ?></span>
-                    </strong>
-                    <?php else: ?>
-                    <a class="mode <?php echo strtolower($_code); ?>" title="<?php echo $_label ?>"
-                       href="<?php echo $this->getModeUrl($_code) ?>">
-                       <span><?php echo $_label ?></span>
-                    </a>
-                    <?php endif; ?>
-            <?php endforeach; ?>
-            <?php endif; ?>
-        </div>
-        <?php endif; ?>
-
-        <div class="sorter">
-            <label class="label" for="sorter"><?php echo __('Sort By') ?></label>
-            <select id="sorter" data-mage-init="{redirectUrl: {event:'change'}}">
-                <?php foreach ($this->getAvailableOrders() as $_key => $_order): ?>
-                <option
-                    value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if ($this->isOrderCurrent($_key)): ?>
-                    selected="selected"<?php endif; ?>>
-                    <?php echo __($_order) ?>
-                </option>
-                <?php endforeach; ?>
-            </select>
-            <?php if ($this->getCurrentDirection() == 'desc'): ?>
-            <a title="<?php echo __('Set Ascending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'asc') ?>" class="action sort desc">
-                <span><?php echo __('Set Ascending Direction') ?></span>
-            </a>
-            <?php else: ?>
-            <a title="<?php echo __('Set Descending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'desc') ?>" class="action sort asc">
-                <span><?php echo __('Set Descending Direction') ?></span>
-            </a>
-            <?php endif; ?>
-        </div>
-
-    </div>
-    <?php endif; ?>
-
-    <div class="pager">
-        <p class="amount">
-            <?php if ($this->getLastPageNum() > 1): ?>
-            <?php echo __('Items %1-%2 of %3', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
-            <?php elseif ($this->getLastPageNum() == 1): ?>
-            <?php echo __('%1 Item', $this->getTotalNum()) ?>
-            <?php else: ?>
-            <?php echo __('%1 Item(s)', $this->getTotalNum()) ?>
-            <?php endif; ?>
-        </p>
-
-        <div class="limiter">
-            <strong class="label"><?php echo __('Show') ?></strong>
-            <select id="limiter" data-mage-init="{redirectUrl: {event:'change'}}">
-                <?php foreach ($this->getAvailableLimit() as $_key => $_limit): ?>
-                <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if ($this->isLimitCurrent($_key)): ?>
-                        selected="selected"<?php endif ?>>
-                    <?php echo $_limit ?>
-                </option>
-                <?php endforeach; ?>
-            </select>
-            <span class="text"><?php echo __('per page') ?></span>
-        </div>
-
-        <?php echo $this->getPagerHtml() ?>
-    </div>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml
deleted file mode 100644
index 076fc1132f6e7cc0fc29b6953291adad29035827..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php $_product = $this->getProduct(); ?>
-<?php $_wishlistSubmitUrl = $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product); ?>
-
-<div class="product addto links" data-role="add-to-links">
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <a href="<?php echo $_wishlistSubmitUrl ?>" class="action towishlist" data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
-<?php endif; ?>
-<?php
-    $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product);
-?>
-<?php if($_compareUrl) : ?>
-    <a href="<?php echo $_compareUrl ?>" class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
-<?php endif; ?>
-</div>
-<script type="text/javascript">
-    head.js("<?php echo $this->getViewFileUrl('Magento_Wishlist::js/add-to-wishlist.js') ?>", function () {
-        jQuery('[data-role="add-to-links"]').addToWishlist(
-            <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode(array('productType' => $_product->getTypeId()))?>
-        );
-    });
-</script>
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml
deleted file mode 100644
index 726d90b9c1fba16265e2fa66f62db865d5a66544..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_product = $this->getProduct(); ?>
-<?php $buttonTitle = __('Add to Cart'); ?>
-<?php if ($_product->isSaleable()): ?>
-<div class="box tocart">
-    <?php if (!$_product->isGrouped()): ?>
-    <div class="field qty">
-        <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
-        <div class="control">
-            <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>"
-               title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{required:true,digits:true}"/>
-        </div>
-    </div>
-    <?php endif; ?>
-    <div class="actions">
-        <button type="submit" title="<?php echo $buttonTitle ?>" class="action primary tocart" id="product-addtocart-button">
-            <span><?php echo $buttonTitle ?></span>
-        </button>
-        <?php echo $this->getChildHtml('', true) ?>
-    </div>
-</div>
-<?php endif; ?>
-
-<script type="text/javascript">
-    (function ($) {
-        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>", function () {
-                $('#product_addtocart_form').validation({
-                    errorPlacement: function (error, element) {
-                        if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-one-checkbox-required-by-name') > 0) {
-                            error.appendTo('#links-advice-container');
-                        } else if (element.attr('data-validate')&& element.attr('data-validate').indexOf('validate-grouped-qty') > 0) {
-                            $('#super-product-table').siblings(this.errorElement + '.' + this.errorClass).remove();
-                            $('#super-product-table').after(error);
-                        } else if (element.is(':radio, :checkbox')) {
-                            element.closest('.nested').after(error);
-                        } else {
-                            element.after(error);
-                        }
-                    },
-                    highlight: function (element, errorClass) {
-                        if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
-                            $(element).parent().find('.datetime-picker').each(function() {
-                                $(this).removeClass(errorClass);
-                                if ($(this).val().length === 0) {
-                                    $(this).addClass(errorClass);
-                                }
-                            });
-                        } else if ($(element).is(':radio, :checkbox')) {
-                            $(element).closest('.nested').addClass(errorClass+'-group');
-                        } else {
-                            $(element).addClass(errorClass);
-                        }
-                    },
-                    unhighlight: function (element, errorClass) {
-                        if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
-                            $(element).parent().find('.datetime-picker').removeClass(errorClass);
-                        } else if ($(element).is(':radio, :checkbox')) {
-                            $(element).closest('.nested').removeClass(errorClass+'-group');
-                        } else {
-                            $(element).removeClass(errorClass);
-                        }
-                    }
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml
deleted file mode 100644
index f4a0c38483cd63b7d4a66ac8ce268a1cfd039c32..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Product additional attributes template
- *
- * @see \Magento\Catalog\Block\Product\View\Attributes
- */
-?>
-<?php
-    $_helper = $this->helper('Magento\Catalog\Helper\Output');
-    $_product = $this->getProduct()
-?>
-<?php if($_additional = $this->getAdditionalData()): ?>
-<table class="data table product attributes" id="product-attribute-specs-table">
-    <tbody>
-    <?php foreach ($_additional as $_data): ?>
-        <tr>
-            <th class="col label"><?php echo $this->escapeHtml(__($_data['label'])) ?></th>
-            <td class="col data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
-        </tr>
-    <?php endforeach; ?>
-    </tbody>
-</table>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml
deleted file mode 100644
index e8ab0f4616b6ce1df48cef29afd3829bd3919015..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Product media data template
- *
- * @see \Magento\Catalog\Block\Product\View\BaseImage
- */
-?>
-<?php
-    $_product = $this->getProduct();
-    $_helper = $this->helper('Magento\Catalog\Helper\Output');
-
-    //list($_imgWidth, $_imgHeight) = $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image')->getOriginalSizeArray();
-
-    $image = 'product_page_main_image';
-
-    $_resizedWidth = $this->getVar("{$image}:width");
-    $_resizedHeight = $this->getVar("{$image}:height") ?: $_resizedWidth ;
-
-    $_hasImage = ($_product->getImage() && $_product->getImage() != "no_selection") ? true : false;
-
-    //$_isOldDisplayMode = $this->getOldDisplayMode() || 0;
-    $_isOldDisplayMode = 0;
-    $whiteBorders =  $this->getVar("product_image_white_borders");
-?>
-<?php //if($whiteBorders == 0): ?>
-    <style scoped>
-    .magento-zoom > .img > img {
-        position:absolute;
-        top:0; bottom:0; left:0; right:0; margin:auto; max-height: 100%; max-width: 100%;
-    }
-    </style>
-<?php //endif; ?>
-<div class="product photo main">
-    <a class="product photo magento-zoom<?php echo (!$_hasImage) ? ' isPlaceholder' : ''; ?>"
-       id="base-image" data-role="base-image-zoom"
-       href="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>" >
-        <?php echo $this->getChildBlock('product.image.main')->init($_product, $image)->toHtml() ?>
-    </a>
-<?php  ?>
-    <script type="text/javascript">
-        jQuery('[data-role=base-image-zoom]').attr('rel', '<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>');
-    </script>
-
-    <p class="notice"></p>
-
-    <script type="text/javascript">
-        jQuery(function(){
-            <?php if ($_isOldDisplayMode): ?>
-                jQuery('.magento-zoom').magentoZoom({
-                    useGallery: false,
-                    swapNotices: false,
-                    isOldMode: <?php print $_isOldDisplayMode; ?>,
-                    messages: {
-                        noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
-                        loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
-                    }
-                });
-            <?php else: ?>
-                jQuery('.magento-zoom').magentoZoom({
-                    useLens: true,
-                    enlarged: {
-                        adjustment: 20,
-                        width: 500,
-                        height: <?php echo $_resizedHeight ?>
-                    },
-                    useGallery: true,
-                    swapNotices: true,
-                    isOldMode: <?php print $_isOldDisplayMode; ?>,
-                    messages: {
-                        noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
-                        noticeLightBox: '<?php echo $this->escapeJsQuote(__("Click on image to view it full sized")) ?>', loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
-                    }
-                });
-            <?php endif; ?>
-        });
-    </script>
-<?php  ?>
-</div>
-
-<?php if (count($this->getGalleryImages()) > 0): ?>
-
-<?php
-    $thumbWidth =  $this->getVar("product_page_more_views:width");
-    $thumbHeight =  $this->getVar("product_page_more_views:height") ? : $thumbWidth;
-?>
-<div class="product photo thumbs">
-    <strong class="title"><?php echo __('More Views') ?></strong>
-    <ul class="items thumbs">
-    <?php foreach ($this->getGalleryImages() as $_image): ?>
-        <?php if ($_isOldDisplayMode) {
-                $attributes = ' href="#" data-mage-popwin="{windowURL:'
-                    . $this->getGalleryUrl($_image)
-                    . ',windowName:\'gallery\',width:300,height:300,status:1,scrollbars:1,resizable:1}"';
-            } else {
-                $attributes = ' href="'
-                    . $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())
-                    . '" rel="';
-                if ($whiteBorders) {
-                    $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->resize($_resizedWidth,$_resizedHeight) . '"';
-                } else {
-                    $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($_resizedWidth,$_resizedHeight) . '"';
-                }
-        };?>
-        <li class="item thumb">
-            <a<?php echo $attributes; ?> class="magento-zoom" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>">
-            <?php if ($whiteBorders): ?>
-                <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
-                <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
-                </span>
-            <?php else: ?>
-                <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
-                    <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
-                </span>
-            <?php endif; ?>
-            </a>
-        </li>
-    <?php endforeach; ?>
-    </ul>
-</div>
-    <?php if ($_isOldDisplayMode): ?>
-    <script type="text/javascript">
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('jquery/jquery.popupwindow.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/popup-window.js')?>"
-            );
-        })(jQuery);
-    </script>
-    <?php endif; ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml
deleted file mode 100644
index cd98c96ea758d4b8fb91fabb977ae10919b873eb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Product description template
- *
- * @see \Magento\Catalog\Block\Product\View\Description
- */
-?>
-<?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($this->getProduct(), $this->getProduct()->getDescription(), 'description') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.phtml
deleted file mode 100644
index 815bfc49d92db20704c534f4074621c443f669ed..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.phtml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if (count($this->getGalleryImages()) > 0): ?>
-
-<?php
-    $thumbWidth =  $this->getVar("product_page_more_views:width");
-    $thumbHeight =  $this->getVar("product_page_more_views:height") ? : $thumbWidth;
-?>
-<div class="product photo thumbs">
-    <strong class="title"><?php echo __('More Views') ?></strong>
-    <ul class="items thumbs">
-    <?php foreach ($this->getGalleryImages() as $_image): ?>
-        <?php if ($_isOldDisplayMode) {
-                $attributes = ' href="#" data-mage-popwin="{windowURL:'
-                    . $this->getGalleryUrl($_image)
-                    . ',windowName:\'gallery\',width:300,height:300,status:1,scrollbars:1,resizable:1}"';
-            } else {
-                $attributes = ' href="'
-                    . $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())
-                    . '" rel="';
-                if ($whiteBorders) {
-                    $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->resize($_resizedWidth,$_resizedHeight) . '"';
-                } else {
-                    $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($_resizedWidth,$_resizedHeight) . '"';
-                }
-        };?>
-        <li class="item thumb">
-            <a<?php echo $attributes; ?> class="magento-zoom" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>">
-            <?php if ($whiteBorders): ?>
-                <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
-                <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
-                </span>
-            <?php else: ?>
-                <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
-                    <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
-                </span>
-            <?php endif; ?>
-            </a>
-        </li>
-    <?php endforeach; ?>
-    </ul>
-</div>
-    <?php if ($_isOldDisplayMode): ?>
-    <script type="text/javascript">
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('jquery/jquery.popupwindow.js')?>",
-                "<?php echo $this->getViewFileUrl('mage/popup-window.js')?>"
-            );
-        })(jQuery);
-    </script>
-    <?php endif; ?>
-<?php endif; ?>
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml
deleted file mode 100644
index 44339ee0148a5d26be8c5a22504079f712452e2d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Catalog\Block\Product\View\Options */
-?>
-
-<?php $_options = $this->decorateArray($this->getOptions()) ?>
-<?php if (count($_options)):?>
-    <script type="text/javascript">
-        (function ($) {
-            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/price-option.js') ?>", function () {
-                $('#product_addtocart_form').priceOption({
-                    'optionConfig':<?php echo $this->getJsonConfig()?>,
-                    'controlContainer': '.field'
-                }).trigger('reloadPrice');
-            });
-        })(jQuery);
-    </script>
-    <?php foreach($_options as $_option): ?>
-        <?php echo $this->getOptionHtml($_option) ?>
-    <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml
deleted file mode 100644
index 9cafa8bb474409d63b4d7b9379a2d37c6ed3927b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<script type="text/javascript">
-//<![CDATA[
-var DateOption = Class.create({
-
-    getDaysInMonth: function(month, year)
-    {
-        var curDate = new Date();
-        if (!month) {
-            month = curDate.getMonth();
-        }
-        if (2 == month && !year) { // leap year assumption for unknown year
-            return 29;
-        }
-        if (!year) {
-            year = curDate.getFullYear();
-        }
-        return 32 - new Date(year, month - 1, 32).getDate();
-    },
-
-    reloadMonth: function(event)
-    {
-        var selectEl = event.findElement();
-        var idParts = selectEl.id.split("_");
-        if (idParts.length != 3) {
-            return false;
-        }
-        var optionIdPrefix = idParts[0] + "_" + idParts[1];
-        var month = parseInt($(optionIdPrefix + "_month").value);
-        var year = parseInt($(optionIdPrefix + "_year").value);
-        var dayEl = $(optionIdPrefix + "_day");
-
-        var days = this.getDaysInMonth(month, year);
-
-        //remove days
-        for (var i = dayEl.options.length - 1; i >= 0; i--) {
-            if (dayEl.options[i].value > days) {
-                dayEl.remove(dayEl.options[i].index);
-            }
-        }
-
-        // add days
-        var lastDay = parseInt(dayEl.options[dayEl.options.length-1].value);
-        for (i = lastDay + 1; i <= days; i++) {
-            this.addOption(dayEl, i, i);
-        }
-    },
-
-    addOption: function(select, text, value)
-    {
-        var option = document.createElement('OPTION');
-        option.value = value;
-        option.text = text;
-
-        if (select.options.add) {
-            select.options.add(option);
-        } else {
-            select.appendChild(option);
-        }
-    }
-});
-dateOption = new DateOption();
-//]]>
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml
deleted file mode 100644
index 8322a297e9c2360a47b848aff6fed4908bbd9eec..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_option = $this->getOption() ?>
-<?php $_optionId = $_option->getId() ?>
-<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
-<div class="field date<?php echo $class; ?>">
-    <label class="label">
-        <span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span>
-        <?php echo $this->getFormatedPrice() ?>
-    </label>
-    <div class="control">
-    <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
-        || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE): ?>
-
-        <?php echo $this->getDateHtml() ?>
-
-        <?php if (!$this->useCalendar()): ?>
-            <script type="text/javascript">
-            //<![CDATA[
-                (function($) {
-                    head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/date-option.js') ?>", function() {
-                        $.mage.dateOption({
-                            datepickerFieldSelector: 'select.datetime-picker',
-                            monthSelector: '#options_<?php echo $_optionId ?>_month',
-                            yearSelector: '#options_<?php echo $_optionId ?>_year'
-                        });
-                    });
-                })(jQuery);
-            //]]>
-            </script>
-        <?php endif; ?>
-
-    <?php endif; ?>
-
-    <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
-        || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_TIME): ?>
-        <span class="time-picker"><?php echo $this->getTimeHtml() ?></span>
-    <?php endif; ?>
-
-    <?php if ($_option->getIsRequire()): ?>
-        <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
-    <?php else: ?>
-        <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
-    <?php endif; ?>
-
-        <script type="text/javascript">
-        //<![CDATA[
-            (function($) {
-                head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>", function() {
-                    $.validator.setDefaults({ignore: ':hidden:not(input[name^="validate_datetime_"])'});
-                });
-            })(jQuery);
-        //]]>
-        </script>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml
deleted file mode 100644
index 5bfb09586a90b5106bcd5143fd1a1c50d93199d6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_option = $this->getOption() ?>
-<div class="field">
-    <label class="label"><span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span></label>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml
deleted file mode 100644
index 3d4432539caa236f89d8b1cdb7d1922a96a0fbeb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_option = $this->getOption(); ?>
-<?php $_fileInfo = $this->getFileInfo(); ?>
-<?php $_fileExists = $_fileInfo->hasData(); ?>
-<?php $_fileName = 'options_' . $_option->getId() . '_file'; ?>
-<?php $_fieldNameAction = $_fileName . '_action'; ?>
-<?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
-<?php $_fileNamed = $_fileName . '_name'; ?>
-<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
-
-
-<script type="text/javascript">
-//<![CDATA[
-    (function($) {
-        head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/file-option.js')?>", function() {
-            $('#input-box-<?php echo $_fileName ?>').fileOption({
-                fileName: '<?php echo $_fileName ?>',
-                fileNamed: '<?php echo $_fileNamed ?>',
-                fieldNameAction: '<?php echo $_fieldNameAction ?>',
-                changeFileSelector: '#change-<?php echo $_fileName ?>',
-                deleteFileSelector: '#delete-<?php echo $_fileName ?>'
-            });
-        });
-    })(jQuery);
-//]]>
-</script>
-
-<div class="field file<?php echo $class; ?>">
-    <label class="label">
-        <span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span>
-        <?php echo $this->getFormatedPrice() ?>
-    </label>
-    <?php if ($_fileExists): ?>
-    <div class="control">
-        <span class="<?php echo $_fileNamed ?>"><?php echo $_fileInfo->getTitle(); ?></span>
-        <a href="javascript:void(0)" class="label" id="change-<?php echo $_fileName ?>" >
-            <?php echo __('Change') ?>
-        </a>&nbsp;
-        <?php if (!$_option->getIsRequire()): ?>
-           <input type="checkbox" id="delete-<?php echo $_fileName ?>" />
-           <span class="label"><?php echo __('Delete') ?></span>
-        <?php endif; ?>
-    </div>
-    <?php endif; ?>
-    <div class="control" id="input-box-<?php echo $_fileName ?>" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
-        <input type="file" name="<?php echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
-        <input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
-        <?php if ($_option->getFileExtension()): ?>
-            <p class="note">
-                <?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong>
-            </p>
-        <?php endif; ?>
-        <?php if ($_option->getImageSizeX() > 0): ?>
-            <p class="note">
-                <?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong>
-            </p>
-        <?php endif; ?>
-        <?php if ($_option->getImageSizeY() > 0): ?>
-            <p class="note">
-                <?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong>
-            </p>
-        <?php endif; ?>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml
deleted file mode 100644
index 765061bced1c8638c4f6ce3f17766aca2b1297eb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php /* @var $this \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
-<?php 
-    $_option = $this->getOption();
-    $class = ($_option->getIsRequire()) ? ' required' : '';
-?>
-<div class="field<?php echo $class; ?>">
-    <label class="label">
-        <span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span>
-    </label>
-    <div class="control">
-    <?php echo $this->getValuesHtml() ?>
-    <?php if ($_option->getIsRequire()): ?>
-        <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
-            <span id="options-<?php echo $_option->getId() ?>-container"></span>
-        <?php endif; ?>
-    <?php endif;?>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml
deleted file mode 100644
index 8a1d38825fcb23a921d9e5a3c0a6cb764a71a52a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php 
-    $_option = $this->getOption();
-    $class = ($_option->getIsRequire()) ? ' required' : '';
-?>
-<div class="field<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA) { echo ' textarea';}?><?php echo $class ?>">
-    <label class="label">
-        <span><?php echo  $this->escapeHtml($_option->getTitle()) ?></span>
-        <?php echo $this->getFormatedPrice() ?>
-    </label>
-    <div class="control">
-        <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_FIELD): ?>
-        <?php $_textValidate = null;
-        if($_option->getIsRequire()){
-            $_textValidate['required'] = true;
-        }
-        if($_option->getMaxCharacters()){
-            $_textValidate['maxlength'] = $_option->getMaxCharacters();
-        }
-        ?>
-        <input type="text" id="options_<?php echo $_option->getId() ?>_text" class="input-text product-custom-option"  <?php if(!empty($_textValidate))echo 'data-validate='.json_encode($_textValidate) ; ?>  name="options[<?php echo $_option->getId() ?>]" value="<?php echo $this->escapeHtml($this->getDefaultValue()) ?>" />
-        <?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
-        <?php $_textAreaValidate = null;
-        if($_option->getIsRequire()){
-            $_textAreaValidate['required'] = true;
-        }
-        if($_option->getMaxCharacters()){
-            $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
-        }
-        ?>
-        <textarea id="options_<?php echo $_option->getId() ?>_text" class="product-custom-option" <?php if(!empty($_textAreaValidate))echo 'data-validate='.json_encode($_textAreaValidate) ; ?> name="options[<?php echo $_option->getId() ?>]" rows="5" cols="25"><?php echo $this->escapeHtml($this->getDefaultValue()) ?></textarea>
-        <?php endif; ?>
-        <?php if ($_option->getMaxCharacters()): ?>
-        <p class="note"><?php echo __('Maximum number of characters:')?> <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
-        <?php endif; ?>
-    </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml
deleted file mode 100644
index f1f0c8070aa4240cd67b1fbe607f4a0b0270a851..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-$required = '';
-if ($this->hasRequiredOptions()) {
-    $required = ' data-hasrequired="' . __('* Required Fields') . '"';
-}
-?>
-<div class="product options wrapper" id="product-options-wrapper"<?php echo $required; ?>>
-    <fieldset class="fieldset">
-    <?php echo $this->getChildHtml('', true);?>
-    </fieldset>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml
deleted file mode 100644
index 2c956095b468003bace46b2af74a4a3187f4ab69..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="product options bottom">
-    <?php echo $this->getChildHtml('', true);?>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml
deleted file mode 100644
index dabb8a33bf668554cf4ffe8884c7e0114b77e004..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_product = $this->getProduct() ?>
-<?php echo $this->getPriceHtml($_product, false, '_clone') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml
deleted file mode 100644
index 17bbc40bf1d81e95aa1ea6a06dabce21dc9b651d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php
-/**
- * @var $this \Magento\Catalog\Block\Product\View
- */
-$_product = $this->getProduct();
-$_tierPrices = $this->getTierPrices();
-$_finalPriceInclTax = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getFinalPrice(), true);
-
-/** @var $_catalogHelper \Magento\Catalog\Helper\Data */
-$_catalogHelper = $this->helper('Magento\Catalog\Helper\Data');
-
-$_weeeTaxAmount = $this->helper('Magento\Weee\Helper\Data')->getAmountForDisplay($_product);
-if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,2,4))) {
-    $_weeeTaxAttributes = $this->helper('Magento\Weee\Helper\Data')->getProductWeeeAttributesForDisplay($_product);
-}
-
-?>
-<?php if (count($_tierPrices) > 0): ?>
-    <ul class="<?php echo ($this->getInGrouped() ? 'tier prices grouped items' : 'prices tier items'); ?>">
-    <?php if ($this->getInGrouped()): ?>
-        <?php $_tierPrices = $this->getTierPrices($_product); ?>
-    <?php endif; ?>
-    <?php $this->helper('Magento\Weee\Helper\Data')->processTierPrices($_product, $_tierPrices); ?>
-    <?php foreach ($_tierPrices as $_index => $_price): ?>
-        <li class="item">
-        <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
-            <?php if ($this->getInGrouped()): ?>
-                <?php echo __('Buy %1 for', $_price['price_qty']) ?>:
-            <?php else: ?>
-                <?php echo __('Buy %1', $_price['price_qty']) ?>
-            <?php endif; ?>
-        <?php else: ?>
-
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayBothPrices()): ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
-                <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?>
-            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
-                    <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                    <?php if ($_weeeTaxAttributes): ?>
-                    (<small>
-                    <?php echo __('%1 incl tax.', $_price['formated_price_incl_weee']); ?>
-                    <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                        <?php echo $separator; ?>
-                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                    <?php endforeach; ?>
-                    </small>)
-                    <?php endif; ?>
-                    <?php echo __('each') ?>
-            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
-                    <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                    <?php if ($_weeeTaxAttributes): ?>
-                    (<small>
-                    <?php echo __('%1 incl tax.', $_price['formated_price_incl_weee']); ?>
-                    <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                        <?php echo $separator; ?>
-                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
-                    <?php endforeach; ?>
-                    </small>)
-                    <?php endif; ?>
-                    <?php echo __('each') ?>
-            <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
-                    <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
-                    <?php if ($_weeeTaxAttributes): ?>
-                    (<small>
-                    <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
-                        <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                    <?php endforeach; ?>
-                    <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
-                    </small>)
-                    <?php endif; ?>
-                    <?php echo __('each') ?>
-            <?php else: ?>
-                    <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
-            <?php endif; ?>
-        <?php else: ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayPriceIncludingTax()): ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee']) ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_tax']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php endforeach; ?>
-                        <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php else: ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_tax']) ?>
-                <?php endif; ?>
-            <?php else: ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee_only']) ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $separator; ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
-                        <?php $separator = ' + '; endforeach; ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
-                        <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
-                        <?php if ($_weeeTaxAttributes): ?>
-                        (<small>
-                        <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
-                            <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
-                        <?php endforeach; ?>
-                        <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee_only']); ?>
-                        </small>)
-                        <?php endif; ?>
-                        <?php echo __('each') ?>
-                <?php else: ?>
-                        <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price']) ?>
-                <?php endif; ?>
-            <?php endif; ?>
-        <?php endif; ?>
-
-        <?php endif; // Can apply MSRP ?>
-
-        <?php if (!$this->getInGrouped()): ?>
-            <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
-            || ($_product->getPrice() != $_product->getFinalPrice() &&  $_product->getFinalPrice() > $_price['price'])): ?>
-                <?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>&nbsp;<span class="percent tier-<?php echo $_index;?>"><?php echo $_price['savePercent']?></span>%
-            <?php endif ?></strong>
-        <?php endif; ?>
-
-        <?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
-            <?php $popupId = 'msrp-popup-' . $_product->getId() . $this->getRandomString(20); ?>
-            <?php
-            $addToCartUrl = $this->getProduct()->isSalable()
-                ? $this->getAddToCartUrl($_product, array('qty' => $_price['price_qty']))
-                : '';
-            ?>
-            <a href="#" id="<?php echo($popupId);?>" data-tier-price='{addToCartUrl:"<?php echo $addToCartUrl; ?>", name:"<?php echo $_product->getName() ?>", price:<?php echo json_encode($_price['real_price_html']) ?>, msrp:"<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,false) ?>"<?php if (!$this->getInGrouped()): ?>, qty:"<?php echo $_price['price_qty']?>"<?php endif ?>}'><?php echo __('Click for price'); ?></a>
-        <?php else: ?>
-            <span class="msrp-price-hide-message">
-                <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
-            </span>
-        <?php endif; ?>
-        </li>
-    <?php endforeach ?>
-    </ul>
-    <?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
-        <script type="text/javascript">
-            (function($) {
-                head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/tier-price.js') ?>", function () {
-                    $('#product_addtocart_form').tierPrice({
-                        inputQty: '#qty'
-                    });
-                });
-            })(jQuery);
-        </script>
-    <?php endif;?>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml
deleted file mode 100644
index a8e728a5bf626f9e8b68143edbf90dc333db8374..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Catalog\Block\Product\View\AbstractView */?>
-<?php $_product = $this->getProduct() ?>
-
-<?php if ($this->displayProductStockStatus()): ?>
-    <?php if ($_product->isAvailable()): ?>
-        <p class="stock available" title="<?php echo __('Availability') ?>">
-            <span><?php echo __('In stock') ?></span>
-        </p>
-    <?php else: ?>
-        <p class="stock unavailable" title="<?php echo __('Availability') ?>">
-            <span><?php echo __('Out of stock') ?></span>
-        </p>
-    <?php endif; ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml
deleted file mode 100644
index 5f7b68c66eff20188fd3ee8635aeafeba25a74f5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Grouped product data template
- *
- * @see \Magento\Catalog\Block\Product\View\BaseImage
- * @see \Magento\Catalog\Block\Product\View\Type\Grouped
- */
-?>
-<?php $this->setPreconfiguredValue(); ?>
-<?php $_product = $this->getProduct(); ?>
-<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
-<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
-<?php if ($this->displayProductStockStatus()): ?>
-    <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
-        <p class="stock available" title="<?php echo __('Availability') ?>">
-            <span><?php echo __('In stock') ?></span>
-        </p>
-    <?php else: ?>
-        <p class="stock unavailable" title="<?php echo __('Availability') ?>">
-            <span><?php echo __('Out of stock') ?></span>
-        </p>
-    <?php endif; ?>
-<?php endif; ?>
-
-<table class="table data grouped" id="super-product-table">
-    <thead>
-        <tr>
-            <th class="col item"><?php echo __('Product Name') ?></th>
-            <?php if ($this->getCanShowProductPrice($_product)): ?>
-            <th class="col price"><?php echo __('Price') ?></th>
-            <?php endif; ?>
-            <?php if ($_product->isSaleable()): ?>
-            <th class="col qty"><?php echo __('Qty') ?></th>
-            <?php endif; ?>
-        </tr>
-    </thead>
-    <tbody>
-    <?php if ($_hasAssociatedProducts): ?>
-    <?php foreach ($_associatedProducts as $_item): ?>
-        <?php $_finalPriceInclTax = $this->helper('Magento\Tax\Helper\Data')->getPrice($_item, $_item->getFinalPrice(), true) ?>
-        <tr>
-            <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
-            <?php if ($this->getCanShowProductPrice($_product)): ?>
-            <td class="col price">
-                <?php if ($this->getCanShowProductPrice($_item)): ?>
-                <?php echo $this->getPriceHtml($_item, true) ?>
-                <?php echo $this->getTierPriceHtml($_item) ?>
-                <?php endif; ?>
-            </td>
-            <?php endif; ?>
-            <?php if ($_product->isSaleable()): ?>
-            <td class="col qty">
-            <?php if ($_item->isSaleable()) : ?>
-                <div class="control qty">
-                    <input type="text" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{'validate-grouped-qty':'#super-product-table'}"/>
-                </div>
-            <?php else: ?>
-                <p class="stock unavailable" title="<?php echo __('Availability') ?>">
-                    <span><?php echo __('Out of stock') ?></span>
-                </p>
-            <?php endif; ?>
-            </td>
-            <?php endif; ?>
-        </tr>
-    <?php endforeach; ?>
-    <?php else: ?>
-       <tr>
-           <td class="unavailable" colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>"><?php echo __('No options of this product are available.') ?></td>
-       </tr>
-    <?php endif; ?>
-    </tbody>
-</table>
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.phtml
deleted file mode 100644
index 174a4f5bd9e76b47d429c4af8e5f74479cd27151..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.phtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php
-$_product    = $this->getProduct();
-$_attributes = $this->decorateArray($this->getAllowAttributes());
-?>
-<?php if ($_product->isSaleable() && count($_attributes)):?>
-    <div class="product options configure">
-    <?php foreach($_attributes as $_attribute): ?>
-        <div class="field required">
-            <label class="label" for="attribute<?php echo $_attribute->getAttributeId() ?>">
-                <span><?php echo $this->escapeHtml($_attribute->getLabel()) ?></span>
-            </label>
-            <div class="control">
-                <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]" data-validate="{required:true}" id="attribute<?php echo $_attribute->getAttributeId() ?>" class="super-attribute-select">
-                    <option><?php echo __('Choose an Option...') ?></option>
-                  </select>
-            </div>
-        </div>
-    <?php endforeach; ?>
-    </div>
-    <script type="text/javascript">
-        (function ($) {
-            head.js("<?php echo $this->getViewFileUrl('jquery/jquery.parsequery.js') ?>",
-                "<?php echo $this->getViewFileUrl('Magento_Catalog::js/configurable.js') ?>", function () {
-                $('#product_addtocart_form').configurable({"spConfig":<?php echo $this->getJsonConfig() ?>});
-            })
-        })(jQuery);
-    </script>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml
deleted file mode 100644
index ee234cbe0270eab451c85cd4c5eec4c542e74de9..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="widget product link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml
deleted file mode 100644
index ef8fb3f550dcbbf786eba613540d60c28fe783d7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<span class="widget product link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.phtml
deleted file mode 100644
index d6e0d27bd73eeabfe3db23b719e083cf3e845e08..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.phtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<?php $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');?>
-<div class="block widget new minilist">
-    <div class="title">
-        <strong><?php echo __('New Products') ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php $suffix = $this->getNameInLayout(); ?>
-        <?php $iterator = 1; ?>
-        <ol class="items minilist products" id="widget-new-products-<?php echo $suffix; ?>">
-        <?php foreach ($_products->getItems() as $_product): ?>
-            <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-                <div class="product">
-                    <a class="product photo" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
-                        <?php echo $imageBlock->init($_product, 'side_column_widget_product_thumbnail')->toHtml() ?>
-                    </a>
-                    <div class="product details">
-                        <strong class="product name">
-                            <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a>
-                        </strong>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-new-'.$suffix) ?>
-                        <div class="product actions">
-                            <div class="primary">
-                            <?php if($_product->isSaleable()): ?>
-                                    <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="action tocart">
-                                        <span><?php echo __('Add to Cart') ?></span>
-                                    </a>
-                            <?php else: ?>
-                                <?php if ($_product->getIsSalable()): ?>
-                                    <p class="stock available" title="<?php echo __('Availability') ?>"><span><?php echo __('In stock') ?></span></p>
-                                <?php else: ?>
-                                    <p class="stock unavailable" title="<?php echo __('Availability') ?>"><span><?php echo __('Out of stock') ?></span></p>
-                                <?php endif; ?>
-                            <?php endif; ?>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            <?php echo ($iterator==count($_products->getItems())+1) ? '</li>' : '' ?>
-        <?php endforeach; ?>
-        </ol>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml
deleted file mode 100644
index dcb4704157857eb06db7632e043106d5917ebd20..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<?php $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
-<div class="widget block new photos">
-    <div class="title">
-        <strong><?php echo __('New Products') ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php $suffix = $this->getNameInLayout(); ?>
-        <ol class="items">
-        <?php foreach ($_products->getItems() as $_product): ?>
-            <li class="item">
-                <a class="product photo" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
-                    <!-- new_products_images_only_widget -->
-                    <?php echo $imageBlock->init($_product, 'new_products_images_only_widget')->toHtml() ?>
-                </a>
-            </li>
-        <?php endforeach; ?>
-        </ol>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml
deleted file mode 100644
index 217c0418f1601f41e9df4b4ccf404888152d4044..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget block new names">
-    <div class="title">
-        <strong><?php echo __('New Products') ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php $suffix = $this->getNameInLayout(); ?>
-        <ol class="items">
-        <?php foreach ($_products->getItems() as $_product): ?>
-            <li class="item">
-                <strong class="product name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></strong>
-            </li>
-        <?php endforeach; ?>
-        </ol>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml
deleted file mode 100644
index 5eef1b00a9714dc1993a59ba74e7808d1c012523..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-if ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
-    $type = 'widget-new-grid';
-
-    $class = 'widget new grid';
-
-    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-    $image ='new_products_content_widget_grid';
-    $title = __('New Products');
-    $items = $this->getProductCollection()->getItems();
-
-    $showWishlist = true;
-    $showCompare = true;
-    $showCart = true;
-    $rating = true;
-    $description = false;
-}
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
-    <div class="title">
-        <strong><?php echo $title; ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php echo '<!-- ' . $image . '-->' ?>
-        <ol class="products list items <?php echo $type; ?>">
-        <?php $iterator = 1; ?>
-        <?php foreach($items as $_item): ?>
-            <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-                <div class="product">
-                    <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
-                        <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
-                    </a>
-
-                    <div class="product details">
-
-                        <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
-                            <?php echo $this->escapeHtml($_item->getName()) ?></a>
-                        </strong>
-
-                        <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
-                        <?php if ($_item->getRatingSummary() && $rating): ?>
-                            <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
-                        <?php endif; ?>
-
-                        <?php if($showWishlist || $showCompare || $showCart): ?>
-                        <div class="product actions">
-
-                            <?php if($showCart): ?>
-                            <div class="primary">
-                                <?php if($_item->isSaleable()): ?>
-                                <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
-                                </button>
-                                <?php else: ?>
-                                    <?php if ($_item->getIsSalable()): ?>
-                                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                                    <?php else: ?>
-                                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                                    <?php endif; ?>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-
-                            <?php if($showWishlist || $showCompare): ?>
-                            <div class="secondary addto links">
-                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                    <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
-                                        <span><?php echo __('Add to Wishlist') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                                <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
-                                    <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
-                                        <span><?php echo __('Add to Compare') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-                        </div>
-                        <?php endif; ?>
-
-                    </div>
-                </div>
-            <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
-        <?php endforeach ?>
-        </ol>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-        </script>
-    </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml
deleted file mode 100644
index abfa60384a5112b7589b5bae14126ed452a97e22..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-if ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
-    $type = 'widget-new-list';
-
-    $class = 'widget new list';
-
-    $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-    $image ='new_products_content_widget_list';
-    $title = __('New Products');
-    $items = $this->getProductCollection()->getItems();
-
-    $showWishlist = true;
-    $showCompare = true;
-    $showCart = true;
-    $rating = true;
-    $description = true;
-}
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
-    <div class="title">
-        <strong><?php echo $title; ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php echo '<!-- ' . $image . '-->' ?>
-        <ol class="products list items <?php echo $type; ?>">
-        <?php $iterator = 1; ?>
-        <?php foreach($items as $_item): ?>
-            <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-                <div class="product">
-
-                    <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
-                        <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
-                    </a>
-
-                    <div class="product details">
-
-                        <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
-                            <?php echo $this->escapeHtml($_item->getName()) ?></a>
-                        </strong>
-
-                        <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
-                        <?php if ($_item->getRatingSummary() && $rating): ?>
-                            <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
-                        <?php endif; ?>
-
-                        <?php if($showWishlist || $showCompare || $showCart): ?>
-                        <div class="product actions">
-
-                            <?php if($showCart): ?>
-                            <div class="primary">
-                                <?php if($_item->isSaleable()): ?>
-                                <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
-                                </button>
-                                <?php else: ?>
-                                    <?php if ($_item->getIsSalable()): ?>
-                                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                                    <?php else: ?>
-                                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                                    <?php endif; ?>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-
-                            <?php if($showWishlist || $showCompare): ?>
-                            <div class="secondary addto links">
-                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                    <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
-                                        <span><?php echo __('Add to Wishlist') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                                <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
-                                    <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
-                                        <span><?php echo __('Add to Compare') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-                        </div>
-                        <?php endif; ?>
-
-                    </div>
-                </div>
-            <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
-        <?php endforeach ?>
-        </ol>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-        </script>
-    </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml
deleted file mode 100644
index 446652e8ded32cfc90aed2db43090c5a8e152178..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Catalog advanced search form
- *
- * @see \Magento\CatalogSearch\Block\Advanced\Form
- */
-?>
-<?php $maxQueryLength= $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
-<form class="form search advanced" action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
-<fieldset class="fieldset">
-    <legend class="legend"><span><?php echo __('Search Settings') ?></span></legend><br />
-    <?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
-    <?php $_code = $_attribute->getAttributeCode() ?>
-        <div class="field <?php echo $_code ?>">
-            <label class="label" for="<?php echo $_code ?>"><span><?php echo $this->getAttributeLabel($_attribute) ?></span></label>
-            <div class="control">
-            <?php switch($this->getAttributeInputType($_attribute)):
-                case 'number': ?>
-                <div class="range fields group group-2">
-                    <div class="field no-label">
-                        <div class="control">
-                            <input type="text" name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
-                        </div>
-                    </div>
-                    <div class="field no-label">
-                        <div class="control">
-                            <input type="text" name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text"  maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
-                        </div>
-                    </div>
-                </div>
-                <?php break;
-                case 'price': ?>
-                <div class="range price fields group group-2">
-                    <div class="field no-label">
-                        <div class="control">
-                            <input name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"  class="input-text" type="text"  maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
-                        </div>
-                    </div>
-                    <div class="field with-addon no-label">
-                        <div class="control">
-                            <div class="addon">
-                            <input name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" type="text"  maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
-                            <label class="addafter" for="<?php echo $_code ?>_to"><?php echo $this->getCurrency($_attribute); ?></label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <?php break;
-                case 'select': ?>
-                    <?php echo $this->getAttributeSelectElement($_attribute) ?>
-                <?php break;
-                case 'yesno': ?>
-                    <?php echo $this->getAttributeYesNoElement($_attribute) ?>
-                <?php break;
-                case 'date': ?>
-                <div class="range dates fields group group-2">
-                    <div class="field date no-label">
-                        <div class="control">
-                            <?php echo $this->getDateInput($_attribute, 'from') ?>
-                        </div>
-                    </div>
-                    <div class="field date no-label">
-                        <div class="control">
-                            <?php echo $this->getDateInput($_attribute, 'to') ?>
-                        </div>
-                    </div>
-                </div>
-                <?php break;
-                default: ?>
-                <input type="text" name="<?php echo $_code ?>" id="<?php echo $_code ?>" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute)) ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"  class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>"  maxlength="<?php echo $maxQueryLength;?>" />
-            <?php endswitch; ?>
-            </div>
-        </div>
-    <?php endforeach; ?>
-</fieldset>
-<div class="actions">
-    <button type="submit" class="action search" title="<?php echo __('Search') ?>"><span><?php echo __('Search') ?></span></button>
-</div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js(
-            "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
-            function() {
-                $('#form-validate').validation({
-                    errorPlacement: function (error, element) {
-                        var parent = element.parent();
-                        if (parent.hasClass('range')) {
-                            parent.find(this.errorElement + '.' + this.errorClass).remove().end().append(error);
-                        } else {
-                            error.insertAfter(element);
-                        }
-                    },
-                    messages: {
-                        'price[to]': {'greater-than-equals-to': 'Please enter a valid price range.'},
-                        'price[from]': {'less-than-equals-to': 'Please enter a valid price range.'}
-                    }
-                });
-            });
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml
deleted file mode 100644
index 027b889fc9b59b8bd6b448d66055db31fa8d5a84..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if($this->getResultCount()): ?>
-    <div class="search found">
-        <?php echo __('<strong>%1 item(s)</strong> were found using the following search criteria', $this->getResultCount()); ?>
-    </div>
-<?php else: ?>
-    <div class="error-msg">
-        <div>
-            <?php echo __('No items were found using the following search criteria.');?> <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
-        </div>
-    </div>
-<?php endif; ?>
-
-<?php $searchCriterias=$this->getSearchCriterias(); ?>
-<div class="search summary">
-    <?php foreach (array('left', 'right') as $side): ?>
-        <?php if(@$searchCriterias[$side]): ?>
-            <ul class="items">
-                <?php foreach($searchCriterias[$side] as $criteria): ?>
-                    <li class="item"><strong><?php echo $this->escapeHtml(__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
-                <?php endforeach; ?>
-            </ul>
-        <?php endif; ?>
-    <?php endforeach; ?>
-</div>
-<?php if($this->getResultCount()): ?>
-    <div class="note-msg">
-        <div>
-            <?php echo __("Don't see what you're looking for?"); ?>
-            <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
-        </div>
-    </div>
-<?php endif; ?>
-<?php if($this->getResultCount()): ?>
-    <div class="search results"><?php echo $this->getProductListHtml() ?></div>
-<?php endif; ?>
-<?php $this->getSearchCriterias(); ?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml
deleted file mode 100644
index 40da82c16b7084da1bfb8adcb1627dabde19f62b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/** @var $this \Magento\View\Block\Template */
-/** @var $helper \Magento\CatalogSearch\Helper\Data */
-$helper = $this->helper('Magento\CatalogSearch\Helper\Data');
-?>
-<div class="block search">
-    <div class="title"><strong><?php echo __('Search') ?></strong></div>
-    <div class="content search">
-        <form class="form minisearch" id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>"
-      method="get">
-            <div class="field search">
-                <label class="label" for="search"><?php echo __('Search') ?></label>
-                <div class="control">
-                    <input id="search" type="text" name="<?php echo $helper->getQueryParamName() ?>" value="<?php echo $helper->getEscapedQueryText() ?>" placeholder="<?php echo __('Search entire store here...') ?>" class="input-text" autocomplete="off"/>
-                    <div id="search_autocomplete" class="search autocomplete"></div>
-                    <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>"><?php echo __('Advanced Search'); ?></a>
-                </div>
-            </div>
-            <div class="actions">
-                <button type="submit" title="<?php echo __('Search') ?>" class="action search"><span><?php echo __('Search') ?></span></button>
-            </div>
-            <script type="text/javascript">
-            //<![CDATA[
-            (function($) {
-                head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
-                    $('#search').catalogSearch({
-                        formSelector: '#search_mini_form',
-                        url: '<?php echo $helper->getSuggestUrl() ?>',
-                        destinationSelector: '#search_autocomplete'
-                        //placeholder: '<?php echo __('Search entire store here...') ?>',
-                    });
-                });
-            })(jQuery);
-            //]]>
-            </script>
-        </form>
-    </div>
-</div>
-
-
-<?php /*
-<form id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>"
-      method="get">
-    <div class="form-search">
-        <label for="search"><?php echo __('Search:') ?></label><input id="search" type="text" name="<?php echo $helper->getQueryParamName() ?>" value="<?php echo $helper->getEscapedQueryText() ?>" class="input-text" autocomplete="off"/>&nbsp;<button type="submit" title="<?php echo __('Search') ?>" class="button"><span><span><?php echo __('Search') ?></span></span></button><a href="<?php echo $helper->getAdvancedSearchUrl(); ?>"><?php echo __('Advanced Search'); ?></a>
-        <div id="search_autocomplete" class="search-autocomplete"></div>
-        <script type="text/javascript">
-        //<![CDATA[
-        (function($) {
-            head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
-                $('#search').catalogSearch({
-                    formSelector: '#search_mini_form',
-                    placeholder: '<?php echo __('Search entire store here...') ?>',
-                    url: '<?php echo $helper->getSuggestUrl() ?>',
-                    destinationSelector: '#search_autocomplete'
-                });
-            });
-        })(jQuery);
-        //]]>
-        </script>
-    </div>
-</form>
-*/ ?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.xml
deleted file mode 100644
index 58a124e9c1548c48d2f9940eb8fde0d14e697d6c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="page_one_column"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml
deleted file mode 100644
index 05344815a0a799a0801592aa61b8b76d2462b7ba..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="page_two_columns_left"/>
-    <referenceBlock name="page.main.title">
-        <action method="setPageTitle">
-            <argument translate="true" name="title" xsi:type="string">Catalog Advanced Search</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.xml
deleted file mode 100644
index 2471560447b40a16f509d2e71d48ac33d8ebeb39..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceBlock name="search_result_list">
-        <arguments>
-            <!-- If position of argument is depend on image size changable in VDE:
-                positions:list-secondary,grid-secondary,list-actions,grid-actions,list-primary,grid-primary
-            -->
-            <argument name="positioned" xsi:type="string">positions:list-secondary</argument>
-        </arguments>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml
deleted file mode 100644
index 8f2b1e21cb7f5dc6797ce9c982b32d3c7e7494ef..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="page_one_column"/>
-    <referenceBlock name="page.main.title">
-        <action method="setPageTitle">
-            <argument translate="true" name="title" xsi:type="string">Popular Search Terms</argument>
-        </action>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
deleted file mode 100644
index 0accf0cd9171cc67ab6a2a84e5282410c208dd8c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="page_two_columns_left"/>
-    <referenceContainer name="left">
-        <block class="Magento\CatalogSearch\Block\Layer" name="catalogsearch.leftnav" before="-" template="Magento_Catalog::layer/view.phtml"/>
-    </referenceContainer>
-    <referenceContainer name="content">
-        <block class="Magento\CatalogSearch\Block\Result" name="search.result" template="result.phtml">
-            <block class="Magento\Catalog\Block\Product\ListProduct" name="search_result_list" template="product/list.phtml">
-                <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
-                    <block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
-                </block>
-                <action method="setToolbarBlockName">
-                    <argument name="name" xsi:type="string">product_list_toolbar</argument>
-                </action>
-            </block>
-            <action method="setListOrders"/>
-            <action method="setListModes"/>
-            <action method="setListCollection"/>
-        </block>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml
deleted file mode 100644
index 4bf465e769e62a535c1046d07fc5d3bed44b9753..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if($this->getResultCount()): ?>
-<?php echo $this->getChildHtml('tagged_product_list_rss_link'); ?>
-<div class="search results">
-    <?php if ($messages = $this->getNoteMessages()):?>
-    <div class="note-msg">
-        <div>
-            <?php foreach ($messages as $message):?>
-                <?php echo $message?><br />
-            <?php endforeach;?>
-        </div>
-    </div>
-    <?php endif; ?>
-    <?php echo $this->getProductListHtml() ?>
-</div>
-<?php else: ?>
-
-<div class="note-msg">
-    <div>
-        <?php echo ($this->getNoResultText()) ? $this->getNoResultText() : __('Your search returns no results.') ?>
-        <?php echo $this->getAdditionalHtml() ?>
-        <?php if ($messages = $this->getNoteMessages()):?>
-            <?php foreach ($messages as $message):?>
-                <br /><?php echo $message?>
-            <?php endforeach;?>
-        <?php endif; ?>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml
deleted file mode 100644
index 706dff536e60b09684e73b224502d780e7581944..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if( sizeof($this->getTerms()) > 0 ): ?>
-    <ul class="search terms">
-        <?php foreach ($this->getTerms() as $_term): ?>
-            <li class="item"><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_term->getName()) ?></a></li>
-        <?php endforeach; ?>
-    </ul>
-<?php else: ?>
-    <div class="note-msg"><div><?php echo __('There are no search terms available.'); ?></div></div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml
deleted file mode 100644
index d494ef4bb92af19f6c4fd11818ec28e12693b804..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Downloadable\Block\Catalog\Product\Links */ ?>
-<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
-<?php if ($this->getProduct()->isSaleable() && $this->hasLinks()):?>
-    <?php $_links = $this->getLinks(); ?>
-    <?php $_isRequired = $this->getLinkSelectionRequired(); ?>
-    <div class="field downloads<?php if ($_isRequired) echo ' required' ?>">
-        <label class="label"><span><?php echo $this->getLinksTitle() ?></span></label>
-        <div class="control" id="downloadable-links-list">
-            <?php foreach ($_links as $_link): ?>
-            <div class="field choice">
-                <?php if ($_linksPurchasedSeparately): ?>
-                <input type="checkbox" <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
-                       name="links[]" id="links_<?php echo $_link->getId() ?>"
-                       value="<?php echo $_link->getId(); ?>" <?php echo $this->getLinkCheckedValue($_link); ?> />
-                <?php endif; ?>
-                <label class="label" for="links_<?php echo $_link->getId() ?>">
-                    <span><?php echo $this->escapeHtml($_link->getTitle()); ?></span>
-                    <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-                        <a class="sample" href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>><?php echo __('sample') ?></a>
-                    <?php endif; ?>
-                    <?php if ($_linksPurchasedSeparately): ?>
-                    <?php echo $this->getFormattedLinkPrice($_link); ?>
-                    <?php endif; ?>
-                </label>
-            </div>
-            <?php endforeach; ?>
-        </div>
-        <?php if ($_isRequired): ?>
-            <span id="links-advice-container"></span>
-        <?php endif;?>
-    </div>
-    <script type="text/javascript">
-        (function ($) {
-            head.js("<?php echo $this->getViewFileUrl('Magento_Downloadable::downloadable.js') ?>", function () {
-                $('#downloadable-links-list').downloadable({
-                    linkElement: 'input:checkbox',
-                    config: <?php echo $this->getJsonConfig() ?>
-                });
-            });
-    })(jQuery);
-</script>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml
deleted file mode 100644
index a130635232b5b40d3632c2bb29b1266d850ac2e5..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Downloadable product links
- *
- * @see \Magento\Downloadable\Block\Catalog\Product\Samples
- */
-?>
-
-<?php if ($this->hasSamples()): ?>
-    <dl class="downloadable samples">
-        <dt><?php echo $this->getSamplesTitle() ?></dt>
-        <?php $_samples = $this->getSamples() ?>
-        <?php foreach ($_samples as $_sample): ?>
-            <dd>
-                <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo  $this->escapeHtml($_sample->getTitle()) ?></a>
-            </dd>
-        <?php endforeach; ?>
-    </dl>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml
deleted file mode 100644
index 36f5df0a2cfe26e785aeffeee45f8f8a55f9135e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/**
- * Downloadable product type
- *
- * @see \Magento\Downloadable\Block\Catalog\Product\View\Type
- */
-?>
-<?php $_product = $this->getProduct() ?>
-
-<?php if($_product->getIsSalable()): ?>
-    <p class="stock available" title="<?php echo __('Availability') ?>"><span><?php echo __('In stock') ?></span></p>
-<?php else: ?>
-    <p class="stock unavailable" title="<?php echo __('Availability') ?>"><span><?php echo __('Out of stock') ?></span></p>
-<?php endif; ?>
-<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<?php echo $this->getPriceHtml($_product) ?>
-<?php echo $this->getChildHtml('samples') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml
deleted file mode 100644
index 3e5638117de0fd85fb8e351b63621ea262d8c98f..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-$_item = $this->getItem();
-$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
-$canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
-?>
-<?php echo $this->getChildHtml('item_extra') ?>
-<tbody class="cart item">
-<tr class="item info">
-    <td class="col item">
-        <?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product photo"><?php endif;?>
-        <?php echo $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($_item->getProduct(), 'cart_page_product_thumbnail')->toHtml(); ?>
-        <?php if ($this->hasProductUrl()):?></a><?php endif;?>
-        <div class="product details">
-            <strong class="product name">
-            <?php if ($this->hasProductUrl()):?>
-                <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
-            <?php else: ?>
-                <?php echo $this->escapeHtml($this->getProductName()) ?>
-            <?php endif; ?>
-            </strong>
-            <?php if ($_options = $this->getOptionList()):?>
-            <dl class="cart item options">
-                <?php foreach ($_options as $_option) : ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item-options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-                <?php endforeach; ?>
-            </dl>
-            <?php endif;?>
-            <!-- downloadable -->
-            <?php if ($links = $this->getLinks()): ?>
-            <dl class="cart item options">
-                <dt><?php echo $this->getLinksTitle() ?></dt>
-                <?php foreach ($links as $link): ?>
-                    <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
-                <?php endforeach; ?>
-            </dl>
-            <?php endif; ?>
-            <?php echo $this->getChildHtml('item_extra'); ?>
-            <!-- EOF downloadable -->
-            <?php if ($messages = $this->getMessages()): ?>
-            <?php foreach ($messages as $message): ?>
-                <p class="cart item message <?php echo $message['type'] ?>">* <?php echo $this->escapeHtml($message['text']) ?></p>
-            <?php endforeach; ?>
-            <?php endif; ?>
-            <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-            <?php if ($addInfoBlock): ?>
-                <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
-            <?php endif;?>
-        </div>
-    </td>
-
-    <?php if ($canApplyMsrp): ?>
-        <td class="col msrp a-right"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
-            <span class="cart-price">
-                <span class="cart-msrp-unit"><?php echo __('See price before order confirmation.'); ?></span>
-                <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
-                <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo __("What's this?"); ?></a>
-                <script type="text/javascript">
-                    Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo __("What's this?") ?>");
-                </script>
-            </span>
-        </td>
-    <?php else: ?>
-
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <td class="col price excl tax">
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-            <?php else: ?>
-                <span class="cart-price">
-            <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-                <?php endif; ?>
-
-            </span>
-
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-                <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php endif; ?>
-                </div>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                        <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
-                    </div>
-                <?php endif; ?>
-            <?php endif; ?>
-        </td>
-
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <td class="col price incl tax">
-            <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-            <?php else: ?>
-                <span class="cart-price">
-            <?php endif; ?>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-                <?php endif; ?>
-
-            </span>
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-                <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                            <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
-                        <?php endforeach; ?>
-                    <?php endif; ?>
-                </div>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                        <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-                    </div>
-                <?php endif; ?>
-            <?php endif; ?>
-        </td>
-        <?php endif; ?>
-    <?php endif; ?>
-    <td class="col qty">
-        <div class="control qty">
-        <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" type="text" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{required:true,'validate-greater-than-zero':true}"/>
-        </div>
-    </td>
-    <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <td class="col subtotal excl tax">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($canApplyMsrp): ?>
-                <span class="cart-msrp-subtotal">--</span>
-            <?php else: ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-                <?php endif; ?>
-            <?php endif; ?>
-
-        </span>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <td class="col subtotal incl tax">
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($canApplyMsrp): ?>
-                <span class="cart-msrp-subtotal">--</span>
-            <?php else: ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-                <?php else: ?>
-                    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-                <?php endif; ?>
-            <?php endif; ?>
-
-        </span>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
-                    <?php endforeach; ?>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-</tr>
-<tr class="item actions">
-    <td colspan="100">
-        <div class="actions">
-
-            <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
-                <?php if ($isVisibleProduct): ?>
-                <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="use-ajax action towishlist">
-                    <span><?php echo __('Move to Wishlist'); ?></span>
-                </a>
-                <?php endif ?>
-            <?php endif ?>
-
-            <?php if ($isVisibleProduct): ?>
-            <a class="action edit" href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><span><?php echo __('Edit') ?></span></a>
-            <?php endif ?>
-
-            <a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo __('Remove item')?>" class="action delete"><span><?php echo __('Remove item')?></span></a>
-        </div>
-    </td>
-</tr>
-</tbody>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml
deleted file mode 100644
index ebf63dc44e18fcc2882a01e98a4d4955b8983275..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<div class="product details">
-    <strong class="product name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong>
-    <?php if ($_options = $this->getOptionList()): ?>
-        <dl class="item options">
-            <?php foreach ($_options as $_option) : ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    <?php endif; ?>
-                </dd>
-            <?php endforeach; ?>
-        </dl>
-    <?php endif; ?>
-    <!-- downloadable -->
-    <?php if ($links = $this->getLinks()): ?>
-    <dl class="item options">
-        <dt><?php echo $this->getLinksTitle() ?></dt>
-        <?php foreach ($links as $link): ?>
-            <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
-        <?php endforeach; ?>
-    </dl>
-    <?php endif; ?>
-    <!-- EOF downloadable -->
-    <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()): ?>
-        <?php echo $addtInfoBlock->setItem($this->getItem())->toHtml() ?>
-    <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml
deleted file mode 100644
index dbd0f629fc26a170f18bb5a210ea5f9689aa6a2a..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem()?>
-<tr>
-    <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($this->getProductName()) ?></strong>
-        <?php if ($_options = $this->getOptionList()):?>
-        <dl class="review item options">
-            <?php foreach ($_options as $_option) : ?>
-            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                <div class="truncated_full_value">
-                    <dl class="item-options">
-                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                    </dl>
-                </div>
-                <?php endif; ?>
-            </dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif;?>
-        <?php if ($links = $this->getLinks()): ?>
-        <dl class="review item options">
-            <dt><?php echo $this->getLinksTitle() ?></dt>
-            <?php foreach ($links as $link): ?>
-                <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <!-- EOF downloadable -->
-        <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
-            <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
-        <?php endif;?>
-    </td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="col price excl tax">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-            <?php endif; ?>
-
-        </span>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="col price incl tax">
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-            <?php endif; ?>
-
-        </span>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <td class="col qty"><span class="qty"><?php echo $_item->getQty() ?></span></td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="col subtotal excl tax">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-        </span>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="col subtotal incl tax">
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <span class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            <?php endif; ?>
-
-        </span>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml
deleted file mode 100644
index cdbdcffdae09f6f7259affc7e3e980efc6b7def2..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php $_item = $this->getItem()?>
-<tr>
-    <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
-        <!-- item custom options -->
-        <?php if ($_options = $this->getOptionList()):?>
-        <dl class="item-options">
-            <?php foreach ($_options as $_option) : ?>
-            <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                <div class="truncated_full_value">
-                    <dl class="item-options">
-                        <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                    </dl>
-                </div>
-                <?php endif; ?>
-            </dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif;?>
-        <?php if ($links = $this->getLinks()): ?>
-        <dl class="item-options">
-            <dt><?php echo $this->getLinksTitle() ?></dt>
-            <?php foreach ($links as $link): ?>
-                <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
-            <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <!-- EOF downloadable -->
-    </td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
-            <?php endif; ?>
-
-        </div>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
-            <?php endif; ?>
-
-        </div>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <td class="a-center"><?php echo $_item->getQty() ?></td>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td class="a-right">
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
-            <?php endif; ?>
-
-        </div>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-    <td>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-            <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-        <?php else: ?>
-            <div class="cart-price">
-        <?php endif; ?>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            <?php else: ?>
-                <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            <?php endif; ?>
-
-        </div>
-
-
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
-                    <?php endforeach; ?>
-                <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                    <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
-                    <?php endforeach; ?>
-                    </small>
-                <?php endif; ?>
-            </div>
-
-            <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
-                <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
-                    <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-                </div>
-            <?php endif; ?>
-        <?php endif; ?>
-    </td>
-    <?php endif; ?>
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.phtml
deleted file mode 100644
index 7f2054f740900c5b7c2ebc22cd72337165560629..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.phtml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Downloadable\Block\Customer\Products\ListProducts
- */
-?>
-<?php $_items = $this->getItems(); ?>
-<div class="downloadable products toolbar">
-    <?php echo $this->getChildHtml('pager'); ?>
-</div>
-<?php if(count($_items)): ?>
-    <table id="my-downloadable-products-table" class="data table downloadable products">
-        <thead>
-            <tr>
-                <th class="col id"><?php echo __('Order #') ?></th>
-                <th class="col date"><?php echo __('Date') ?></th>
-                <th class="col title"><?php echo __('Title') ?></th>
-                <th class="col status"><?php echo __('Status') ?></th>
-                <th class="col remaining"><?php echo __('Remaining Downloads') ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($_items as $_item): ?>
-                <tr>
-                    <td class="col id">
-                        <a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo __('View Order') ?>">
-                            <?php echo $_item->getPurchased()->getOrderIncrementId() ?>
-                        </a>
-                    </td>
-                    <td class="col date"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
-                    <td class="col title">
-                        <?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo __('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()) ?></a>
-                    </td>
-                    <td class="col status"><?php echo __(ucfirst($_item->getStatus())) ?></td>
-                    <td class="col remaining"><?php echo $this->getRemainingDownloads($_item) ?></td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-<?php else: ?>
-    <p class="empty"><?php echo __('You have not purchased any downloadable products yet.'); ?></p>
-<?php endif; ?>
-<div class="downloadable products toolbar">
-    <?php echo $this->getChildHtml('pager'); ?>
-</div>
-
-<div class="actions">
-    <div class="secondary">
-        <a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="action back"><span><?php echo __('Back') ?></span></a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml b/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml
deleted file mode 100644
index a476967ac50ac4df74a44a09e50911f14850455c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="product.info.type">
-        <block class="Magento\Downloadable\Block\Catalog\Product\View\Type" name="product.info.downloadable" as="product_type_data" template="catalog/product/type.phtml">
-            <block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml"/>
-            <block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" name="product.info.downloadable.extra" as="product_type_data_extra" template="stockqty/default.phtml"/>
-        </block>
-    </referenceContainer>
-    <referenceBlock name="product.info.options.wrapper">
-        <block class="Magento\Downloadable\Block\Catalog\Product\Links" name="product.info.downloadable.options" as="type_downloadable_options" before="-" template="catalog/product/links.phtml"/>
-    </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
deleted file mode 100644
index 6d2f675ae55e4d4ef42124bcea4bdebeb7be7a97..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @package     base_default
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
-?>
-<?php $_item = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
-    <td class="col name">
-        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-
-        <!-- downloadable -->
-        <?php if ($links = $this->getLinks()): ?>
-            <dl class="item options">
-                <dt><?php echo $this->getLinksTitle() ?></dt>
-                <?php foreach ($links->getPurchasedItems() as $link): ?>
-                    <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
-                <?php endforeach; ?>
-            </dl>
-        <?php endif; ?>
-        <!-- EOF downloadable -->
-
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td  class="col sku"><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="col price">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="col qty"><?php echo $_item->getQty()*1 ?></td>
-    <td class="col subtotal">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-
-
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="col discount"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-    <td class="cot total">
-        <?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml
deleted file mode 100644
index 5df170eecb4f30d7a91b41bfb43dbdf3506ef71e..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
-?>
-<?php $_item = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
-    <td class="col name">
-        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <!-- downloadable -->
-        <?php if ($links = $this->getLinks()): ?>
-            <dl class="item options">
-                <dt><?php echo $this->getLinksTitle() ?></dt>
-                <?php foreach ($links->getPurchasedItems() as $link): ?>
-                    <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
-                <?php endforeach; ?>
-            </dl>
-        <?php endif; ?>
-        <!-- EOF downloadable -->
-        <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
-            <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
-        <?php endif; ?>
-    </td>
-    <td class="col sku"><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="col price">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="col qty">
-        <span class="qty summary"><?php echo $_item->getQty()*1 ?></span>
-    </td>
-    <td class="col subtotal">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-            </span>
-        <?php endif; ?>
-    </td>
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml
deleted file mode 100644
index 8b0a06a9a83043bd90d682143b7e4ea1c594db3c..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-
-/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
-?>
-<?php $_item = $this->getItem() ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
-    <td class="col name">
-        <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
-        <?php if($_options = $this->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$this->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="truncated_full_value">
-                        <dl class="item options">
-                            <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd>
-                    <?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
-                </dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
-        <?php endif; ?>
-        <!-- downloadable -->
-        <?php if ($links = $this->getLinks()): ?>
-            <dl class="item-options">
-                <dt><?php echo $this->getLinksTitle() ?></dt>
-                <?php foreach ($links->getPurchasedItems() as $link): ?>
-                    <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
-                <?php endforeach; ?>
-            </dl>
-        <?php endif; ?>
-        <!-- EOF downloadable -->
-        <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addtInfoBlock) :?>
-            <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
-        <?php endif; ?>
-        <?php echo $this->escapeHtml($_item->getDescription()) ?>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
-            <a href="#"
-               id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
-               class="action show"
-               aria-controls="order-item-gift-message-<?php echo $_item->getId()?>"
-               data-item-id="<?php echo $_item->getId()?>">
-                <?php echo __('Gift Message') ?>
-            </a>
-        <?php endif; ?>
-    </td>
-    <td class="col sku"><?php echo $this->prepareSku($this->getSku()) ?></td>
-    <td class="col price">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-        <?php endif; ?>
-    </td>
-    <td class="col qty">
-        <span class="qty summary">
-                <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
-            <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyShipped() > 0): ?>
-            <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
-            <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
-        <?php endif; ?>
-        <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
-            <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
-        <?php endif; ?>
-        </span>
-    </td>
-    <td class="col subtotal">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-            <span class="price-excl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-            </span>
-            <br />
-        <?php endif; ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-            <span class="price-incl-tax">
-                <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-                   <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-price">
-                    <?php endif; ?>
-                        <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
-                    <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-                <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                    <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                <?php else: ?>
-                    <span class="cart-price">
-                <?php endif; ?>
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
-                    <?php else: ?>
-                        <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
-                    <?php endif; ?>
-                </span>
-
-                <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
-
-                    <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
-                        <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
-                            <?php endforeach; ?>
-                        <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                            <small>
-                            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
-                                <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
-                            <?php endforeach; ?>
-                            </small>
-                        <?php endif; ?>
-                    </span>
-
-                    <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
-                        <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
-                            <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
-                        </span>
-                    <?php endif; ?>
-                <?php endif; ?>
-
-            </span>
-        <?php endif; ?>
-    </td>
-    <!--
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
-    <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
-    <?php endif; ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
-    <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
-    <?php endif; ?>
-    -->
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml b/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml
deleted file mode 100644
index 46e55c7076c9cc4d97ec7fbe42f8d409089b2d54..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <referenceContainer name="right">
-        <block class="Magento\Reports\Block\Product\Viewed" name="right.reports.product.viewed" template="product_viewed.phtml"/>
-        <block class="Magento\Reports\Block\Product\Compared" name="right.reports.product.compared" template="product_compared.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml b/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml
deleted file mode 100644
index 6c60196129d6c92ce012ad36ab5a4e7194de6ea6..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/product_compared.phtml b/app/design/frontend/magento_plushe/Magento_Reports/product_compared.phtml
deleted file mode 100644
index 0925c4376f185e7db84a6ea13a98321c3d32c791..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/product_compared.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Reports\Block\Product\Compared */
-?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="block compared links">
-    <div class="title">
-        <strong><?php echo __('Recently Compared Products') ?></strong>
-    </div>
-    <div class="content">
-        <ol class="items compared">
-        <?php foreach ($_products as $_item): ?>
-            <li class="item">
-                <strong class="product name">
-                    <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName() , 'name') ?></a>
-                </strong>
-            </li>
-        <?php endforeach; ?>
-        </ol>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml b/app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml
deleted file mode 100644
index 006415faeaa1afe8d88537ab0ef79addd1503b1b..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Reports\Block\Product\Viewed */
-?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="block viewed links">
-    <div class="title">
-        <strong><?php echo __('Recently Viewed Products') ?></strong>
-    </div>
-    <div class="content">
-        <ol class="items viewed">
-            <?php foreach ($_products as $_item): ?>
-            <li class="item">
-                <strong class="product name">
-                    <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
-                </strong>
-            </li>
-            <?php endforeach; ?>
-        </ol>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml
deleted file mode 100644
index ad0e07081a83bc70868d374e3e56c5f11d2ba079..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
-    <div class="block block-products">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Compared') ?></span></strong>
-        </div>
-        <div class="block-content">
-            <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-list" id="widget-compared-<?php echo $suffix; ?>">
-            <?php foreach ($_products as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product) ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                    <div class="product-details">
-                        <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-compared-'.$suffix) ?>
-                        <?php if($_product->isSaleable()): ?>
-                            <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
-                        <?php else: ?>
-                            <?php if ($_product->getIsSalable()): ?>
-                                <p class="availability in-stock"><span><?php echo __('In stock') ?></span></p>
-                            <?php else: ?>
-                                <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                            <?php endif; ?>
-                        <?php endif; ?>
-                    </div>
-                </li>
-            <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
-        </div>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml
deleted file mode 100644
index 5e5bfa290ce0f9f37b1c3700047928773f615ac3..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php
-    if ($exist = $this->getRecentlyComparedProducts()) {
-        $type = 'widget-compared';
-        $mode = 'grid';
-
-        $type = $type . '-' . $mode;
-
-        $class = 'widget compared' . ' ' . $mode;
-
-        $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-        $image = 'recently_compared_products_grid_content_widget';
-        $title = __('Recently Compared');
-        $items = $exist;
-
-        $showWishlist = true;
-        $showCompare = true;
-        $showCart = true;
-        $rating = 'short';
-        $description = ($mode == 'list') ? true : false;
-    }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
-    <div class="title">
-        <strong><?php echo $title; ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php echo '<!-- ' . $image . '-->' ?>
-        <ol class="products list items <?php echo $type; ?>">
-        <?php $iterator = 1; ?>
-        <?php foreach($items as $_item): ?>
-            <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-                <div class="product">
-
-                    <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
-                        <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
-                    </a>
-
-                    <div class="product details">
-
-                        <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
-                            <?php echo $this->escapeHtml($_item->getName()) ?></a>
-                        </strong>
-
-                        <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
-                        <?php if ($_item->getRatingSummary() && $rating): ?>
-                            <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
-                        <?php endif; ?>
-
-                        <?php if($showWishlist || $showCompare || $showCart): ?>
-                        <div class="product actions">
-
-                            <?php if($showCart): ?>
-                            <div class="primary">
-                                <?php if($_item->isSaleable()): ?>
-                                <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
-                                </button>
-                                <?php else: ?>
-                                    <?php if ($_item->getIsSalable()): ?>
-                                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                                    <?php else: ?>
-                                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                                    <?php endif; ?>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-
-                            <?php if($showWishlist || $showCompare): ?>
-                            <div class="secondary addto links">
-                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                    <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" title="<?php echo __('Add to Wishlist') ?>">
-                                        <span><?php echo __('Add to Wishlist') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                                <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
-                                    <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
-                                        <span><?php echo __('Add to Compare') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-                        </div>
-                        <?php endif; ?>
-
-                    </div>
-                </div>
-            <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
-        <?php endforeach ?>
-        </ol>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-        </script>
-    </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml
deleted file mode 100644
index a9149fb99a09a1ee2e8560a3795f338f433092fb..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-
-<?php
-    if ($exist = $this->getRecentlyComparedProducts()) {
-        $type = 'widget-compared';
-        $mode = 'list';
-
-        $type = $type . '-' . $mode;
-
-        $class = 'widget compared' . ' ' . $mode;
-
-        $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-        $image = 'recently_compared_products_list_content_widget';
-        $title = __('Recently Compared');
-        $items = $exist;
-
-        $showWishlist = true;
-        $showCompare = true;
-        $showCart = true;
-        $rating = 'short';
-        $description = ($mode == 'list') ? true : false;
-    }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
-    <div class="title">
-        <strong><?php echo $title; ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php echo '<!-- ' . $image . '-->' ?>
-        <ol class="products list items <?php echo $type; ?>">
-        <?php $iterator = 1; ?>
-        <?php foreach($items as $_item): ?>
-            <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-                <div class="product">
-
-                    <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
-                        <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
-                    </a>
-
-                    <div class="product details">
-
-                        <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
-                            <?php echo $this->escapeHtml($_item->getName()) ?></a>
-                        </strong>
-
-                        <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
-                        <?php if ($_item->getRatingSummary() && $rating): ?>
-                            <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
-                        <?php endif; ?>
-
-                        <?php if($showWishlist || $showCompare || $showCart): ?>
-                        <div class="product actions">
-
-                            <?php if($showCart): ?>
-                            <div class="primary">
-                                <?php if($_item->isSaleable()): ?>
-                                <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
-                                </button>
-                                <?php else: ?>
-                                    <?php if ($_item->getIsSalable()): ?>
-                                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                                    <?php else: ?>
-                                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                                    <?php endif; ?>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-
-                            <?php if($showWishlist || $showCompare): ?>
-                            <div class="secondary addto links">
-                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                    <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" title="<?php echo __('Add to Wishlist') ?>">
-                                        <span><?php echo __('Add to Wishlist') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                                <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
-                                    <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
-                                        <span><?php echo __('Add to Compare') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-                        </div>
-                        <?php endif; ?>
-
-                    </div>
-                </div>
-            <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
-        <?php endforeach ?>
-        </ol>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-        </script>
-    </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.phtml
deleted file mode 100644
index c8344e639f7589fba2ef96b02829cf03920462d7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.phtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
-    <div class="block block-products">
-        <div class="block-title">
-            <strong><span><?php echo __('Recently Viewed') ?></span></strong>
-        </div>
-        <div class="block-content">
-            <?php $suffix = $this->getNameInLayout(); ?>
-            <ol class="mini-products-list" id="widget-viewed-<?php echo $suffix; ?>">
-            <?php foreach ($_products as $_product): ?>
-                <li class="item">
-                    <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product) ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
-                    <div class="product-details">
-                        <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
-                        <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-'.$suffix) ?>
-                        <?php if($_product->isSaleable()): ?>
-                            <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
-                        <?php else: ?>
-                            <?php if ($_product->getIsSalable()): ?>
-                                <p class="availability in-stock"><span><?php echo __('In stock') ?></span></p>
-                            <?php else: ?>
-                                <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
-                            <?php endif; ?>
-                        <?php endif; ?>
-                    </div>
-                </li>
-            <?php endforeach; ?>
-            </ol>
-            <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
-        </div>
-    </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml
deleted file mode 100644
index 678aba0dd82b2045f1615caca36a37a9168c0bb7..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php
-    if ($exist = $this->getRecentlyViewedProducts()) {
-        $type = 'widget-viewed';
-        $mode = 'grid';
-
-        $type = $type . '-' . $mode;
-
-        $class = 'widget viewed' . ' ' . $mode;
-
-        $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-        $image = 'recently_viewed_products_grid_content_widget';
-        $title = __('Recently Viewed');
-        $items = $exist;
-
-        $showWishlist = true;
-        $showCompare = true;
-        $showCart = true;
-        $rating = 'short';
-        $description = ($mode == 'list') ? true : false;
-    }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
-    <div class="title">
-        <strong><?php echo $title; ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php echo '<!-- ' . $image . '-->' ?>
-        <ol class="products list items <?php echo $type; ?>">
-        <?php $iterator = 1; ?>
-        <?php foreach($items as $_item): ?>
-            <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-                <div class="product">
-
-                    <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
-                        <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
-                    </a>
-
-                    <div class="product details">
-
-                        <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
-                            <?php echo $this->escapeHtml($_item->getName()) ?></a>
-                        </strong>
-
-                        <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
-                        <?php if ($_item->getRatingSummary() && $rating): ?>
-                            <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
-                        <?php endif; ?>
-
-                        <?php if($showWishlist || $showCompare || $showCart): ?>
-                        <div class="product actions">
-
-                            <?php if($showCart): ?>
-                            <div class="primary">
-                                <?php if($_item->isSaleable()): ?>
-                                <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
-                                </button>
-                                <?php else: ?>
-                                    <?php if ($_item->getIsSalable()): ?>
-                                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                                    <?php else: ?>
-                                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                                    <?php endif; ?>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-
-                            <?php if($showWishlist || $showCompare): ?>
-                            <div class="secondary addto links">
-                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                    <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
-                                        <span><?php echo __('Add to Wishlist') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                                <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
-                                    <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
-                                        <span><?php echo __('Add to Compare') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-                        </div>
-                        <?php endif; ?>
-
-                    </div>
-                </div>
-            <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
-        <?php endforeach ?>
-        </ol>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-        </script>
-    </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml
deleted file mode 100644
index b30e980f338fc76baa2f69e90da078c16d970dad..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php
-    if ($exist = $this->getRecentlyViewedProducts()) {
-        $type = 'widget-viewed';
-        $mode = 'list';
-
-        $type = $type . '-' . $mode;
-
-        $class = 'widget viewed' . ' ' . $mode;
-
-        $imageBlock =  $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-        $image = 'recently_viewed_products_list_content_widget';
-        $title = __('Recently Viewed');
-        $items = $exist;
-
-        $showWishlist = true;
-        $showCompare = true;
-        $showCart = true;
-        $rating = 'short';
-        $description = ($mode == 'list') ? true : false;
-    }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
-    <div class="title">
-        <strong><?php echo $title; ?></strong>
-    </div>
-    <div class="content">
-        <?php echo $this->getPagerHtml() ?>
-        <?php echo '<!-- ' . $image . '-->' ?>
-        <ol class="products list items <?php echo $type; ?>">
-        <?php $iterator = 1; ?>
-        <?php foreach($items as $_item): ?>
-            <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-                <div class="product">
-                    <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
-                        <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
-                    </a>
-
-                    <div class="product details">
-
-                        <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
-                            <?php echo $this->escapeHtml($_item->getName()) ?></a>
-                        </strong>
-
-                        <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
-                        <?php if ($_item->getRatingSummary() && $rating): ?>
-                            <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
-                        <?php endif; ?>
-
-                        <?php if($showWishlist || $showCompare || $showCart): ?>
-                        <div class="product actions">
-
-                            <?php if($showCart): ?>
-                            <div class="primary">
-                                <?php if($_item->isSaleable()): ?>
-                                <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
-                                </button>
-                                <?php else: ?>
-                                    <?php if ($_item->getIsSalable()): ?>
-                                        <p class="stock available"><span><?php echo __('In stock') ?></span></p>
-                                    <?php else: ?>
-                                        <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
-                                    <?php endif; ?>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-
-                            <?php if($showWishlist || $showCompare): ?>
-                            <div class="secondary addto links">
-                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                    <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
-                                        <span><?php echo __('Add to Wishlist') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                                <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
-                                    <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
-                                        <span><?php echo __('Add to Compare') ?></span>
-                                    </a>
-                                <?php endif; ?>
-                            </div>
-                            <?php endif; ?>
-                        </div>
-                        <?php endif; ?>
-
-                    </div>
-                </div>
-            <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
-        <?php endforeach ?>
-        </ol>
-        <script type="text/javascript">
-            head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
-        </script>
-    </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml b/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
deleted file mode 100644
index 8fca208b2b1a9adc8402c569e8de37c2498451db..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <update handle="page_one_column"/>
-    <referenceBlock name="page.main.title">
-        <action method="setPageTitle">
-            <argument name="title" translate="true" xsi:type="string">Email to a Friend</argument>
-        </action>
-    </referenceBlock>
-    <referenceContainer name="content">
-        <block class="Magento\Sendfriend\Block\Send" name="sendfriend.send" template="send.phtml"/>
-    </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml b/app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml
deleted file mode 100644
index b4ee62ed58c8fc278df965c25aa8fb657bb4132d..0000000000000000000000000000000000000000
--- a/app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category    design
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
- */
-/* @var $this \Magento\Sendfriend\Block\Send */
-/**
- * Send to friend form
- *
- * @see \Magento\Sendfriend\Block\Send
- */
-?>
-<script id="add-recipient-tmpl" type="text/x-jQuery-tmpl">
-    <a href="delete_email"  id="btn-remove${_index_}" class="action delete" title="<?php echo $this->escapeJsQuote(__('Remove Email')) ?>"><span><?php echo $this->escapeJsQuote(__('Remove Email')) ?></span></a>
-
-    <div class="field name required">
-        <label for="recipients-name${_index_}" class="label"><span><?php echo __('Name:')?></span></label>
-        <div class="control">
-            <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name:')?>" class="input-text" id="recipients-name${_index_}" data-validate="{required:true}"/>
-        </div>
-    </div>
-
-    <div class="field email required">
-        <label for="recipients-email${_index_}" class="label"><span><?php echo __('Email Address:') ?></span></label>
-        <div class="control">
-            <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address:') ?>" id="recipients-email${_index_}" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
-        </div>
-    </div>
-</script>
-
-<form action="<?php echo $this->getSendUrl() ?>" method="post" id="product-sendtofriend-form" class="form send friend" data-hasRequired="<?php echo __('* Required Fields') ?>">
-    <fieldset class="fieldset sender" id="sender_options">
-        <?php echo $this->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo __('Sender:') ?></span></legend>
-        <br>
-        <div class="field sender required">
-            <label for="sender-name" class="label"><span><?php echo __('Name:') ?></span></label>
-            <div class="control">
-                <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text" data-validate="{required:true}"/>
-            </div>
-        </div>
-
-        <div class="field email required">
-            <label for="sender-email" class="label"><span><?php echo __('Email:') ?></span></label>
-            <div class="control">
-                <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo __('Email Address') ?>" id="sender-email" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
-            </div>
-        </div>
-
-        <div class="field text required">
-            <label for="sender-message" class="label"><span><?php echo __('Message:') ?></span></label>
-            <div class="control">
-                <textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($this->getMessage())?></textarea>
-            </div>
-        </div>
-    </fieldset>
-
-    <fieldset class="fieldset recipients" id="recipients-options">
-        <?php echo $this->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo __('Recipient:') ?></span></legend><br />
-    </fieldset>
-    <div class="actions">
-        <div class="primary">
-            <button type="submit" class="action submit"<?php if (!$this->canSend()):?> disabled="disabled"<?php endif ?>><span><?php echo __('Send Email') ?></span></button>
-            <div id="max-recipient-message" style="display:none;" class="notice-msg limit">
-                <?php if ($this->getMaxRecipients()): ?>
-                <span><?php echo __('Maximum %1 email addresses allowed.', $this->getMaxRecipients()) ?></span>
-                <?php endif; ?>
-            </div>
-            <?php if (1 < $this->getMaxRecipients()): ?>
-                <button type="button" id="add-recipient-button" class="action add"><span><?php echo __('Add Recipient') ?></span></button>
-            <?php endif; ?>
-        </div>
-        <div class="secondary">
-            <a class="action back" href="#" role="back"><span><?php echo __('Back') ?></span></a>
-        </div>
-    </div>
-</form>
-<script type="text/javascript">
-    (function($) {
-        head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
-            "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
-            "<?php echo $this->getViewFileUrl('Magento_Page::js/row-builder.js')?>", function() {
-                $('#product-sendtofriend-form').rowBuilder({
-                    rowTemplate: '#add-recipient-tmpl',
-                    rowContainer: '#recipients-options',
-                    rowParentElem: '<div></div>',
-                    btnRemoveSelector: '.action.delete',
-                    maxRows: '<?php echo $this->getMaxRecipients() ?>',
-                    maxRowsMsg: '#max-recipient-message',
-                    addRowBtn: '#add-recipient-button',
-                    additionalRowClass: 'additional'
-                }).validation();
-                $('a[role="back"]').on('click', function() { history.back(); return false; });
-            })
-    })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/css/styles.css b/app/design/frontend/magento_plushe/css/styles.css
index 164b29e1a5fb4a0112d075e8f3559bac5c910e0a..627537351d565790aceaaf8d712b5405dd986bff 100644
--- a/app/design/frontend/magento_plushe/css/styles.css
+++ b/app/design/frontend/magento_plushe/css/styles.css
@@ -4807,6 +4807,31 @@ body {
 .notice.global.site p {
   margin: 0;
 }
+/*
+    Additional Information
+-------------------------------------- */
+.data.table.additional.attributes {
+  width: 100%;
+}
+.data.table.additional.attributes th,
+.data.table.additional.attributes td {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 7px 10px;
+  text-align: left;
+}
+.data.table.additional.attributes th {
+  width: 40%;
+}
+.data.table.additional.attributes td {
+  width: 60%;
+}
+.data.table.additional.attributes tr:nth-child(2n+1) th,
+.data.table.additional.attributes tr:nth-child(2n+1) td {
+  background: #f8f8f8;
+}
 /*
     Reviews
 -------------------------------------- */
@@ -6981,7 +7006,7 @@ body {
   content: '|';
   display: inline-block;
   text-decoration: none;
-  padding: 0 8px;
+  padding: 0 3px;
 }
 .block.minicart .products.minilist .item .product.options.wrapper + .action.edit:hover:before {
   color: #675f55;
@@ -7251,6 +7276,9 @@ body {
 .block.newsletter {
   text-align: left;
 }
+.block.newsletter .fieldset {
+  margin: 0;
+}
 .block.newsletter .title {
   display: none;
 }
@@ -7419,6 +7447,10 @@ body {
 span.widget.link {
   display: inline-block;
 }
+.widget.mini.products.images .item {
+  display: inline-block;
+  margin: 0 3px;
+}
 /*
     Magento_Catalog
     Compare
@@ -7527,7 +7559,13 @@ span.widget.link {
 .data.comparison td:last-child {
   border-right: 1px solid #e5e5e5;
 }
+.data.comparison tbody:first-child .cell.attribute {
+  background-color: #f8f8f8;
+}
 .data.comparison tr:nth-child(odd) .cell.attribute {
+  background-color: #ffffff;
+}
+.data.comparison tr:nth-child(even) .cell.attribute {
   background-color: #f8f8f8;
 }
 .data.comparison .product.photo {
@@ -7805,27 +7843,32 @@ span.widget.link {
   float: none;
   display: inline-block;
 }
-.block.widget.new .products.list.items.widget-new-grid .item.product {
+.block.widget.new .products.list.items.widget-new-grid .item.product,
+.block.widget.new .products.list.items.new.grid .item.product {
   width: 20%;
   float: none;
   display: inline-block;
 }
 .col2-left-layout .block.widget.new .products.list.items.widget-new-grid .item.product,
-.col2-right-layout .block.widget.new .products.list.items.widget-new-grid .item.product {
+.col2-left-layout .block.widget.new .products.list.items.new.grid .item.product,
+.col2-right-layout .block.widget.new .products.list.items.widget-new-grid .item.product,
+.col2-right-layout .block.widget.new .products.list.items.new.grid .item.product {
   float: left;
   width: 25%;
   margin-right: 0%;
   float: none;
   display: inline-block;
 }
-.col3-layout .block.widget.new .products.list.items.widget-new-grid .item.product {
+.col3-layout .block.widget.new .products.list.items.widget-new-grid .item.product,
+.col3-layout .block.widget.new .products.list.items.new.grid .item.product {
   float: left;
   width: 33.33333333333333%;
   margin-right: 0%;
   float: none;
   display: inline-block;
 }
-.block.widget.new .products.list.items.widget-new-grid .item.product .product.photo {
+.block.widget.new .products.list.items.widget-new-grid .item.product .product.photo,
+.block.widget.new .products.list.items.new.grid .item.product .product.photo {
   float: none;
   display: block;
   margin: 0 0 10px;
@@ -8319,6 +8362,9 @@ span.widget.link {
     Magento_Catalog
     Product List
 -------------------------------------- */
+.category.image img {
+  max-width: 100%;
+}
 .products.wrapper .products.list .item {
   z-index: 1;
   position: relative;
@@ -8482,6 +8528,18 @@ span.widget.link {
 .pricing p:last-child {
   margin-bottom: 0;
 }
+.product.details .price-box .price-excluding-tax,
+.product.details .price-box .price-including-tax {
+  display: block;
+}
+.old-price,
+.old.price {
+  text-decoration: line-through;
+}
+.special-price,
+.special.price {
+  color: #da370a;
+}
 .stock[title] {
   line-height: 16px;
 }
@@ -8688,6 +8746,9 @@ span.widget.link {
 .product.info.main .page.title.product + .price-box {
   border-bottom: 1px solid #e5e5e5;
 }
+.product.info.main .col.price .price-box {
+  margin: 0;
+}
 .product.info.main p {
   margin: 5px 0;
 }
@@ -8697,9 +8758,6 @@ span.widget.link {
 .product.info.main .old-price .price {
   text-decoration: line-through;
 }
-.product.info.main .special-price {
-  color: #da370a;
-}
 .product.info.main .stock {
   margin: 15px 0;
 }
@@ -8989,6 +9047,16 @@ span.widget.link {
 .product.photo.main .notice {
   font-size: 11px;
 }
+.magento-zoom > .img > img {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  max-height: 100%;
+  max-width: 100%;
+}
 .product.attibute.sku {
   font-size: 12px;
 }
@@ -9183,6 +9251,15 @@ span.widget.link {
     margin-top: 20px;
   }
 }
+.availability.only.detailed {
+  display: none;
+}
+.availability.only.detailed.active {
+  display: block;
+}
+.availability.only .data.table {
+  width: 100%;
+}
 /*
     Magento_Bundle
     Product View
@@ -9248,10 +9325,24 @@ body.type-bundle {
   width: 360px;
 }
 .bundle.options.container .product.options.bottom {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
   float: left;
+  padding: 0 10px 20px 30px;
   width: 500px;
   clear: left;
 }
+.bundle.options.container .prices.tier {
+  background: #e5e5e5;
+}
+.bundle.options.container .prices.tier + .price-box {
+  font-size: 16px;
+}
+.bundle.options.container .prices.tier + .price-box .price {
+  color: #da370a;
+}
 .fieldset.bundle.options {
   border: 0;
   padding: 0;
@@ -11674,13 +11765,67 @@ img[align="right"] {
   border-bottom: 1px dotted #332e29;
   cursor: help;
 }
-.map-popup {
+/*
+    Minimum Advertising Price
+-------------------------------------- */
+.map.popup {
   background: #ffffff;
   border: 1px solid #c2c2c2;
+  margin: 18px 0 0;
   position: absolute;
   padding: 20px;
+  width: 300px;
   z-index: 10;
 }
+.map.popup:before {
+  border-color: transparent transparent #ffffff transparent;
+  border-style: solid;
+  border-width: 0 15px 15px;
+  content: "";
+  height: 0;
+  left: 50%;
+  margin: 0 0 0 -7px;
+  position: absolute;
+  top: -15px;
+  width: 0;
+  z-index: 2;
+}
+.map.popup:after {
+  border-color: transparent transparent #c2c2c2 transparent;
+  border-style: solid;
+  border-width: 0 16px 16px;
+  content: "";
+  height: 0;
+  left: 50%;
+  margin: 0 0 0 -8px;
+  position: absolute;
+  top: -16px;
+  width: 0;
+  z-index: 1;
+}
+.map.popup .title {
+  margin-bottom: 20px;
+}
+.map.popup .map.msrp .old.price {
+  text-decoration: line-through;
+}
+.map.popup .form.map.checkout {
+  float: right;
+}
+.map.popup .content {
+  margin: 15px 0 0;
+}
+.map.popup .content .map.msrp > .label:after,
+.map.popup .content .map.price > .label:after {
+  content: ": ";
+}
+.map.popup .content .map.price > .label {
+  font-weight: 700;
+}
+.map.popup .price-excluding-tax,
+.map.popup .price-including-tax {
+  display: block;
+}
 .mobileAction {
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -11859,44 +12004,44 @@ img[align="right"] {
     background: transparent;
   }
   .search.results .toolbar .pager,
-  .category-view .toolbar .pager {
+  .category.view .toolbar .pager {
     display: none;
   }
   .search.results .toolbar .pager .pages > ol,
-  .category-view .toolbar .pager .pages > ol {
+  .category.view .toolbar .pager .pages > ol {
     line-height: 33px;
   }
   .search.results .toolbar .pager .pages > ol a,
-  .category-view .toolbar .pager .pages > ol a,
+  .category.view .toolbar .pager .pages > ol a,
   .search.results .toolbar .pager .pages > ol strong,
-  .category-view .toolbar .pager .pages > ol strong {
+  .category.view .toolbar .pager .pages > ol strong {
     padding: 0 5px;
   }
   .search.results .toolbar .sorter select,
-  .category-view .toolbar .sorter select,
+  .category.view .toolbar .sorter select,
   .search.results .toolbar .limiter select,
-  .category-view .toolbar .limiter select {
+  .category.view .toolbar .limiter select {
     padding: 5px 10px 4px;
   }
   .search.results .toolbar .modes,
-  .category-view .toolbar .modes {
+  .category.view .toolbar .modes {
     float: right;
     margin-right: 0;
     margin-left: 0;
   }
   .search.results .toolbar .modes .mode span,
-  .category-view .toolbar .modes .mode span {
+  .category.view .toolbar .modes .mode span {
     width: 18px;
   }
   .search.results .toolbar .modes .mode span:after,
-  .category-view .toolbar .modes .mode span:after {
+  .category.view .toolbar .modes .mode span:after {
     font-size: 18px;
     width: 18px;
     height: 18px;
     line-height: 18px;
   }
   .search.results .toolbar .modes .mode.grid,
-  .category-view .toolbar .modes .mode.grid {
+  .category.view .toolbar .modes .mode.grid {
     width: 18px;
     display: block;
     line-height: 0;
@@ -11907,7 +12052,7 @@ img[align="right"] {
     display: inline-block;
   }
   .search.results .toolbar .modes .mode.grid:after,
-  .category-view .toolbar .modes .mode.grid:after {
+  .category.view .toolbar .modes .mode.grid:after {
     font-family: "icons";
     font-size: 18px;
     line-height: 18px;
@@ -11924,17 +12069,17 @@ img[align="right"] {
     text-align: center;
   }
   .search.results .toolbar .modes .mode.grid:active,
-  .category-view .toolbar .modes .mode.grid:active {
+  .category.view .toolbar .modes .mode.grid:active {
     outline: 0;
   }
   .search.results .toolbar .modes .mode.grid:after,
-  .category-view .toolbar .modes .mode.grid:after {
+  .category.view .toolbar .modes .mode.grid:after {
     text-indent: 0;
     display: block;
     margin: 0;
   }
   .search.results .toolbar .modes .mode.list,
-  .category-view .toolbar .modes .mode.list {
+  .category.view .toolbar .modes .mode.list {
     width: 18px;
     display: block;
     line-height: 0;
@@ -11945,7 +12090,7 @@ img[align="right"] {
     display: inline-block;
   }
   .search.results .toolbar .modes .mode.list:after,
-  .category-view .toolbar .modes .mode.list:after {
+  .category.view .toolbar .modes .mode.list:after {
     font-family: "icons";
     font-size: 18px;
     line-height: 18px;
@@ -11962,25 +12107,25 @@ img[align="right"] {
     text-align: center;
   }
   .search.results .toolbar .modes .mode.list:active,
-  .category-view .toolbar .modes .mode.list:active {
+  .category.view .toolbar .modes .mode.list:active {
     outline: 0;
   }
   .search.results .toolbar .modes .mode.list:after,
-  .category-view .toolbar .modes .mode.list:after {
+  .category.view .toolbar .modes .mode.list:after {
     text-indent: 0;
     display: block;
     margin: 0;
   }
   .search.results .toolbar.bottom .toolbar .pager,
-  .category-view .toolbar.bottom .toolbar .pager {
+  .category.view .toolbar.bottom .toolbar .pager {
     display: block;
   }
   .search.results .toolbar.bottom .toolbar .settings,
-  .category-view .toolbar.bottom .toolbar .settings {
+  .category.view .toolbar.bottom .toolbar .settings {
     display: none;
   }
   .search.results .products.wrapper.grid .products.list .item.product,
-  .category-view .products.wrapper.grid .products.list .item.product {
+  .category.view .products.wrapper.grid .products.list .item.product {
     width: 50%;
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
@@ -11988,39 +12133,39 @@ img[align="right"] {
     box-sizing: border-box;
   }
   .search.results .products.wrapper.grid .products.list .item.product .secondary,
-  .category-view .products.wrapper.grid .products.list .item.product .secondary {
+  .category.view .products.wrapper.grid .products.list .item.product .secondary {
     background: transparent;
   }
   .search.results .products.wrapper.grid .products.list .item.product .secondary .action.tocompare,
-  .category-view .products.wrapper.grid .products.list .item.product .secondary .action.tocompare {
+  .category.view .products.wrapper.grid .products.list .item.product .secondary .action.tocompare {
     display: none;
   }
   .search.results .products.wrapper.list .products.list .item.product .product.photo,
-  .category-view .products.wrapper.list .products.list .item.product .product.photo {
+  .category.view .products.wrapper.list .products.list .item.product .product.photo {
     float: none;
   }
   .search.results .products.wrapper.list .products.list .item.product .product.details,
-  .category-view .products.wrapper.list .products.list .item.product .product.details {
+  .category.view .products.wrapper.list .products.list .item.product .product.details {
     display: block;
     padding: 15px 0 0;
     text-align: center;
   }
   .search.results .products.wrapper.list .products.list .item.product .product.details .product.name,
-  .category-view .products.wrapper.list .products.list .item.product .product.details .product.name {
+  .category.view .products.wrapper.list .products.list .item.product .product.details .product.name {
     font-size: 18px;
   }
   .search.results .products.wrapper.list .products.list .item.product .product.details .price-box,
-  .category-view .products.wrapper.list .products.list .item.product .product.details .price-box {
+  .category.view .products.wrapper.list .products.list .item.product .product.details .price-box {
     font-size: 16px;
   }
   .search.results .product.photo .img.photo.container,
-  .category-view .product.photo .img.photo.container {
+  .category.view .product.photo .img.photo.container {
     position: static !important;
     width: auto !important;
     height: auto !important;
   }
   .search.results .product.photo .img.photo.container img,
-  .category-view .product.photo .img.photo.container img {
+  .category.view .product.photo .img.photo.container img {
     position: static !important;
     width: auto !important;
     height: auto !important;
diff --git a/app/design/frontend/magento_plushe/less/responsive/responsive.less b/app/design/frontend/magento_plushe/less/responsive/responsive.less
index e38d75756ff7b5b2160c2d55f3fd08984c49da01..eef42ae697114e7d0c46b7a742af9c1ca759cda0 100644
--- a/app/design/frontend/magento_plushe/less/responsive/responsive.less
+++ b/app/design/frontend/magento_plushe/less/responsive/responsive.less
@@ -259,7 +259,7 @@ and (max-width : @breakPoint1) {
     }
 
     .search.results,
-    .category-view {
+    .category.view {
         .toolbar {
             .pager {
                 display: none;
diff --git a/app/design/frontend/magento_plushe/less/styles.less b/app/design/frontend/magento_plushe/less/styles.less
index c50ba837fef60e1b913f13327101baf49f56cb14..8d1328c59d6583f14dd57f915a61b78299bebf0b 100644
--- a/app/design/frontend/magento_plushe/less/styles.less
+++ b/app/design/frontend/magento_plushe/less/styles.less
@@ -553,6 +553,29 @@ body {
     }
 }
 
+/*
+    Additional Information
+-------------------------------------- */
+.data.table.additional.attributes {
+    width: 100%;
+    th,
+    td {
+        .box-sizing();
+        padding: 7px 10px;
+        text-align: left;
+    }
+    th {
+        width: 40%;
+    }
+    td {
+        width: 60%;
+    }
+    tr:nth-child(2n+1) th,
+    tr:nth-child(2n+1) td {
+        background: @primary1;
+    }
+}
+
 /*
     Reviews
 -------------------------------------- */
@@ -2493,7 +2516,7 @@ body {
                     content: '|';
                     display: inline-block;
                     text-decoration: none;
-                    padding: 0 8px;
+                    padding: 0 3px;
                 }
                 &:hover:before {
                     color: @primary6;
@@ -2698,6 +2721,9 @@ body {
 .block.newsletter {
     @fit: 45px;
     text-align: left;
+    .fieldset {
+        margin: 0;
+    }
     .title {
         display: none;
     }
@@ -2826,6 +2852,13 @@ span.widget.link {
     display: inline-block;
 }
 
+.widget.mini.products.images {
+    .item {
+        display: inline-block;
+        margin: 0 3px;
+    }
+}
+
 /*
     Magento_Catalog
     Compare
@@ -2935,7 +2968,13 @@ span.widget.link {
     td:last-child {
         border-right: 1px solid @primary2;
     }
+    tbody:first-child .cell.attribute {
+        background-color: @primary1;
+    }
     tr:nth-child(odd) .cell.attribute {
+        background-color: @primary7;
+    }
+    tr:nth-child(even) .cell.attribute {
         background-color: @primary1;
     }
     .product.photo {
@@ -3165,7 +3204,8 @@ span.widget.link {
 }
 
 .block.widget.new {
-    .products.list.items.widget-new-grid {
+    .products.list.items.widget-new-grid,
+    .products.list.items.new.grid {
         .item.product {
             width: 20%;
             float: none;
@@ -3608,6 +3648,12 @@ span.widget.link {
 @imageHeight: 180px;
 @imageWidth: 180px;
 
+.category.image {
+    img {
+        max-width: 100%;
+    }
+}
+
 .products.wrapper .products.list {
     .item {
         .product.photo {
@@ -3762,6 +3808,21 @@ span.widget.link {
     }
 }
 
+.product.details .price-box .price-excluding-tax,
+.product.details .price-box .price-including-tax {
+    display: block;
+}
+
+.old-price,
+.old.price {
+    text-decoration: line-through;
+}
+
+.special-price,
+.special.price {
+    color: @secondary1;
+}
+
 .stock[title] {
     line-height: 16px;
     span:before {
@@ -3845,6 +3906,9 @@ span.widget.link {
     .page.title.product + .price-box {
         border-bottom: 1px solid @primary2;
     }
+    .col.price .price-box {
+        margin: 0;
+    }
     p {
         margin: 5px 0;
     }
@@ -3857,9 +3921,6 @@ span.widget.link {
             text-decoration: line-through;
         }
     }
-    .special-price {
-        color: @secondary1;
-    }
     .stock {
         margin: 15px 0;
     }
@@ -4022,6 +4083,17 @@ span.widget.link {
     }
 }
 
+.magento-zoom > .img > img {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    max-height: 100%;
+    max-width: 100%;
+}
+
 .product.attibute.sku {
     font-size: @baseFontSizeMiddle;
     .value {
@@ -4064,6 +4136,19 @@ and (max-width : 768px) {
     }
 }
 
+// Catalog Inventory
+.availability.only {
+    &.detailed {
+        display: none;
+        &.active {
+            display: block;
+        }
+    }
+    .data.table {
+        width: 100%;
+    }
+}
+
 /*
     Magento_Bundle
     Product View
@@ -4131,10 +4216,22 @@ and (max-width : 768px) {
         }
     }
     .product.options.bottom {
+        .box-sizing();
         float: left;
+        padding: 0 10px 20px 30px;
         width: 500px;
         clear: left;
     }
+
+    .prices.tier {
+        background: @primary2;
+        + .price-box {
+            font-size: @baseFontSizeBigger;
+            .price {
+                color: @secondary1;
+            }
+        }
+    }
 }
 
 .fieldset.bundle.options {
@@ -5626,13 +5723,68 @@ img[align="right"] {
     }
 }
 
-.map-popup {
+/*
+    Minimum Advertising Price
+-------------------------------------- */
+.map.popup {
     background: @commonBg;
     border: 1px solid @primary3;
+    margin: 18px 0 0;
     position: absolute;
     padding: 20px;
+    width: 300px;
     z-index: 10;
+    &:before {
+        border-color: transparent transparent @primary7 transparent;
+        border-style: solid;
+        border-width: 0 15px 15px;
+        content: "";
+        height: 0;
+        left: 50%;
+        margin: 0 0 0 -7px;
+        position: absolute;
+        top: -15px;
+        width: 0;
+        z-index: 2;
+    }
+    &:after {
+        border-color: transparent transparent @primary3 transparent;
+        border-style: solid;
+        border-width: 0 16px 16px;
+        content: "";
+        height: 0;
+        left: 50%;
+        margin: 0 0 0 -8px;
+        position: absolute;
+        top: -16px;
+        width: 0;
+        z-index: 1;
+    }
+    .title {
+        margin-bottom: 20px;
+    }
+    .map.msrp .old.price {
+        text-decoration: line-through;
+    }
+    .form.map.checkout {
+        float: right;
+    }
+    .content {
+        margin: 15px 0 0;
+        .map.msrp,
+        .map.price {
+            > .label:after {
+                content: ": ";
+            }
+        }
+        .map.price > .label {
+            font-weight: 700;
+        }
+    }
+    .price-excluding-tax,
+    .price-including-tax {
+        display: block;
+    }
 }
 
-
 @import "/responsive/responsive.less";
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php
new file mode 100644
index 0000000000000000000000000000000000000000..34f6d3297b5dd14fb463e28a2a86cbeff50ce38f
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento
+ * @subpackage  integration_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Implementation of the @magentoAdminConfigFixture DocBlock annotation
+ */
+namespace Magento\TestFramework\Annotation;
+
+class AdminConfigFixture
+{
+    /**
+     * Test instance that is available between 'startTest' and 'stopTest' events
+     *
+     * @var \PHPUnit_Framework_TestCase
+     */
+    protected $_currentTest;
+
+    /**
+     * Original values for global configuration options that need to be restored
+     *
+     * @var array
+     */
+    private $_configValues = array();
+
+    /**
+     * Retrieve configuration node value
+     *
+     * @param string $configPath
+     * @return string
+     */
+    protected function _getConfigValue($configPath)
+    {
+        return \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+            ->getValue($configPath);
+    }
+
+    /**
+     * Assign configuration node value
+     *
+     * @param string $configPath
+     * @param string $value
+     */
+    protected function _setConfigValue($configPath, $value)
+    {
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+            ->setValue($configPath, $value);
+    }
+
+    /**
+     * Assign required config values and save original ones
+     *
+     * @param \PHPUnit_Framework_TestCase $test
+     */
+    protected function _assignConfigData(\PHPUnit_Framework_TestCase $test)
+    {
+        $annotations = $test->getAnnotations();
+        if (!isset($annotations['method']['magentoAdminConfigFixture'])) {
+            return;
+        }
+        foreach ($annotations['method']['magentoAdminConfigFixture'] as $configPathAndValue) {
+            list($configPath, $requiredValue) = preg_split('/\s+/', $configPathAndValue, 2);
+
+            $originalValue = $this->_getConfigValue($configPath);
+            $this->_configValues[$configPath] = $originalValue;
+
+            $this->_setConfigValue($configPath, $requiredValue);
+        }
+    }
+
+    /**
+     * Restore original values for changed config options
+     */
+    protected function _restoreConfigData()
+    {
+        foreach ($this->_configValues as $configPath => $originalValue) {
+            $this->_setConfigValue($configPath, $originalValue);
+        }
+        $this->_configValues = array();
+    }
+
+    /**
+     * Handler for 'startTest' event
+     *
+     * @param \PHPUnit_Framework_TestCase $test
+     */
+    public function startTest(\PHPUnit_Framework_TestCase $test)
+    {
+        $this->_currentTest = $test;
+        $this->_assignConfigData($test);
+    }
+
+    /**
+     * Handler for 'endTest' event
+     *
+     * @param \PHPUnit_Framework_TestCase $test
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function endTest(\PHPUnit_Framework_TestCase $test)
+    {
+        $this->_currentTest = null;
+        $this->_restoreConfigData();
+    }
+
+    /**
+     * Reassign configuration data whenever application is reset
+     */
+    public function initStoreAfter()
+    {
+        /* process events triggered from within a test only */
+        if ($this->_currentTest) {
+            $this->_assignConfigData($this->_currentTest);
+        }
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
index 2ba88cb33711fd5331c66da8aac4973173d71387..11602b5abc2a0fa62845fe71e1aaf948b02ab377 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
@@ -80,6 +80,7 @@ class DocBlock
             ))),
             new \Magento\TestFramework\Annotation\AppArea($application),
             new \Magento\TestFramework\Annotation\ConfigFixture(),
+            new \Magento\TestFramework\Annotation\AdminConfigFixture(),
         );
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Cookie.php b/dev/tests/integration/framework/Magento/TestFramework/Cookie.php
index e475842f533c4bc4974198d987cc9ed0dd119007..bcd1d13ce01ac92a5b5f5ad55f9504fc5964c382 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Cookie.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Cookie.php
@@ -88,4 +88,20 @@ class Cookie extends \Magento\Core\Model\Cookie
         unset($_COOKIE[$name]);
         return $this;
     }
+
+    /**
+     * Is https secure request
+     *
+     * @return bool
+     */
+    public function isSecure()
+    {
+        $areaCode = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')
+            ->getAreaCode();
+        if ($areaCode == \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
+            return $this->_getRequest()->isSecure();
+        } else {
+            return parent::isSecure();
+        }
+    }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php
index ec9ea2a26b62f23afc8bfe1ffa21519209ea8b39..c3f49d7d4f563a1407f53bf751223de67216fd36 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php
@@ -83,6 +83,7 @@ class ObjectManagerFactory extends \Magento\App\ObjectManagerFactory
             ),
             'preferences' => array(
                 'Magento\Core\Model\Cookie' => 'Magento\TestFramework\Cookie',
+                'Magento\Backend\Model\Cookie' => 'Magento\TestFramework\Cookie',
                 'Magento\App\RequestInterface' => 'Magento\TestFramework\Request',
                 'Magento\App\ResponseInterface' => 'Magento\TestFramework\Response',
             ),
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..252a9eb62c99680767be7b4b98cde5ff74150a4c
--- /dev/null
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento
+ * @subpackage  integration_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Test class for \Magento\TestFramework\Annotation\AdminConfigFixture.
+ */
+namespace Magento\Test\Annotation;
+
+class AdminConfigFixtureTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\TestFramework\Annotation\AdminConfigFixture|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_object;
+
+    protected function setUp()
+    {
+        $this->_object = $this->getMock(
+            'Magento\TestFramework\Annotation\AdminConfigFixture',
+            array('_getConfigValue', '_setConfigValue')
+        );
+    }
+
+    /**
+     * @magentoAdminConfigFixture any_config some_value
+     */
+    public function testConfig()
+    {
+        $this->_object
+            ->expects($this->at(0))
+            ->method('_getConfigValue')
+            ->with('any_config')
+            ->will($this->returnValue('some_value'));
+        $this->_object
+            ->expects($this->at(1))
+            ->method('_setConfigValue')
+            ->with('any_config', 'some_value');
+        $this->_object->startTest($this);
+
+        $this->_object
+            ->expects($this->once())
+            ->method('_setConfigValue')
+            ->with('any_config', 'some_value');
+        $this->_object->endTest($this);
+    }
+
+    public function testInitStoreAfterOfScope()
+    {
+        $this->_object
+            ->expects($this->never())
+            ->method('_getConfigValue');
+        $this->_object
+            ->expects($this->never())
+            ->method('_setConfigValue');
+        $this->_object->initStoreAfter();
+    }
+
+    /**
+     * @magentoAdminConfigFixture any_config some_value
+     */
+    public function testInitStoreAfter()
+    {
+        $this->_object->startTest($this);
+        $this->_object
+            ->expects($this->at(0))
+            ->method('_getConfigValue')
+            ->with('any_config')
+            ->will($this->returnValue('some_value'));
+        $this->_object
+            ->expects($this->at(1))
+            ->method('_setConfigValue')
+            ->with('any_config', 'some_value');
+        $this->_object->initStoreAfter();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
deleted file mode 100644
index 38080f0a1c270d3c0df3a548d47e316f7cc073ea..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-namespace Magento\Adminhtml;
-
-/**
- * @magentoAppArea adminhtml
- */
-class DashboardTest extends \Magento\Backend\Utility\Controller
-{
-    public function testTunnelAction()
-    {
-        $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL .
-            '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
-        $handle = curl_init();
-        curl_setopt($handle, CURLOPT_URL, $testUrl);
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-        try {
-            if (false === curl_exec($handle)) {
-                $this->markTestSkipped('Third-party service is unavailable: ' . $testUrl);
-            }
-            curl_close($handle);
-        } catch (\Exception $e) {
-            curl_close($handle);
-            throw $e;
-        }
-
-        $gaData = array(
-            'cht' => 'lc',
-            'chf' => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
-            'chm' => 'B,f4d4b2,0,0,0',
-            'chco' => 'db4814',
-            'chd' => 'e:AAAAAAAAf.AAAA',
-            'chxt' => 'x,y',
-            'chxl' => '0:|10/13/12|10/14/12|10/15/12|10/16/12|10/17/12|10/18/12|10/19/12|1:|0|1|2',
-            'chs' => '587x300',
-            'chg' => '16.666666666667,50,1,0',
-        );
-        $gaFixture = urlencode(base64_encode(json_encode($gaData)));
-
-        /** @var $helper \Magento\Backend\Helper\Dashboard\Data */
-        $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get('Magento\Backend\Helper\Dashboard\Data');
-        $hash = $helper->getChartDataHash($gaFixture);
-        $this->getRequest()->setParam('ga', $gaFixture)->setParam('h', $hash);
-        $this->dispatch('backend/admin/dashboard/tunnel');
-        $this->assertStringStartsWith("\x89\x50\x4E\x47", $this->getResponse()->getBody()); // PNG header
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php b/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php
index bf6181af2ff36427e7f8a5c36311a8393f6a7dad..10c8957ad996cbd68bc4711b3de7bbc44912ded8 100644
--- a/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php
@@ -31,10 +31,10 @@ class IframeTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @magentoAppIsolation enabled
+     * @magentoAppArea frontend
      */
     public function testToHtml()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')->setAreaCode('frontend');
         $xssString = '</script><script>alert("XSS")</script>';
         /** @var $block \Magento\Authorizenet\Block\Directpost\Iframe */
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeadTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeadTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeadTest.php
rename to dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeadTest.php
index 4dbab16ae6799351e37103415b5b327ea2b14ab6..b72f36520369f509f14dd05d3b83179ec4e9ffdf 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeadTest.php
@@ -22,7 +22,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
 
 /**
  * @magentoAppArea adminhtml
@@ -32,9 +32,9 @@ class HeadTest extends \PHPUnit_Framework_TestCase
     public function testConstruct()
     {
         $this->assertInstanceOf(
-            'Magento\Adminhtml\Block\Page\Head',
+            'Magento\Backend\Block\Page\Head',
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-                ->createBlock('Magento\Adminhtml\Block\Page\Head')
+                ->createBlock('Magento\Backend\Block\Page\Head')
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeaderTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeaderTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeaderTest.php
rename to dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeaderTest.php
index 5100a6c818dce446e28249bfbef2a760eba5dd9c..28f16468dc4fc41354a5a083feb382ad5a8827bd 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeaderTest.php
@@ -25,16 +25,16 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
 
 /**
- * Test \Magento\Adminhtml\Block\Page\Header
+ * Test \Magento\Backend\Block\Page\Header
  * @magentoAppArea adminhtml
  */
 class HeaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Adminhtml\Block\Page\Header
+     * @var \Magento\Backend\Block\Page\Header
      */
     protected $_block;
 
@@ -42,7 +42,7 @@ class HeaderTest extends \PHPUnit_Framework_TestCase
     {
         parent::setUp();
         $this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Page\Header');
+            ->createBlock('Magento\Backend\Block\Page\Header');
     }
 
     public function testGetHomeLink()
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php
index 323b4fcbe6b8404e95545ebc6fc42135d5f0237e..33017d562f8041054bf1fc0624554c0d52b907f4 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php
@@ -49,6 +49,9 @@ class EditTest extends \PHPUnit_Framework_TestCase
         /** @var $objectManager \Magento\TestFramework\ObjectManager */
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         foreach ($registryData as $key => $value) {
+            if ($key == 'store_data') {
+                $value = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create($value);
+            }
             $objectManager->get('Magento\Core\Model\Registry')->register($key, $value);
         }
     }
@@ -81,27 +84,24 @@ class EditTest extends \PHPUnit_Framework_TestCase
             array(
                 array(
                     'store_type' => 'website',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Website')
+                    'store_data' => 'Magento\Core\Model\Website',
                 ),
-                'Magento\Backend\Block\System\Store\Edit\Form\Website'
+                'Magento\Backend\Block\System\Store\Edit\Form\Website',
             ),
             array(
                 array(
                     'store_type' => 'group',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Store\Group')
+                    'store_data' => 'Magento\Core\Model\Store\Group',
                 ),
-                'Magento\Backend\Block\System\Store\Edit\Form\Group'
+                'Magento\Backend\Block\System\Store\Edit\Form\Group',
             ),
             array(
                 array(
                     'store_type' => 'store',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Store')
+                    'store_data' => 'Magento\Core\Model\Store',
                 ),
-                'Magento\Backend\Block\System\Store\Edit\Form\Store'
-            )
+                'Magento\Backend\Block\System\Store\Edit\Form\Store',
+            ),
         );
     }
     /**
@@ -132,57 +132,51 @@ class EditTest extends \PHPUnit_Framework_TestCase
             array(
                 array(
                     'store_type' => 'website',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Website'),
-                    'store_action' => 'add'
+                    'store_data' => 'Magento\Core\Model\Website',
+                    'store_action' => 'add',
                 ),
-                'New Web Site'
+                'New Web Site',
             ),
             array(
                 array(
                     'store_type' => 'website',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Website'),
-                    'store_action' => 'edit'
+                    'store_data' => 'Magento\Core\Model\Website',
+                    'store_action' => 'edit',
                 ),
-                'Edit Web Site'
+                'Edit Web Site',
             ),
             array(
                 array(
                     'store_type' => 'group',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Store\Group'),
-                    'store_action' => 'add'
+                    'store_data' => 'Magento\Core\Model\Store\Group',
+                    'store_action' => 'add',
                 ),
-                'New Store'
+                'New Store',
             ),
             array(
                 array(
                     'store_type' => 'group',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Store\Group'),
-                    'store_action' => 'edit'
+                    'store_data' => 'Magento\Core\Model\Store\Group',
+                    'store_action' => 'edit',
                 ),
-                'Edit Store'
+                'Edit Store',
             ),
             array(
                 array(
                     'store_type' => 'store',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Store'),
-                    'store_action' => 'add'
+                    'store_data' => 'Magento\Core\Model\Store',
+                    'store_action' => 'add',
                 ),
-                'New Store View'
+                'New Store View',
             ),
             array(
                 array(
                     'store_type' => 'store',
-                    'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                            ->create('Magento\Core\Model\Store'),
-                    'store_action' => 'edit'
+                    'store_data' => 'Magento\Core\Model\Store',
+                    'store_action' => 'edit',
                 ),
-                'Edit Store View'
-            )
+                'Edit Store View',
+            ),
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/CacheTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
similarity index 90%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/CacheTest.php
rename to dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index bd1f9102e7bc2e7a0ee4474ac24b5072778f32d3..58025f3e30961bd4576da3c9465d7b5916e4d61f 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -22,7 +22,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Backend\Controller\Adminhtml;
 
 /**
  * @magentoAppArea adminhtml
@@ -30,8 +30,8 @@ namespace Magento\Adminhtml\Controller;
 class CacheTest extends \Magento\Backend\Utility\Controller
 {
     /**
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/application_cache.php
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/non_application_cache.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/non_application_cache.php
      */
     public function testFlushAllAction()
     {
@@ -52,8 +52,8 @@ class CacheTest extends \Magento\Backend\Utility\Controller
     }
 
     /**
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/application_cache.php
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/non_application_cache.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/non_application_cache.php
      */
     public function testFlushSystemAction()
     {
@@ -75,7 +75,7 @@ class CacheTest extends \Magento\Backend\Utility\Controller
     }
 
     /**
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
      * @dataProvider massActionsDataProvider
      * @param array $typesToEnable
      */
@@ -101,7 +101,7 @@ class CacheTest extends \Magento\Backend\Utility\Controller
     }
 
     /**
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
      * @dataProvider massActionsDataProvider
      * @param array $typesToDisable
      */
@@ -127,7 +127,7 @@ class CacheTest extends \Magento\Backend\Utility\Controller
     }
 
     /**
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_invalidated.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_invalidated.php
      * @dataProvider massActionsDataProvider
      * @param array $typesToRefresh
      */
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 3e1004c73a4a7f656fce682bba133832a12774a1..167c99b79cba87bf1dab6e703955420027d22774 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -40,4 +40,43 @@ class DashboardTest extends \Magento\Backend\Utility\Controller
         $actual = $this->getResponse()->getBody();
         $this->assertContains('dashboard-diagram', $actual);
     }
+
+    public function testTunnelAction()
+    {
+        $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL .
+            '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
+        $handle = curl_init();
+        curl_setopt($handle, CURLOPT_URL, $testUrl);
+        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+        try {
+            if (false === curl_exec($handle)) {
+                $this->markTestSkipped('Third-party service is unavailable: ' . $testUrl);
+            }
+            curl_close($handle);
+        } catch (\Exception $e) {
+            curl_close($handle);
+            throw $e;
+        }
+
+        $gaData = array(
+            'cht' => 'lc',
+            'chf' => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
+            'chm' => 'B,f4d4b2,0,0,0',
+            'chco' => 'db4814',
+            'chd' => 'e:AAAAAAAAf.AAAA',
+            'chxt' => 'x,y',
+            'chxl' => '0:|10/13/12|10/14/12|10/15/12|10/16/12|10/17/12|10/18/12|10/19/12|1:|0|1|2',
+            'chs' => '587x300',
+            'chg' => '16.666666666667,50,1,0',
+        );
+        $gaFixture = urlencode(base64_encode(json_encode($gaData)));
+
+        /** @var $helper \Magento\Backend\Helper\Dashboard\Data */
+        $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get('Magento\Backend\Helper\Dashboard\Data');
+        $hash = $helper->getChartDataHash($gaFixture);
+        $this->getRequest()->setParam('ga', $gaFixture)->setParam('h', $hash);
+        $this->dispatch('backend/admin/dashboard/tunnel');
+        $this->assertStringStartsWith("\x89\x50\x4E\x47", $this->getResponse()->getBody()); // PNG header
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
index a5d4d98a96db0c332ad563563174132b8c527505..4ca17fb74f469d7bb476c4418239b46631d9fa56 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
@@ -29,25 +29,10 @@
 namespace Magento\Backend\Controller\Adminhtml;
 
 /**
- * Test class for \Magento\Backend\Controller\Adminhtml\Index.
- *
  * @magentoAppArea adminhtml
  */
 class IndexTest extends \Magento\Backend\Utility\Controller
 {
-    /**
-     * @covers \Magento\Backend\Controller\Adminhtml\Index::globalSearchAction
-     */
-    public function testGlobalSearchAction()
-    {
-        $this->getRequest()->setParam('isAjax', 'true');
-        $this->getRequest()->setPost('query', 'dummy');
-        $this->dispatch('backend/admin/index/globalSearch');
-
-        $actual = $this->getResponse()->getBody();
-        $this->assertEquals(array(), json_decode($actual));
-    }
-
     /**
      * Check not logged state
      * @covers \Magento\Backend\Controller\Adminhtml\Index::indexAction
@@ -73,4 +58,17 @@ class IndexTest extends \Magento\Backend\Utility\Controller
         $this->dispatch('backend/admin/index/index');
         $this->assertRedirect();
     }
+
+    /**
+     * @covers \Magento\Backend\Controller\Adminhtml\Index::globalSearchAction
+     */
+    public function testGlobalSearchAction()
+    {
+        $this->getRequest()->setParam('isAjax', 'true');
+        $this->getRequest()->setPost('query', 'dummy');
+        $this->dispatch('backend/admin/index/globalSearch');
+
+        $actual = $this->getResponse()->getBody();
+        $this->assertEquals(array(), json_decode($actual));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
index 416d41d18300c9e58d7eb345034e0dbb2ec0d48c..423f3a579bbe27b827fe300d1cae2aeb604db726 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
@@ -63,7 +63,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
 
     /**
      * Disabled form security in order to prevent exit from the app
-     * @magentoConfigFixture current_store admin/security/session_lifetime 100
+     * @magentoAdminConfigFixture admin/security/session_lifetime 100
      */
     public function testIsLoggedIn()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php
index 61dc2c70390873df2325e36d1fd3642b1add1213..c10c76ae2d186a670c4683d3fca6d56a649d69ba 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php
@@ -111,7 +111,7 @@ class AuthTest extends \PHPUnit_Framework_TestCase
 
     /**
      * Disabled form security in order to prevent exit from the app
-     * @magentoConfigFixture current_store admin/security/session_lifetime 100
+     * @magentoAdminConfigFixture admin/security/session_lifetime 100
      */
     public function testIsLoggedIn()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..bbfa1acd60cbead36f3f211f027bdcf80440249b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Backend
+ * @subpackage  integration_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Backend\Model\Translate;
+
+/**
+ * Test class for \Magento\Backend\Model\Translate\Inline.
+ *
+ * @magentoAppArea adminhtml
+ */
+class InlineTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Core\Model\Translate\InlineInterface
+     */
+    protected $_translate;
+
+    protected function setUp()
+    {
+        $this->_translate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create('Magento\Core\Model\Translate\InlineInterface');
+    }
+
+    /**
+     * @magentoAdminConfigFixture dev/translate_inline/active_admin 1
+     * @covers \Magento\Backend\Model\Translate\Inline::_getAjaxUrl
+     */
+    public function testAjaxUrl()
+    {
+        $body = '<html><body>some body</body></html>';
+        /** @var \Magento\Backend\Model\Url $url */
+        $url = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get('Magento\UrlInterface');
+        $url->getUrl(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE . '/ajax/translate');
+        $this->_translate->processResponseBody($body, true);
+        $this->assertContains(
+            $url->getUrl(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE . '/ajax/translate'),
+            $body
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
index fb19483a94a3b65f96952e129d56d8d84992dcd4..772567cc1c8ae8a5a366caf8b07b7f482e52d5b1 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
@@ -51,12 +51,12 @@ class UrlTest extends \PHPUnit_Framework_TestCase
      */
     public function testIsSecure()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setConfig('web/secure/use_in_adminhtml', true);
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+            ->setValue('web/secure/use_in_adminhtml', true);
         $this->assertTrue($this->_model->isSecure());
 
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setConfig('web/secure/use_in_adminhtml', false);
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+            ->setValue('web/secure/use_in_adminhtml', false);
         $this->assertFalse($this->_model->isSecure());
 
         $this->_model->setData('secure_is_forced', true);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/empty_storage.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/empty_storage.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/empty_storage.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/empty_storage.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
index c3da0b70bd6c6f1596839076239f675ee8a36686..33d3737072fdce749ebab1b1e8f2e03fd908e298 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
@@ -73,15 +73,10 @@ class ProductTest extends \PHPUnit_Framework_TestCase
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
      */
     public function testCRUD()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->setCurrentStore(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                    ->get('Magento\Core\Model\StoreManagerInterface')
-                    ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
-            );
         $this->_model->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
             ->setAttributeSetId(4)
             ->setName('Bundle Product')->setSku(uniqid())->setPrice(10)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php
similarity index 56%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/TemplateTest.php
rename to dev/tests/integration/testsuite/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php
index b651f0e7a48a0af39b8bf809dec2f3aeb1e3335e..c74a49b124e7e43c150d5278342911f169800e56 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php
@@ -19,25 +19,34 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Captcha
  * @subpackage  integration_tests
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
+namespace Magento\Captcha\Block\Adminhtml\Captcha;
 
-namespace Magento\Adminhtml\Block;
-
-/**
- * @magentoAppArea adminhtml
- */
-class TemplateTest extends \PHPUnit_Framework_TestCase
+class DefaultCaptchaTest extends \PHPUnit_Framework_TestCase
 {
-    public function testConstructor()
+    /**
+     * @var \Magento\Captcha\Block\Captcha\DefaultCaptcha
+     */
+    protected $_block;
+
+    protected function setUp()
+    {
+         $this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+             ->get('Magento\View\LayoutInterface')
+             ->createBlock('Magento\Captcha\Block\Adminhtml\Captcha\DefaultCaptcha');
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testGetRefreshUrl()
     {
-        $this->assertInstanceOf(
-            'Magento\Backend\Block\Template',
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-                ->createBlock('Magento\Adminhtml\Block\Template')
-        );
+        $this->assertContains('backend/admin/refresh/refresh', $this->_block->getRefreshUrl());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php
index 992efc5a94205ddadfa40f693d0c76d251168440..037a04a5febe2233b5b0085738744cc5de4085af 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php
@@ -48,24 +48,4 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertContains('captcha/refresh', $this->_block->getRefreshUrl());
     }
-
-    /**
-     * @magentoDbIsolation enabled
-     * @magentoAppIsolation enabled
-     */
-    public function testGetRefreshUrlWhenIsAdminStore()
-    {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore('admin')->setUrlModel(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                    ->create('Magento\Backend\Model\Url')
-            );
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->setCurrentStore(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                    ->get('Magento\Core\Model\StoreManagerInterface')->getStore('admin')
-            );
-
-        $this->assertContains('backend/admin/refresh/refresh', $this->_block->getRefreshUrl());
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
index 0d7446806d527f0723ce933c0f767c4ce90979e5..1dd26258c80559d068d299c523e0f4cd7250cccb 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -35,9 +35,9 @@ namespace Magento\Captcha\Model;
 class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
-     * @magentoConfigFixture admin_store admin/captcha/forms backend_login
-     * @magentoConfigFixture admin_store admin/captcha/enable 1
-     * @magentoConfigFixture admin_store admin/captcha/mode always
+     * @magentoAdminConfigFixture admin/captcha/forms backend_login
+     * @magentoAdminConfigFixture admin/captcha/enable 1
+     * @magentoAdminConfigFixture admin/captcha/mode always
      */
     public function testBackendLoginActionWithInvalidCaptchaReturnsError()
     {
@@ -59,10 +59,10 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
     }
 
     /**
-     * @magentoConfigFixture admin_store admin/captcha/enable 1
-     * @magentoConfigFixture admin_store admin/captcha/forms backend_login
-     * @magentoConfigFixture admin_store admin/captcha/mode after_fail
-     * @magentoConfigFixture admin_store admin/captcha/failed_attempts_login 1
+     * @magentoAdminConfigFixture admin/captcha/enable 1
+     * @magentoAdminConfigFixture admin/captcha/forms backend_login
+     * @magentoAdminConfigFixture admin/captcha/mode after_fail
+     * @magentoAdminConfigFixture admin/captcha/failed_attempts_login 1
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      */
@@ -91,9 +91,9 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Captcha/_files/dummy_user.php
-     * @magentoConfigFixture admin_store admin/captcha/enable 1
-     * @magentoConfigFixture admin_store admin/captcha/forms backend_forgotpassword
-     * @magentoConfigFixture admin_store admin/captcha/mode always
+     * @magentoAdminConfigFixture admin/captcha/enable 1
+     * @magentoAdminConfigFixture admin/captcha/forms backend_forgotpassword
+     * @magentoAdminConfigFixture admin/captcha/mode always
      */
     public function testCheckUserForgotPasswordBackendWhenCaptchaFailed()
     {
@@ -108,9 +108,9 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture admin_store admin/captcha/enable 1
-     * @magentoConfigFixture admin_store admin/captcha/forms backend_forgotpassword
-     * @magentoConfigFixture admin_store admin/captcha/mode always
+     * @magentoAdminConfigFixture admin/captcha/enable 1
+     * @magentoAdminConfigFixture admin/captcha/forms backend_forgotpassword
+     * @magentoAdminConfigFixture admin/captcha/mode always
      */
     public function testCheckUnsuccessfulMessageWhenCaptchaFailed()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php
index 24cc8fa268b9cebfaf33c0c296ea709dcb6c4155..673f73abc13586f4b302bffe38c4472d730613dd 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php
@@ -28,6 +28,8 @@
 /**
  * Create dummy user
  */
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+    ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
 /** @var $user \Magento\User\Model\User */
 $user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\User\Model\User');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
index 2fffdd8105b48d5d6dadb381322b3dd718bc05b9..407a7b04d5520ea41d2d1a87c8d783dadf1f6d38 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
@@ -42,6 +42,6 @@ class ContentTest extends \PHPUnit_Framework_TestCase
             'block'
         );
 
-        $this->assertInstanceOf('Magento\Adminhtml\Block\Media\Uploader', $block->getUploader());
+        $this->assertInstanceOf('Magento\Backend\Block\Media\Uploader', $block->getUploader());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
index 2bc79c50f9c2cd3facd8a90becdab639ba742be5..d823dee517ad615b31753a8de0d7067c52651af3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
@@ -49,7 +49,8 @@ class RelatedTest extends \PHPUnit_Framework_TestCase
             ->createBlock('Magento\Catalog\Block\Product\ProductList\Related');
         $block->setLayout(\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
                 ->get('Magento\View\LayoutInterface'));
-        $block->setTemplate('product/list/related.phtml');
+        $block->setTemplate('Magento_Catalog::product/list/items.phtml');
+        $block->setType('related');
 
         $html = $block->toHtml();
         $this->assertNotEmpty($html);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
index 125977e64faa864e79fb6aa1142d3cc62a14f6ee..4d5d9c41f8a681adb3c235669059daa8d5e322cc 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
@@ -75,7 +75,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
 
     /**
      * @magentoDataFixture Magento/Core/_files/db_translate_admin_store.php
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
      * @magentoDataFixture Magento/Catalog/controllers/_files/attribute_user_defined.php
      * @magentoAppIsolation enabled
      */
@@ -86,9 +86,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
         /** @var \Magento\Core\Model\Resource\Translate\String $translateString */
         $translateString = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Core\Model\Resource\Translate\String');
-        $translateString->saveTranslate(
-            'Fixture String', 'New Db Translation', 'en_US', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
-        );
+        $translateString->saveTranslate('Fixture String', 'New Db Translation', 'en_US');
         $this->assertEquals(
             'Fixture Db Translation', $this->_translate('Fixture String'), 'Translation is expected to be cached'
         );
@@ -111,8 +109,6 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
     protected function _translate($string)
     {
         // emulate admin store and design
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->setCurrentStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
             ->setDesignTheme(1);
         /** @var \Magento\Core\Model\Translate $translate */
@@ -150,7 +146,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
             'used_for_sort_by' => '0',
             'apply_to' => array('simple', 'configurable'),
             'frontend_label' => array(
-                \Magento\Core\Model\AppInterface::ADMIN_STORE_ID => 'Fixture String',
+                \Magento\Core\Model\Store::DEFAULT_STORE_ID => 'Fixture String',
             ),
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
index 4ad57bdf1950a7fd9e779ece23fea6ca54ac5717..799b2e0c8a2ce6f3e6fba7b37032623359275417 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -120,18 +120,16 @@ class TierpriceTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(2, count($price));
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     */
     public function testAfterSave()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->setCurrentStore(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                    ->get('Magento\Core\Model\StoreManagerInterface')
-                    ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
-            );
         /** @var $product \Magento\Catalog\Model\Product */
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Catalog\Model\Product');
         $product->load(1);
+        $product->unlockAttributes();
         $product->setOrigData();
         $product->setTierPrice(
             array(
@@ -160,7 +158,7 @@ class TierpriceTest extends \PHPUnit_Framework_TestCase
             ->get('Magento\Core\Model\StoreManagerInterface')->setCurrentStore(
                 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
                     ->get('Magento\Core\Model\StoreManagerInterface')
-                    ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+                    ->getStore(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
             );
         /** @var $product \Magento\Catalog\Model\Product */
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index f9a0dca71da95b2a098e771656b86a69349f049f..dfbe08b0d7e4821d0f574a31cef44e5338335752 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -69,15 +69,10 @@ class ProductTest extends \PHPUnit_Framework_TestCase
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
      */
     public function testCRUD()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->setCurrentStore(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                    ->get('Magento\Core\Model\StoreManagerInterface')
-                    ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
-            );
         $this->_model->setTypeId('simple')->setAttributeSetId(4)
             ->setName('Simple Product')->setSku(uniqid())->setPrice(10)
             ->setMetaTitle('meta title')->setMetaKeyword('meta keyword')->setMetaDescription('meta description')
@@ -140,6 +135,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
      */
     public function testDuplicate()
     {
@@ -157,6 +153,9 @@ class ProductTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     */
     public function testDuplicateSkuGeneration()
     {
         $this->_model->load(1);
@@ -173,7 +172,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
     protected function _undo($duplicate)
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+            ->getStore()->setId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
         $duplicate->delete();
     }
 
@@ -349,28 +348,29 @@ class ProductTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    public function testSetOrigData()
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testSetOrigDataFrontend()
     {
         $this->assertEmpty($this->_model->getOrigData());
         $this->_model->setOrigData('key', 'value');
         $this->assertEmpty($this->_model->getOrigData());
+    }
 
-        $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get('Magento\Core\Model\StoreManagerInterface')->getStore()->getId();
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
-        try {
-            $this->_model->setOrigData('key', 'value');
-            $this->assertEquals('value', $this->_model->getOrigData('key'));
-        } catch (\Exception $e) {
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-                ->getStore()->setId($storeId);
-            throw $e;
-        }
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId($storeId);
+    /**
+     * @magentoAppArea adminhtml
+     */
+    public function testSetOrigDataBackend()
+    {
+        $this->assertEmpty($this->_model->getOrigData());
+        $this->_model->setOrigData('key', 'value');
+        $this->assertEquals('value', $this->_model->getOrigData('key'));
     }
 
+    /**
+     * @magentoAppArea frontend
+     */
     public function testReset()
     {
         $model = $this->_model;
diff --git a/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php b/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
index 4189f655d9438e7dd652478afd7963a2ea821f9e..d0a8d85f6142116d46d3a2ddf8a6594a3a38fa64 100644
--- a/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
@@ -33,7 +33,7 @@ namespace Magento\Centinel;
 class CreateOrderTest extends \Magento\Backend\Utility\Controller
 {
     /**
-     * @magentoConfigFixture admin_store payment/ccsave/centinel 1
+     * @magentoConfigFixture default_store payment/ccsave/centinel 1
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testIndexAction()
@@ -49,7 +49,11 @@ class CreateOrderTest extends \Magento\Backend\Utility\Controller
             'cc_cid' => '123',
             'method' => 'ccsave',
         );
-        $order->addProducts(array(1 => array('qty' => 1)))->getQuote()->getPayment()->addData($paymentData);
+        $quote = $order->addProducts(array(1 => array('qty' => 1)))->getQuote();
+        $defaultStoreId = $this->_objectManager->get('Magento\Core\Model\StoreManagerInterface')
+            ->getStore('default')->getId();
+        $quote->setStoreId($defaultStoreId);
+        $quote->getPayment()->addData($paymentData);
         $this->dispatch('backend/sales/order_create/index');
         $this->assertContains('<div class="centinel">', $this->getResponse()->getBody());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index e1bb835ef3b7b16c5e37be8b615f6c93271342ed..b40cf2950b0b062df85f813af723ef344f810389 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -57,7 +57,7 @@ class StorageTest extends \PHPUnit_Framework_TestCase
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
             ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
-            ->setDesignTheme('magento_basic');
+            ->setDesignTheme('magento_backend');
         /** @var $model \Magento\Cms\Model\Wysiwyg\Images\Storage */
         $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Cms\Model\Wysiwyg\Images\Storage');
@@ -74,6 +74,9 @@ class StorageTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     */
     public function testGetThumbsPath()
     {
         $filesystem = new \Magento\Filesystem(new \Magento\Filesystem\Adapter\Local);
diff --git a/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php b/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php
index b6593aa7be4f8b8e8203e30f99f4e67bf3f60f4a..552e2445c9e806d66881510493d74eb0a1e39efd 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php
@@ -35,15 +35,10 @@ class UrlTest extends \PHPUnit_Framework_TestCase
     protected $_helper = null;
 
     protected function setUp()
-    {
-        $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Helper\Url');
-    }
-
-    public function testGetCurrentUrl()
     {
         $_SERVER['HTTP_HOST'] = 'example.com';
         $_SERVER['REQUEST_URI'] = '/fancy_uri';
-        $this->assertEquals('http://example.com/fancy_uri', $this->_helper->getCurrentUrl());
+        $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Helper\Url');
     }
 
     public function testGetCurrentBase64Url()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php
index a76f932b62d3bd3a6f4a780d427fd472822e3a58..e9c1fe7debd992a7c8b3590533e61d11b0f8e5c6 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php
@@ -140,8 +140,14 @@ class AppTest extends \PHPUnit_Framework_TestCase
     public function testGetStores()
     {
         $this->assertNotEmpty($this->_mageModel->getStores());
-        $this->assertNotContains(\Magento\Core\Model\App::ADMIN_STORE_ID, array_keys($this->_mageModel->getStores()));
-        $this->assertContains(\Magento\Core\Model\App::ADMIN_STORE_ID, array_keys($this->_mageModel->getStores(true)));
+        $this->assertNotContains(
+            \Magento\Core\Model\Store::DEFAULT_STORE_ID,
+            array_keys($this->_mageModel->getStores())
+        );
+        $this->assertContains(
+            \Magento\Core\Model\Store::DEFAULT_STORE_ID,
+            array_keys($this->_mageModel->getStores(true))
+        );
     }
 
     public function testGetDefaultStoreView()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
index 30ca12b56b1386448d2076230c4ab464f891267a..9581464cae359ecc5d4dca543f2e16bdab0c78e9 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
@@ -67,7 +67,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
         $this->_model->setData(
             array(
                 'store_id'  => 1,
-                'design'    => 'magento_demo',
+                'design'    => 'magento_blank',
                 /* Note: in order to load a design change it should be active within the store's time zone */
                 'date_from' => date('Y-m-d', strtotime('-1 day')),
                 'date_to'   => date('Y-m-d', strtotime('+1 day')),
@@ -140,7 +140,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
         $this->assertArrayHasKey('design', $cachedDesign);
         $this->assertEquals($cachedDesign['design'], $design->getDesign());
 
-        $design->setDesign('magento_demo')->save();
+        $design->setDesign('magento_blank')->save();
 
         $design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Core\Model\Design');
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
index 4e1c95ccf3080454ef60f0e2545fb71db50ae9da..5b2e198655f5970bec6cbb23699b7228b5f81d09 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
@@ -83,6 +83,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
+     * @magentoAppArea frontend
      */
     public function testDestructor()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
index a0f03563a78b91f4ed2a9b47673e222b18bf0c71..64e9bc1b563c6a0cb42575e0999649ea1f94ffbe 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
@@ -59,8 +59,8 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/application_cache.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
      * @magentoDataFixture Magento/Core/_files/layout_cache.php
      */
     public function testSaveAfterClearCache()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php
index 26b1911501dac9a3e588bebdb125a7e5fdb98927..9e7af0dbc561eaf4a7b1c955cf985961be58c72a 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php
@@ -147,7 +147,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetAllIds()
     {
-        $this->assertContains(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, $this->_collection->getAllIds());
+        $this->assertContains(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID, $this->_collection->getAllIds());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php
index 5aae59ab788ea52c7d55c7166b8854b8b520de20..f93d3daeb1c040c60923803c022fd071a7c02190 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php
@@ -40,6 +40,9 @@ class TransactionTest extends \PHPUnit_Framework_TestCase
             ->create('Magento\Core\Model\Resource\Transaction');
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     */
     public function testSaveDelete()
     {
         $first  = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
@@ -71,8 +74,6 @@ class TransactionTest extends \PHPUnit_Framework_TestCase
         $this->assertNotEmpty($first->getId());
         $this->assertNotEmpty($second->getId());
 
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
         $this->_model->delete();
 
         $test  = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php
index 500aa52a910d68a7c8e3774b51cbe70053f31c48..806ec740e427665c56dd747987df05b911b91575 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php
@@ -71,7 +71,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
             $this->_modelParams
         );
     }
-    
+
     protected function tearDown()
     {
         $this->_model = null;
@@ -298,6 +298,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
      */
     public function testCRUD()
     {
@@ -313,8 +314,6 @@ class StoreTest extends \PHPUnit_Framework_TestCase
         );
 
         /* emulate admin store */
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
         $crud = new \Magento\TestFramework\Entity($this->_model, array('name' => 'new name'));
         $crud->testCrud();
     }
@@ -342,8 +341,6 @@ class StoreTest extends \PHPUnit_Framework_TestCase
         $this->_model->setData($data);
 
         /* emulate admin store */
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId(\Magento\Core\Model\App::ADMIN_STORE_ID);
         $this->_model->save();
     }
 
@@ -368,7 +365,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider isUseStoreInUrlDataProvider
      */
-    public function testIsUseStoreInUrl($isInstalled, $storeInUrl, $storeId, $expectedResult)
+    public function testIsUseStoreInUrl($isInstalled, $storeInUrl, $disableStoreInUrl, $expectedResult)
     {
         $appStateMock = $this->getMock('Magento\App\State', array(), array(), '', false, false);
         $appStateMock->expects($this->any())
@@ -384,7 +381,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
         $model->expects($this->any())->method('getConfig')
             ->with($this->stringContains(\Magento\Core\Model\Store::XML_PATH_STORE_IN_URL))
             ->will($this->returnValue($storeInUrl));
-        $model->setStoreId($storeId);
+        $model->setDisableStoreInUrl($disableStoreInUrl);
         $this->assertEquals($expectedResult, $model->isUseStoreInUrl());
     }
 
@@ -395,10 +392,11 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     public function isUseStoreInUrlDataProvider()
     {
         return array(
-            array(true, true, 1, true),
-            array(false, true, 1, false),
-            array(true, false, 1, false),
-            array(true, true, 0, false),
+            array(true, true, null, true),
+            array(false, true, null, false),
+            array(true, false, null, false),
+            array(true, true, true, false),
+            array(true, true, false, true),
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php
index 69e10432dbabef004ca7647f058ecaf5a14636bc..cd99be9555eb4bd48c9b3d42daad0ba9d9943802 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php
@@ -40,7 +40,7 @@ class InlineParserTest extends \PHPUnit_Framework_TestCase
     public static function setUpBeforeClass()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
-            ->setDesignTheme('magento_demo');
+            ->setDesignTheme('magento_blank');
     }
 
     protected function setUp()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php
index bcbe27e1c9e636c2f455ee647c9e2248f6f41c5f..0f7974451aea96ab4eacb7e7609fd84baa90fe00 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php
@@ -43,7 +43,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')->setAreaCode('frontend');
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
-            ->setDesignTheme('magento_demo');
+            ->setDesignTheme('magento_blank');
     }
 
     protected function setUp()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php
index 404cd1e8dc7ec9c833a0e8a7722f579fa62ef801..e8778a93c49dd35b7ffbd9415a9ea50dd561bdde 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php
@@ -28,7 +28,7 @@
 namespace Magento\Core\Model;
 
 /**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
  */
 class TranslateTest extends \PHPUnit_Framework_TestCase
 {
@@ -113,7 +113,9 @@ class TranslateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoDataFixture Magento/Core/_files/db_translate.php
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
+     * @covers \Magento\Backend\Model\Resource\Translate::_getStoreId
+     * @covers \Magento\Backend\Model\Resource\Translate\String::_getStoreId
      */
     public function testInitCaching()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php
index a6cc866d7242ea7eed413d7cb7b193ca8b0f3726..df4c9d89b60adf9449a352a516286abbbfd37127 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php
@@ -114,8 +114,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($this->_model->isSecure());
         $this->_model->setSecureIsForced(1);
         $this->assertTrue(is_bool($this->_model->isSecure()));
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
         $this->assertFalse($this->_model->isSecure());
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
index 7201ce9e7be644c8a66ebdf3c9695708cfae3e06..bbe565fd5cf5edd8c553a247adab9dbb79306f88 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
@@ -27,6 +27,9 @@
 
 namespace Magento\Core\Model\Variable;
 
+/**
+ * @magentoAppArea adminhtml
+ */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
index 6d367985a03a99037be72e988d5f9485bf33f1c0..de3e5df9fe372db0b5871bc13dcdf23d2459da9e 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
@@ -197,7 +197,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
             array('theme_file.txt', array('module' => 'Magento_Catalog')),
             array('Magento_Catalog::theme_file.txt', array()),
             array('Magento_Catalog::theme_file_with_2_dots..txt', array()),
-            array('Magento_Catalog::theme_file.txt', array('module' => 'Overriden_Module')),
+            array('Magento_Catalog::theme_file.txt', array('module' => 'Overridden_Module')),
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php
index 6a91dcd4b8f5b055d4890df90886932e69eece35..4dd8aedc3ad2e1aa48e678378f092239b2f24058 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php
@@ -182,6 +182,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
      */
     public function testCRUD()
     {
@@ -194,8 +195,6 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
         );
 
         /* emulate admin store */
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
         $crud = new \Magento\TestFramework\Entity($this->_model, array('name' => 'new name'));
         $crud->testCrud();
     }
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml
index 042a16b16f64eab04a23e4df4a9cc51642fcf515..d4c188c7bbcbd6affbbb2c3a0ea5a2ca20cb2721 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml
@@ -27,8 +27,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Adminhtml\Block\Page" name="root" output="1" template="page.phtml">
-        <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+    <block class="Magento\Backend\Block\Page" name="root" output="1" template="page.phtml">
+        <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
             <action method="setTitle">
                 <argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
             </action>
@@ -43,7 +43,7 @@
             </action>
             <block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="page/js/calendar.phtml"/>
         </block>
-        <block class="Magento\Adminhtml\Block\Page\Header" name="header" as="header"/>
+        <block class="Magento\Backend\Block\Page\Header" name="header" as="header"/>
         <block class="Magento\Backend\Block\Menu" name="menu" as="menu"/>
         <block class="Magento\View\Block\Messages" name="messages" as="messages"/>
         <block class="Magento\View\Block\Text" as="no_name"/>
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php b/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php
index f6cc80c1fa54ca6ac21f828f33a0f5544b47e97f..aaae82a2a8a19491a96561d4cce2147e472febba 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php
@@ -22,9 +22,9 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+    ->loadAreaPart(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE, \Magento\Core\Model\App\Area::PART_CONFIG);
 /** @var \Magento\Core\Model\Resource\Translate\String $translateString */
 $translateString = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\Core\Model\Resource\Translate\String');
-$translateString->saveTranslate(
-    'Fixture String', 'Fixture Db Translation', null, \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
-);
+$translateString->saveTranslate('Fixture String', 'Fixture Db Translation', null);
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php
index 40a6ce86a4c4135704e7c6ec242a8bac39e32706..69c528a8fe95ddb8b52551bd70e82a2b0e7ae499 100644
--- a/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php
@@ -32,6 +32,8 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+            ->loadAreaPart('crontab', \Magento\Core\Model\App\Area::PART_CONFIG);
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Cron\Model\Observer');
         $this->_model->dispatch('this argument is not used');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php b/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php
index 45d52fdca37a40d6e0619b9945cbbdfb2c2b1cb1..ec7c640e13921ff1be4d10bd570c12c82c0a148d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php
@@ -59,13 +59,9 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
     {
         $previousStoreId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get('Magento\Core\Model\StoreManagerInterface')->getStore();
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->setCurrentStore(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                    ->get('Magento\Core\Model\StoreManagerInterface')
-                    ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
-            );
         if ($this->_createdCustomer && $this->_createdCustomer->getId() > 0) {
+            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+                ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
             $this->_createdCustomer->getAddressesCollection()->delete();
             $this->_createdCustomer->delete();
         }
@@ -123,7 +119,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
                 'password' => '123123q',
                 'default_billing' => null,
                 'default_shipping' => null,
-                'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+                'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
             )),
             'Mandatory data' => array(array(
                 'firstname' => 'SomeName',
@@ -161,7 +157,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
                 'suffix' => null,
                 'email' => 'test' . mt_rand(1000, 9999) . '@mail.com',
                 'password' => '123123q',
-                'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+                'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
             ), 'Magento\Validator\ValidatorException'),
             'Invalid email' => array(array(
                 'website_id' => 0,
@@ -173,7 +169,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
                 'suffix' => null,
                 'email' => '111@111',
                 'password' => '123123q',
-                'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+                'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
             ), 'Magento\Validator\ValidatorException'),
             'Invalid password' => array(array(
                 'website_id' => 0,
@@ -185,7 +181,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
                 'suffix' => null,
                 'email' => 'test' . mt_rand(1000, 9999) . '@mail.com',
                 'password' => '123',
-                'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+                'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
             ), 'Magento\Eav\Model\Entity\Attribute\Exception', 'The password must have at least 6 characters.')
         );
     }
@@ -364,7 +360,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
                 'email' => 'test' . mt_rand(1000, 9999) . '@mail.com',
                 'dob' => date('Y-m-d H:i:s'),
                 'gender' => 1,
-                'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+                'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
             ))
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php
index 3328b98984b5867926d4af974383babbd379b7d5..e9f49b6d4e420b0aaff53cea0d6e91a9bce1dc7b 100644
--- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php
+++ b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php
@@ -48,7 +48,7 @@ class InlineVdeTest extends \PHPUnit_Framework_TestCase
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')->setAreaCode('frontend');
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
-            ->setDesignTheme('magento_demo');
+            ->setDesignTheme('magento_blank');
     }
 
     protected function setUp()
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
index dae98bf10900032716fe3b48a91a026abca5a076..84850a22b08228bd2638b7e3dd0e6de4fb792d9a 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
@@ -45,14 +45,13 @@ class TypeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoDataFixture Magento/Downloadable/_files/product_with_files.php
+     * @magentoAppArea adminhtml
      */
     public function testDeleteTypeSpecificData()
     {
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Catalog\Model\Product');
         $product->load(1);
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
-            ->setCurrentStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
         $product->setOrigData();
         $downloadableData = array();
 
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml
index a9b326af3ba38b7c79906da11421eb8f6a65a295..8dbddf898e97cdd9b70edcabc8578941ed809010 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml
@@ -27,5 +27,5 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
-    <block class="Magento\Adminhtml\Block\Template" name="sample_email_content" template="Magento_Core::sample_email_content.phtml"/>
+    <block class="Magento\Backend\Block\Template" name="sample_email_content" template="Magento_Core::sample_email_content.phtml"/>
 </layout>
diff --git a/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
index cc82c080b8ed18fdc11372f635d7ee4f8d32cd59..1222260bdb1ada2ee994f24cd5a6bed7bd5aa470 100644
--- a/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
@@ -224,10 +224,10 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
         if (count($expectedSteps) > $counter+1) {
             $this->fail('Some expected steps are missing');
         }
-        $pathesForCheck = $model->getWritableFullPathsForCheck();
-        $this->assertArrayHasKey('etc', $pathesForCheck);
-        $this->assertArrayHasKey('media', $pathesForCheck);
-        $this->assertArrayHasKey('lib', $pathesForCheck);
-        $this->assertEquals('1', $pathesForCheck['etc']['recursive']);
+        $pathsForCheck = $model->getWritableFullPathsForCheck();
+        $this->assertArrayHasKey('etc', $pathsForCheck);
+        $this->assertArrayHasKey('media', $pathsForCheck);
+        $this->assertArrayHasKey('lib', $pathsForCheck);
+        $this->assertEquals('1', $pathsForCheck['etc']['recursive']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php b/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php
index 6641592ae4c55b49ef816ddbee41168de5bfb6a5..1edc55f9882339fbeb4e8d6eadd946c4de8cbd35 100644
--- a/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php
@@ -77,6 +77,7 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoDbIsolation enabled
+     * @magentoAppArea install
      */
     public function testCreateAdministrator()
     {
@@ -166,7 +167,7 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
      */
     public function testFinish()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/Queue/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php
similarity index 90%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/Queue/Edit/FormTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php
index 4bb4a1e8eab4bbae814454627090ff72b6a654a1..5dfb9682a014a6d4fe08f388bd1e42d13e3b10f6 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/Queue/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php
@@ -25,10 +25,10 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Edit;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
 
 /**
- * Test class for \Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form
+ * Test class for \Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form
  * @magentoAppArea adminhtml
  */
 class FormTest extends \PHPUnit_Framework_TestCase
@@ -45,9 +45,9 @@ class FormTest extends \PHPUnit_Framework_TestCase
             ->get('Magento\Config\ScopeInterface')
             ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create('Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form');
+            ->create('Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form');
         $prepareFormMethod = new \ReflectionMethod(
-            'Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form', '_prepareForm');
+            'Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form', '_prepareForm');
         $prepareFormMethod->setAccessible(true);
 
         $queue = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Newsletter\Model\Queue');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/SubscriberTest.php
similarity index 89%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/SubscriberTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/SubscriberTest.php
index 15a98eea39f1a3b5d49114a1f9a527d9d034b307..5a4215b2485fb5a1b0cdabeac8a2c4ccb9ad2098 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/SubscriberTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
 
 /**
  * @magentoAppArea adminhtml
@@ -36,8 +36,8 @@ class SubscriberTest extends \PHPUnit_Framework_TestCase
     {
         /** @var $layout \Magento\Core\Model\Layout */
         $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface');
-        /** @var $block \Magento\Adminhtml\Block\Newsletter\Subscriber */
-        $block = $layout->createBlock('Magento\Adminhtml\Block\Newsletter\Subscriber', 'block');
+        /** @var $block \Magento\Newsletter\Block\Adminhtml\Subscriber */
+        $block = $layout->createBlock('Magento\Newsletter\Block\Adminhtml\Subscriber', 'block');
         /** @var $childBlock \Magento\View\Block\Template */
         $childBlock = $layout->addBlock('Magento\View\Block\Template', 'grid', 'block');
 
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterQueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterQueueTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
index 89c3d5bf586126ada690f073c64f00c8034b5f13..57eb3281b756d27cc68271ba61df3156a3df9b75 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterQueueTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Newsletter\Controller\Adminhtml;
 
 /**
  * @magentoAppArea adminhtml
@@ -54,7 +54,7 @@ class NewsletterQueueTest extends \Magento\Backend\Utility\Controller
     }
 
     /**
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/newsletter_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
      * @magentoAppIsolation disabled
      */
     public function testSaveActionQueueTemplateAndVerifySuccessMessage()
@@ -66,7 +66,7 @@ class NewsletterQueueTest extends \Magento\Backend\Utility\Controller
         $this->getRequest()->setPost($postForQueue);
         $this->_model->loadByCode('some_unique_code');
         $this->getRequest()->setParam('template_id', $this->_model->getId());
-        $this->dispatch('backend/admin/newsletter_queue/save');
+        $this->dispatch('backend/newsletter/queue/save');
 
         /**
          * Check that errors was generated and set to session
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterTemplateTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
index fe8d41fd44af1d7b8015f23c8b6f5c0630a33b88..cbe0015142ac911048a0a1bc2124a2b2abceeac8 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterTemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Newsletter\Controller\Adminhtml;
 
 /**
  * @magentoAppArea adminhtml
@@ -68,7 +68,7 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
     {
         $this->_model->loadByCode('some_unique_code');
         $this->getRequest()->setParam('id', $this->_model->getId());
-        $this->dispatch('backend/admin/newsletter_template/save');
+        $this->dispatch('backend/newsletter/template/save');
         /**
          * Check that errors was generated and set to session
          */
@@ -83,13 +83,13 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/newsletter_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
      */
     public function testSaveActionEditTemplateAndVerifySuccessMessage()
     {
         $this->_model->loadByCode('some_unique_code');
         $this->getRequest()->setParam('id', $this->_model->getId());
-        $this->dispatch('backend/admin/newsletter_template/save');
+        $this->dispatch('backend/newsletter/template/save');
 
         /**
          * Check that errors was generated and set to session
@@ -116,7 +116,7 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
                       'sender_name'=>'Test Sender Name',
                       'text'=>'Template Content');
         $this->getRequest()->setPost($post);
-        $this->dispatch('backend/admin/newsletter_template/save');
+        $this->dispatch('backend/newsletter/template/save');
 
         /**
          * Check that errors was generated and set to session
@@ -131,13 +131,13 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Adminhtml/controllers/_files/newsletter_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
      */
     public function testDeleteActionTemplateAndVerifySuccessMessage()
     {
         $this->_model->loadByCode('some_unique_code');
         $this->getRequest()->setParam('id', $this->_model->getId());
-        $this->dispatch('backend/admin/newsletter_template/delete');
+        $this->dispatch('backend/newsletter/template/delete');
 
         /**
          * Check that errors was generated and set to session
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php
index 7922f12618cf240469af5432c57cce8315124229..0653284ae5c1b41f3db876fe4576c8185beac1a2 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php
@@ -51,7 +51,7 @@ class QueueTest extends \PHPUnit_Framework_TestCase
         $app->loadArea(\Magento\Core\Model\App\Area::AREA_FRONTEND);
 
         $collection = $objectManager->create('Magento\Core\Model\Resource\Theme\Collection');
-        $themeId = $collection->getThemeByFullPath('frontend/magento_demo')->getId();
+        $themeId = $collection->getThemeByFullPath('frontend/magento_blank')->getId();
         /** @var $storeManager \Magento\Core\Model\StoreManagerInterface */
         $storeManager = $objectManager->get('Magento\Core\Model\StoreManagerInterface');
         $storeManager->getStore('fixturestore')->setConfig(
@@ -65,7 +65,7 @@ class QueueTest extends \PHPUnit_Framework_TestCase
             $this->stringEndsWith('/static/frontend/magento_plushe/en_US/images/logo.gif')
         );
         $subscriberTwo->expects($this->once())->method('setBodyHTML')->with(
-            $this->stringEndsWith('/static/frontend/magento_demo/de_DE/images/logo.gif')
+            $this->stringEndsWith('/static/frontend/magento_blank/de_DE/images/logo.gif')
         );
         /** @var $filter \Magento\Newsletter\Model\Template\Filter */
         $filter = $objectManager->get('Magento\Newsletter\Model\Template\Filter');
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
index 0bed8ed1da3cba7128d1011729fc281970e77482..cd86bcf71faad2c9a975624ac71ef0fdcc626c77 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -46,7 +46,6 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
     /**
      * This test expects next themes for areas:
      * install/design/theme/full_name   magento_basic
-     * adminhtml/design/theme/full_name magento_basic
      * current_store design/theme/full_name magento_iphone
      * fixturestore_store design/theme/full_name magento_blank
      *
@@ -57,7 +56,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
     {
         $this->markTestIncomplete('Test partially fails bc of MAGETWO-557.');
         $this->_model->setTemplateText('{{view url="Magento_Page::favicon.ico"}}');
-        $this->assertStringEndsWith('theme/frontend/magento_demo/en_US/Magento_Page/favicon.ico',
+        $this->assertStringEndsWith('theme/frontend/magento_blank/en_US/Magento_Page/favicon.ico',
             $this->_model->getProcessedTemplate()
         );
         $this->_model->emulateDesign($store, $area);
@@ -73,7 +72,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
     {
         return array(
             'install'        => array('install',   'default',      'magento_demo'),
-            'backend'        => array('adminhtml', 'admin',        'magento_basic'),
+            'backend'        => array('adminhtml', 'admin',        'magento_backend'),
             'frontend'       => array('frontend',  'default',      'magento_iphone'),
             'frontend store' => array('frontend',  'fixturestore', 'magento_blank'),
         );
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/newsletter_sample.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/newsletter_sample.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/newsletter_sample.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/_files/newsletter_sample.php
diff --git a/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php
index 22482a4b2c20cd7413d08c1782b765655ebf2c14..23caad9aa8623168007f00ba187be061dce25bf2 100644
--- a/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php
@@ -26,7 +26,7 @@
 namespace Magento\Object\Copy\Config;
 
 /**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
  */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php b/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php
index 073c9867e536418bb5f1dff893fb65c4db3eba88..0ce75e260b5b137d4e40b7fd42709e835ac09b5c 100644
--- a/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php
@@ -39,7 +39,7 @@ class HeadTest extends \PHPUnit_Framework_TestCase
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')
             ->setAreaCode('frontend');
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
-            ->setDesignTheme('magento_demo');
+            ->setDesignTheme('magento_blank');
         $this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
             ->createBlock('Magento\Page\Block\Html\Head');
     }
@@ -118,12 +118,12 @@ class HeadTest extends \PHPUnit_Framework_TestCase
             . "\n"
             . '<script type="text/javascript" src="http://localhost/pub/lib/varien/js.js"></script>' . "\n"
             . '<script type="text/javascript" '
-            . 'src="http://localhost/pub/static/frontend/magento_demo/en_US/Magento_Bundle/bundle.js">'
+            . 'src="http://localhost/pub/static/frontend/magento_blank/en_US/Magento_Bundle/bundle.js">'
             . '</script>' . "\n"
             . '<link rel="stylesheet" type="text/css" media="all"'
             . ' href="http://localhost/pub/lib/tiny_mce/themes/advanced/skins/default/ui.css" />' . "\n"
             . '<link rel="stylesheet" type="text/css" media="print" '
-                . 'href="http://localhost/pub/static/frontend/magento_demo/en_US/css/styles.css" />'
+                . 'href="http://localhost/pub/static/frontend/magento_blank/en_US/css/styles.css" />'
                 . "\n"
             . '<link rel="next" href="http://localhost/index.php/category.html" />' . "\n"
             . '<!--[if lt IE 7]>' . "\n"
@@ -223,7 +223,7 @@ class HeadTest extends \PHPUnit_Framework_TestCase
             . '<link rel="stylesheet" type="text/css" media="all"'
             . ' href="http://localhost/index.php/core/index/notfound" />' . "\n"
             . '<link rel="stylesheet" type="text/css" media="print"'
-            . ' href="http://localhost/pub/static/frontend/magento_demo/en_US/css/styles.css" />'
+            . ' href="http://localhost/pub/static/frontend/magento_blank/en_US/css/styles.css" />'
             . "\n", $this->_block->getCssJsHtml());
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php b/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
index 0c62e072adf4f63d89fdfbaddadac218d1c59eee..ede0e33dfaad0c72d8bcd60fd67260f1ad505a46 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
@@ -32,11 +32,10 @@ class InfoTest extends \PHPUnit_Framework_TestCase
     /**
      * @magentoConfigFixture current_store payment/banktransfer/title Bank Method Title
      * @magentoConfigFixture current_store payment/checkmo/title Checkmo Title Of The Method
+     * @magentoAppArea adminhtml
      */
     public function testGetChildPdfAsArray()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')
-            ->setAreaCode(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         /** @var $layout \Magento\Core\Model\Layout */
         $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface');
         $block = $layout->createBlock('Magento\Payment\Block\Info', 'block');
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
index 516719a44c09e631d82dc1043a27d977f5669250..a726fadbc87d20fbce0d62f4ae9f95ca9fbce2f8 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
@@ -32,11 +32,9 @@ class ExpressTest extends \Magento\TestFramework\TestCase\AbstractController
      */
     public function testReviewAction()
     {
-        $this->markTestSkipped('There is a dependency that needs to be identified for this test');
         $quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create('Magento\Sales\Model\Quote');
         $quote->load('test01', 'reserved_order_id');
-        echo "Quote ID: {$quote->getId}\n";
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Checkout\Model\Session')
             ->setQuoteId($quote->getId());
 
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Filter/FormTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Filter/FormTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php
index 09b6fb1b156822272e66a43c7dfc718332eab527..b508e7fb61cac311b4a7fa4d932251dbd30c67bc 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Filter/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php
@@ -25,10 +25,10 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Filter;
+namespace Magento\Reports\Block\Adminhtml\Filter;
 
 /**
- * Test class for \Magento\Adminhtml\Block\Report\Filter\Form
+ * Test class for \Magento\Reports\Block\Adminhtml\Filter\Form
  * @magentoAppArea adminhtml
  */
 class FormTest extends \PHPUnit_Framework_TestCase
@@ -42,9 +42,9 @@ class FormTest extends \PHPUnit_Framework_TestCase
             ->setArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE)
             ->setDefaultDesignTheme();
         $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Layout');
-        $block = $layout->addBlock('Magento\Adminhtml\Block\Report\Filter\Form');
+        $block = $layout->addBlock('Magento\Reports\Block\Adminhtml\Filter\Form');
         $prepareFormMethod = new \ReflectionMethod(
-            'Magento\Adminhtml\Block\Report\Filter\Form', '_prepareForm');
+            'Magento\Reports\Block\Adminhtml\Filter\Form', '_prepareForm');
         $prepareFormMethod->setAccessible(true);
         $prepareFormMethod->invoke($block);
 
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Bestsellers/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/GridTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Bestsellers/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/GridTest.php
index 4472f31e9d6964074075f82e9eedd185ed811883..a2b56db8c248cdbda63d79e62136d4cceb4c858c 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Bestsellers/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/GridTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales\Bestsellers;
+namespace Magento\Reports\Block\Adminhtml\Sales\Bestsellers;
 
 /**
  * @magentoAppArea adminhtml
@@ -33,7 +33,7 @@ namespace Magento\Adminhtml\Block\Report\Sales\Bestsellers;
 class GridTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid
+     * @var \Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid
      */
     protected $_block;
 
@@ -41,7 +41,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
     {
         parent::setUp();
         $this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid');
+            ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid');
     }
 
     public function testGetResourceCollectionName()
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Coupons/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Coupons/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Coupons/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Coupons/GridTest.php
index f7befb8871badd76bc64b61d8b6a4829daab0e77..513db339755ec51582d57c8ecf2ae85bac409ea5 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Coupons/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Coupons/GridTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales\Coupons;
+namespace Magento\Reports\Block\Adminhtml\Sales\Coupons;
 
 /**
  * @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
      * Creates and inits block
      *
      * @param string|null $reportType
-     * @return \Magento\Adminhtml\Block\Report\Sales\Coupons\Grid
+     * @return \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
      */
     protected function _createBlock($reportType = null)
     {
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Report\Sales\Coupons\Grid');
+            ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid');
 
         $filterData = new \Magento\Object();
         if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Invoiced/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Invoiced/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Invoiced/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Invoiced/GridTest.php
index 5e39ca592de8ce9e229135def0bc7938d4efb353..a7ef2b3cefbd2c65bea652666cd9b86a209d6aef 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Invoiced/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Invoiced/GridTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales\Invoiced;
+namespace Magento\Reports\Block\Adminhtml\Sales\Invoiced;
 
 /**
  * @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
      * Creates and inits block
      *
      * @param string|null $reportType
-     * @return \Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid
+     * @return \Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid
      */
     protected function _createBlock($reportType = null)
     {
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid');
+            ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid');
 
         $filterData = new \Magento\Object();
         if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Refunded/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Refunded/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Refunded/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Refunded/GridTest.php
index ad6d42391ae411afc17452a3e92d7ecfab059dc6..2f290a9c124dff497aba83ff93e0e135ea25cdcf 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Refunded/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Refunded/GridTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales\Refunded;
+namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
 
 /**
  * @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
      * Creates and inits block
      *
      * @param string|null $reportType
-     * @return \Magento\Adminhtml\Block\Report\Sales\Refunded\Grid
+     * @return \Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid
      */
     protected function _createBlock($reportType = null)
     {
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Report\Sales\Refunded\Grid');
+            ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid');
 
         $filterData = new \Magento\Object();
         if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Sales/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Sales/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
index e6d091edb27ee2fff0974c637d91b28cb18e3a10..0fa577c7919457dd8564a6a7d444ebf0616603bd 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Sales/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
 
 /**
  * @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
      * Creates and inits block
      *
      * @param string|null $reportType
-     * @return \Magento\Adminhtml\Block\Report\Sales\Sales\Grid
+     * @return \Magento\Reports\Block\Adminhtml\Sales\Sales\Grid
      */
     protected function _createBlock($reportType = null)
     {
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Report\Sales\Sales\Grid');
+            ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid');
 
         $filterData = new \Magento\Object();
         if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Shipping/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Shipping/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Shipping/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Shipping/GridTest.php
index 7f1de78a63a5c00b3b1db33ec590b810bd405e25..c41c8badf1c007b5bd92281afe3cf04a834f8133 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Shipping/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Shipping/GridTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales\Shipping;
+namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
 
 /**
  * @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
      * Creates and inits block
      *
      * @param string|null $reportType
-     * @return \Magento\Adminhtml\Block\Report\Sales\Shipping\Grid
+     * @return \Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid
      */
     protected function _createBlock($reportType = null)
     {
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Report\Sales\Shipping\Grid');
+            ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid');
 
         $filterData = new \Magento\Object();
         if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Tax/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Tax/GridTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Tax/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Tax/GridTest.php
index db75c6a06353e412cb130ec2f9490c3fc7d857a7..e997e4ca9ed3c03fe522c432bdbb84523541e42e 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Tax/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Tax/GridTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block\Report\Sales\Tax;
+namespace Magento\Reports\Block\Adminhtml\Sales\Tax;
 
 /**
  * @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
      * Creates and inits block
      *
      * @param string|null $reportType
-     * @return \Magento\Adminhtml\Block\Report\Sales\Tax\Grid
+     * @return \Magento\Reports\Block\Adminhtml\Sales\Tax\Grid
      */
     protected function _createBlock($reportType = null)
     {
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
-            ->createBlock('Magento\Adminhtml\Block\Report\Sales\Tax\Grid');
+            ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid');
 
         $filterData = new \Magento\Object();
         if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
index 2cdcd80295ebb389296b2cef7be6e72a999c5aaf..32d2ef25633f97c589cac347e689daada213b58c 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
@@ -52,7 +52,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     {
         $expectedResult = array(1 => 3, 2 => 1, 21 => 2);
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[$reportItem->getData('product_id')] = $reportItem->getData('views_num');
         }
diff --git a/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php b/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php
index 1c65ad9656b543212a2d761a066999490269d1ac..b20f0c47fbedb1a8ca99ed8c7d23505731e4849a 100644
--- a/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php
+++ b/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php
@@ -85,6 +85,7 @@ class CatalogTest extends \Magento\TestFramework\TestCase\AbstractController
 
     /**
      * @dataProvider authorizationFailedDataProvider
+     * @magentoAppArea adminhtml
      */
     public function testAuthorizationFailed($action)
     {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
index b815f224dc43add27489dcf3dd0372579d86e53f..7b9ea090d7efc6a265bb92bf31f9291a746410a1 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
@@ -97,6 +97,7 @@ class CreateTest extends \Magento\Backend\Utility\Controller
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoAppArea adminhtml
      */
     public function testIndexAction()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php
index e5d8d2acc022430c39523d14b0ee8b6f52501194..e96f2ff69b9ad411d9ff763862b119c70b8f1d74 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php
@@ -50,7 +50,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     {
         $expectedResult = array(1 => 2);
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[$reportItem->getData('product_id')] = $reportItem->getData('qty_ordered');
         }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php
index 6f708abc830fc3d42581956d33297b7ba0a36d1a..8c9d0fe7d68f2d6bf08c37eefaa80a936a5608f8 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php
@@ -52,7 +52,7 @@ class InvoicedTest extends \PHPUnit_Framework_TestCase
             array('orders_count' => 1, 'orders_invoiced' => 1),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array(
                 'orders_count' => $reportItem->getData('orders_count'),
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php
index 68c026af8bf4c24c5bc5989757ecffe3f913d5a2..cfd74e3f2512d6958b166f737860f6faffd882d6 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php
@@ -52,7 +52,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
             array('orders_count' => 1, 'orders_invoiced' => 1),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array(
                 'orders_count' => $reportItem->getData('orders_count'),
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php
index 27255c07b1cb30b1e4bb5cc0457b958713500e94..20df0848a27202194128d3d7645f70453c9ab7d9 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php
@@ -52,7 +52,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
             array('orders_count' => 1, 'total_qty_ordered' => 2, 'total_qty_invoiced' => 2),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php
index 83dc8a3cd1215abbe89276328991163d6836bbdd..a235c1019e6af5c39fd5ac4dc94875c6c25ff138 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php
@@ -57,7 +57,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
             ),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php
index 8a6b1b7b7084d4723646ea31f924ef0268f7a61d..f2e9450218611c914b5538c5a06f4f9118d2e8bf 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php
@@ -57,7 +57,7 @@ class RefundedTest extends \PHPUnit_Framework_TestCase
             ),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php
index b3891565224e6975e2d08095de91422091863a5e..865b37dc6854d7967f1b997afd65360aa237ebb4 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php
@@ -56,7 +56,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
             ),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php
index b9c1c160264dbcf9cd4353a7d6b2ed7de38494c0..2cb998a6c0506e22efae1165c3220c5ac7b2eb31 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php
@@ -56,7 +56,7 @@ class ShipmentTest extends \PHPUnit_Framework_TestCase
             ),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
index 4b4c1db083579f02d45313810dee86d79e72d453..fe3ece45992c70ecc6aa7bef76ca3d261a505558 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
@@ -55,7 +55,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
             ),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php
index c4fa96c57b9a96b3729a032a6f75ad085e37ec88..42238147942a600c857fd076c8648f93353b79c5 100644
--- a/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php
@@ -47,7 +47,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             50000,
-            $this->_helper->getMaximumLinesNumber(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            $this->_helper->getMaximumLinesNumber(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
         );
         $this->assertEquals(
             10,
@@ -61,7 +61,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     public function testGetMaximumFileSize()
     {
         $this->assertEquals(
-            10485760, $this->_helper->getMaximumFileSize(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            10485760, $this->_helper->getMaximumFileSize(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
         );
         $this->assertEquals(
             1024,
@@ -75,7 +75,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     public function testGetCategoryChangefreq()
     {
         $this->assertEquals(
-            'daily', $this->_helper->getCategoryChangefreq(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            'daily', $this->_helper->getCategoryChangefreq(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
         );
         $this->assertEquals(
             'montly', $this->_helper->getCategoryChangefreq(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -88,7 +88,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     public function testGetProductChangefreq()
     {
         $this->assertEquals(
-            'daily', $this->_helper->getProductChangefreq(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            'daily', $this->_helper->getProductChangefreq(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
         );
         $this->assertEquals(
             'montly', $this->_helper->getProductChangefreq(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -102,7 +102,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             'daily',
-            $this->_helper->getPageChangefreq(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            $this->_helper->getPageChangefreq(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
         );
         $this->assertEquals(
             'montly',
@@ -115,7 +115,10 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetCategoryPriority()
     {
-        $this->assertEquals(0.5, $this->_helper->getCategoryPriority(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID));
+        $this->assertEquals(
+            0.5,
+            $this->_helper->getCategoryPriority(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
+        );
         $this->assertEquals(
             100,
             $this->_helper->getCategoryPriority(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -127,7 +130,10 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetProductPriority()
     {
-        $this->assertEquals(1, $this->_helper->getProductPriority(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID));
+        $this->assertEquals(
+            1,
+            $this->_helper->getProductPriority(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
+        );
         $this->assertEquals(100, $this->_helper->getProductPriority(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID));
     }
 
@@ -136,7 +142,10 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetPagePriority()
     {
-        $this->assertEquals(0.25, $this->_helper->getPagePriority(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID));
+        $this->assertEquals(
+            0.25,
+            $this->_helper->getPagePriority(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
+        );
         $this->assertEquals(100, $this->_helper->getPagePriority(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID));
     }
 
@@ -147,7 +156,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             0,
-            $this->_helper->getEnableSubmissionRobots(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            $this->_helper->getEnableSubmissionRobots(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
         );
         $this->assertEquals(
             1, $this->_helper->getEnableSubmissionRobots(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -160,7 +169,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     public function testGetProductImageIncludePolicy()
     {
         $this->assertEquals(
-            'all', $this->_helper->getProductImageIncludePolicy(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+            'all', $this->_helper->getProductImageIncludePolicy(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
         );
         $this->assertEquals(
             'base', $this->_helper->getProductImageIncludePolicy(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php
index 02a81decdb108dd3afe82a3b5fba4ee39e6b146b..f89df7a918f3b84b5054166cc558841d46fc66b9 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php
@@ -57,7 +57,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
             ),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
index ad6e00c2b1c28273bdad619d50d5a7109a942201..437a66a7e329349dd9bd16c3d176a4ac36aa4357 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
@@ -66,7 +66,7 @@ class MethodsTest extends \PHPUnit_Framework_TestCase
                     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
                         ->get('Magento\Core\Model\StoreManagerInterface')
                         ->getStore()
-                        ->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+                        ->setId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
                     $block->setArea('adminhtml');
                     $this->assertFileExists($block->getTemplateFile(), $message);
                     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
index 42cd9dcbfb81831e66b204a26ccbc738b9979eed..5781111f437dac12ee9022306947a567c76cb20c 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
@@ -49,8 +49,9 @@ class LayoutFilesTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider layoutTypesDataProvider
      */
-    public function testLayoutTypes($layout)
+    public function testLayoutTypes($area, $layout)
     {
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')->loadArea($area);
         $layout = simplexml_load_file(
             $layout,
             'Magento\View\Layout\Element'
@@ -79,7 +80,15 @@ class LayoutFilesTest extends \PHPUnit_Framework_TestCase
      */
     public function layoutTypesDataProvider()
     {
-        return \Magento\TestFramework\Utility\Files::init()->getLayoutFiles();
+        $areas = array('adminhtml', 'frontend', 'install', 'email');
+        $data = array();
+        foreach ($areas as $area) {
+            $layoutFiles = \Magento\TestFramework\Utility\Files::init()->getLayoutFiles(array('area' => $area), false);
+            foreach ($layoutFiles as $layoutFile) {
+                $data[] = array($area, $layoutFile);
+            }
+        }
+        return $data;
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php
index fb5e3c023b9100132859847aa75f5b84c27527c7..d8cbb573f38ea63fb5e44694f92973425e4893f4 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php
@@ -45,7 +45,6 @@ class ViewFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrity
              * @throws \PHPUnit_Framework_AssertionFailedError|Exception
              */
             function ($area, $themeId, $file) {
-                $this->_markTestIncompleteDueToBug($area, $file);
                 try {
                     $params = array('area' => $area, 'themeId' => $themeId);
                     $viewFile = \Magento\TestFramework\Helper\Bootstrap::getObjectmanager()
@@ -84,21 +83,6 @@ class ViewFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrity
         );
     }
 
-    /**
-     * This dummy method was introduced to circumvent cyclomatic complexity check
-     *
-     * @param string $area
-     * @param string $file
-     */
-    protected function _markTestIncompleteDueToBug($area, $file)
-    {
-        if ($area === 'frontend' && in_array($file, array('js/selectivizr-min.js', 'css/styles.css'))
-            || $area === 'adminhtml' && in_array($file, array('mui/reset.css'))
-        ) {
-            $this->markTestIncomplete('MAGETWO-9806, MAGETWO-12325');
-        }
-    }
-
     /**
      * Analyze path to a file in CSS url() directive and add the original CSS-file relative path to it
      *
diff --git a/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php
index c48ae2c58c295eefa56d7a99847b0811cf899b4f..2a8d3503fa8eea1b7eb1ed268aa6594e8708c427 100644
--- a/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php
@@ -60,13 +60,13 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetResetPasswordLinkExpirationPeriod()
     {
-        /** @var $configModel \Magento\Core\Model\Config */
-        $configModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\Config');
+        /** @var $configModel \Magento\Backend\App\ConfigInterface */
+        $configModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get('Magento\Backend\App\ConfigInterface');
         $this->assertEquals(
             1,
             (int) $configModel->getValue(
-                \Magento\User\Helper\Data::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD,
-                'default'
+                \Magento\User\Helper\Data::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD
         ));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php
index cbca65c9e56843133ba8362a53681b20c2b871fd..43ec9413f9b868388fad93a1fb8f595afed2925c 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php
@@ -49,7 +49,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
             ),
         );
         $actualResult = array();
-        /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+        /** @var \Magento\Reports\Model\Item $reportItem */
         foreach ($this->_collection->getItems() as $reportItem) {
             $actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
         }
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
index 62868e97866c79d75dd30b536d00c14c2314ed4d..31d3da3060789d279f77d68e59037fe388ad62da 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -173,15 +173,15 @@ class UserTest extends \PHPUnit_Framework_TestCase
 
     public function testSendPasswordResetConfirmationEmail()
     {
-        /** @var $storeConfig \Magento\Core\Model\Store\Config */
-        $storeConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get('Magento\Core\Model\Store\Config');
+        /** @var $config \Magento\Backend\App\ConfigInterface */
+        $config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get('Magento\Backend\App\ConfigInterface');
         $mailer = $this->getMock('Magento\Email\Model\Template\Mailer', array(), array(
             $this->getMock('Magento\Email\Model\TemplateFactory', array(), array(), '', false)
         ));
         $mailer->expects($this->once())
             ->method('setTemplateId')
-            ->with($storeConfig->getConfig(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_TEMPLATE));
+            ->with($config->getValue(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_TEMPLATE));
         $mailer->expects($this->once())
             ->method('send');
         $this->_model->setMailer($mailer);
@@ -205,7 +205,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store admin/security/use_case_sensitive_login 1
+     * @magentoAdminConfigFixture admin/security/use_case_sensitive_login 1
      */
     public function testAuthenticate()
     {
diff --git a/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php b/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php
index c2b28c7998aacccab4f028d7e384b342fdfde7be..f316aa6387f82821e5e4efc94a3542279836c920 100644
--- a/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php
+++ b/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php
@@ -28,6 +28,8 @@
 /**
  * Create dummy user
  */
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+    ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
 $user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create('Magento\User\Model\User');
 $user->setFirstname('Dummy')
diff --git a/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php b/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php
index efdbf9b14acf62d41f0dc5e9890918878fb51099..2e4fdaeff2a51ad73d3da99ef32ca1ca6f8ac5d8 100644
--- a/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php
@@ -72,7 +72,7 @@ class AbstractBlockTest extends \PHPUnit_Framework_TestCase
 
         $cssUrl = $this->_block->getViewFileUrl('css/wrong.css', array(
             'area'    => 'frontend',
-            'theme'   => 'magento_demo',
+            'theme'   => 'magento_plushe',
             'locale'  => 'en_US'
         ));
         $this->assertStringMatchesFormat('%s/css/wrong.css', $cssUrl);
diff --git a/dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_demo/css/wrong.css b/dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_plushe/css/wrong.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_demo/css/wrong.css
rename to dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_plushe/css/wrong.css
diff --git a/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php b/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php
index 8f2561f7af56efd766271e0106032f7e31446722..f9919e167c74c3bf92d2cf4711990af6a95d43bb 100644
--- a/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php
+++ b/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php
@@ -51,7 +51,7 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         $this->_model->prepare();
 
         $this->assertEquals('root', (string)$blockNode->attributes()->parent);
-        $this->assertEquals('Magento\Adminhtml\Block\Page\Head', (string)$blockNode->attributes()->class);
+        $this->assertEquals('Magento\Backend\Block\Page\Head', (string)$blockNode->attributes()->class);
         $this->assertEquals('head', (string)$actionNode->attributes()->block);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml b/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml
index 79ef0cc3b40e0ea9b6b4dfc01e898ea2711c89ba..072d3a23fba4ee318d67c53335981f4508ad4cde 100644
--- a/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml
+++ b/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml
@@ -27,8 +27,8 @@
  */
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <block class="Magento\Adminhtml\Block\Page" name="root" output="1" template="page.phtml">
-        <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+    <block class="Magento\Backend\Block\Page" name="root" output="1" template="page.phtml">
+        <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
             <action method="setTitle">
                 <argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
             </action>
@@ -49,7 +49,7 @@
             </block>
             <block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="page/js/calendar.phtml"/>
         </block>
-        <block class="Magento\Adminhtml\Block\Page\Header" name="header" as="header"/>
+        <block class="Magento\Backend\Block\Page\Header" name="header" as="header"/>
         <block class="Magento\Backend\Block\Menu" name="menu" as="menu"/>
         <block class="Magento\View\Block\Messages" name="messages" as="messages"/>
         <block class="Magento\View\Block\Text" as="no_name"/>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
index e91dfb2f41bc158a119b6bee76f7213696da7e22..161a3aaac441f7d02b42641d8a1a5bc13e1bdf8c 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
@@ -27,7 +27,7 @@
 namespace Magento\Widget\Model\Config;
 
 /**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
  * @magentoAppArea adminhtml
  */
 class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
index 688480e6f4e02ea0bb7ba811a19667737a84d879..9260106652191c2ecb9c1aa7e1f5c474994ad216 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
@@ -23,7 +23,7 @@ namespace Magento\Widget\Model\Config;
  *
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
  */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
index 6ab959f223f358a97a646342f6617fb7bee96cd7..7d5bd951ecd92a1574fd5c18e4bd2c6958271619 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
@@ -26,6 +26,9 @@
  */
 namespace Magento\Widget\Model\Widget;
 
+/**
+ * @magentoAppArea adminhtml
+ */
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -46,10 +49,8 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetPluginSettings()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
-            ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
-            ->setDesignTheme('magento_basic');
+            ->setDesignTheme('magento_backend');
 
         $config = new \Magento\Object();
         $settings = $this->_model->getPluginSettings($config);
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
index a506788d31b5f881ec9c51abe410523909a1025a..96fec5f9530603c6cb0852a827a902bad96b0cd5 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
@@ -130,7 +130,7 @@ class InstanceTest extends \PHPUnit_Framework_TestCase
         );
         $model->setData('widget_parameters', $params);
         $this->assertEquals('', $model->generateLayoutUpdateXml('content'));
-        $model->setId('test_id')->setPackageTheme('magento_demo');
+        $model->setId('test_id')->setPackageTheme('magento_plushe');
         $result = $model->generateLayoutUpdateXml('content');
         $this->assertContains('<referenceContainer name="content">', $result);
         $this->assertContains('<block class="' . $model->getType() . '"', $result);
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php
index c2e4f87bb728203bcfc0a891a608ac42bb6a75a8..dd06f01af156600f944a3e2c8edf852a148aa88d 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php
@@ -68,9 +68,9 @@ class WidgetTest extends \PHPUnit_Framework_TestCase
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
             ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
-            ->setDesignTheme('magento_basic');
+            ->setDesignTheme('magento_backend');
         $expectedPubFile = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\Dir')
-                ->getDir(\Magento\App\Dir::STATIC_VIEW) . "/adminhtml/magento_basic/en_US/{$expectedFile}";
+                ->getDir(\Magento\App\Dir::STATIC_VIEW) . "/adminhtml/magento_backend/en_US/{$expectedFile}";
         if (file_exists($expectedPubFile)) {
             unlink($expectedPubFile);
         }
@@ -122,7 +122,7 @@ class WidgetTest extends \PHPUnit_Framework_TestCase
         );
 
         $expectedFile = dirname(__DIR__)
-            . '/_files/design/adminhtml/magento_basic/Magento_Catalog/images/product_widget_new.gif';
+            . '/_files/design/adminhtml/magento_backend/Magento_Catalog/images/product_widget_new.gif';
         $this->assertFileEquals($expectedFile, $actualFile);
     }
 }
diff --git a/dev/tests/performance/benchmark_logs_merge.php b/dev/tests/performance/benchmark_logs_merge.php
new file mode 100644
index 0000000000000000000000000000000000000000..f2ccbdd17e8d98805bfd7652271568073c0997c1
--- /dev/null
+++ b/dev/tests/performance/benchmark_logs_merge.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     performance_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+$magentoBaseDir = realpath(__DIR__ . '/../../../');
+require_once $magentoBaseDir. '/lib/Zend/Console/Getopt.php';
+
+$shell = new Zend_Console_Getopt(array(
+    'xml=s'  => 'xml',
+    'csv=s'  => 'csv',
+    'logs=s' => 'logs'
+));
+
+$args = $shell->getOptions();
+if (empty($args)) {
+    echo $shell->getUsageMessage();
+    exit(1);
+}
+
+$xmlUrl = $shell->getOption('xml');
+$scvUrl = $shell->getOption('csv');
+$newLogsUrl = $shell->getOption('logs');
+
+if (!file_exists($xmlUrl)) {
+    echo 'xml does not exist';
+    exit(1);
+}
+
+if (!file_exists($scvUrl)) {
+    echo 'csv does not exist';
+    exit(1);
+}
+
+$xml = simplexml_load_file($xmlUrl);
+$scv = readCsv($scvUrl);
+
+foreach ($xml as $key => $value) {
+    unset($value->httpSample);
+    unset($value->assertionResult);
+}
+
+foreach ($scv as $key => $value) {
+    $httpSample = $xml->addChild('httpSample');
+
+    $httpSample->addAttribute('t', $value[1]);
+    $httpSample->addAttribute('lt', $value[1]);
+    $httpSample->addAttribute('ts', $value[0]);
+    $httpSample->addAttribute('s', 'true');
+    $httpSample->addAttribute('lb', $value[2]);
+    $httpSample->addAttribute('rc', '200');
+    $httpSample->addAttribute('rm', 'OK');
+    $httpSample->addAttribute('tn', $value[2]);
+}
+
+$xml->asXML($newLogsUrl);
+
+function readCsv($csvFile)
+{
+    $fileHandle = fopen($csvFile, 'r');
+    $lineOfText = array();
+    while (!feof($fileHandle) ) {
+        $lineOfText[] = fgetcsv($fileHandle, 1024);
+    }
+    fclose($fileHandle);
+    return $lineOfText;
+}
diff --git a/dev/tests/performance/framework/Magento/TestFramework/Application.php b/dev/tests/performance/framework/Magento/TestFramework/Application.php
index d2d65f029d02cbd10ecf57b6f30e18c1be5c1e43..2c85ec361e6415756d1b7b0206771f86bcb44e5b 100644
--- a/dev/tests/performance/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/performance/framework/Magento/TestFramework/Application.php
@@ -206,7 +206,6 @@ class Application
     {
         /** @var $app \Magento\Core\Model\App */
         $this->_application = $this->getObjectManager()->get('Magento\Core\Model\App');
-        $this->getObjectManager()->get('Magento\App\State')->setAreaCode(self::AREA_CODE);
         $this->getObjectManager()->configure(
             $this->getObjectManager()->get('Magento\App\ObjectManager\ConfigLoader')->load(self::AREA_CODE)
         );
@@ -285,6 +284,7 @@ class Application
         if (!$this->_objectManager) {
             $locatorFactory = new \Magento\App\ObjectManagerFactory();
             $this->_objectManager = $locatorFactory->create(BP, $_SERVER);
+            $this->_objectManager->get('Magento\App\State')->setAreaCode(self::AREA_CODE);
         }
         return $this->_objectManager;
     }
diff --git a/dev/tests/performance/testsuite/add_to_cart.jmx b/dev/tests/performance/testsuite/add_to_cart.jmx
index fdafdaad4a79cee289ec3e5e52b9f37e5cfb5f83..b2e928a763de3dd67faf4dfbec7d4127efa6d6e3 100644
--- a/dev/tests/performance/testsuite/add_to_cart.jmx
+++ b/dev/tests/performance/testsuite/add_to_cart.jmx
@@ -110,7 +110,7 @@
           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract &quot;product_name&quot;" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
             <stringProp name="RegexExtractor.refname">product_name</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;h1&gt;(.+?)&lt;/h1&gt;</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;h1.*&gt;(.+?)&lt;/span&gt;&lt;/h1&gt;</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default">FAIL</stringProp>
             <stringProp name="RegexExtractor.match_number"></stringProp>
diff --git a/dev/tests/performance/testsuite/advanced_search.jmx b/dev/tests/performance/testsuite/advanced_search.jmx
index b7d20f74fe895d93af396bdcc8df3125cae8890a..73d58b41a30a216c6409e71f777f01a34c14bcd7 100644
--- a/dev/tests/performance/testsuite/advanced_search.jmx
+++ b/dev/tests/performance/testsuite/advanced_search.jmx
@@ -106,7 +106,7 @@
         <hashTree>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assertion: Header Presence" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="-462078532">&lt;h1&gt;Catalog Advanced Search&lt;/h1&gt;</stringProp>
+              <stringProp name="-462078532">Advanced Search</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
@@ -189,11 +189,13 @@
           <hashTree/>
           <XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="Assertion: Product Found" enabled="true">
             <boolProp name="XPath.negate">false</boolProp>
-            <stringProp name="XPath.xpath">//h2[@class=&quot;product-name&quot;]/a[@title=&quot;${search_parameter1}&quot; and text()=&quot;${search_parameter1}&quot;]</stringProp>
+            <stringProp name="XPath.xpath">//img[@class=&quot;photo image&quot;]</stringProp>
             <boolProp name="XPath.validate">false</boolProp>
             <boolProp name="XPath.whitespace">false</boolProp>
-            <boolProp name="XPath.tolerant">false</boolProp>
+            <boolProp name="XPath.tolerant">true</boolProp>
             <boolProp name="XPath.namespace">false</boolProp>
+            <boolProp name="XPath.show_warnings">true</boolProp>
+            <boolProp name="XPath.report_errors">true</boolProp>
           </XPathAssertion>
           <hashTree/>
         </hashTree>
diff --git a/dev/tests/performance/testsuite/backend.jmx b/dev/tests/performance/testsuite/backend.jmx
index 9d58951369cb8b548df8c340c63ddafe95f68944..24fefc71f86633aca605a676d81c318e5bca9f76 100644
--- a/dev/tests/performance/testsuite/backend.jmx
+++ b/dev/tests/performance/testsuite/backend.jmx
@@ -112,7 +112,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/catalog_product/</stringProp>
+          <stringProp name="HTTPSampler.path">${ADMIN_PATH}catalog/product/</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -144,7 +144,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding">UTF8</stringProp>
-          <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/customer/</stringProp>
+          <stringProp name="HTTPSampler.path">${ADMIN_PATH}customer/</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -176,7 +176,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding">UTF8</stringProp>
-          <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/sales_order/</stringProp>
+          <stringProp name="HTTPSampler.path">${ADMIN_PATH}sales/order/</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
diff --git a/dev/tests/performance/testsuite/checkout.jmx b/dev/tests/performance/testsuite/checkout.jmx
index 79a9f510984af9b860b0d4e8f0f28b4d71b9c6d1..c4d3938033d60bb344944a6010ee0472400c4cd8 100644
--- a/dev/tests/performance/testsuite/checkout.jmx
+++ b/dev/tests/performance/testsuite/checkout.jmx
@@ -94,7 +94,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/sales_order/</stringProp>
+          <stringProp name="HTTPSampler.path">${ADMIN_PATH}sales/order/</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -198,7 +198,7 @@
           <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract product name" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
             <stringProp name="RegexExtractor.refname">product_name</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;h1&gt;(.+?)&lt;/h1&gt;</stringProp>
+            <stringProp name="RegexExtractor.regex">&lt;h1 class=&quot;title&quot;&gt;&lt;span class=&quot;base&quot;&gt;(.+?)&lt;/span&gt;&lt;/h1&gt;</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"></stringProp>
             <stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -292,7 +292,7 @@
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
             <collectionProp name="Asserion.test_strings">
               <stringProp name="2058954891">${product_name}</stringProp>
-              <stringProp name="1157735154">class=&quot;button btn-proceed-checkout btn-checkout&quot;</stringProp>
+              <stringProp name="837394321">class=&quot;action primary checkout&quot;</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
diff --git a/dev/tests/performance/testsuite/product_edit.jmx b/dev/tests/performance/testsuite/product_edit.jmx
index 5520ce623313c4e515eafa4849f07800a1532fc0..963f479c6fcf670d9b5ff48d699f0ca591fd29f6 100644
--- a/dev/tests/performance/testsuite/product_edit.jmx
+++ b/dev/tests/performance/testsuite/product_edit.jmx
@@ -124,7 +124,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/catalog_product/grid/product_filter/${grid_product_filter}/</stringProp>
+          <stringProp name="HTTPSampler.path">${ADMIN_PATH}catalog/product/grid/product_filter/${grid_product_filter}/</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -187,7 +187,7 @@ vars.put(&quot;grid_product_filter&quot;, gridProductFilter);</stringProp>
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/catalog_product/edit/id/${product_id}/</stringProp>
+          <stringProp name="HTTPSampler.path">${ADMIN_PATH}catalog/product/edit/id/${product_id}/</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
diff --git a/dev/tests/performance/testsuite/quick_search.jmx b/dev/tests/performance/testsuite/quick_search.jmx
index 123c81fc6e010f24bb2a729d644c2c96b40734e2..363cc6cae638407429459b64f34642828a831d24 100644
--- a/dev/tests/performance/testsuite/quick_search.jmx
+++ b/dev/tests/performance/testsuite/quick_search.jmx
@@ -137,8 +137,7 @@
           <hashTree/>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="-887183200">Search results for &apos;${search_query}&apos;</stringProp>
-              <stringProp name="1258932845">View as:</stringProp>
+              <stringProp name="-887183200">Search results for: &apos;${search_query}&apos;</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php
index 26896dc7bc217e4f6c7220346ca7dc1feb6e83ff..01efd8b50d3b6d13c87e85086e8a8a96a246c979 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php
@@ -28,72 +28,20 @@
 return array(
     // Blocks
     'Block/Admin',
-    'Block/Backup',
-    'Block/Cache',
-    'Block/Denied',
-    'Block/Html',
-    'Block/Media',
-    'Block/Messages',
-    'Block/Newsletter',
-    'Block/Page',
-    'Block/Report',
-    'Block/Review',
-    'Block/Shipping',
-    'Block/Sitemap',
-    'Block/Template',
-    'Block/Text',
     'Block/Urlrewrite',
     'Block/Widget',
 
     // Controllers
-    'Controller/Newsletter',
-    'Controller/Report',
     'Controller/Urlrewrite',
 
     // Helpers
     'Helper/Addresses',
     'Helper/Media',
-    'Helper/Data',
     'Helper/Js',
 
     // Models
-    'Model/Email',
-    'Model/Giftmessage',
-    'Model/LayoutUpdate',
-    'Model/Newsletter',
-    'Model/Observer',
-    'Model/Report',
-    'Model/Search',
     'Model/Session',
 
-    // Views
-    'view/adminhtml/admin',
-    'view/adminhtml/backup',
-    'view/adminhtml/email',
-    'view/adminhtml/images',
-    'view/adminhtml/media',
-    'view/adminhtml/newsletter',
-    'view/adminhtml/page',
-    'view/adminhtml/report',
-    'view/adminhtml/review',
-    'view/adminhtml/store',
-    'view/adminhtml/urlrewrite',
-    'view/adminhtml/widget',
-
     // Layouts
-    'layout/adminhtml_cache',
-    'layout/adminhtml_denied',
-    'layout/adminhtml_newsletter',
-    'layout/adminhtml_noroute',
-    'layout/adminhtml_report',
     'layout/adminhtml_urlrewrite',
-    'layout/default',
-    'layout/editor',
-    'layout/empty',
-    'layout/formkey',
-    'layout/newsletter',
-    'layout/overlay_popup',
-    'layout/popup',
-    'layout/preview',
-    'layout/report_sales',
 );
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 4babc7a6336329a1d18bf7a98e31e7c6eab27a73..3d18ba848726e81bb08700ff054788b35c18e942 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -1478,4 +1478,216 @@ return array(
     array('Magento\Core\Helper\AbstractHelper', 'Magento\App\Helper\AbstractHelper'),
     array('Magento\Core\Helper\Context', 'Magento\App\Helper\Context'),
     array('Magento\Core\Block\Template\Context', 'Magento\View\Block\Template\Context'),
+    array(
+        'Magento\Adminhtml\Controller\Report\AbstractReport',
+        'Magento\Reports\Controller\Adminhtml\AbstractReport'
+    ),
+    array(
+        'Magento\Adminhtml\Controller\Report\Customer',
+        'Magento\Reports\Controller\Adminhtml\Customer'
+    ),
+    array(
+        'Magento\Adminhtml\Controller\Report\Product',
+        'Magento\Reports\Controller\Adminhtml\Product'
+    ),
+    array(
+        'Magento\Adminhtml\Controller\Report\Review',
+        'Magento\Reports\Controller\Adminhtml\Review'
+    ),
+    array(
+        'Magento\Adminhtml\Controller\Report\Sales',
+        'Magento\Reports\Controller\Adminhtml\Sales'
+    ),
+    array(
+        'Magento\Adminhtml\Controller\Report\Shopcart',
+        'Magento\Reports\Controller\Adminhtml\Shopcart'
+    ),
+    array(
+        'Magento\Adminhtml\Controller\Report\Statistics',
+        'Magento\Reports\Controller\Adminhtml\Statistics'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Config\Form\Field\MtdStart',
+        'Magento\Reports\Block\Adminhtml\Config\Form\Field\MtdStart'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Config\Form\Field\YtdStart',
+        'Magento\Reports\Block\Adminhtml\Config\Form\Field\YtdStart'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Filter\Form',
+        'Magento\Reports\Block\Adminhtml\Filter\Form'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Grid\AbstractGrid',
+        'Magento\Reports\Block\Adminhtml\Grid\AbstractGrid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Blanknumber',
+        'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Blanknumber'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+        'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Customer',
+        'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Customer'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Product',
+        'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Product'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Grid\Shopcart',
+        'Magento\Reports\Block\Adminhtml\Grid\Shopcart'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Downloads\Grid',
+        'Magento\Reports\Block\Adminhtml\Product\Downloads\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Downloads\Renderer\Purchases',
+        'Magento\Reports\Block\Adminhtml\Product\Downloads\Renderer\Purchases'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Downloads',
+        'Magento\Reports\Block\Adminhtml\Product\Downloads'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Grid',
+        'Magento\Reports\Block\Adminhtml\Product\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Lowstock\Grid',
+        'Magento\Reports\Block\Adminhtml\Product\Lowstock\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Lowstock',
+        'Magento\Reports\Block\Adminhtml\Product\Lowstock'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Viewed\Grid',
+        'Magento\Reports\Block\Adminhtml\Product\Viewed\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product\Viewed',
+        'Magento\Reports\Block\Adminhtml\Product\Viewed'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Product',
+        'Magento\Reports\Block\Adminhtml\Product'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Review\Customer',
+        'Magento\Reports\Block\Adminhtml\Review\Customer'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Review\Detail\Grid',
+        'Magento\Reports\Block\Adminhtml\Review\Detail\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Review\Detail',
+        'Magento\Reports\Block\Adminhtml\Review\Detail'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Review\Product',
+        'Magento\Reports\Block\Adminhtml\Review\Product'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid',
+        'Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Bestsellers',
+        'Magento\Reports\Block\Adminhtml\Sales\Bestsellers'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Coupons\Grid',
+        'Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Coupons',
+        'Magento\Reports\Block\Adminhtml\Sales\Coupons'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+        'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid',
+        'Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Invoiced',
+        'Magento\Reports\Block\Adminhtml\Sales\Invoiced'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Refunded\Grid',
+        'Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Refunded',
+        'Magento\Reports\Block\Adminhtml\Sales\Refunded'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Sales\Grid',
+        'Magento\Reports\Block\Adminhtml\Sales\Sales\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Sales',
+        'Magento\Reports\Block\Adminhtml\Sales\Sales'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Shipping\Grid',
+        'Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Shipping',
+        'Magento\Reports\Block\Adminhtml\Sales\Shipping'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Tax\Grid',
+        'Magento\Reports\Block\Adminhtml\Sales\Tax\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Sales\Tax',
+        'Magento\Reports\Block\Adminhtml\Sales\Tax'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Search',
+        'Magento\Reports\Block\Adminhtml\Search'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Shopcart\Abandoned\Grid',
+        'Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Shopcart\Abandoned',
+        'Magento\Reports\Block\Adminhtml\Shopcart\Abandoned'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Shopcart\Customer\Grid',
+        'Magento\Reports\Block\Adminhtml\Shopcart\Customer\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Shopcart\Customer',
+        'Magento\Reports\Block\Adminhtml\Shopcart\Customer'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Shopcart\Product\Grid',
+        'Magento\Reports\Block\Adminhtml\Shopcart\Product\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Shopcart\Product',
+        'Magento\Reports\Block\Adminhtml\Shopcart\Product'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Wishlist\Grid',
+        'Magento\Reports\Block\Adminhtml\Wishlist\Grid'
+    ),
+    array(
+        'Magento\Adminhtml\Block\Report\Wishlist',
+        'Magento\Reports\Block\Adminhtml\Wishlist'
+    ),
 );
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index 2ad87198adc8115685d3e3caf17a48b0349a2c43..48ea702498f62c026142f8db1057ec915176534b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -26,6 +26,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 return array(
+    array('ADMIN_STORE_ID', 'Magento\Core\Model\AppInterface'),
     array('BACKORDERS_BELOW'),
     array('BACKORDERS_YES'),
     array('CACHE_TAG', 'Magento\Api\Model\Config', 'Magento_Api_Model_Cache_Type::CACHE_TAG'),
@@ -76,6 +77,7 @@ return array(
     array('DEFAULT_THEME_NAME', 'Magento\Core\Model\Design\PackageInterface'),
     array('DEFAULT_THEME_NAME', 'Magento\Core\Model\Design\Package'),
     array('DEFAULT_TIMEZONE', 'Magento\Core\Model\Locale', 'Magento_Core_Model_LocaleInterface::DEFAULT_TIMEZONE'),
+    array('DEFAULT_STORE_ID', 'Magento\Catalog\Model\AbstractModel', 'Magento\Core\Model\Store::DEFAULT_STORE_ID'),
     array('DEFAULT_VALUE_TABLE_PREFIX'),
     array('ENTITY_PRODUCT', 'Magento\Review\Model\Review'),
     array('EXCEPTION_CODE_IS_GROUPED_PRODUCT'),
@@ -98,9 +100,9 @@ return array(
         'Magento\Core\Model\Layout\Merge',
         'Magento_Core_Model_Cache_Type_Layout::CACHE_TAG'
     ),
-    array('LOCALE_CACHE_KEY', 'Magento\Adminhtml\Block\Page\Footer'),
-    array('LOCALE_CACHE_LIFETIME', 'Magento\Adminhtml\Block\Page\Footer'),
-    array('LOCALE_CACHE_TAG', 'Magento\Adminhtml\Block\Page\Footer'),
+    array('LOCALE_CACHE_KEY', 'Magento\Backend\Block\Page\Footer'),
+    array('LOCALE_CACHE_LIFETIME', 'Magento\Backend\Block\Page\Footer'),
+    array('LOCALE_CACHE_TAG', 'Magento\Backend\Block\Page\Footer'),
     array('PATH_PREFIX_CUSTOMIZATION', 'Magento\Core\Model\Theme'),
     array('PATH_PREFIX_CUSTOMIZED', 'Magento\Core\Model\Theme\Files'),
     array('PUBLIC_BASE_THEME_DIR', 'Magento\Core\Model\Design\PackageInterface'),
@@ -392,4 +394,5 @@ return array(
     array('XML_PATH_IMAGE_TYPES', 'Magento\Adminhtml\Block\Catalog\Product\Frontend\Product\Watermark'),
     array('XML_PATH_WEBHOOK', 'Magento\Webhook\Model\Source\Hook'),
     array('XML_PATH_SUBSCRIPTIONS', 'Magento\Webhook\Model\Subscription\Config'),
+    array('PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN', 'Magento\Paypal\Model\Express\Checkout'),
 );
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 8f3c6dbc791917e8f7576254a54b5cb74de6abca..70d71d1ad1b306f7cff068b0a187106856f8c3df 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -168,7 +168,7 @@ return array(
     array('_saveCustomers', 'Magento\Sales\Model\AdminOrder\Create'),
     array('_saveSectionCache', 'Magento\Core\Model\Config'),
     array('_sendUploadResponse', 'Magento\Adminhtml\Controller\Customer'),
-    array('_sendUploadResponse', 'Magento\Adminhtml\Controller\Newsletter\Subscriber'),
+    array('_sendUploadResponse', 'Magento\Newsletter\Controller\Adminhtml\Subscriber'),
     array('_setAttribteValue'),
     array('_shouldSkipProcessUpdates', 'Magento\Core\Model\App'),
     array('_sort', 'Magento\Backend\Model\Config\Structure\Converter'),
@@ -329,7 +329,7 @@ return array(
     array('getCache', 'Magento\Core\Model\Config'),
     array('getCacheBetaTypes'),
     array('getCacheControls', 'Magento\PageCache\Helper\Data', 'Magento\PageCache\Model\CacheControlFactory'),
-    array('getChangeLocaleUrl', 'Magento\Adminhtml\Block\Page\Footer'),
+    array('getChangeLocaleUrl', 'Magento\Backend\Block\Page\Footer'),
     array('getCheckoutMehod', 'Magento\Checkout\Model\Type\Onepage'),
     array('getChildGroup', '', 'Magento_Core_Block_AbstractBlock::getGroupChildNames()'),
     array('getConfig', 'Magento\Captcha\Helper\Data'),
@@ -341,10 +341,11 @@ return array(
     array('getConfigDataModel', 'Magento\Core\Model\Config'),
     array('getConnectionTypeInstance', 'Magento\App\Resource'),
     array('getContainers', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
+    array('getCurrentUrl', 'Magento\Core\Helper\Url', 'Magento\Core\Model\Url'),
     array('getCustomerData', 'Magento\Sales\Block\Adminhtml\Order\Create\Form\Account'),
     array('getDataForSave', 'Magento\Wishlist\Model\Item'),
     array('getDataMaxSize'),
-    array('getDataMaxSizeInBytes', 'Magento\Adminhtml\Block\Media\Uploader', 'Magento_File_Size::getMaxFileSize()'),
+    array('getDataMaxSizeInBytes', 'Magento\Backend\Block\Media\Uploader', 'Magento_File_Size::getMaxFileSize()'),
     array('getDbAdapter', 'Magento\App\Cache'),
     array('getDbAdapter', 'Magento\App\Cache\Proxy'),
     array('getDbAdapter', 'Magento\App\CacheInterface'),
@@ -400,7 +401,7 @@ return array(
     array('getItemRendererInfo', 'Magento\Checkout\Block\Cart\AbstractCart'),
     array('getKeyList', 'Magento\DB\Adapter\Pdo\Mysql'),
     array('getLanguages', 'Magento\Install\Block\Begin'),
-    array('getLanguageSelect', 'Magento\Adminhtml\Block\Page\Footer'),
+    array('getLanguageSelect', 'Magento\Backend\Block\Page\Footer'),
     array('getLayoutFilename', '', 'getFilename'),
     array('getLifeTime', 'Magento\Core\Model\Resource\Session'),
     array('getLocaleBaseDir', 'Magento\Core\Model\Design\Package'),
@@ -447,7 +448,7 @@ return array(
     array('getPathFromArray', '', 'direct usage of /'),
     array('getPathVars', 'Magento\Core\Model\Config'),
     array('getParentProductIds', 'Magento\Catalog\Model\Resource\Product'),
-    array('getPostMaxSize', 'Magento\Adminhtml\Block\Media\Uploader', 'Magento_File_Size::getPostMaxSize()'),
+    array('getPostMaxSize', 'Magento\Backend\Block\Media\Uploader', 'Magento_File_Size::getPostMaxSize()'),
     array('getPriceFormatted', 'Magento\Customer\Block\Adminhtml\Edit\Tab\View\Sales'),
     array('getPrices', 'Magento\Bundle\Model\Product\Price'),
     array('getPricesDependingOnTax', 'Magento\Bundle\Model\Product\Price'),
@@ -462,7 +463,7 @@ return array(
     array('getQuoteItem', 'Magento\Catalog\Model\Product\Option\Type\DefaultType'),
     array('getQuoteItemOption', 'Magento\Catalog\Model\Product\Option\Type\DefaultType'),
     array('getQuoteOrdersHtml', 'Magento\GoogleAnalytics\Block\Ga'),
-    array('getRefererParamName', 'Magento\Adminhtml\Block\Page\Footer'),
+    array('getRefererParamName', 'Magento\Backend\Block\Page\Footer'),
     array('getRelativePath', 'Magento\Core\Model\Theme\Files'),
     array('getRemoveItemUrl', 'Magento\Wishlist\Block\Customer\Sidebar'),
     array('getReorderUrl', 'Magento\Sales\Block\Order\Info'),
@@ -545,8 +546,8 @@ return array(
     array('getUnprocessedEventsCollection', 'Magento\Index\Model\Process',
         'Magento_Index_Model_EventRepository::getUnprocessed()'
     ),
-    array('getUploadMaxSize', 'Magento\Adminhtml\Block\Media\Uploader', 'Magento_File_Size::getUploadMaxSize()'),
-    array('getUrlForReferer', 'Magento\Adminhtml\Block\Page\Footer'),
+    array('getUploadMaxSize', 'Magento\Backend\Block\Media\Uploader', 'Magento_File_Size::getUploadMaxSize()'),
+    array('getUrlForReferer', 'Magento\Backend\Block\Page\Footer'),
     array('getUseCacheFilename', 'Magento\Core\Model\App'),
     array('getValidator', 'Magento\SalesRule\Model\Observer'),
     array('getValidatorData', 'Magento\Core\Model\Session\AbstractSession', 'use _getSessionEnvironment method'),
@@ -582,6 +583,7 @@ return array(
     array('initSpecified', 'Magento\Core\Model\App'),
     array('insertProductPrice', 'Magento\Catalog\Model\Resource\Product\Attribute\Backend\Tierprice'),
     array('isAbsolutePath'),
+    array('isAdmin', 'Magento\Core\Model\Store'),
     array('isAllowedGuestCheckout', 'Magento\Sales\Model\Quote'),
     array('isAutomaticCleaningAvailable', 'Magento\Cache\Backend\Eaccelerator'),
     array('isCheckoutAvailable', 'Magento\Checkout\Model\Type\Multishipping'),
@@ -867,7 +869,7 @@ return array(
     array('turnOnReadCommittedMode', 'Magento\Backup\Model\Resource\Db'),
     array('turnOnSerializableMode', 'Magento\Backup\Model\Resource\Db', 'prepareTransactionIsolationLevel'),
     array('_getResourceModel', '\Magento\Webapi\Model\Source\Acl\Role', '$this->_resource'),
-    array('_getSession', '\Magento\Adminhtml\Model\Giftmessage\Save', '$this->_session'),
+    array('_getSession', '\Magento\GiftMessage\Model\Save', '$this->_session'),
     array('_initRequest', '\Magento\Core\Model\App'),
     array('run', '\Magento\Core\Model\App'),
     array('_initFrontController', '\Magento\Core\Model\App'),
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
index b62dfb5e8c88005b85c8c759ce58c48799d0218e..15aeb9671d34bb0efd6cc523b8d4864959388fab 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
@@ -43,11 +43,18 @@
         <word>secure_base_url}}js/</word>
         <word>secure_base_url}}skin/</word>
         <word>secure_base_url}}media/</word>
+        <!-- typos -->
+        <word>overriden</word>
+        <word>retrive</word>
+        <word>retreive</word>
     </words>
     <whitelist>
         <item>
             <path>CHANGELOG.md</path>
         </item>
+        <item>
+            <path>CHANGELOG_CE.md</path>
+        </item>
         <item>
             <path>app/code/Magento/User/data/user_setup/data-upgrade-1.6.1.1-1.6.1.2.php</path>
             <word>xmlconnect</word>
@@ -71,5 +78,9 @@
         <item>
             <path>lib/Zend</path>
         </item>
+        <item>
+            <path>dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php</path>
+            <word>overriden</word>
+        </item>
     </whitelist>
 </config>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 862f6c19e678ec13b540420c0e3e41e374aa510b..0f95fbd175f0aeb647af4a26e4f7ee5cf83c8938 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -141,7 +141,6 @@ class LiveCodeTest extends \PHPUnit_Framework_TestCase
 
     public function testCopyPaste()
     {
-        $this->markTestSkipped('Skipped');
         $reportFile = self::$_reportDir . '/phpcpd_report.xml';
         $copyPasteDetector = new \Magento\TestFramework\CodingStandard\Tool\CopyPasteDetector($reportFile);
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index b5112146f16700b9b3fbe7046a8ff77068fe6186..639bd9da5ada9212fb6e862ef4af0b155f2e8236 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -57,12 +57,16 @@ Magento/GiftMessage/Block/Adminhtml/Sales/Order
 Magento/ImportExport/Model
 Magento/Index/Model/Process
 Magento/Install/Block/Db
+Magento/Newsletter/Block/Adminhtml/Template/Preview
+Magento/Newsletter/Block/Adminhtml/Queue/Preview
 Magento/Payment/Block/Form
 Magento/Payment/Model/Method
 Magento/Payment/Model/Config
 Magento/ProductAlert/Model
 Magento/Rating/Model
+Magento/Reports/Block/Adminhtml
 Magento/Reports/Block/Product/Widget
+Magento/Reports/Controller/Adminhtml/Report
 Magento/Reports/Model/Resource/Helper
 Magento/Reports/Model/Resource
 Magento/Review/Block
@@ -74,6 +78,7 @@ Magento/Sales/Model/Quote/Address/Total
 Magento/Sales/Model/Resource/Report/Order
 Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab
 Magento/Shipping/Model/Carrier
+Magento/Sitemap/Block/Adminhtml/Edit
 Magento/CatalogRule/Model
 Magento/Tax/Block/Checkout
 Magento/Tax/Model/Sales/Pdf
@@ -100,5 +105,6 @@ Magento/Tax/Model/Sales/Total/Quote/Nominal
 Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit
 Magento/User/Block/User/Edit
 var/generation
+Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer
 Magento/Newsletter/Model/Template/Filter
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
index b3f11828c12acb241cbd77317a240034d10c4992..5d24c7f740b501d1225278a3769bdca134656888 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
@@ -17,7 +17,7 @@ app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
 # Formatter intorduces long line
 app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
 # Formatter intorduces long line
-app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
+app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
 # Formatter intorduces long line
 app/code/Magento/Backend/Block/System/Store/Edit.php
 # Not magento code
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
index 5a9165dfe78a4eaeb2145cd2e319befeb87bf5ae..556cf1b6365d963e158838a6814e1ddcc86d6266 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
@@ -2,15 +2,12 @@
 # Glob patterns are supported
 #
 app/bootstrap.php
-app/code/Magento/Adminhtml/Model/Observer.php
 app/code/Magento/Adminhtml/Block/Urlrewrite
-app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
-app/code/Magento/Adminhtml/Controller/Report/Customer.php
-app/code/Magento/Adminhtml/Controller/Report/Product.php
-app/code/Magento/Adminhtml/Controller/Report/Product.php
 app/code/Magento/Adminhtml/Controller/Urlrewrite.php
+app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
 app/code/Magento/Backend/Block/System/Store/Edit
 app/code/Magento/Backend/Block/System/Store/Edit.php
+app/code/Magento/Backend/Model/Observer.php
 app/code/Magento/Bundle/Model/Plugin
 app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
 app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -109,6 +106,8 @@ app/code/Magento/PageCache/Model/CacheControlFactory.php
 app/code/Magento/ProductAlert/Block/Product/View
 app/code/Magento/Reports/Block/Adminhtml/Customer
 app/code/Magento/Reports/Block/Adminhtml/Product
+app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
+app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
 app/code/Magento/Reports/Model/Plugin
 app/code/Magento/Reports/Model/Resource/Accounts
 app/code/Magento/Reports/Model/Resource/Customer
diff --git a/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.php b/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..2f6dd2156a8f80e8735bc7429498fe1d45b8145e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Authorizenet\Helper;
+
+class BackendTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Backend
+     */
+    protected $_model;
+
+    /**
+     * @var \Magento\Backend\Model\Url|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_urlBuilder;
+
+    /**
+     * @var \Magento\Sales\Model\OrderFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_orderFactory;
+
+    protected function setUp()
+    {
+        $this->_urlBuilder = $this->getMock('Magento\Backend\Model\Url', array('getUrl'), array(), '', false);
+        $this->_orderFactory = $this->getMock('Magento\Sales\Model\OrderFactory', array('create'), array(), '', false);
+        $this->_model = new Backend(
+            $this->getMock('Magento\App\Helper\Context', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false),
+            $this->_orderFactory,
+            $this->_urlBuilder
+        );
+    }
+
+    public function testGetPlaceOrderAdminUrl()
+    {
+        $this->_urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->with($this->equalTo('*/authorizenet_directpost_payment/place'), $this->equalTo(array()))
+            ->will($this->returnValue('some value'));
+        $this->assertEquals('some value', $this->_model->getPlaceOrderAdminUrl());
+    }
+
+    public function testGetSuccessOrderUrl()
+    {
+        $order = $this->getMock(
+            'Magento\Sales\Model\Order',
+            array('loadByIncrementId', 'getId', '__wakeup'),
+            array(),
+            '',
+            false
+        );
+        $order->expects($this->once())
+            ->method('loadByIncrementId')
+            ->with('invoice number')
+            ->will($this->returnSelf());
+        $order->expects($this->once())->method('getId')->will($this->returnValue('order id'));
+        $this->_orderFactory->expects($this->once())->method('create')->will($this->returnValue($order));
+        $this->_urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->with($this->equalTo('sales/order/view'), $this->equalTo(array('order_id' => 'order id')))
+            ->will($this->returnValue('some value'));
+        $this->assertEquals(
+            'some value',
+            $this->_model->getSuccessOrderUrl(array('x_invoice_num' => 'invoice number', 'some param'))
+        );
+    }
+
+    public function testGetRedirectIframeUrl()
+    {
+        $params = array('some params');
+        $this->_urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->with($this->equalTo('adminhtml/authorizenet_directpost_payment/redirect'), $this->equalTo($params))
+            ->will($this->returnValue('some value'));
+        $this->assertEquals('some value', $this->_model->getRedirectIframeUrl($params));
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php b/dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php
deleted file mode 100644
index fc155abfa7709d69e17c594767e4228d47d9dfac..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-namespace Magento\Backend\App\Action\Plugin;
-
-class StoreTest extends \PHPUnit_Framework_TestCase
-{
-
-    public function testAroundDispatch()
-    {
-        $storeManagerMock = $this->getMock('Magento\Core\Model\StoreManagerInterface', array(), array(), '', false);
-        $invocationChainMock = $this->getMock('Magento\Code\Plugin\InvocationChain', array(), array(), '', false);
-        $plugin = new \Magento\Backend\App\Action\Plugin\Store($storeManagerMock);
-        $storeManagerMock->expects($this->once())->method('setCurrentStore')->with('admin');
-        $invocationChainMock->expects($this->once())->method('proceed')
-            ->with(array())->will($this->returnValue('expected'));
-        $this->assertEquals('expected', $plugin->aroundDispatch(array(), $invocationChainMock));
-    }
-}
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php b/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php
index 3ddc6eb5cb65d088895fb06ca59fdd9ebdf1440c..f7bfd89fb966b35820853896a84a1ae08436792f 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php
@@ -42,24 +42,23 @@ class FrontNameResolverTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_configMock
-            = $this->getMock('\Magento\Core\Model\ConfigInterface');
+        $this->_configMock = $this->getMock('\Magento\Backend\App\Config', array(), array(), '', false);
         $this->_model = new \Magento\Backend\App\Area\FrontNameResolver($this->_configMock, $this->_defaultFrontName);
     }
 
     public function testIfCustomPathUsed()
     {
         $this->_configMock->expects($this->at(0))
-            ->method('getValue')->with('admin/url/use_custom_path', 'default')->will($this->returnValue(true));
+            ->method('getValue')->with('admin/url/use_custom_path')->will($this->returnValue(true));
         $this->_configMock->expects($this->at(1))
-            ->method('getValue')->with('admin/url/custom_path', 'default')->will($this->returnValue('expectedValue'));
+            ->method('getValue')->with('admin/url/custom_path')->will($this->returnValue('expectedValue'));
         $this->assertEquals('expectedValue', $this->_model->getFrontName());
     }
 
     public function testIfCustomPathNotUsed()
     {
-        $this->_configMock->expects($this->once())->
-            method('getValue')->with('admin/url/use_custom_path', 'default')->will($this->returnValue(false));
+        $this->_configMock->expects($this->once())
+            ->method('getValue')->with('admin/url/use_custom_path')->will($this->returnValue(false));
         $this->assertEquals($this->_defaultFrontName, $this->_model->getFrontName());
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5f30134fbc175b01dacca7eff2c67401be3928fa
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Backend\App;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Core\Model\Config\SectionPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $sectionPool;
+
+    /**
+     * @var Config
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->sectionPool = $this->getMock(
+            'Magento\Core\Model\Config\SectionPool',
+            array('getSection', 'clean'),
+            array(),
+            '',
+            false
+        );
+        $this->model = new Config($this->sectionPool);
+    }
+
+    public function testGetValue()
+    {
+        $expectedValue = 'some value';
+        $path = 'some path';
+        $configData = $this->getConfigDataMock('getValue');
+        $configData
+            ->expects($this->once())
+            ->method('getValue')
+            ->with($this->equalTo($path))
+            ->will($this->returnValue($expectedValue));
+        $this->sectionPool
+            ->expects($this->once())
+            ->method('getSection')
+            ->with($this->equalTo('default'), $this->isNull())
+            ->will($this->returnValue($configData));
+        $this->assertEquals($expectedValue, $this->model->getValue($path));
+    }
+
+    public function testSetValue()
+    {
+        $value = 'some value';
+        $path = 'some path';
+        $configData = $this->getConfigDataMock('setValue');
+        $configData
+            ->expects($this->once())
+            ->method('setValue')
+            ->with($this->equalTo($path), $this->equalTo($value));
+        $this->sectionPool
+            ->expects($this->once())
+            ->method('getSection')
+            ->with($this->equalTo('default'), $this->isNull())
+            ->will($this->returnValue($configData));
+        $this->model->setValue($path, $value);
+    }
+
+    public function testReinit()
+    {
+        $this->sectionPool->expects($this->once())->method('clean');
+        $this->model->reinit();
+    }
+
+    /**
+     * @param mixed $configValue
+     * @param bool $expectedResult
+     * @dataProvider getFlagDataProvider
+     */
+    public function testGetFlag($configValue, $expectedResult)
+    {
+        $path = 'some path';
+        $configData = $this->getConfigDataMock('getValue');
+        $configData
+            ->expects($this->once())
+            ->method('getValue')
+            ->with($this->equalTo($path))
+            ->will($this->returnValue($configValue));
+        $this->sectionPool
+            ->expects($this->once())
+            ->method('getSection')
+            ->with($this->equalTo('default'), $this->isNull())
+            ->will($this->returnValue($configData));
+        $this->assertEquals($expectedResult, $this->model->getFlag($path));
+    }
+
+    public function getFlagDataProvider()
+    {
+        return array(
+            array(0, false),
+            array(true, true),
+            array('0', false),
+            array('', false),
+            array('some string', true),
+            array(1, true),
+        );
+    }
+
+    /**
+     * Get ConfigData mock
+     *
+     * @param $mockedMethod
+     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Core\Model\Config\Data
+     */
+    protected function getConfigDataMock($mockedMethod)
+    {
+        return $this->getMock('Magento\Core\Model\Config\Data', array($mockedMethod), array(), '', false);
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Page/System/Config/Robots/ResetTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Page/System/Config/Robots/ResetTest.php
similarity index 88%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Page/System/Config/Robots/ResetTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Block/Page/System/Config/Robots/ResetTest.php
index 73fdb3df357034fe8522a3673cadda4c9bc668ea..896de7ab771efb5c11173ac537226392a759a3fe 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Page/System/Config/Robots/ResetTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Page/System/Config/Robots/ResetTest.php
@@ -26,14 +26,14 @@
  */
 
 /**
- * Test class for \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset
+ * Test class for \Magento\Backend\Block\Page\System\Config\Robots\Reset
  */
-namespace Magento\Adminhtml\Block\Page\System\Config\Robots;
+namespace Magento\Backend\Block\Page\System\Config\Robots;
 
 class ResetTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset
+     * @var \Magento\Backend\Block\Page\System\Config\Robots\Reset
      */
     private $_resetRobotsBlock;
 
@@ -51,7 +51,7 @@ class ResetTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->_resetRobotsBlock = $objectManagerHelper->getObject(
-            'Magento\Adminhtml\Block\Page\System\Config\Robots\Reset',
+            'Magento\Backend\Block\Page\System\Config\Robots\Reset',
             array(
                 'pageRobots' => $this->_mockRobotsHelper,
                 'coreData' => $this->getMock('Magento\Core\Helper\Data', array(), array(), '', false),
@@ -74,7 +74,7 @@ class ResetTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
+     * @covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
      */
     public function testGetRobotsDefaultCustomInstructions()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/UrlrewriteTest.php
similarity index 98%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Block/UrlrewriteTest.php
index b8494c8699623634d1379b726ba5eb4e023ed71c..cf4d341dae5ec30f91d05fa59ccfca84b2d57faa 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/UrlrewriteTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backend\Block;
 
 class UrlrewriteTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
similarity index 98%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index abbc61af1f70ffb671e1d77e6cd36f6d62f8d479..5415075f03109b8afa7328952b4ecb619bef8a11 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -22,7 +22,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Backend\Controller\Adminhtml;
 
 class CacheTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
similarity index 99%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 94b45cfe92e0c3cb972dd736972e0bf9c81f2c59..7eb9583cfab495e115e34478e2f26c0e22a332b8 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -21,7 +21,7 @@
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-namespace Magento\Adminhtml;
+namespace Magento\Backend\Controller\Adminhtml;
 
 class DashboardTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..e6df4f5b43ca9e7addbd627d979c8fcbc5b24931
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Backend
+ * @subpackage  unit_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Backend\Model;
+
+class CookieTest extends \PHPUnit_Framework_TestCase
+{
+    public function testIsSecure()
+    {
+        $request = $this->getMock('Magento\App\Request\Http', array('isSecure'), array(), '', false);
+        $request->expects($this->once())->method('isSecure')->will($this->returnValue('some value'));
+
+        $response = $this->getMockForAbstractClass('Magento\App\ResponseInterface');
+        $coreStoreConfig = $this->getMock('Magento\Core\Model\Store\Config', null, array(), '', false);
+        $storeManager = $this->getMockForAbstractClass('Magento\Core\Model\StoreManagerInterface');
+
+        $model = new Cookie($request, $response, $coreStoreConfig, $storeManager);
+        $this->assertEquals('some value', $model->isSecure());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..f792461ad4e91e09d3a57a67e27382216f7f51e5
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Backend\Model\Translate\Inline;
+
+class ConfigFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @param string|null $area
+     * @param null|string $appStateArea
+     * @param string $expectedName
+     * @dataProvider createDataProvider
+     */
+    public function testCreate($area, $appStateArea, $expectedName)
+    {
+        $result = 'result';
+        $objectManager = $this->getMockForAbstractClass('Magento\ObjectManager');
+        $objectManager
+            ->expects($this->once())
+            ->method('create')
+            ->with($this->equalTo($expectedName))
+            ->will($this->returnValue($result));
+        $factory = new ConfigFactory($objectManager, $this->getAppState($appStateArea));
+        $this->assertEquals($result, $factory->create($area));
+    }
+
+    public function createDataProvider()
+    {
+        return array(
+            array(null, 'some area', 'Magento\Core\Model\Translate\Inline\Config'),
+            array(
+                null,
+                \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+                'Magento\Backend\Model\Translate\Inline\Config'
+            ),
+            array('some area', null, 'Magento\Core\Model\Translate\Inline\Config'),
+            array(
+                \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+                null,
+                'Magento\Backend\Model\Translate\Inline\Config'
+            ),
+        );
+    }
+
+    /**
+     * Get mock of app state
+     *
+     * @param null|string $area
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getAppState($area)
+    {
+        $appState = $this->getMock('Magento\App\State', array('getAreaCode'), array(), '', false);
+        if (isset($area)) {
+            $appState->expects($this->once())->method('getAreaCode')->will($this->returnValue($area));
+        } else {
+            $appState->expects($this->never())->method('getAreaCode');
+        }
+        return $appState;
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..dee00f0808f43a38d61b26c721d1168c1727a675
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Backend\Model\Translate\Inline;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+    public function testIsActive()
+    {
+        $result = 'result';
+        $backendConfig = $this->getMockForAbstractClass('Magento\Backend\App\ConfigInterface');
+        $backendConfig
+            ->expects($this->once())
+            ->method('getFlag')
+            ->with($this->equalTo('dev/translate_inline/active_admin'))
+            ->will($this->returnValue($result));
+        $config = new Config($backendConfig);
+        $this->assertEquals($result, $config->isActive('any'));
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..fc8a7412c47d6e2b7a90e5bee1591ef6e821469f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Captcha
+ * @subpackage  unit_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Captcha\Helper\Adminhtml;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Captcha\Helper\Adminhtml\Data|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_model;
+
+    /**
+     * setUp
+     */
+    protected function setUp()
+    {
+        $backendConfig = $this->getMockBuilder('Magento\Backend\App\ConfigInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getValue', 'setValue', 'reinit', 'getFlag'))
+            ->getMock();
+        $backendConfig->expects($this->any())
+            ->method('getValue')
+            ->with('admin/captcha/qwe')
+            ->will($this->returnValue('1'));
+
+        $this->_model = new \Magento\Captcha\Helper\Adminhtml\Data(
+            $this->getMock('Magento\App\Helper\Context', array(), array(), '', false),
+            $this->getMock('Magento\App\Dir', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\Config', array(), array(), '', false),
+            $this->getMock('Magento\Filesystem', array(), array(), '', false),
+            $this->getMock('Magento\Captcha\Model\CaptchaFactory', array(), array(), '', false),
+            $backendConfig
+        );
+    }
+
+    public function testGetConfig()
+    {
+        $this->assertEquals('1', $this->_model->getConfig('qwe'));
+    }
+
+    /**
+     * @covers \Magento\Captcha\Helper\Adminhtml\Data::_getWebsiteCode
+     */
+    public function testGetWebsiteId()
+    {
+        $this->assertStringEndsWith('/admin/', $this->_model->getImgDir());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
index d71f39ff8fb2f944bdc71b66d1e7f14752c3b294..9b2ffd345e83aa39fad37510bc5a9003249eb6da 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
@@ -72,10 +72,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
     public function testGetCaptcha()
     {
         $store = $this->_getStoreStub();
-        $store->expects($this->once())
-            ->method('isAdmin')
-            ->will($this->returnValue(false));
-
         $store->expects($this->once())
             ->method('getConfig')
             ->with('customer/captcha/type')
@@ -103,10 +99,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
     public function testGetConfigNode()
     {
         $store = $this->_getStoreStub();
-        $store->expects($this->once())
-            ->method('isAdmin')
-            ->will($this->returnValue(false));
-
         $store->expects($this->once())
             ->method('getConfig')
             ->with('customer/captcha/enable')
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a81ea99ed55a32de4622f725a4087e185b5ac20
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Captcha
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Captcha\Model;
+
+/**
+ * Class \Magento\Captcha\Model\CronTest
+ */
+class CronTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * CAPTCHA helper
+     *
+     * @var \Magento\Captcha\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_helper;
+
+    /**
+     * CAPTCHA helper
+     *
+     * @var \Magento\Captcha\Helper\Adminhtml\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_adminHelper;
+
+    /**
+     * @var \Magento\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_filesystem;
+
+    /**
+     * @var \Magento\Core\Model\StoreManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_storeManager;
+
+    /**
+     * @var \Magento\Captcha\Model\Cron
+     */
+    protected $_model;
+
+    /**
+     * @var int
+     */
+    public static $currentTime;
+
+    /**
+     * Create mocks and model
+     */
+    public function setUp()
+    {
+        $this->_helper = $this->getMock('Magento\Captcha\Helper\Data', array(), array(), '', false);
+        $this->_adminHelper = $this->getMock('Magento\Captcha\Helper\Adminhtml\Data', array(), array(), '', false);
+        $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
+        $this->_storeManager = $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false);
+
+        $this->_model = new \Magento\Captcha\Model\Cron(
+            $this->getMock('Magento\Captcha\Model\Resource\LogFactory', array(), array(), '', false),
+            $this->_helper,
+            $this->_adminHelper,
+            $this->_filesystem,
+            $this->_storeManager
+        );
+    }
+
+    /**
+     * @dataProvider getExpiredImages
+     */
+    public function testDeleteExpiredImages($website, $isFile, $filename, $mTime, $timeout, $mustDelete)
+    {
+        $this->_storeManager->expects($this->once())
+            ->method('getWebsites')
+            ->will($this->returnValue(isset($website) ? array($website) : array()));
+        if (isset($website)) {
+            $this->_helper->expects($this->once())
+            ->method('getConfig')
+            ->with(
+                $this->equalTo('timeout'),
+                new \PHPUnit_Framework_Constraint_IsIdentical($website->getDefaultStore())
+            )
+            ->will($this->returnValue($timeout));
+        } else {
+            $this->_helper->expects($this->never())->method('getConfig');
+        }
+        $this->_adminHelper->expects($this->once())
+            ->method('getConfig')
+            ->with(
+                $this->equalTo('timeout'),
+                new \PHPUnit_Framework_Constraint_IsNull()
+            )
+            ->will($this->returnValue($timeout));
+
+        $timesToCall = isset($website) ? 2 : 1;
+        $this->_filesystem->expects($this->exactly($timesToCall))
+            ->method('getNestedKeys')
+            ->will($this->returnValue(array($filename)));
+        $this->_filesystem->expects($this->exactly($timesToCall))->method('isFile')->will($this->returnValue($isFile));
+        $this->_filesystem->expects($this->any())->method('getMTime')->will($this->returnValue($mTime));
+        if ($mustDelete) {
+            $this->_filesystem->expects($this->exactly($timesToCall))->method('delete')->with($filename);
+        } else {
+            $this->_filesystem->expects($this->never())->method('delete');
+        }
+        $this->_model->deleteExpiredImages();
+    }
+
+    /**
+     * @return array
+     */
+    public function getExpiredImages()
+    {
+        $website = $this->getMock(
+            'Magento\Core\Model\Website',
+            array('__wakeup', 'getDefaultStore'),
+            array(),
+            '',
+            false
+        );
+        $store = $this->getMock('Magento\Core\Model\Store', array('__wakeup'), array(), '', false);
+        $website->expects($this->any())->method('getDefaultStore')->will($this->returnValue($store));
+        $time = time();
+        return array(
+            array(null, true, 'test.png', 50, ($time - 60) / 60, true),
+            array($website, false, 'test.png', 50, ($time - 60) / 60, false),
+            array($website, true, 'test.jpg', 50, ($time - 60) / 60, false),
+            array($website, true, 'test.png', 50,  ($time - 20) / 60, false)
+        );
+    }
+}
+
+/**
+ * Fix current time
+ *
+ * @return int
+ */
+function time()
+{
+    if (!isset(CronTest::$currentTime)) {
+        CronTest::$currentTime = \time();
+    }
+    return CronTest::$currentTime;
+}
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php
index 7eb623229d4f5ea2129a7918021a32c8e47f4b74..a1177ceb62564bedc996f53f916e24bced1a5399 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -78,6 +78,16 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
      */
     protected $_actionFlag;
 
+    /**
+     * @var \Magento\Core\Helper\Data
+     */
+    protected $_coreData;
+
+    /**
+     * @var \Magento\Customer\Helper\Data
+     */
+    protected $_customerData;
+
     protected function setUp()
     {
         $this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -93,7 +103,6 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
         $this->_customerData = $this->getMock('Magento\Customer\Helper\Data', array(), array(), '', false);
         $this->_helper = $this->getMock('Magento\Captcha\Helper\Data', array(), array(), '', false);
         $this->_urlManager = $this->getMock('Magento\Core\Model\Url', array(), array(), '', false);
-        $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
         $this->_actionFlag = $this->getMock('Magento\App\ActionFlag', array(), array(), '', false);
         $this->_observer = $this->_objectManager->getObject(
             'Magento\Captcha\Model\Observer',
@@ -105,7 +114,6 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
                 'customerData' => $this->_customerData,
                 'helper' => $this->_helper,
                 'urlManager' => $this->_urlManager,
-                'filesystem' => $this->_filesystem,
                 'actionFlag' => $this->_actionFlag
             )
         );
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php
index c4192571c7bbb0b2081df114e621bd56619d688f..dd4d096265c4e1e3765eee9a51ef943bdecf032c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php
@@ -41,7 +41,7 @@ class ValueTest extends \PHPUnit_Framework_TestCase
      */
     public static $valueTitleData = array(
     'id'       => 2,
-    'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+    'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
     'scope'    => array('title' => 1)
     );
 
@@ -72,4 +72,4 @@ class ValueTest extends \PHPUnit_Framework_TestCase
 
         $this->_object->saveValueTitles($object);
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..251662537eb99687f8a8810f2c29390499e99f25
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\CatalogInventory\Model\Adminhtml\Stock;
+
+class ItemTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\Adminhtml\Stock\Item|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_model;
+
+    /**
+     * setUp
+     */
+    protected function setUp()
+    {
+        $resourceMock = $this->getMock(
+            'Magento\Core\Model\Resource\AbstractResource',
+            array('_construct', '_getReadAdapter', '_getWriteAdapter', 'getIdFieldName'),
+            array(), '', false
+        );
+
+        $this->_model = new \Magento\CatalogInventory\Model\Adminhtml\Stock\Item(
+            $this->getMock('Magento\Customer\Model\Session', array(), array(), '', false),
+            $this->getMock('Magento\Index\Model\Indexer', array(), array(), '', false),
+            $this->getMock('Magento\CatalogInventory\Model\Stock\Status', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\Context', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\Registry', array(), array(), '', false),
+            $this->getMock('Magento\CatalogInventory\Helper\Data', array(), array(), '', false),
+            $this->getMock('Magento\CatalogInventory\Helper\Minsaleqty', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\Store\Config', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\StoreManagerInterface', array(), array(), '', false),
+            $this->getMock('Magento\Core\Model\LocaleInterface', array(), array(), '', false),
+            $this->getMock('Magento\Math\Division', array(), array(), '', false),
+            $resourceMock,
+            $this->getMock('Magento\Data\Collection\Db', array(), array(), '', false),
+            array()
+        );
+    }
+
+    public function testGetCustomerGroupId()
+    {
+        $this->_model->setCustomerGroupId(null);
+        $this->assertEquals(32000, $this->_model->getCustomerGroupId());
+        $this->_model->setCustomerGroupId(2);
+        $this->assertEquals(2, $this->_model->getCustomerGroupId());
+    }
+
+    public function testIsQtyCheckApplicable()
+    {
+        $this->assertTrue($this->_model->checkQty(1.0));
+    }
+
+    public function testCheckQuoteItemQty()
+    {
+        $this->_model->setData('manage_stock', 1);
+        $this->_model->setData('is_in_stock', 1);
+        $this->_model->setProductName('qwerty');
+        $this->_model->setData('backorders', 3);
+        $result = $this->_model->checkQuoteItemQty(1, 1);
+        $this->assertEquals('We don\'t have as many "qwerty" as you requested.', $result->getMessage());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php b/dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..218a78ad7f67e7c14d69495a91f4814b678ef927
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Test class for \Magento\Centinel\Model\Service
+ */
+namespace Magento\Centinel\Model;
+
+class ServiceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers \Magento\Centinel\Model\Service::getAuthenticationStartUrl
+     * @covers \Magento\Centinel\Model\Service::_getUrl
+     */
+    public function testGetAuthenticationStartUrl()
+    {
+        $url = $this->getMock('Magento\Core\Model\Url', array('getUrl'), array(), '', false);
+        $url->expects($this->once())
+            ->method('getUrl')
+            ->with($this->equalTo('url_prefix/authenticationstart'))
+            ->will($this->returnValue('some value'));
+
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        /** @var Service $model */
+        $model = $helper->getObject(
+            'Magento\Centinel\Model\Service',
+            array('url' => $url, 'urlPrefix' => 'url_prefix/')
+        );
+        $this->assertEquals('some value', $model->getAuthenticationStartUrl());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php b/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php
index 54b429dca10f0e1c34597baf18b2a1d0b8365668..67662c38622e230d226a79e533b078ca123b4c3d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php
@@ -59,7 +59,7 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
     {
         $store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
         $this->_storeManagerMock
-            ->expects($this->once())->method('getStores')->with(true, true)
+            ->expects($this->once())->method('getStores')->with(false, true)
             ->will($this->returnValue(array('storeCode' => $store)));
         $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
         $this->_requestMock
@@ -73,7 +73,7 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
     {
         $store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
         $this->_storeManagerMock
-            ->expects($this->once())->method('getStores')->with(true, true)
+            ->expects($this->once())->method('getStores')->with(false, true)
             ->will($this->returnValue(array('storeCode' => $store)));
         $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
         $this->_requestMock
@@ -88,7 +88,7 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
         $path = '/0/node_one/';
         $store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
         $this->_storeManagerMock
-            ->expects($this->once())->method('getStores')->with(true, true)
+            ->expects($this->once())->method('getStores')->with(false, true)
             ->will($this->returnValue(array('0' => $store)));
         $store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
         $this->_requestMock
@@ -102,10 +102,10 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
     {
         $store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
         $this->_storeManagerMock
-            ->expects($this->once())->method('getStores')->with(true, true)
+            ->expects($this->once())->method('getStores')->with(false, true)
             ->will($this->returnValue(array('0' => $store)));
         $store->expects($this->never())->method('isUseStoreInUrl');
         $this->_requestMock->expects($this->never())->method('isDirectAccessFrontendName');
         $this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo));
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
index 88df23167e2c00ab01d7af1a0144dd400095ceb4..658d07f0148999b083718bd917dc9dc7a1ef8846 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -34,32 +34,37 @@ class MergeTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Core\Model\Layout\Merge
      */
-    private $_model;
+    protected $_model;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $_resource;
+    protected $_resource;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $_appState;
+    protected $_appState;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $_cache;
+    protected $_cache;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $_theme;
+    protected $_theme;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $_store;
+    protected $_store;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_logger;
 
     protected function setUp()
     {
@@ -81,6 +86,8 @@ class MergeTest extends \PHPUnit_Framework_TestCase
 
         $this->_appState = $this->getMock('Magento\App\State', array(), array(), '', false);
 
+        $this->_logger = $this->getMock('Magento\Logger', array('log'), array(), '', false);
+
         $this->_cache = $this->getMockForAbstractClass('Magento\Cache\FrontendInterface');
 
         $this->_theme = $this->getMock('Magento\Core\Model\Theme', array(), array(), '', false, false);
@@ -97,6 +104,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
             'appState' => $this->_appState,
             'cache' => $this->_cache,
             'theme' => $this->_theme,
+            'logger' => $this->_logger
         ));
     }
 
@@ -233,6 +241,11 @@ class MergeTest extends \PHPUnit_Framework_TestCase
 
     public function testGetFileLayoutUpdatesXml()
     {
+        $errorString = "Theme layout update file '" . __DIR__ . "/_files/layout/file_wrong.xml' is not valid.";
+        $this->_logger->expects($this->atLeastOnce())
+            ->method('log')
+            ->with($this->stringStartsWith($errorString), \Zend_Log::ERR, \Magento\Logger::LOGGER_SYSTEM);
+
         $actualXml = $this->_model->getFileLayoutUpdatesXml();
         $this->assertXmlStringEqualsXmlFile(__DIR__ . '/_files/merged.xml', $actualXml->asNiceXml());
     }
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Model/LayoutUpdate/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
similarity index 89%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Model/LayoutUpdate/ValidatorTest.php
rename to dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
index 31c776f5af88ce6098eeaac579f875e96394c73f..3172fc1f43c4999458070be49b3a4353c32fddfe 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Model/LayoutUpdate/ValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
@@ -25,7 +25,7 @@
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Adminhtml\Model\LayoutUpdate;
+namespace Magento\Core\Model\Layout\Update;
 
 class ValidatorTest extends \PHPUnit_Framework_TestCase
 {
@@ -42,7 +42,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @param string $layoutUpdate
      * @param boolean $isSchemaValid
-     * @return \Magento\Adminhtml\Model\LayoutUpdate\Validator
+     * @return \Magento\Core\Model\Layout\Update\Validator
      */
     protected function _createValidator($layoutUpdate, $isSchemaValid = true)
     {
@@ -75,7 +75,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
                     : $this->throwException(new \Magento\Config\Dom\ValidationException($exceptionMessage))
             );
 
-        $model = $this->_objectHelper->getObject('Magento\Adminhtml\Model\LayoutUpdate\Validator', array(
+        $model = $this->_objectHelper->getObject('Magento\Core\Model\Layout\Update\Validator', array(
             'modulesReader' => $modulesReader,
             'domConfigFactory' => $domConfigFactory,
         ));
@@ -96,7 +96,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(
             $model->isValid(
                 $layoutUpdate,
-                \Magento\Adminhtml\Model\LayoutUpdate\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
+                \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
                 false
             ),
             $expectedResult
@@ -112,7 +112,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
         return array(
             array('test', true, true, array()),
             array('test', false, false, array(
-                \Magento\Adminhtml\Model\LayoutUpdate\Validator::XML_INVALID =>
+                \Magento\Core\Model\Layout\Update\Validator::XML_INVALID =>
                 'Please correct the XML data and try again. validation exception'
             )),
         );
@@ -130,7 +130,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(
             $model->isValid(
                 $layoutUpdate,
-                \Magento\Adminhtml\Model\LayoutUpdate\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
+                \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
                 true
             ),
             $expectedResult
@@ -181,11 +181,11 @@ XML;
 XML;
         return array(
             array($insecureHelper, false, array(
-                \Magento\Adminhtml\Model\LayoutUpdate\Validator::HELPER_ARGUMENT_TYPE =>
+                \Magento\Core\Model\Layout\Update\Validator::HELPER_ARGUMENT_TYPE =>
                 'Helper arguments should not be used in custom layout updates.'
             )),
             array($insecureUpdater, false, array(
-                \Magento\Adminhtml\Model\LayoutUpdate\Validator::UPDATER_MODEL =>
+                \Magento\Core\Model\Layout\Update\Validator::UPDATER_MODEL =>
                 'Updater model should not be used in custom layout updates.'
             )),
             array($secureLayout, true, array()),
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
similarity index 92%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml
rename to dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
index 6ee5a363eadc0836dd20546da184878c6a27d14e..3105a760eb0cb37a346bb41cefb7337f72f14690 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
@@ -23,5 +23,5 @@
  * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-</layout>
+<layout>
+    <container name="content" as="content" label="Main Content Area"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
index 3d41fa5f102c7c4c33bff54a9f1683fb08067657..06f0ad3c06051ef88b0386f5ad908f37dea91d6e 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
@@ -28,7 +28,7 @@ class ThemeProviderTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetByFullPath()
     {
-        $path = 'frontend/magento_fixed_width';
+        $path = 'frontend/magento_plushe';
         $collectionFactory = $this->getMock(
             'Magento\Core\Model\Resource\Theme\CollectionFactory', array('create'), array(), '', false
         );
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..53a26037dd672ece28fee70142f1385ee20c502f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Core
+ * @subpackage  unit_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Core\Model\Translate\Inline;
+
+class ConfigFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreate()
+    {
+        $result = 'result';
+        $objectManager = $this->getMockForAbstractClass('Magento\ObjectManager');
+        $objectManager
+            ->expects($this->once())
+            ->method('create')
+            ->with($this->equalTo('Magento\Core\Model\Translate\Inline\Config'))
+            ->will($this->returnValue($result));
+        $factory = new ConfigFactory($objectManager);
+        $this->assertEquals($result, $factory->create('any'));
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c11ebee310e78ff8570006f59f4deb253d4ec7af
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Core
+ * @subpackage  unit_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Magento\Core\Model\Translate\Inline;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+    public function testIsActive()
+    {
+        $store = 'some store';
+        $result = 'result';
+        $coreStoreConfig = $this->getMock('Magento\Core\Model\Store\Config', array(), array(), '', false);
+        $coreStoreConfig
+            ->expects($this->once())
+            ->method('getConfigFlag')
+            ->with($this->equalTo('dev/translate_inline/active'), $this->equalTo($store))
+            ->will($this->returnValue($result));
+        $config = new Config($coreStoreConfig);
+        $this->assertEquals($result, $config->isActive($store));
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php
index 93c822b6d8562c5f96d65aeef772039615363a50..d441a51ab29460479099ba78452a1fb03a200405 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php
@@ -37,21 +37,15 @@ class UrlTest extends \PHPUnit_Framework_TestCase
      */
     protected $_model;
 
-
-    protected $_sessionMock;
+    /**
+     * @var \Magento\TestFramework\Helper\ObjectManager
+     */
+    protected $_objectManager;
 
     protected function setUp()
     {
-        $this->_sessionMock = $this->getMock('Magento\Core\Model\Session\AbstractSession', array(), array(), '', false);
-        $this->_model = new \Magento\Core\Model\Url(
-            $this->getMock('\Magento\App\Route\ConfigInterface'),
-            $this->getMock('Magento\App\Request\Http', array(), array(), '', false),
-            $this->getMock('Magento\Core\Model\Url\SecurityInfoInterface'),
-            $this->getMock('Magento\Core\Model\Store\Config', array(), array(), '', false),
-            $this->getMock('Magento\Core\Model\App', array(), array(), '', false, false),
-            $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false, false),
-            $this->getMock('Magento\Core\Model\Session', array(), array(), '', false, false)
-        );
+        $this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->_model = $this->_objectManager->getObject('\Magento\Core\Model\Url');
     }
 
     public function testSetRoutePath()
@@ -119,4 +113,35 @@ class UrlTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('v1', $this->_model->getRouteParam('p1'));
         $this->assertEquals('v2', $this->_model->getRouteParam('p2'));
     }
+
+    /**
+     * @param $port mixed
+     * @param $url string
+     * @dataProvider getCurrentUrlProvider
+     */
+    public function testGetCurrentUrl($port, $url)
+    {
+        $methods = array('getServer', 'getScheme', 'getHttpHost', 'getModuleName', 'setModuleName',
+            'getActionName', 'setActionName', 'getParam');
+        $requestMock = $this->getMock('\Magento\App\RequestInterface', $methods);
+        $requestMock->expects($this->at(0))->method('getServer')->with('SERVER_PORT')
+            ->will($this->returnValue($port));
+        $requestMock->expects($this->at(1))->method('getServer')->with('REQUEST_URI')
+            ->will($this->returnValue('/fancy_uri'));
+        $requestMock->expects($this->once())->method('getScheme')->will($this->returnValue('http'));
+        $requestMock->expects($this->once())->method('getHttpHost')->will($this->returnValue('example.com'));
+
+        /** @var \Magento\Core\Model\Url $model */
+        $model = $this->_objectManager->getObject('Magento\Core\Model\Url', array('request' => $requestMock));
+        $this->assertEquals($url, $model->getCurrentUrl());
+    }
+
+    public function getCurrentUrlProvider()
+    {
+        return array(
+            'without_port' => array('', 'http://example.com/fancy_uri'),
+            'default_port' => array(80, 'http://example.com/fancy_uri'),
+            'custom_port' => array(8080, 'http://example.com:8080/fancy_uri')
+        );
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b8b30d10fa1833412dc80ac6187e050104eeed81
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Unit test for customer adminhtml model
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Test class for \Magento\Customer\Model\Backend\Customer testing
+ */
+namespace Magento\Customer\Model\Backend;
+
+class CustomerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Core\Model\StoreManager|\PHPUnit_Framework_MockObject_MockObject */
+    protected $_storeManager;
+
+    /** @var \Magento\Customer\Model\Backend\Customer */
+    protected $_model;
+
+    /**
+     * Create model
+     */
+    protected function setUp()
+    {
+        $this->_storeManager = $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false);
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->_model = $helper->getObject('Magento\Customer\Model\Backend\Customer', array(
+            'storeManager' => $this->_storeManager
+            )
+        );
+    }
+
+    /**
+     * @dataProvider getStoreDataProvider
+     * @param $websiteId
+     * @param $websiteStoreId
+     * @param $storeId
+     * @param $result
+     */
+    public function testGetStoreId($websiteId, $websiteStoreId, $storeId, $result)
+    {
+        if ($websiteId * 1) {
+            $this->_model->setWebsiteId($websiteId);
+            $website = new \Magento\Object(array('store_ids' => array($websiteStoreId)));
+            $this->_storeManager->expects($this->once())->method('getWebsite')->will($this->returnValue($website));
+        } else {
+            $this->_model->setStoreId($storeId);
+            $this->_storeManager->expects($this->never())->method('getWebsite');
+        }
+        $this->assertEquals($result, $this->_model->getStoreId());
+    }
+
+    /**
+     * Data provider for testGetStoreId
+     * @return array
+     */
+    public function getStoreDataProvider()
+    {
+        return array(
+            array(1, 10, 5, 10),
+            array(0, 10, 5, 5)
+        );
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
index ae60231f57b05ba0cd701272490649256e34efdf..2bdad813ea600324fa0889ba28c47509e510080c 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
@@ -75,7 +75,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
         $this->_registryMock = $this->getMock('Magento\Core\Model\Registry', array(), array(), '', false, false);
         $layoutMock = $this->getMock('Magento\Core\Model\Layout', array(), array(), '', false, false);
-        $helperMock = $this->getMock('Magento\Adminhtml\Helper\Data', array(), array(), '', false, false);
+        $helperMock = $this->getMock('Magento\Backend\Helper\Data', array(), array(), '', false, false);
         $menuConfigMock = $this->getMock('Magento\Backend\Model\Menu\Config', array(), array(), '', false, false);
         $menuMock = $this->getMock('Magento\Backend\Model\Menu', array(), array(), '', false, false);
         $menuItemMock = $this->getMock('Magento\Backend\Model\Menu\Item', array(), array(), '', false, false);
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php
index 9d9ebe7840f756d0a414dde50d9709193317a7a1..c1f6deee445b89e1e31cd6bee0b33898a1859d74 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php
@@ -40,8 +40,8 @@ class AddressTest extends \PHPUnit_Framework_TestCase
      * @var array
      */
     protected $_websites = array(
-        \Magento\Core\Model\AppInterface::ADMIN_STORE_ID => 'admin',
-        1                                            => 'website1',
+        \Magento\Core\Model\Store::DEFAULT_STORE_ID  => 'admin',
+        1                                                       => 'website1',
     );
 
     /**
@@ -204,7 +204,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
             unset($websites[0]);
         }
         foreach ($this->_websites as $id => $code) {
-            if (!$withDefault && $id == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+            if (!$withDefault && $id == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
                 continue;
             }
             $websiteData = array(
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php
index 9fa1451d3c6f3a6bceb6c3f630770fade281b516..4395038219209eb3460b7e78cff688179a68c780 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php
@@ -41,8 +41,8 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
      * @var array
      */
     protected $_websites = array(
-        \Magento\Core\Model\AppInterface::ADMIN_STORE_ID => 'admin',
-        1                                            => 'website1',
+        \Magento\Core\Model\Store::DEFAULT_STORE_ID  => 'admin',
+        1                                                       => 'website1',
     );
 
     /**
@@ -168,7 +168,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
             unset($websites[0]);
         }
         foreach ($this->_websites as $id => $code) {
-            if (!$withDefault && $id == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+            if (!$withDefault && $id == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
                 continue;
             }
             $websiteData = array(
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php
index 1ec10a17795d286a5e5f54de63ca2a7a04741928..ce66279843cb094a197e40a02661be0b663a9ddf 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php
@@ -339,7 +339,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
             unset($websites[0]);
         }
         foreach ($this->_websites as $id => $code) {
-            if (!$withDefault && $id == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+            if (!$withDefault && $id == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
                 continue;
             }
             $websiteData = array(
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..42c109aadb0e4b6f2eca665277053b5cda28214a
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Test class for \Magento\ImportExport\Model\Import\Entity\Product
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_ImportExport
+ * @subpackage  unit_tests
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\ImportExport\Model\Import\Entity;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Abstract import entity eav model
+     *
+     * @var \Magento\ImportExport\Model\Import\Entity\AbstractEav
+     */
+    protected $_model;
+
+    /**
+     * @var \Magento\Eav\Model\Config|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_eavConfig;
+
+    /**
+     * @var \Magento\ImportExport\Model\Import\Entity\Product\OptionFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_optionFactory;
+
+    /**
+     * @var \Magento\ImportExport\Model\Import\Entity\Product\Option|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_optionModel;
+
+    /**
+     * @var \Magento\Core\Model\StoreManager
+     */
+    protected $_storeManager;
+
+    /**
+     * @var \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory
+     */
+    protected $_setColFactory;
+
+    /**
+     * @var \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection
+     */
+    protected $_setCol;
+
+    /**
+     * @var \Magento\ImportExport\Model\Import\Config
+     */
+    protected $_importConfig;
+
+    /**
+     * @var \Magento\Catalog\Model\Resource\Category\CollectionFactory
+     */
+    protected $_categoryColFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\Resource\Category\Collection
+     */
+    protected $_categoryCol;
+
+    /**
+     * @var \Magento\Catalog\Model\ProductFactory
+     */
+    protected $_productFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\Product
+     */
+    protected $_product;
+
+    /**
+     * @var \Magento\Customer\Model\Resource\Group\CollectionFactory
+     */
+    protected $_groupColFactory;
+
+    protected function setUp()
+    {
+        $this->_eavConfig = $this->getMock('Magento\Eav\Model\Config', array('getEntityType', 'getEntityTypeId'),
+            array(), '', false);
+
+        $this->_eavConfig->expects($this->atLeastOnce())->method('getEntityType')
+            ->with($this->equalTo('catalog_product'))
+            ->will($this->returnSelf());
+        $this->_eavConfig->expects($this->atLeastOnce())->method('getEntityTypeId')
+            ->will($this->returnValue('1'));
+
+        $this->_optionModel = $this->getMock('\Magento\ImportExport\Model\Import\Entity\Product\Option',
+            array(), array(), '', false);
+        $this->_optionFactory = $this->getMock('\Magento\ImportExport\Model\Import\Entity\Product\OptionFactory',
+            array('create'), array(), '', false);
+        $this->_optionFactory->expects($this->atLeastOnce())->method('create')
+            ->will($this->returnValue($this->_optionModel));
+
+        $this->_storeManager = $this->getMock('\Magento\Core\Model\StoreManager',
+            array('getWebsites', 'getStores'), array(), '', false);
+
+        $this->_storeManager->expects($this->atLeastOnce())->method('getWebsites')->will($this->returnValue(array()));
+        $this->_storeManager->expects($this->atLeastOnce())->method('getStores')->will($this->returnValue(array()));
+
+        $this->_setCol = $this->getMock('\Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection',
+            array('setEntityTypeFilter'), array(), '', false);
+        $this->_setCol->expects($this->atLeastOnce())->method('setEntityTypeFilter')->with($this->equalTo('1'))
+            ->will($this->returnValue(array()));
+
+        $this->_setColFactory = $this->getMock('\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory',
+            array('create'), array(), '', false);
+        $this->_setColFactory->expects($this->atLeastOnce())->method('create')
+            ->will($this->returnValue($this->_setCol));
+
+        $this->_importConfig = $this->getMock('\Magento\ImportExport\Model\Import\Config',
+            array('getProductTypes'), array(), '', false);
+        $this->_importConfig->expects($this->atLeastOnce())->method('getProductTypes')
+            ->will($this->returnValue(array()));
+
+        $this->_categoryCol = $this->getMock('\Magento\Catalog\Model\Resource\Category\Collection',
+        array('addNameToResult'), array(), '', false);
+        $this->_categoryCol->expects($this->atLeastOnce())->method('addNameToResult')
+            ->will($this->returnValue(array()));
+
+        $this->_categoryColFactory = $this->getMock('\Magento\Catalog\Model\Resource\Category\CollectionFactory',
+            array('create'), array(), '', false);
+        $this->_categoryColFactory->expects($this->atLeastOnce())->method('create')
+            ->will($this->returnValue($this->_categoryCol));
+
+        $this->_product = $this->getMock('\Magento\Catalog\Model\Product',
+        array('getProductEntitiesInfo', '__wakeup'), array(), '', false);
+        $this->_product->expects($this->atLeastOnce())->method('getProductEntitiesInfo')
+            ->with($this->equalTo(array('entity_id', 'type_id', 'attribute_set_id', 'sku')))
+            ->will($this->returnValue(array()));
+
+        $this->_productFactory = $this->getMock('\Magento\Catalog\Model\ProductFactory',
+            array('create'), array(), '', false);
+        $this->_productFactory->expects($this->atLeastOnce())->method('create')
+            ->will($this->returnValue($this->_product));
+
+        $this->_groupColFactory = $this->getMock('\Magento\Customer\Model\Resource\Group\CollectionFactory',
+            array('create'), array(), '', false);
+        $this->_groupColFactory->expects($this->atLeastOnce())->method('create')
+            ->will($this->returnValue(array()));
+
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->_model = $objectManager->getObject('\Magento\ImportExport\Model\Import\Entity\Product', array(
+            'config' => $this->_eavConfig,
+            'optionFactory' => $this->_optionFactory,
+            'storeManager' => $this->_storeManager,
+            'setColFactory' => $this->_setColFactory,
+            'importConfig' => $this->_importConfig,
+            'categoryColFactory' => $this->_categoryColFactory,
+            'productFactory' => $this->_productFactory,
+            'groupColFactory' => $this->_groupColFactory
+        ));
+    }
+
+    protected function tearDown()
+    {
+        unset($this->_model);
+    }
+
+    /**
+     * @param array $data
+     * @param array $expected
+     * @dataProvider isMediaValidDataProvider
+     */
+    public function testIsMediaValid($data, $expected)
+    {
+        $method = new \ReflectionMethod('\Magento\ImportExport\Model\Import\Entity\Product', '_isMediaValid');
+        $method->setAccessible(true);
+
+        $this->assertEquals($expected['method_return'], $method->invoke($this->_model, $data, 1));
+
+        $errors = new \ReflectionProperty('\Magento\ImportExport\Model\Import\Entity\Product', '_errors');
+        $errors->setAccessible(true);
+        $this->assertEquals($expected['_errors'], $errors->getValue($this->_model));
+
+        $invalidRows = new \ReflectionProperty('\Magento\ImportExport\Model\Import\Entity\Product', '_invalidRows');
+        $invalidRows->setAccessible(true);
+        $this->assertEquals($expected['_invalidRows'], $invalidRows->getValue($this->_model));
+
+        $errorsCount = new \ReflectionProperty('\Magento\ImportExport\Model\Import\Entity\Product', '_errorsCount');
+        $errorsCount->setAccessible(true);
+        $this->assertEquals($expected['_errorsCount'], $errorsCount->getValue($this->_model));
+    }
+
+    /**
+     * @return array
+     */
+    public function isMediaValidDataProvider()
+    {
+        return array(
+            'valid' => array(
+                array('_media_image' => 1, '_media_attribute_id' => 1),
+                array('method_return' => true, '_errors' => array(), '_invalidRows' => array(), '_errorsCount' => 0),
+            ),
+            'valid2' => array(
+                array('_media_attribute_id' => 1),
+                array('method_return' => true, '_errors' => array(), '_invalidRows' => array(), '_errorsCount' => 0),
+            ),
+            'invalid' => array(
+                array('_media_image' => 1),
+                array(
+                    'method_return' => false,
+                    '_errors' => array('mediaDataIsIncomplete' => array(array(2, null))),
+                    '_invalidRows' => array(1 => 1),
+                    '_errorsCount' => 1
+                ),
+            ),
+        );
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
index 8cf7e95d063e3d36c255b35c97781e2ff868fcf3..02b0fe444105f2962ed8a4627372c94de99cec8c 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -69,7 +69,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
             ->setMethods(array('methods'))
             ->getMock();
 
-        $giftMessageSave = $this->getMockBuilder('Magento\Adminhtml\Model\Giftmessage\Save')
+        $giftMessageSave = $this->getMockBuilder('Magento\GiftMessage\Model\Save')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
index 3a3713c08ef241a369348ae51c9b83e29c260cb8..63d6c3fa1e0ecb18a6cd1598e49dd2a24f7e73ce 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
@@ -206,7 +206,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
      */
     protected function _getAssignedTheme()
     {
-        return new \Magento\Object(array('id' => 1, 'theme_path' => 'magento_demo'));
+        return new \Magento\Object(array('id' => 1, 'theme_path' => 'magento_plushe'));
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php b/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php
index 71f70fa788ab51136c1f7680111a348e64cc87b9..371075dd3b98971ed8e9a614f4d76aaded42cb77 100644
--- a/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php
@@ -69,7 +69,7 @@ class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
      */
     public function testCreateByPath()
     {
-        $path = 'frontend/magento_fixed_width';
+        $path = 'frontend/magento_plushe';
         $themeId = 7;
         $theme = $this->getMock('Magento\Core\Model\Theme', array(), array(), '', false);
         $theme->expects($this->exactly(3))
@@ -82,7 +82,7 @@ class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
 
         $this->themeProviderMock->expects($this->once())
             ->method('getThemeByFullPath')
-            ->with('frontend/frontend/magento_fixed_width')
+            ->with('frontend/frontend/magento_plushe')
             ->will($this->returnValue($theme));
 
         $this->assertSame($theme, $this->factory->create($path));
diff --git a/downloader/app/Magento/Downloader/Controller.php b/downloader/app/Magento/Downloader/Controller.php
index b7db3018a378e848037ebdfb6e7209561c0e4f0f..f6b48772f675565f0f0b4d6a430dc356058fcf43 100755
--- a/downloader/app/Magento/Downloader/Controller.php
+++ b/downloader/app/Magento/Downloader/Controller.php
@@ -1036,7 +1036,7 @@ final class Controller
                 ->get('Magento\Core\Model\Registry')
                 ->register('backup_manager', $backupManager);
 
-            if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+            if ($type != \Magento\Backup\Factory::TYPE_DB) {
                 $backupManager->setRootDir(\Mage::getBaseDir())
                     ->addIgnorePaths($this->_getBackupIgnorePaths());
             }
@@ -1059,10 +1059,10 @@ final class Controller
     protected function _getExtensionType($type)
     {
         $extensionType = array(
-            \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT => 'tgz',
-            \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
-            \Magento\Backup\Helper\Data::TYPE_MEDIA => 'tgz',
-            \Magento\Backup\Helper\Data::TYPE_DB => 'gz'
+            \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'tgz',
+            \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
+            \Magento\Backup\Factory::TYPE_MEDIA => 'tgz',
+            \Magento\Backup\Factory::TYPE_DB => 'gz'
         );
 
         return $extensionType[$type];
@@ -1092,10 +1092,10 @@ final class Controller
     protected function _getBackupTypeByCode($code)
     {
         $typeMap = array(
-            1 => \Magento\Backup\Helper\Data::TYPE_DB,
-            2 => \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT,
-            3 => \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA,
-            4 => \Magento\Backup\Helper\Data::TYPE_MEDIA
+            1 => \Magento\Backup\Factory::TYPE_DB,
+            2 => \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT,
+            3 => \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA,
+            4 => \Magento\Backup\Factory::TYPE_MEDIA
         );
 
         if (!isset($typeMap[$code])) {
@@ -1114,10 +1114,10 @@ final class Controller
     protected function _getCreateBackupSuccessMessageByType($type)
     {
         $messagesMap = array(
-            \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT => 'System backup has been created',
-            \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'System (excluding Media) backup has been created',
-            \Magento\Backup\Helper\Data::TYPE_MEDIA => 'Database and media backup has been created',
-            \Magento\Backup\Helper\Data::TYPE_DB => 'Database backup has been created'
+            \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'System backup has been created',
+            \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'System (excluding Media) backup has been created',
+            \Magento\Backup\Factory::TYPE_MEDIA => 'Database and media backup has been created',
+            \Magento\Backup\Factory::TYPE_DB => 'Database backup has been created'
         );
 
         if (!isset($messagesMap[$type])) {
diff --git a/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php b/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php
index cf25c0b4888155f8cae29c9f861b99ec7e04db0f..9ea95e6b2fe2d95891e02f279e1f5c3511c3b43c 100644
--- a/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php
+++ b/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php
@@ -36,7 +36,7 @@ namespace Magento\Downloader\Model\Config;
 class AbstractConfig extends \Magento\Downloader\Model
 {
     /**
-    * Retrive file name
+    * Retrieve file name
     *
     * @return string
     */
diff --git a/downloader/app/Magento/Downloader/Model/Connect.php b/downloader/app/Magento/Downloader/Model/Connect.php
index 2f9d6838d78d4ec4305f06d18f84d1cb74838715..76db951fd6364d00f1e58347d8d67e17dc43ddcb 100644
--- a/downloader/app/Magento/Downloader/Model/Connect.php
+++ b/downloader/app/Magento/Downloader/Model/Connect.php
@@ -39,7 +39,7 @@ include_once "Magento/Connect.php";
 class Connect extends \Magento\Downloader\Model
 {
     /**
-     * Retrive object of \Magento\Downloader\Connect
+     * Retrieve object of \Magento\Downloader\Connect
      *
      * @return \Magento\Downloader\Connect
      */
diff --git a/downloader/lib/Magento/Backup/Snapshot.php b/downloader/lib/Magento/Backup/Snapshot.php
index 0e2e9bc66cadd474e1900e801c1a1039fc465916..e08ca5136902b46830cb9801d3919d2f72a26e49 100755
--- a/downloader/lib/Magento/Backup/Snapshot.php
+++ b/downloader/lib/Magento/Backup/Snapshot.php
@@ -133,7 +133,7 @@ class Snapshot extends \Magento\Backup\Filesystem
      */
     protected function _createDbBackupInstance()
     {
-        return $this->_backupFactory->create(\Magento\Backup\Helper\Data::TYPE_DB)
+        return $this->_backupFactory->create(\Magento\Backup\Factory::TYPE_DB)
             ->setBackupExtension('gz')
             ->setTime($this->getTime())
             ->setBackupsDir($this->_dirs->getDir('var'))
diff --git a/downloader/lib/Magento/Connect/Package.php b/downloader/lib/Magento/Connect/Package.php
index 87adef51207b2c86f0902a4b429746533778a3a3..d17d65354a55a7bc86ab0a7627e2e268f855912d 100644
--- a/downloader/lib/Magento/Connect/Package.php
+++ b/downloader/lib/Magento/Connect/Package.php
@@ -1112,7 +1112,7 @@ END;
 
     /**
      * Validate package. Errors can be
-     * retreived by calling getErrors();
+     * retrieved by calling getErrors();
      *
      * @return bool
      */
diff --git a/downloader/lib/Magento/System/Ftp.php b/downloader/lib/Magento/System/Ftp.php
index b96dcc5fd272a171b4f0c8f46ba0449caf96d672..7911fb26137400a6152c120ca0c6c7f35a2ebf53 100755
--- a/downloader/lib/Magento/System/Ftp.php
+++ b/downloader/lib/Magento/System/Ftp.php
@@ -59,7 +59,7 @@ class Ftp
     /**
      * ftp_mkdir wrapper
      *
-     * @param sting $name
+     * @param string $name
      * @return unknown_type
      */
     public function mdkir($name)
diff --git a/lib/Magento/App/Cache.php b/lib/Magento/App/Cache.php
index 9ea029980244456f3844e6a7d70f94a3834c31cc..970773d4d3adc12712529100409a7b81da1bfc00 100644
--- a/lib/Magento/App/Cache.php
+++ b/lib/Magento/App/Cache.php
@@ -26,7 +26,7 @@
 
 /**
  * System cache model
- * support id and tags preffix support,
+ * support id and tags prefix support,
  */
 
 namespace Magento\App;
diff --git a/lib/Magento/App/Dir.php b/lib/Magento/App/Dir.php
index f9ad9d74171e34a2c2c8501b1d79375d21006c48..3e68f380adc747c764771a7a9973473614871750 100644
--- a/lib/Magento/App/Dir.php
+++ b/lib/Magento/App/Dir.php
@@ -3,7 +3,7 @@
  * Application file system directories dictionary
  *
  * Provides information about what directories are available in the application
- * Serves as customizaiton point to specify different directories or add own
+ * Serves as customization point to specify different directories or add own
  *
  * Magento
  *
diff --git a/lib/Magento/App/Request/Http.php b/lib/Magento/App/Request/Http.php
index 59d99a944d7d7cdadd1a8f9a7f0fc8e5f258e789..c22adc7edc8cb14370162e83fbbd5c0d998b02a2 100644
--- a/lib/Magento/App/Request/Http.php
+++ b/lib/Magento/App/Request/Http.php
@@ -52,7 +52,7 @@ class Http extends \Zend_Controller_Request_Http implements \Magento\App\Request
     protected $_controllerModule = null;
 
     /**
-     * Streight request flag.
+     * Straight request flag.
      * If flag is determined no additional logic is applicable
      *
      * @var $_isStraight bool
diff --git a/lib/Magento/Backup/Factory.php b/lib/Magento/Backup/Factory.php
index 4001ecf1d8059b9d5fd14ae909ac3fa1da13231d..084b2d8683b7627ecebae321ba2ba7b34bb69b0c 100644
--- a/lib/Magento/Backup/Factory.php
+++ b/lib/Magento/Backup/Factory.php
@@ -34,12 +34,37 @@ class Factory
      */
     private $_objectManager;
 
+    /**
+     * Backup type constant for database backup
+     */
+    const TYPE_DB = 'db';
+
+    /**
+     * Backup type constant for filesystem backup
+     */
+    const TYPE_FILESYSTEM = 'filesystem';
+
+    /**
+     * Backup type constant for full system backup(database + filesystem)
+     */
+    const TYPE_SYSTEM_SNAPSHOT = 'snapshot';
+
+    /**
+     * Backup type constant for media and database backup
+     */
+    const TYPE_MEDIA = 'media';
+
+    /**
+     * Backup type constant for full system backup excluding media folder
+     */
+    const TYPE_SNAPSHOT_WITHOUT_MEDIA = 'nomedia';
+
     /**
      * List of supported a backup types
      *
      * @var array
      */
-    private $_allowedTypes = array('db', 'snapshot', 'filesystem', 'media', 'nomedia');
+    protected $_allowedTypes;
 
     /**
      * @param \Magento\ObjectManager $objectManager
@@ -47,6 +72,13 @@ class Factory
     public function __construct(\Magento\ObjectManager $objectManager)
     {
         $this->_objectManager = $objectManager;
+        $this->_allowedTypes = array(
+            self::TYPE_DB,
+            self::TYPE_FILESYSTEM,
+            self::TYPE_SYSTEM_SNAPSHOT,
+            self::TYPE_MEDIA,
+            self::TYPE_SNAPSHOT_WITHOUT_MEDIA,
+        );
     }
 
     /**
diff --git a/lib/Magento/Backup/Snapshot.php b/lib/Magento/Backup/Snapshot.php
index 3a3e8bfaf6e43a372d7c445de78b7909742072d6..9b55053a542866fa0a60a0cfc712b43e42580a4e 100644
--- a/lib/Magento/Backup/Snapshot.php
+++ b/lib/Magento/Backup/Snapshot.php
@@ -133,7 +133,7 @@ class Snapshot extends \Magento\Backup\Filesystem
      */
     protected function _createDbBackupInstance()
     {
-        return $this->_backupFactory->create(\Magento\Backup\Helper\Data::TYPE_DB)
+        return $this->_backupFactory->create(\Magento\Backup\Factory::TYPE_DB)
             ->setBackupExtension('gz')
             ->setTime($this->getTime())
             ->setBackupsDir($this->_dirs->getDir('var'))
diff --git a/lib/Magento/Config/Dom.php b/lib/Magento/Config/Dom.php
index febd9a6dce51f8c50661495fbf8ef31f907e4cb5..f52689dbeb694b0307d64daa58c7b6829797e650 100644
--- a/lib/Magento/Config/Dom.php
+++ b/lib/Magento/Config/Dom.php
@@ -137,7 +137,7 @@ class Dom
             }
             /* override node value */
             if ($this->_isTextNode($node)) {
-                /* skip the case when the matched node has children, otherwise they get overriden */
+                /* skip the case when the matched node has children, otherwise they get overridden */
                 if (!$matchedNode->hasChildNodes() || $this->_isTextNode($matchedNode)) {
                     $matchedNode->nodeValue = $node->childNodes->item(0)->nodeValue;
                 }
diff --git a/lib/Magento/Connect/Package.php b/lib/Magento/Connect/Package.php
index b148b368253f77355cf12fed19243278710809e6..c01fb071df6100665eea7ea7e74982b2363bdb0f 100644
--- a/lib/Magento/Connect/Package.php
+++ b/lib/Magento/Connect/Package.php
@@ -1291,7 +1291,7 @@ END;
 
     /**
      * Validate package. Errors can be
-     * retreived by calling getErrors();
+     * retrieved by calling getErrors();
      *
      * @return bool
      */
diff --git a/lib/Magento/Connect/Rest.php b/lib/Magento/Connect/Rest.php
index fedf0e4b0e7185d795090d3fa029a05974153626..ac1f08b16b99941b43d578ac041067b80d12ea41 100644
--- a/lib/Magento/Connect/Rest.php
+++ b/lib/Magento/Connect/Rest.php
@@ -89,7 +89,7 @@ class Rest
      * Set channel info
      *
      * @param string $uri
-     * @param sting $name
+     * @param string $name
      */
     public function setChannel($uri)
     {
@@ -219,15 +219,15 @@ class Rest
             }
             $return = $output;
         }
-        
+
         $out = array();
         foreach($return as $name=>$package) {
             $stabilities = array_map(array($this, 'shortStateToLong'), array_keys($package));
-            $versions = array_map('trim', array_values($package));                
+            $versions = array_map('trim', array_values($package));
             $package = array_combine($versions, $stabilities);
             ksort($package);
             $out[$name] = $package;
-        }        
+        }
         return $out;
     }
 
@@ -337,8 +337,8 @@ class Rest
                 }
             }
         }
-        
-        
+
+
         $out = $this->loadChannelUri($package."/".$version."/".$package."-".$version.".".self::EXT);
 
         $statusCode = $this->getLoader()->getStatus();
@@ -355,12 +355,12 @@ class Rest
     }
 
     protected $states = array('b'=>'beta', 'd'=>'dev', 's'=>'stable', 'a'=>'alpha');
-    
+
     public function shortStateToLong($s)
     {
         return isset($this->states[$s]) ? $this->states[$s] : 'dev';
     }
-            
-    
+
+
 }
 
diff --git a/lib/Magento/Connect/Singleconfig.php b/lib/Magento/Connect/Singleconfig.php
index 633e6141e39c21bfd89d8f8a8c635ffbdb16750f..f1f371796a32a9cdc0e0d67682646953d203d921 100644
--- a/lib/Magento/Connect/Singleconfig.php
+++ b/lib/Magento/Connect/Singleconfig.php
@@ -93,7 +93,7 @@ class Singleconfig
     }
 
     public function formatUri($uri)
-    {        
+    {
         $uri = rtrim($uri, "/");
         $uri = str_replace("http://", '', $uri);
         $uri = str_replace("ftp://", '', $uri);
@@ -593,7 +593,7 @@ class Singleconfig
 
     /**
      * Get package
-     * @param sting $chanName
+     * @param string $chanName
      * @param string $package
      * @return void
      */
@@ -652,9 +652,9 @@ class Singleconfig
         } elseif(version_compare($min1, $min2, ">=") && version_compare($max1, $max2, "<=")) {
             return true;
         } elseif(version_compare($min1, $min2, "<=") && version_compare($max1, $max2, ">=")) {
-           return true;            
+           return true;
         }
-        return false;        
+        return false;
     }
 
     /**
@@ -792,8 +792,8 @@ class Singleconfig
                 }
                 $deps = $package[self::K_PACK_DEPS];
                 if($this->specifiedInDependencyList($deps, $chanName, $packageName)) {
-                    $out[] = array('channel'=>$channel, 'name' =>$package['name'], 'version'=>$package['version']); 
-                }               
+                    $out[] = array('channel'=>$channel, 'name' =>$package['name'], 'version'=>$package['version']);
+                }
             }
         }
         return $out;
@@ -825,7 +825,7 @@ class Singleconfig
     }
 
 
-    
+
     /**
      * Check if package conflicts with installed packages
      * Returns:
diff --git a/lib/Magento/Data/Collection.php b/lib/Magento/Data/Collection.php
index 5ab084b7fcbb48fe039ed618891492e6ae903868..375fce45cddb3fe2632ac205cd63221e28b98e68 100644
--- a/lib/Magento/Data/Collection.php
+++ b/lib/Magento/Data/Collection.php
@@ -116,14 +116,14 @@ class Collection implements \IteratorAggregate, \Countable, \Magento\Core\Model\
     protected $_flags = array();
 
     /**
-     * @var \Magento\Core\Model\EntityFactory
+     * @var \Magento\Data\Collection\EntityFactoryInterface
      */
     protected $_entityFactory;
 
     /**
-     * @param \Magento\Core\Model\EntityFactory $entityFactory
+     * @param \Magento\Data\Collection\EntityFactoryInterface $entityFactory
      */
-    public function __construct(\Magento\Core\Model\EntityFactory $entityFactory)
+    public function __construct(\Magento\Data\Collection\EntityFactoryInterface $entityFactory)
     {
         $this->_entityFactory = $entityFactory;
     }
diff --git a/lib/Magento/Data/Collection/Db.php b/lib/Magento/Data/Collection/Db.php
index a5bfd5a985af7e9461c599d60d5b428aabdf42c3..14ef48df1def2745ff0fedff5c8458b5d0728cd2 100644
--- a/lib/Magento/Data/Collection/Db.php
+++ b/lib/Magento/Data/Collection/Db.php
@@ -104,13 +104,13 @@ class Db extends \Magento\Data\Collection
     /**
      * @param \Magento\Logger $logger
      * @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @param \Magento\Core\Model\EntityFactory $entityFactory
+     * @param \Magento\Data\Collection\EntityFactoryInterface $entityFactory
      * @param null $conn
      */
     public function __construct(
         \Magento\Logger $logger,
         \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-        \Magento\Core\Model\EntityFactory $entityFactory,
+        \Magento\Data\Collection\EntityFactoryInterface $entityFactory,
         $conn = null
     ) {
         parent::__construct($entityFactory);
diff --git a/app/code/Magento/Adminhtml/Block/Messages.php b/lib/Magento/Data/Collection/EntityFactoryInterface.php
similarity index 76%
rename from app/code/Magento/Adminhtml/Block/Messages.php
rename to lib/Magento/Data/Collection/EntityFactoryInterface.php
index 93896f840b8b75a01df92c62023101284dd2d0a9..046daa40d534ec8a4e1415413e962522d0c30235 100644
--- a/app/code/Magento/Adminhtml/Block/Messages.php
+++ b/lib/Magento/Data/Collection/EntityFactoryInterface.php
@@ -19,21 +19,22 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Magento
- * @package     Magento_Adminhtml
+ * @package     Magento_Data
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+namespace Magento\Data\Collection;
 
-/**
- * Adminhtml messages block
- *
- * @category   Magento
- * @package    Magento_Adminhtml
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Adminhtml\Block;
-
-class Messages extends \Magento\View\Block\Messages
+interface EntityFactoryInterface
 {
+
+    /**
+     * Create new object instance
+     *
+     * @param string $type
+     * @param array $arguments
+     * @return mixed
+     */
+    public function create($type, array $arguments = array());
 }
diff --git a/app/code/Magento/Backend/App/Action/Plugin/Store.php b/lib/Magento/Data/Form/Element/CollectionFactory.php
similarity index 59%
rename from app/code/Magento/Backend/App/Action/Plugin/Store.php
rename to lib/Magento/Data/Form/Element/CollectionFactory.php
index 25d991069eb720e1a7afa3e4e67fbd85f10ba595..6b4b8dfc6816b116dea4f4663aecc429157cb8fb 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/Store.php
+++ b/lib/Magento/Data/Form/Element/CollectionFactory.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Magento
  *
  * NOTICE OF LICENSE
@@ -19,35 +18,38 @@
  * versions in the future. If you wish to customize Magento for your
  * needs please refer to http://www.magentocommerce.com for more information.
  *
+ * @category    Magento
+ * @package     Magento_Data
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace Magento\Backend\App\Action\Plugin;
+namespace Magento\Data\Form\Element;
 
-class Store
+class CollectionFactory
 {
     /**
-     * @var \Magento\Core\Model\StoreManagerInterface
+     * @var \Magento\ObjectManager
      */
-    protected $_storeManager;
+    protected $_objectManager;
+
 
     /**
-     * @param \Magento\Core\Model\StoreManagerInterface $storeManager
+     * @param \Magento\ObjectManager $objectManager
      */
-    public function __construct(\Magento\Core\Model\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\ObjectManager $objectManager)
     {
-        $this->_storeManager = $storeManager;
+        $this->_objectManager = $objectManager;
     }
 
     /**
-     * @param array $arguments
-     * @param \Magento\Code\Plugin\InvocationChain $invocationChain
-     * @return array
+     * Create collection factory with specified parameters
+     *
+     * @param array $data
+     * @return \Magento\Data\Form\Element\Collection
      */
-    public function aroundDispatch(array $arguments, \Magento\Code\Plugin\InvocationChain $invocationChain)
+    public function create(array $data = array())
     {
-        $this->_storeManager->setCurrentStore('admin');
-        return $invocationChain->proceed($arguments);
+        return $this->_objectManager->create('Magento\Data\Form\Element\Collection', $data);
     }
-} 
\ No newline at end of file
+}
diff --git a/lib/Magento/Filter/Object.php b/lib/Magento/Filter/Object.php
index 9a573010f4a4187ce70197805708b13554b6ca0c..db52fb3edbd37a27466591bb9a7dbc79d9f13e01 100644
--- a/lib/Magento/Filter/Object.php
+++ b/lib/Magento/Filter/Object.php
@@ -35,14 +35,14 @@ class Object extends \Zend_Filter
     protected $_columnFilters = array();
 
     /**
-     * @var \Magento\Core\Model\EntityFactory
+     * @var \Magento\Data\Collection\EntityFactoryInterface
      */
     protected $_entityFactory;
 
     /**
-     * @param \Magento\Core\Model\EntityFactory $entityFactory
+     * @param \Magento\Data\Collection\EntityFactoryInterface $entityFactory
      */
-    public function __construct(\Magento\Core\Model\EntityFactory $entityFactory)
+    public function __construct(\Magento\Data\Collection\EntityFactoryInterface $entityFactory)
     {
         $this->_entityFactory = $entityFactory;
     }
diff --git a/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php b/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php
index 866a67ecdcab89ba75b74c7bf1ea7cd0fdbbdc6d..74ba14747d3d0127a85577c96381deb7bf6a2b25 100644
--- a/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php
+++ b/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php
@@ -61,7 +61,7 @@ abstract class AbstractTokenizer
     }
 
     /**
-     * Move current index to previus char.
+     * Move current index to previous char.
      *
      * If index out of bounds returns false
      *
diff --git a/lib/Magento/Gdata/Gshopping/Content.php b/lib/Magento/Gdata/Gshopping/Content.php
index 61cf6b93de2ab99fe85a4e0674a91d5a7f3912b8..8c5de7a4d56b088c2ba9298c03b479cef31884f2 100644
--- a/lib/Magento/Gdata/Gshopping/Content.php
+++ b/lib/Magento/Gdata/Gshopping/Content.php
@@ -94,7 +94,7 @@ class Content extends \Zend_Gdata
     }
 
     /**
-     * Retreive entry object
+     * Retrieve entry object
      *
      * @param mixed $location The location for the feed, as a URL or Query
      * @return \Magento\Gdata\Gshopping\Entry
diff --git a/lib/Magento/HTTP/Adapter/Curl.php b/lib/Magento/HTTP/Adapter/Curl.php
index cd2ba0499b4e76275debc54628c1fb0be588c171..adfa32cb182c1746e1c6f0a2f391cabaaf428420 100644
--- a/lib/Magento/HTTP/Adapter/Curl.php
+++ b/lib/Magento/HTTP/Adapter/Curl.php
@@ -206,6 +206,9 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
             $response = trim($response[1]);
         }
 
+        // CUrl will handle chunked data but leave the header.
+        $response = preg_replace('/Transfer-Encoding:\s+chunked\r?\n/i', '', $response);
+
         return $response;
     }
 
diff --git a/lib/Magento/Image/Adapter/Gd2.php b/lib/Magento/Image/Adapter/Gd2.php
index 51601f7755f238575ed2b0c9c81d0f4467243122..3104e2df3e19ea844037556681007927c4ae8431 100644
--- a/lib/Magento/Image/Adapter/Gd2.php
+++ b/lib/Magento/Image/Adapter/Gd2.php
@@ -499,9 +499,9 @@ class Gd2 extends \Magento\Image\Adapter\AbstractAdapter
     }
 
     /**
-     * Checks required dependecies
+     * Checks required dependencies
      *
-     * @throws \Exception if some of dependecies are missing
+     * @throws \Exception if some of dependencies are missing
      */
     public function checkDependencies()
     {
diff --git a/lib/Magento/Image/Adapter/ImageMagick.php b/lib/Magento/Image/Adapter/ImageMagick.php
index 356c0965938cab83d622d4394a811539c08be8f8..971f57f19a66dc718d2ffaf3a85e418947bf0caa 100644
--- a/lib/Magento/Image/Adapter/ImageMagick.php
+++ b/lib/Magento/Image/Adapter/ImageMagick.php
@@ -357,9 +357,9 @@ class ImageMagick extends \Magento\Image\Adapter\AbstractAdapter
     }
 
     /**
-     * Checks required dependecies
+     * Checks required dependencies
      *
-     * @throws \Exception if some of dependecies are missing
+     * @throws \Exception if some of dependencies are missing
      */
     public function checkDependencies()
     {
diff --git a/lib/Magento/Oauth/ConsumerInterface.php b/lib/Magento/Oauth/ConsumerInterface.php
index abb0688cb204a887cdb5686e9367d060b7466d7a..bb1f61b3923dcadb2d9beffcd2c0f1513ca1a170 100644
--- a/lib/Magento/Oauth/ConsumerInterface.php
+++ b/lib/Magento/Oauth/ConsumerInterface.php
@@ -37,7 +37,7 @@ interface ConsumerInterface
      * Validate consumer data (e.g. Key and Secret length).
      *
      * @return bool - True if the consumer data is valid.
-     * @throws \Magento\Core\Exception|\Exception - Throws exception for validation errors.
+     * @throws \Exception
      */
     public function validate();
 
diff --git a/lib/Magento/Phrase/Renderer/Translate.php b/lib/Magento/Phrase/Renderer/Translate.php
index 5f79905f2985c719177aabb17a31299cac339bf0..6fc9e306138df444587a9706f898df2bb1f41825 100644
--- a/lib/Magento/Phrase/Renderer/Translate.php
+++ b/lib/Magento/Phrase/Renderer/Translate.php
@@ -30,16 +30,16 @@ class Translate implements \Magento\Phrase\RendererInterface
     /**
      * Basic object for translation
      *
-     * @var \Magento\Core\Model\Translate
+     * @var \Magento\TranslateInterface
      */
     protected $_translator;
 
     /**
      * Renderer construct
      *
-     * @param \Magento\Core\Model\Translate $translator
+     * @param \Magento\TranslateInterface $translator
      */
-    public function __construct(\Magento\Core\Model\Translate $translator)
+    public function __construct(\Magento\TranslateInterface $translator)
     {
         $this->_translator = $translator;
     }
diff --git a/lib/Magento/UrlInterface.php b/lib/Magento/UrlInterface.php
index 5c2bcd94cf8b4ed2e12fd783e349d885b3c1f799..dd9b064fab6164c742049ef0fed8648ca955f20d 100644
--- a/lib/Magento/UrlInterface.php
+++ b/lib/Magento/UrlInterface.php
@@ -142,6 +142,13 @@ interface UrlInterface
      */
     public function getBaseUrl($params = array());
 
+    /**
+     * Retrieve current url with port number (if not default used)
+     *
+     * @return string
+     */
+    public function getCurrentUrl();
+
     /**
      * Set Route Parameters
      *
diff --git a/lib/Magento/Validator/Composite/VarienObject.php b/lib/Magento/Validator/Composite/VarienObject.php
index 8739212103c24ba83ffb646503fd07a378f1dbd7..d5afa30fa686a66979fcbab0648ffbfc5e5925d6 100644
--- a/lib/Magento/Validator/Composite/VarienObject.php
+++ b/lib/Magento/Validator/Composite/VarienObject.php
@@ -75,7 +75,7 @@ class VarienObject implements \Zend_Validate_Interface
      * @param \Magento\Object $entity
      * @return bool
      *
-     * @throws \Magento\Core\Exception
+     * @throws \Exception
      */
     public function isValid($entity)
     {
diff --git a/lib/Magento/View/Block/Template.php b/lib/Magento/View/Block/Template.php
index eab884d1be9c3781b36ccf17947ada404f4b598d..794b77253ccdb7e5fbddf73d8b17b53a133c9d4b 100644
--- a/lib/Magento/View/Block/Template.php
+++ b/lib/Magento/View/Block/Template.php
@@ -183,7 +183,6 @@ class Template extends AbstractBlock
     /**
      * Get design area
      *
-     * @deprecated
      * @return string
      */
     public function getArea()
diff --git a/lib/Magento/View/DesignInterface.php b/lib/Magento/View/DesignInterface.php
index d5cb26b8c1180779e517eecaca1be7f0cf9842f6..c717fd6326ccdd6a902989a34bdf376e1fae7198 100644
--- a/lib/Magento/View/DesignInterface.php
+++ b/lib/Magento/View/DesignInterface.php
@@ -46,7 +46,6 @@ interface DesignInterface
     /**
      * Retrieve package area
      *
-     * @deprecated
      * @return string
      */
     public function getArea();
diff --git a/lib/PEAR/SOAP/WSDL.php b/lib/PEAR/SOAP/WSDL.php
index 1fafd342795b77974b645330f7cee00aab4f50a0..9f6ab774d87141f50fc65b758897034216abc0d9 100644
--- a/lib/PEAR/SOAP/WSDL.php
+++ b/lib/PEAR/SOAP/WSDL.php
@@ -1022,7 +1022,7 @@ class SOAP_WSDL_Cache extends SOAP_Base
     }
 
     /**
-     * Retrieves a file from cache if it exists, otherwise retreive from net,
+     * Retrieves a file from cache if it exists, otherwise retrieve from net,
      * add to cache, and return from cache.
      *
      * @param  string   URL to WSDL
diff --git a/lib/Zend/Currency.php b/lib/Zend/Currency.php
index 668ab704f635cc723d27d2600c792676f98d3511..622039178c7dc1d4a78c16bd1dbc2b6d5d18b845 100644
--- a/lib/Zend/Currency.php
+++ b/lib/Zend/Currency.php
@@ -533,7 +533,7 @@ class Zend_Currency
     }
 
     /**
-     * Sets a new locale for data retreivement
+     * Sets a new locale for data retrievement
      * Example: 'de_XX' will be set to 'de' because 'de_XX' does not exist
      * 'xx_YY' will be set to 'root' because 'xx' does not exist
      *
diff --git a/lib/Zend/Db/Select.php b/lib/Zend/Db/Select.php
index 601259e9e2124c4c8c5ca0858bcc650f7a6e5366..43fff9d3c22ab5277cb4354f50fa214412974827 100644
--- a/lib/Zend/Db/Select.php
+++ b/lib/Zend/Db/Select.php
@@ -654,7 +654,7 @@ class Zend_Db_Select
     }
 
     /**
-     * Get part of the structured information for the currect query.
+     * Get part of the structured information for the current query.
      *
      * @param string $part
      * @return mixed
diff --git a/lib/Zend/Filter/Inflector.php b/lib/Zend/Filter/Inflector.php
index d0210298348eb99c76651365d0ccd8410b2984f1..ac42a55b4f0a2ab988667521427acccb1fae9595 100644
--- a/lib/Zend/Filter/Inflector.php
+++ b/lib/Zend/Filter/Inflector.php
@@ -101,7 +101,7 @@ class Zend_Filter_Inflector implements Zend_Filter_Interface
     }
 
     /**
-     * Retreive PluginLoader
+     * Retrieve PluginLoader
      *
      * @return Zend_Loader_PluginLoader_Interface
      */
diff --git a/lib/Zend/Gdata/App.php b/lib/Zend/Gdata/App.php
index dac7e01ecb9c381a1cd000b74eae3d029e63c8c7..fc5a0c7d7411f2769740905464c0bcd8815a2a73 100644
--- a/lib/Zend/Gdata/App.php
+++ b/lib/Zend/Gdata/App.php
@@ -1131,7 +1131,7 @@ class Zend_Gdata_App
      * Retrieve next set of results based on a given feed.
      *
      * @param Zend_Gdata_App_Feed $feed The feed from which to
-     *          retreive the next set of results.
+     *          retrieve the next set of results.
      * @param string $className (optional) The class of feed to be returned.
      *          If null, the next feed (if found) will be the same class as
      *          the feed that was given as the first argument.
@@ -1158,7 +1158,7 @@ class Zend_Gdata_App
      * Retrieve previous set of results based on a given feed.
      *
      * @param Zend_Gdata_App_Feed $feed The feed from which to
-     *          retreive the previous set of results.
+     *          retrieve the previous set of results.
      * @param string $className (optional) The class of feed to be returned.
      *          If null, the previous feed (if found) will be the same class as
      *          the feed that was given as the first argument.
diff --git a/lib/Zend/Gdata/Calendar.php b/lib/Zend/Gdata/Calendar.php
index ce144891a126073719c94031348ce2c81f8203fe..ce20957699c2a9c07bf54c2cb64c57a9384271e7 100644
--- a/lib/Zend/Gdata/Calendar.php
+++ b/lib/Zend/Gdata/Calendar.php
@@ -90,7 +90,7 @@ class Zend_Gdata_Calendar extends Zend_Gdata
     }
 
     /**
-     * Retreive feed object
+     * Retrieve feed object
      *
      * @param mixed $location The location for the feed, as a URL or Query
      * @return Zend_Gdata_Calendar_EventFeed
@@ -108,7 +108,7 @@ class Zend_Gdata_Calendar extends Zend_Gdata
     }
 
     /**
-     * Retreive entry object
+     * Retrieve entry object
      *
      * @return Zend_Gdata_Calendar_EventEntry
      */
@@ -139,7 +139,7 @@ class Zend_Gdata_Calendar extends Zend_Gdata
     }
 
     /**
-     * Retreive entryobject
+     * Retrieve entry object
      *
      * @return Zend_Gdata_Calendar_ListEntry
      */
diff --git a/lib/Zend/Gdata/Docs.php b/lib/Zend/Gdata/Docs.php
index 8376045b35195f42a2bb69c7d80f4083ecf0a01a..a6a2e71c224daf2511e842483a33fc22cc72220a 100755
--- a/lib/Zend/Gdata/Docs.php
+++ b/lib/Zend/Gdata/Docs.php
@@ -113,7 +113,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
     }
 
     /**
-     * Retreive feed object containing entries for the user's documents.
+     * Retrieve feed object containing entries for the user's documents.
      *
      * @param mixed $location The location for the feed, as a URL or Query
      * @return Zend_Gdata_Docs_DocumentListFeed
@@ -131,7 +131,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
     }
 
     /**
-     * Retreive entry object representing a single document.
+     * Retrieve entry object representing a single document.
      *
      * @param mixed $location The location for the entry, as a URL or Query
      * @return Zend_Gdata_Docs_DocumentListEntry
@@ -151,7 +151,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
     }
 
     /**
-     * Retreive entry object representing a single document.
+     * Retrieve entry object representing a single document.
      *
      * This method builds the URL where this item is stored using the type
      * and the id of the document.
@@ -168,7 +168,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
     }
 
     /**
-     * Retreive entry object for the desired word processing document.
+     * Retrieve entry object for the desired word processing document.
      *
      * @param string $id The URL id for the document. Example:
      *     dcmg89gw_62hfjj8m
@@ -178,7 +178,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
     }
 
     /**
-     * Retreive entry object for the desired spreadsheet.
+     * Retrieve entry object for the desired spreadsheet.
      *
      * @param string $id The URL id for the document. Example:
      *     pKq0CzjiF3YmGd0AIlHKqeg
@@ -188,7 +188,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
     }
 
     /**
-     * Retreive entry object for the desired presentation.
+     * Retrieve entry object for the desired presentation.
      *
      * @param string $id The URL id for the document. Example:
      *     dcmg89gw_21gtrjcn
@@ -265,7 +265,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
      *       the appropriate type doesn't exist yet.
      */
     public function createFolder($folderName, $folderResourceId=null) {
-        $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, 
+        $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM,
                                                           self::DOCUMENTS_CATEGORY_SCHEMA);
         $title = new Zend_Gdata_App_Extension_Title($folderName);
         $entry = new Zend_Gdata_Entry();
diff --git a/lib/Zend/Gdata/Gapps.php b/lib/Zend/Gdata/Gapps.php
index 4c0887062ad0ca60abfcfb02103d7c41f4d68034..bc2061e246446581f18b0c66b54892534a555cc7 100644
--- a/lib/Zend/Gdata/Gapps.php
+++ b/lib/Zend/Gdata/Gapps.php
@@ -370,7 +370,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive NicknameFeed object containing multiple NicknameEntry objects.
+     * Retrieve NicknameFeed object containing multiple NicknameEntry objects.
      *
      * @param mixed $location (optional) The location for the feed, as a URL
      *          or Query.
@@ -392,7 +392,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive GroupFeed object containing multiple GroupEntry
+     * Retrieve GroupFeed object containing multiple GroupEntry
      * objects.
      *
      * @param mixed $location (optional) The location for the feed, as a URL
@@ -416,7 +416,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive MemberFeed object containing multiple MemberEntry
+     * Retrieve MemberFeed object containing multiple MemberEntry
      * objects.
      *
      * @param mixed $location (optional) The location for the feed, as a URL
@@ -441,7 +441,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive OwnerFeed object containing multiple OwnerEntry
+     * Retrieve OwnerFeed object containing multiple OwnerEntry
      * objects.
      *
      * @param mixed $location (optional) The location for the feed, as a URL
@@ -466,7 +466,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive EmailListFeed object containing multiple EmailListEntry
+     * Retrieve EmailListFeed object containing multiple EmailListEntry
      * objects.
      *
      * @param mixed $location (optional) The location for the feed, as a URL
@@ -489,7 +489,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive EmailListRecipientFeed object containing multiple
+     * Retrieve EmailListRecipientFeed object containing multiple
      * EmailListRecipientEntry objects.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
@@ -513,7 +513,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive a single UserEntry object.
+     * Retrieve a single UserEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Gapps_UserEntry
@@ -536,7 +536,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive a single NicknameEntry object.
+     * Retrieve a single NicknameEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Gapps_NicknameEntry
@@ -559,7 +559,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive a single GroupEntry object.
+     * Retrieve a single GroupEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Gapps_GroupEntry
@@ -582,7 +582,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive a single MemberEntry object.
+     * Retrieve a single MemberEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Gapps_MemberEntry
@@ -605,7 +605,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive a single OwnerEntry object.
+     * Retrieve a single OwnerEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Gapps_OwnerEntry
@@ -628,7 +628,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive a single EmailListEntry object.
+     * Retrieve a single EmailListEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Gapps_EmailListEntry
@@ -651,7 +651,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     }
 
     /**
-     * Retreive a single EmailListRecipientEntry object.
+     * Retrieve a single EmailListRecipientEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Gapps_EmailListRecipientEntry
@@ -1178,7 +1178,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     {
         $i = 0;
         $group = $this->newGroupEntry();
-        
+
         $properties[$i] = $this->newProperty();
         $properties[$i]->name = 'groupId';
         $properties[$i]->value = $groupId;
@@ -1200,8 +1200,8 @@ class Zend_Gdata_Gapps extends Zend_Gdata
             $properties[$i]->name = 'emailPermission';
             $properties[$i]->value = $emailPermission;
             $i++;
-        }        
-        
+        }
+
         $group->property = $properties;
 
         return $this->insertGroup($group);
@@ -1240,7 +1240,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
      * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry objects
      *              representing all groups apart of the domain.
      */
-    public function retrieveAllGroups() 
+    public function retrieveAllGroups()
     {
         return $this->retrieveAllEntriesForFeed($this->retrievePageOfGroups());
     }
@@ -1257,7 +1257,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
 
         $this->delete($uri);
     }
-    
+
     /**
      * Check to see if a member id or group id is a member of group
      *
@@ -1269,7 +1269,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     {
         $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
         $uri .= $this->getDomain() . '/' . $groupId . '/member/' . $memberId;
-        
+
         //if the enitiy is not a member, an exception is thrown
         try {
             $results = $this->get($uri);
@@ -1353,7 +1353,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
 
         $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
         $uri .= $this->getDomain() . '/' . $groupId . '/owner';
-        
+
         return $this->insertOwner($owner, $uri);
     }
 
@@ -1383,9 +1383,9 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     {
         $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
         $uri .= $this->getDomain() . '/' . $groupId . '/owner/' . $email;
-        
+
         //if the enitiy is not an owner of the group, an exception is thrown
-        try {            
+        try {
             $results = $this->get($uri);
         } catch (Exception $e) {
             $results = false;
@@ -1427,7 +1427,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
     {
         $i = 0;
         $group = $this->newGroupEntry();
-        
+
         $properties[$i] = $this->newProperty();
         $properties[$i]->name = 'groupId';
         $properties[$i]->value = $groupId;
@@ -1453,20 +1453,20 @@ class Zend_Gdata_Gapps extends Zend_Gdata
             $properties[$i]->value = $emailPermission;
             $i++;
         }
-        
+
         $group->property = $properties;
 
         $uri  = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
         $uri .= $this->getDomain() . '/' . $groupId;
 
-        return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry');        
+        return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry');
     }
 
     /**
      * Retrieve all of the groups that a user is a member of
      *
      * @param string $memberId Member username
-     * @param bool $directOnly (Optional) If true, members with direct association 
+     * @param bool $directOnly (Optional) If true, members with direct association
      *             only will be considered
      * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry
      *              objects representing all groups member is apart of in the domain.
diff --git a/lib/Zend/Gdata/Gbase.php b/lib/Zend/Gdata/Gbase.php
index 4af5ea7b34e58be838122004e4097e21b8180b79..6b776670abfb1d34685263b02852cd9e46b58017 100644
--- a/lib/Zend/Gdata/Gbase.php
+++ b/lib/Zend/Gdata/Gbase.php
@@ -108,7 +108,7 @@ class Zend_Gdata_Gbase extends Zend_Gdata
     }
 
     /**
-     * Retreive feed object
+     * Retrieve feed object
      *
      * @param mixed $location The location for the feed, as a URL or Query
      * @return Zend_Gdata_Gbase_ItemFeed
@@ -126,7 +126,7 @@ class Zend_Gdata_Gbase extends Zend_Gdata
     }
 
     /**
-     * Retreive entry object
+     * Retrieve entry object
      *
      * @param mixed $location The location for the feed, as a URL or Query
      * @return Zend_Gdata_Gbase_ItemEntry
diff --git a/lib/Zend/Gdata/Photos.php b/lib/Zend/Gdata/Photos.php
index 342f262be2a95c2b416a3e5716e7920824a91f7b..764455bd7f5552db7a3cffb4f930cd3de33cacd5 100755
--- a/lib/Zend/Gdata/Photos.php
+++ b/lib/Zend/Gdata/Photos.php
@@ -176,7 +176,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
     }
 
     /**
-     * Retreive AlbumFeed object containing multiple PhotoEntry or TagEntry
+     * Retrieve AlbumFeed object containing multiple PhotoEntry or TagEntry
      * objects.
      *
      * @param mixed $location (optional) The location for the feed, as a URL or Query.
@@ -202,7 +202,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
     }
 
     /**
-     * Retreive PhotoFeed object containing comments and tags associated
+     * Retrieve PhotoFeed object containing comments and tags associated
      * with a given photo.
      *
      * @param mixed $location (optional) The location for the feed, as a URL
@@ -230,7 +230,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
     }
 
     /**
-     * Retreive a single UserEntry object.
+     * Retrieve a single UserEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Photos_UserEntry
@@ -255,7 +255,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
     }
 
     /**
-     * Retreive a single AlbumEntry object.
+     * Retrieve a single AlbumEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Photos_AlbumEntry
@@ -280,7 +280,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
     }
 
     /**
-     * Retreive a single PhotoEntry object.
+     * Retrieve a single PhotoEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Photos_PhotoEntry
@@ -305,7 +305,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
     }
 
     /**
-     * Retreive a single TagEntry object.
+     * Retrieve a single TagEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Photos_TagEntry
@@ -330,7 +330,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
     }
 
     /**
-     * Retreive a single CommentEntry object.
+     * Retrieve a single CommentEntry object.
      *
      * @param mixed $location The location for the feed, as a URL or Query.
      * @return Zend_Gdata_Photos_CommentEntry
diff --git a/lib/Zend/Mail/Protocol/Pop3.php b/lib/Zend/Mail/Protocol/Pop3.php
index fa39c6e50a2b22fad666aeba2d49168f34b62c71..c269a91f687702b390556deccdd2e6853f39ad7d 100644
--- a/lib/Zend/Mail/Protocol/Pop3.php
+++ b/lib/Zend/Mail/Protocol/Pop3.php
@@ -416,7 +416,7 @@ class Zend_Mail_Protocol_Pop3
      * @return string message
      * @throws Zend_Mail_Protocol_Exception
      */
-    public function retrive($msgno)
+    public function retrieve($msgno)
     {
         return $this->retrieve($msgno);
     }
diff --git a/lib/Zend/OpenId/Consumer.php b/lib/Zend/OpenId/Consumer.php
index 21ed1d15afcfce2865b0b1950cb566291a093967..da298da217291ca9748121f920f0e0a6d8c54316 100644
--- a/lib/Zend/OpenId/Consumer.php
+++ b/lib/Zend/OpenId/Consumer.php
@@ -433,7 +433,7 @@ class Zend_OpenId_Consumer
     }
 
     /**
-     * Retrive assiciation information for given $url from internal cahce or
+     * Retrieve association information for given $url from internal cache or
      * external storage
      *
      * @param string $url OpenID server url
diff --git a/lib/Zend/Pdf.php b/lib/Zend/Pdf.php
index dff58ab93299554fbea06fbb5b96b17d2f2271ed..75d84941e88a1082945d24f8fd84fb74e09728c1 100644
--- a/lib/Zend/Pdf.php
+++ b/lib/Zend/Pdf.php
@@ -389,7 +389,7 @@ class Zend_Pdf
     }
 
     /**
-     * Retrive number of revisions.
+     * Retrieve number of revisions.
      *
      * @return integer
      */
diff --git a/lib/Zend/Pdf/ElementFactory.php b/lib/Zend/Pdf/ElementFactory.php
index 94abf1205834e9efc8901bc9efd4fb2d352073e0..e03ccfe6bc251fe6e8637b5f774d25b7bae4abfa 100644
--- a/lib/Zend/Pdf/ElementFactory.php
+++ b/lib/Zend/Pdf/ElementFactory.php
@@ -271,7 +271,7 @@ class Zend_Pdf_ElementFactory implements Zend_Pdf_ElementFactory_Interface
     }
 
     /**
-     * Retrive object enumeration shift.
+     * Retrieve object enumeration shift.
      *
      * @param Zend_Pdf_ElementFactory_Interface $factory
      * @return integer
diff --git a/lib/Zend/Pdf/ElementFactory/Interface.php b/lib/Zend/Pdf/ElementFactory/Interface.php
index e9b65a5ee4bac648886eaac9f2b076a563810451..b92727cf55b57f7e0c12c7b5df9f8fdc3260e422 100644
--- a/lib/Zend/Pdf/ElementFactory/Interface.php
+++ b/lib/Zend/Pdf/ElementFactory/Interface.php
@@ -96,7 +96,7 @@ interface Zend_Pdf_ElementFactory_Interface
     public function cleanEnumerationShiftCache();
 
     /**
-     * Retrive object enumeration shift.
+     * Retrieve object enumeration shift.
      *
      * @param Zend_Pdf_ElementFactory_Interface $factory
      * @return integer
diff --git a/lib/Zend/Pdf/ElementFactory/Proxy.php b/lib/Zend/Pdf/ElementFactory/Proxy.php
index 3645c8e656e5aae1ce3448209508cc16a85b5d08..9fa4e933f20228e0d126a7fa0d8a1e919ed2a949 100644
--- a/lib/Zend/Pdf/ElementFactory/Proxy.php
+++ b/lib/Zend/Pdf/ElementFactory/Proxy.php
@@ -151,7 +151,7 @@ class Zend_Pdf_ElementFactory_Proxy implements Zend_Pdf_ElementFactory_Interface
     }
 
     /**
-     * Retrive object enumeration shift.
+     * Retrieve object enumeration shift.
      *
      * @param Zend_Pdf_ElementFactory_Interface $factory
      * @return integer
diff --git a/lib/Zend/Pdf/Page.php b/lib/Zend/Pdf/Page.php
index e0667dc1efcce1b5327035da8363746d0e7f2efe..65ff09d88dda968f3ce817bc684174cee91b4947 100644
--- a/lib/Zend/Pdf/Page.php
+++ b/lib/Zend/Pdf/Page.php
@@ -526,7 +526,7 @@ class Zend_Pdf_Page extends Zend_Pdf_Canvas_Abstract
     }
 
     /**
-     * Retrive PDF file reference to the page
+     * Retrieve PDF file reference to the page
      *
      * @internal
      * @return Zend_Pdf_Element_Dictionary
diff --git a/lib/Zend/Search/Lucene.php b/lib/Zend/Search/Lucene.php
index 89abb77f325fb8972516f9a19d254d519979e64f..b6e17a32dc27c692741cd92b7f348d8a41943dad 100644
--- a/lib/Zend/Search/Lucene.php
+++ b/lib/Zend/Search/Lucene.php
@@ -1307,7 +1307,7 @@ class Zend_Search_Lucene implements Zend_Search_Lucene_Interface
 
 
     /**
-     * Retrive similarity used by index reader
+     * Retrieve similarity used by index reader
      *
      * @return Zend_Search_Lucene_Search_Similarity
      */
@@ -1523,7 +1523,7 @@ class Zend_Search_Lucene implements Zend_Search_Lucene_Interface
     }
 
     /**
-     * Skip terms stream up to the specified term preffix.
+     * Skip terms stream up to the specified term prefix.
      *
      * Prefix contains fully specified field info and portion of searched term
      *
diff --git a/lib/Zend/Search/Lucene/Index/SegmentInfo.php b/lib/Zend/Search/Lucene/Index/SegmentInfo.php
index 6367e45c5f7b6ff3ae36b280bbaad733c2dac683..361860de1430f1a5d9ae6312ea654d2cd733a350 100644
--- a/lib/Zend/Search/Lucene/Index/SegmentInfo.php
+++ b/lib/Zend/Search/Lucene/Index/SegmentInfo.php
@@ -1861,7 +1861,7 @@ class Zend_Search_Lucene_Index_SegmentInfo implements Zend_Search_Lucene_Index_T
 
 
     /**
-     * Skip terms stream up to the specified term preffix.
+     * Skip terms stream up to the specified term prefix.
      *
      * Prefix contains fully specified field info and portion of searched term
      *
diff --git a/lib/Zend/Search/Lucene/Index/SegmentWriter.php b/lib/Zend/Search/Lucene/Index/SegmentWriter.php
index 910fa0003ed552b12bfa6e974fe5884bbb018348..1da16283ceb4af29c3a43101632d2b63d7b64110 100644
--- a/lib/Zend/Search/Lucene/Index/SegmentWriter.php
+++ b/lib/Zend/Search/Lucene/Index/SegmentWriter.php
@@ -402,7 +402,7 @@ abstract class Zend_Search_Lucene_Index_SegmentWriter
         $this->_tiiFile->writeInt(self::$maxSkipLevels);
 
         /** Dump dictionary header */
-        $this->_tiiFile->writeVInt(0);                    // preffix length
+        $this->_tiiFile->writeVInt(0);                    // prefix length
         $this->_tiiFile->writeString('');                 // suffix
         $this->_tiiFile->writeInt((int)0xFFFFFFFF);       // field number
         $this->_tiiFile->writeByte((int)0x0F);
@@ -548,12 +548,12 @@ abstract class Zend_Search_Lucene_Index_SegmentWriter
                 $prefixBytes += $charBytes;
             }
 
-            // Write preffix length
+            // Write prefix length
             $dicFile->writeVInt($prefixChars);
             // Write suffix
             $dicFile->writeString(substr($term->text, $prefixBytes));
         } else {
-            // Write preffix length
+            // Write prefix length
             $dicFile->writeVInt(0);
             // Write suffix
             $dicFile->writeString($term->text);
diff --git a/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php b/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php
index 64d246c30880c28b5bfb7fe85ac8b1bb99ad78d1..c9f0a6b3e93fe02bdd083a6d0642c1bcf79eff29 100644
--- a/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php
+++ b/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php
@@ -35,7 +35,7 @@ interface Zend_Search_Lucene_Index_TermsStream_Interface
     public function resetTermsStream();
 
     /**
-     * Skip terms stream up to the specified term preffix.
+     * Skip terms stream up to the specified term prefix.
      *
      * Prefix contains fully specified field info and portion of searched term
      *
diff --git a/lib/Zend/Search/Lucene/Interface.php b/lib/Zend/Search/Lucene/Interface.php
index 8dafe97340ca221ada161a7abb6c38319a6f1f01..a91e3f6e89058069fd9ba1c34408d7739a2b9a3c 100644
--- a/lib/Zend/Search/Lucene/Interface.php
+++ b/lib/Zend/Search/Lucene/Interface.php
@@ -336,7 +336,7 @@ interface Zend_Search_Lucene_Interface extends Zend_Search_Lucene_Index_TermsStr
     public function docFreq(Zend_Search_Lucene_Index_Term $term);
 
     /**
-     * Retrive similarity used by index reader
+     * Retrieve similarity used by index reader
      *
      * @return Zend_Search_Lucene_Search_Similarity
      */
diff --git a/lib/Zend/Search/Lucene/MultiSearcher.php b/lib/Zend/Search/Lucene/MultiSearcher.php
index 698fd05b4f419bbac1f866089a41e5436f18b307..3e14e0b6c186787e6701cbd7ff6c221ddc7b72de 100644
--- a/lib/Zend/Search/Lucene/MultiSearcher.php
+++ b/lib/Zend/Search/Lucene/MultiSearcher.php
@@ -691,7 +691,7 @@ class Zend_Search_Lucene_Interface_MultiSearcher implements Zend_Search_Lucene_I
     }
 
     /**
-     * Retrive similarity used by index reader
+     * Retrieve similarity used by index reader
      *
      * @return Zend_Search_Lucene_Search_Similarity
      * @throws Zend_Search_Lucene_Exception
@@ -895,7 +895,7 @@ class Zend_Search_Lucene_Interface_MultiSearcher implements Zend_Search_Lucene_I
     }
 
     /**
-     * Skip terms stream up to specified term preffix.
+     * Skip terms stream up to specified term prefix.
      *
      * Prefix contains fully specified field info and portion of searched term
      *
diff --git a/lib/Zend/Search/Lucene/Proxy.php b/lib/Zend/Search/Lucene/Proxy.php
index 1ba38ff1054b3a33dedfaa4d5adc113443915f9b..5c1d8d6ae267568059be429aa5c618e559052355 100644
--- a/lib/Zend/Search/Lucene/Proxy.php
+++ b/lib/Zend/Search/Lucene/Proxy.php
@@ -447,7 +447,7 @@ class Zend_Search_Lucene_Proxy implements Zend_Search_Lucene_Interface
     }
 
     /**
-     * Retrive similarity used by index reader
+     * Retrieve similarity used by index reader
      *
      * @return Zend_Search_Lucene_Search_Similarity
      */
@@ -538,7 +538,7 @@ class Zend_Search_Lucene_Proxy implements Zend_Search_Lucene_Interface
     }
 
     /**
-     * Skip terms stream up to specified term preffix.
+     * Skip terms stream up to specified term prefix.
      *
      * Prefix contains fully specified field info and portion of searched term
      *
diff --git a/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php b/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php
index 2800a4b25b1df4a074be7ab63f40a0eb304c18df..638b3c6b7459d31bf4225c9f3b5a6ddc406ece8b 100644
--- a/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php
+++ b/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php
@@ -90,7 +90,7 @@ class Zend_Search_Lucene_TermStreamsPriorityQueue implements Zend_Search_Lucene_
     }
 
     /**
-     * Skip terms stream up to the specified term preffix.
+     * Skip terms stream up to the specified term prefix.
      *
      * Prefix contains fully specified field info and portion of searched term
      *
diff --git a/lib/Zend/Service/Delicious/PostList.php b/lib/Zend/Service/Delicious/PostList.php
index 66a41e222bf82d8e0e3980407fc551c2a078cd64..2646f797f003cc0dfaa5fc215f932b49413d4725 100644
--- a/lib/Zend/Service/Delicious/PostList.php
+++ b/lib/Zend/Service/Delicious/PostList.php
@@ -23,7 +23,7 @@
 
 
 /**
- * List of posts retrived from the del.icio.us web service
+ * List of posts retrieved from the del.icio.us web service
  *
  * @category   Zend
  * @package    Zend_Service
diff --git a/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php b/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
index 97671bb45bde6c2d1e49477103b9d59f27341f7b..a3b8261e82db4ba0f92ce82a315dce021b36cb59 100644
--- a/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
+++ b/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
@@ -157,9 +157,9 @@ abstract class Zend_Tool_Project_Context_Filesystem_Abstract implements Zend_Too
     /**
      * delete()
      *
-     * Delete this resouce/context
+     * Delete this resource/context
      *
      */
     abstract public function delete();
 
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/View/Helper/Placeholder/Container/Standalone.php b/lib/Zend/View/Helper/Placeholder/Container/Standalone.php
index 0f61b2387b3330b2a775b3f7e0606f2cb9c7c8bb..3f5391039c69a29303bdc4291187d1d57a65fb28 100644
--- a/lib/Zend/View/Helper/Placeholder/Container/Standalone.php
+++ b/lib/Zend/View/Helper/Placeholder/Container/Standalone.php
@@ -54,7 +54,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Standalone extends Zend_Vi
 
     /**
      * Flag wheter to automatically escape output, must also be
-     * enforced in the child class if __toString/toString is overriden
+     * enforced in the child class if __toString/toString is overridden
      * @var book
      */
     protected $_autoEscape = true;
diff --git a/lib/flex/varien/varien/upload/Uploader.as b/lib/flex/varien/varien/upload/Uploader.as
index d6b8707c60f570b72acf337d7a9c4774cc19c466..273dc1c4d0ce6990c5e87dfe425a317f2abece0c 100644
--- a/lib/flex/varien/varien/upload/Uploader.as
+++ b/lib/flex/varien/varien/upload/Uploader.as
@@ -37,60 +37,60 @@ package varien.upload
 	import flash.net.URLRequest;
 	import flash.net.URLRequestMethod;
 	import flash.net.URLVariables;
-	
+
 	import mx.core.IMXMLObject;
 	import mx.utils.ObjectUtil;
-	
-	
-	/**	 
+
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.OPEN
 	 */
 	[Event(name='open', type='varien.upload.UploaderEvent')]
-	
-	/**	 
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.RESET
 	 */
 	[Event(name='reset', type='varien.upload.UploaderEvent')]
-	
-	/**	 
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.REMOVE
 	 */
-	[Event(name='remove', type='varien.upload.UploaderEvent')]	
-	
-	/**	 
+	[Event(name='remove', type='varien.upload.UploaderEvent')]
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.PROGRESS
 	 */
 	[Event(name='progress', type='varien.upload.UploaderEvent')]
-	
-	/**	 
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.ERROR
 	 */
 	[Event(name='error', type='varien.upload.UploaderEvent')]
-	
-	/**	 
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.SELECT
 	 */
 	[Event(name='select', type='varien.upload.UploaderEvent')]
-	
-	/**	 
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.COMPLETE
 	 */
 	[Event(name='complete', type='varien.upload.UploaderEvent')]
-	
-	/**	 
+
+	/**
 	 *  @eventType varien.upload.UploaderEvent.CANCEL
 	 */
 	[Event(name='cancel', type='varien.upload.UploaderEvent')]
-	
+
 	public class Uploader extends EventDispatcher implements IMXMLObject
-	{	
+	{
 		public var document:Object;
-		
+
 		public var id:String;
-				
+
 		public var useTypeFilter:Boolean;
-		
-		protected var _fileList:FileReferenceList;		
+
+		protected var _fileList:FileReferenceList;
 		protected var _typeFilters:Object;
 		protected var _config:Object;
 		protected var _files:Object;
@@ -102,7 +102,7 @@ package varien.upload
 		public static const FILE_COMPLETE:String      = 'complete';
 		public static const FILE_FULL_COMPLETE:String = 'full_complete';
 		public static const FILE_ERROR:String    	  = 'error';
-		
+
 		public static const ERROR_ZERO_SIZE:Number	  = 1;
 		public static const ERROR_HTTP:Number	  	  = 2;
 		public static const ERROR_IO:Number	  	      = 3;
@@ -111,13 +111,13 @@ package varien.upload
 
 		/**
 		 * Constructor
-		 * 
+		 *
 		 * @param config configuration of uploader
 		 */
 		public function Uploader(config:Object=null)
 		{
 			super();
-			_fileList 	   = new FileReferenceList();			
+			_fileList 	   = new FileReferenceList();
 			_files 		   = {};
 			_typeFilters   = {};
 			_config		   = {};
@@ -125,10 +125,10 @@ package varien.upload
 			_laterUploadStack = [];
 			_fileList.addEventListener(Event.SELECT, _handleSelect);
 		}
-		
+
 		/**
 		 * Implementing of IMXMLObject
-		 * 
+		 *
 		 * @see IMXMLObject
 		 */
 		public function initialized(document:Object, id:String):void
@@ -136,7 +136,7 @@ package varien.upload
 			this.document = document;
 			this.id = id;
 		}
-		
+
 		/**
 		 * Browse files for upload
 		 */
@@ -144,62 +144,62 @@ package varien.upload
 		{
 			_fileList.browse(useTypeFilter ? getTypeFiltersArray() : null);
 		}
-		
+
 		/**
 		 * Add file filter for uploader
-		 * 
+		 *
 		 * @param filterId filter unique id
 		 * @param filterLabel label that will be showed in dialog box
 		 * @param fileTypes array of file filter masks
 		 */
 		public function addTypeFilter(filterId:String, filterLabel:String, fileTypes:Array):void
 		{
-			_typeFilters[filterId] = new FileFilter(filterLabel, fileTypes.join(';'));			
+			_typeFilters[filterId] = new FileFilter(filterLabel, fileTypes.join(';'));
 		}
-		
+
 		/**
-		 * Retrive file filters as array
+		 * Retrieve file filters as array
 		 */
 		public function getTypeFiltersArray():Array
 		{
 			var filters:Array = new Array();
-			for each (var typeFilter:FileFilter in _typeFilters) {			
+			for each (var typeFilter:FileFilter in _typeFilters) {
 				filters.push(typeFilter);
 			}
 			return filters;
 		}
-		
+
 		/**
-		 * Retrive file filters as object
+		 * Retrieve file filters as object
 		 */
 		public function getTypeFilters():Object
 		{
 			return _typeFilters;
 		}
-		
+
 		/**
-		 * Retrive file filter with specified id
-		 * 
+		 * Retrieve file filter with specified id
+		 *
 		 * @param filterId filter unique id
 		 */
 		public function getTypeFilter(filterId:String):FileFilter
 		{
 			return hasTypeFilter(filterId) ? _typeFilters[filterId] : null;
 		}
-		
+
 		/**
 		 * Check if filter with specified id exists
-		 * 
+		 *
 		 * @param filterId filter unique id
 		 */
 		public function hasTypeFilter(filterId:String):Boolean
 		{
 			return (_typeFilters[filterId] is FileFilter);
 		}
-		
+
 		/**
 		 * Remove type filter with specified id
-		 * 
+		 *
 		 * @param filterId filter unique id
 		 */
 		public function removeTypeFilter(filterId:String):void
@@ -208,33 +208,33 @@ package varien.upload
 				delete _typeFilters[filterId];
 			}
 		}
-		
+
 		/**
 		 * Upload configuration property
-		 * 
+		 *
 		 * For example:
 		 * uploadObject.config = {
 		 * 		url:		'http://myhost.com/fileUpload.php',
 		 * 		params: 	{test:1},
 		 * 		file_field:	'file'
-		 * }; 
+		 * };
 		 */
-		 
+
 		public function set config(value:Object):void
 		{
 			for (var property:String in value) {
 				_config[property] = value[property];
 			}
 		}
-		
+
 		public function get config():Object
 		{
 			return _config;
 		}
-		
+
 		/**
-		 * Retrive file info with specified id
-		 * 
+		 * Retrieve file info with specified id
+		 *
 		 * @param id file id
 		 */
 		public function getFileInfo(id:String):Object
@@ -243,45 +243,45 @@ package varien.upload
 			if (file) {
 				return _collectFileInfo(id);
 			}
-			return null;			
+			return null;
 		}
-		
+
 		/**
-		 * Retrive file info for all files as array
-		 */					
+		 * Retrieve file info for all files as array
+		 */
 		public function get filesInfo():Array
 		{
 			var result:Array = [];
-			for (var id:String in _files) {				
+			for (var id:String in _files) {
 				result.push(_collectFileInfo(id));
 			}
 			return result;
 		}
-		
+
 		/**
 		 * Removes file info for file with specified id
 		 */
 		public function removeFiles():void
-		{			
+		{
 			for (var id:String in _files) {
 				delete _files[id];
 			}
 			_createEvent(UploaderEvent.REMOVE_ALL);
 		}
-		
+
 		/**
 		 * Removes file info for file with specified id
-		 * 
+		 *
 		 * @param id file id
 		 */
 		public function removeFile(id:String):void
-		{			
+		{
 			if(_files[id]) {
 				delete _files[id];
 			}
 			_createEvent(UploaderEvent.REMOVE);
 		}
-		
+
 		/**
 		 * Start uploading of files
 		 */
@@ -289,16 +289,16 @@ package varien.upload
 		{
 			if (config) {
 				for(var id:String in _files) {
-					if(_files[id].status == Uploader.FILE_NEW 
-					    || 
-					    (_files[id].status == Uploader.FILE_ERROR 
+					if(_files[id].status == Uploader.FILE_NEW
+					    ||
+					    (_files[id].status == Uploader.FILE_ERROR
 					     && _files[id].errorCode!=Uploader.ERROR_ZERO_SIZE)) {
 							_uploadOneFile(id);
 					}
 				}
 			}
 		}
-		
+
 		protected function _uploadOneFile(id:String):void
 		{
 			var request:URLRequest = new URLRequest(config.url);
@@ -309,34 +309,34 @@ package varien.upload
 					request.data[property] = config.params[property];
 				}
 			}
-			
+
 			var file:FileReference = _files[id].file as FileReference;
-			
+
 			file.addEventListener(
 				ProgressEvent.PROGRESS,
 				_handleProgress
 			);
-			
+
 			file.addEventListener(
 				DataEvent.UPLOAD_COMPLETE_DATA,
 				_handleComplete
 			);
-			
+
 			file.addEventListener(
 				Event.COMPLETE,
 				_handlePartialComplete
 			);
-			
+
 			file.addEventListener(
-				IOErrorEvent.IO_ERROR, 
+				IOErrorEvent.IO_ERROR,
 				_handleIOError
 			);
-			
+
 			file.addEventListener(
 				SecurityErrorEvent.SECURITY_ERROR,
 				_handleSecurityError
 			);
-			
+
 			file.addEventListener(
 				HTTPStatusEvent.HTTP_STATUS,
 				_handleHttpStatus
@@ -345,10 +345,10 @@ package varien.upload
 			_files[id].uploadTry ++;
 			file.upload(request, config.file_field);
 		}
-		
+
 		/**
 		 * Collects file info from FileReference object with specified id
-		 * 
+		 *
 		 * @param id file id
 		 */
 		protected function _collectFileInfo(id:String):Object
@@ -359,7 +359,7 @@ package varien.upload
 			try {
 				info.size = _files[id].file.size;
 			} catch (exception:IOError) {
-				info.size = 0;				
+				info.size = 0;
 			}
 			info.creator  	= _files[id].file.creator;
 			info.status	  	= _files[id].status;
@@ -370,20 +370,20 @@ package varien.upload
 			info.response 	= _files[id].response;
 			return info;
 		}
-		
+
 		/**
 		 * Generates unique file id
-		 * 
+		 *
 		 * @param file FileReference
 		 */
 		protected function _uniqueFileId(file:FileReference):String
-		{				
+		{
 			return 'file_' + uint(_counter++).toString();
 		}
-		
+
 		/**
-		 * Retrive file reference by id
-		 * 
+		 * Retrieve file reference by id
+		 *
 		 * @param id file id
 		 */
 		protected function _getFileById(id:String):FileReference
@@ -393,25 +393,25 @@ package varien.upload
 			}
 			return null;
 		}
-		
+
 		/**
-		 * Retrive file id by reference
-		 * 
+		 * Retrieve file id by reference
+		 *
 		 * @param file FileReference
 		 */
 		protected function _getIdByFile(file:FileReference):String
 		{
-			for (var id:String in _files) {				
+			for (var id:String in _files) {
 				if(_files[id].file===file) {
 					return id;
 				}
-			}	
+			}
 			return null;
 		}
-		
+
 		/**
 		 * Create and dispatch UploadEvent with specified type
-		 * 
+		 *
 		 * @param eventType type of UploadEvent
 		 */
 		protected function _createEvent(eventType:String, fileId:String=null):void
@@ -424,54 +424,54 @@ package varien.upload
 			}
 			dispatchEvent(event);
 		}
-		
+
 		/**
 		 * Property indicates that all passed for upload file uploaded successfully
 		 */
 		public function get allComplete():Boolean
 		{
 			for (var id:String in _files) {
-				if (_files[id].status == Uploader.FILE_PROGRESS 
+				if (_files[id].status == Uploader.FILE_PROGRESS
 					|| _files[id].status == Uploader.FILE_COMPLETE) {
 					return false;
 				}
-			} 
-			
+			}
+
 			return true;
 		}
-		
+
 		/**
 		 * Property indicates that all passed for upload file has IO Error
 		 * This problem only on servers with self-signed sertificates.
 		 */
 		public function get allIOError():Boolean
-		{			
+		{
 			for (var id:String in _files) {
-				if (_files[id].status == Uploader.FILE_PROGRESS 
+				if (_files[id].status == Uploader.FILE_PROGRESS
 					 && _laterUploadStack.indexOf(id)===-1) {
 					return false;
-				}	
+				}
 			}
-			
+
 			return true;
 		}
-		
+
 		protected function _handleSelect(event:Event):void
-		{			
+		{
 			for each (var file:FileReference in _fileList.fileList) {
 				// Try to catch bad files
 				var badFile:Boolean = false;
-				var zeroSize:Boolean = false;				 
+				var zeroSize:Boolean = false;
 				try {
 					file.size;
-				} 
+				}
 				catch (exception:IllegalOperationError) {
 					badFile = true;
 				}
 				catch (exception:IOError) { // If file size == 0
 					zeroSize = true;
 				}
-				
+
 				if(!badFile) {
 					var id:String = _uniqueFileId(file);
 					_files[id] = {status:Uploader.FILE_NEW, file:file, uploadTry:0};
@@ -484,7 +484,7 @@ package varien.upload
 			}
 			_createEvent(UploaderEvent.SELECT);
 		}
-		
+
 		protected function _handleProgress(event:ProgressEvent):void
 		{
 			var id:String = _getIdByFile(event.target as FileReference);
@@ -493,24 +493,24 @@ package varien.upload
 			}
 			_createEvent(UploaderEvent.PROGRESS, id);
 		}
-		
+
 		protected function _handleComplete(event:DataEvent):void
 		{
 			var id:String = _getIdByFile(event.target as FileReference);
-			if (_files[id]) {				
+			if (_files[id]) {
 				_files[id].status   = Uploader.FILE_FULL_COMPLETE;
 				_files[id].progress = {total: _files[id].size, loaded: _files[id].size};
 				_files[id].response = event.data;
 				_files[id].http	    = 200;
 			}
-			
+
 			_uploadFromLaterStack();
 			_createEvent(UploaderEvent.PROGRESS, id);
 			if (allComplete) {
 				_createEvent(UploaderEvent.COMPLETE);
-			}		
+			}
 		}
-		
+
 		protected function _handlePartialComplete(event:Event):void
 		{
 			var id:String = _getIdByFile(event.target as FileReference);
@@ -520,11 +520,11 @@ package varien.upload
 			}
 			_createEvent(UploaderEvent.PROGRESS, id);
 		}
-		
+
 		protected function _handleIOError(event:IOErrorEvent):void
 		{
 			var id:String = _getIdByFile(event.target as FileReference);
-			if(_files[id]) {				
+			if(_files[id]) {
 				if(_files[id].status != Uploader.FILE_ERROR){
 					if (_files[id].uploadTry > 1) {
 						_files[id].status    = Uploader.FILE_ERROR;
@@ -535,14 +535,14 @@ package varien.upload
 						_laterUploadStack.push(id);
 						if (allIOError) {
 							_markAsSSLError();
-						}	
+						}
 						return;
 					}
 				}
 			}
 			_createEvent(UploaderEvent.ERROR, id);
 		}
-		
+
 		protected function _markAsSSLError():void
 		{
 			for (var id:String in _files) {
@@ -554,64 +554,64 @@ package varien.upload
 				}
 			}
 		}
-		
+
 		protected function _uploadFromLaterStack():void
 		{
 			if (_laterUploadStack.length > 0) {
 				_uploadOneFile(_laterUploadStack.shift());
 			}
 		}
-		
-		protected function _resetFileHandlers(id:String):void 
+
+		protected function _resetFileHandlers(id:String):void
 		{
 			var file:FileReference = (_files[id].file as FileReference);
-								
+
 			file.removeEventListener(
 				ProgressEvent.PROGRESS,
 				_handleProgress
 			);
-			
+
 			file.removeEventListener(
 				DataEvent.UPLOAD_COMPLETE_DATA,
 				_handleComplete
 			);
-			
+
 			file.removeEventListener(
 				Event.COMPLETE,
 				_handlePartialComplete
 			);
-			
+
 			file.removeEventListener(
-				IOErrorEvent.IO_ERROR, 
+				IOErrorEvent.IO_ERROR,
 				_handleIOError
 			);
-			
+
 			file.removeEventListener(
 				SecurityErrorEvent.SECURITY_ERROR,
 				_handleSecurityError
 			);
-			
+
 			file.removeEventListener(
 				HTTPStatusEvent.HTTP_STATUS,
 				_handleHttpStatus
 			);
 		}
-		
+
 		protected function _handleSecurityError(event:SecurityErrorEvent):void
 		{
 			var id:String = _getIdByFile(event.target as FileReference);
-			if (_files[id]) {				
+			if (_files[id]) {
 				_files[id].status    = Uploader.FILE_ERROR;
 				_files[id].error	 = 'Security Error';
 				_files[id].errorCode = Uploader.ERROR_SECURITY;
 			}
 			_createEvent(UploaderEvent.ERROR, id);
 		}
-		
+
 		protected function _handleHttpStatus(event:HTTPStatusEvent):void
 		{
 			var id:String = _getIdByFile(event.target as FileReference);
-			if (_files[id]) {				
+			if (_files[id]) {
 				if (_files[id].status != Uploader.FILE_ERROR){
 					_files[id].status    = Uploader.FILE_ERROR;
 					_files[id].error     = 'Http Status Error';
@@ -621,7 +621,7 @@ package varien.upload
 			}
 			_createEvent(UploaderEvent.ERROR, id);
 		}
-		
+
 	}
-	
+
 }
diff --git a/lib/phpseclib/Net/SSH2.php b/lib/phpseclib/Net/SSH2.php
index 93a5905e9e5286948484bf7ba73de2036a56f0f0..9b474aa925f4de09babe31219b218d1ddda7b371 100644
--- a/lib/phpseclib/Net/SSH2.php
+++ b/lib/phpseclib/Net/SSH2.php
@@ -112,7 +112,7 @@ define('NET_SSH2_MASK_LOGIN',       0x00000002);
  * RFC4254 refers not to client and server channels but rather to sender and recipient channels.  we don't refer
  * to them in that way because RFC4254 toggles the meaning. the client sends a SSH_MSG_CHANNEL_OPEN message with
  * a sender channel and the server sends a SSH_MSG_CHANNEL_OPEN_CONFIRMATION in response, with a sender and a
- * recepient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
+ * recipient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
  * would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snipet:
  *     The 'recipient channel' is the channel number given in the original
  *     open request, and 'sender channel' is the channel number allocated by
@@ -926,25 +926,25 @@ class Net_SSH2 {
         }
 
         switch ($kex_algorithms[$i]) {
-            // see http://tools.ietf.org/html/rfc2409#section-6.2 and 
+            // see http://tools.ietf.org/html/rfc2409#section-6.2 and
             // http://tools.ietf.org/html/rfc2412, appendex E
             case 'diffie-hellman-group1-sha1':
-                $p = pack('H256', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' . 
-                                  '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' . 
-                                  '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' . 
+                $p = pack('H256', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                                  '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                                  '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
                                   'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF');
                 $keyLength = $keyLength < 160 ? $keyLength : 160;
                 $hash = 'sha1';
                 break;
             // see http://tools.ietf.org/html/rfc3526#section-3
             case 'diffie-hellman-group14-sha1':
-                $p = pack('H512', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' . 
-                                  '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' . 
-                                  '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' . 
-                                  'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' . 
-                                  '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' . 
-                                  '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' . 
-                                  'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' . 
+                $p = pack('H512', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                                  '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                                  '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                                  'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                                  '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                                  '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                                  'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
                                   '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF');
                 $keyLength = $keyLength < 160 ? $keyLength : 160;
                 $hash = 'sha1';
@@ -1438,7 +1438,7 @@ class Net_SSH2 {
         }
 
         // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
-        // be adjusted".  0x7FFFFFFF is, at 4GB, the max size.  technically, it should probably be decremented, but, 
+        // be adjusted".  0x7FFFFFFF is, at 4GB, the max size.  technically, it should probably be decremented, but,
         // honestly, if you're transfering more than 4GB, you probably shouldn't be using phpseclib, anyway.
         // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
         $this->window_size_client_to_server[NET_SSH2_CHANNEL_EXEC] = 0x7FFFFFFF;
@@ -1467,7 +1467,7 @@ class Net_SSH2 {
         // neither will your script.
 
         // although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
-        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the 
+        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
         // "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA.  RFC4254#section-5.2 corroborates.
         $packet = pack('CNNa*CNa*',
             NET_SSH2_MSG_CHANNEL_REQUEST, $this->server_channels[NET_SSH2_CHANNEL_EXEC], strlen('exec'), 'exec', 1, strlen($command), $command);
@@ -1730,7 +1730,7 @@ class Net_SSH2 {
                 case NET_SSH2_MSG_CHANNEL_DATA:
                     if ($client_channel == NET_SSH2_CHANNEL_EXEC) {
                         // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
-                        // this actually seems to make things twice as fast.  more to the point, the message right after 
+                        // this actually seems to make things twice as fast.  more to the point, the message right after
                         // SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
                         // in OpenSSH it slows things down but only by a couple thousandths of a second.
                         $this->_send_channel_packet($client_channel, chr(0));
diff --git a/pub/lib/extjs/ext-all-debug.js b/pub/lib/extjs/ext-all-debug.js
index 070f8e8b797a4bffc93cb953d84cc10f1a8fbaf2..df06b46f615a543710f210cdf96ed9e03081d3cc 100644
--- a/pub/lib/extjs/ext-all-debug.js
+++ b/pub/lib/extjs/ext-all-debug.js
@@ -21209,7 +21209,7 @@ Ext.extend(Ext.form.TriggerField, Ext.form.TextField,  {
     beforeBlur : Ext.emptyFn,
 
     // private
-    // This should be overriden by any subclass that needs to check whether or not the field can be blurred.
+    // This should be overridden by any subclass that needs to check whether or not the field can be blurred.
     validateBlur : function(e, t){
         return true;
     },
diff --git a/pub/lib/extjs/package/form/form-debug.js b/pub/lib/extjs/package/form/form-debug.js
index 6f6cc05fc6f12c2541d4b2a5bd358dcf95e124e7..dbe3f22435419e80bfff8507872d2301a46f14d8 100644
--- a/pub/lib/extjs/package/form/form-debug.js
+++ b/pub/lib/extjs/package/form/form-debug.js
@@ -2,7 +2,7 @@
  * Ext JS Library 1.1 Beta 1
  * Copyright(c) 2006-2007, Ext JS, LLC.
  * licensing@extjs.com
- * 
+ *
  * http://www.extjs.com/license
  */
 
@@ -12,30 +12,30 @@ Ext.form.Field = function(config){
 };
 
 Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
-    
+
     invalidClass : "x-form-invalid",
-    
+
     invalidText : "The value in this field is invalid",
-    
+
     focusClass : "x-form-focus",
-    
+
     validationEvent : "keyup",
-    
+
     validateOnBlur : true,
-    
+
     validationDelay : 250,
-    
+
     defaultAutoCreate : {tag: "input", type: "text", size: "20", autocomplete: "off"},
-    
+
     fieldClass: "x-form-field",
-    
+
     msgTarget: 'qtip',
-    
+
     msgFx : 'normal',
 
-    
-    
-    
+
+
+
     inputType : undefined,
 
     // private
@@ -44,34 +44,34 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
     // private
     hasFocus : false,
 
-    
+
     value : undefined,
 
 
     initComponent : function(){
         Ext.form.Field.superclass.initComponent.call(this);
         this.addEvents({
-            
+
             focus : true,
-            
+
             blur : true,
-            
+
             specialkey : true,
-            
+
             change : true,
-            
+
             invalid : true,
-            
+
             valid : true
         });
     },
 
-    
+
     getName: function(){
          return this.rendered && this.el.dom.name ? this.el.dom.name : (this.hiddenName || '');
     },
 
-    
+
     applyTo : function(target){
         this.allowDomMove = false;
         this.el = Ext.get(target);
@@ -119,7 +119,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         }
     },
 
-    
+
     isDirty : function() {
         if(this.disabled) {
             return false;
@@ -140,7 +140,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         }
     },
 
-    
+
     reset : function(){
         this.setValue(this.originalValue);
         this.clearInvalid();
@@ -180,7 +180,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         this.fireEvent("blur", this);
     },
 
-    
+
     isValid : function(preventMark){
         if(this.disabled){
             return true;
@@ -192,7 +192,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         return v;
     },
 
-    
+
     validate : function(){
         if(this.disabled || this.validateValue(this.getRawValue())){
             this.clearInvalid();
@@ -207,7 +207,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         return true;
     },
 
-    
+
     markInvalid : function(msg){
         if(!this.rendered || this.preventMark){ // not rendered
             return;
@@ -255,7 +255,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         this.errorIcon.alignTo(this.el, 'tl-tr', [2, 0]);
     },
 
-    
+
     clearInvalid : function(){
         if(!this.rendered || this.preventMark){ // not rendered
             return;
@@ -288,12 +288,12 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         this.fireEvent('valid', this);
     },
 
-    
+
     getRawValue : function(){
         return this.el.getValue();
     },
 
-    
+
     getValue : function(){
         var v = this.el.getValue();
         if(v == this.emptyText || v === undefined){
@@ -302,12 +302,12 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent,  {
         return v;
     },
 
-    
+
     setRawValue : function(v){
         return this.el.dom.value = (v === null || v === undefined ? '' : v);
     },
 
-    
+
     setValue : function(v){
         this.value = v;
         if(this.rendered){
@@ -387,47 +387,47 @@ Ext.form.Field.msgFx = {
 Ext.form.TextField = function(config){
     Ext.form.TextField.superclass.constructor.call(this, config);
     this.addEvents({
-        
+
         autosize : true
     });
 };
 
 Ext.extend(Ext.form.TextField, Ext.form.Field,  {
-    
+
     grow : false,
-    
+
     growMin : 30,
-    
+
     growMax : 800,
-    
+
     vtype : null,
-    
+
     maskRe : null,
-    
+
     disableKeyFilter : false,
-    
+
     allowBlank : true,
-    
+
     minLength : 0,
-    
+
     maxLength : Number.MAX_VALUE,
-    
+
     minLengthText : "The minimum length for this field is {0}",
-    
+
     maxLengthText : "The maximum length for this field is {0}",
-    
+
     selectOnFocus : false,
-    
+
     blankText : "This field is required",
-    
+
     validator : null,
-    
+
     regex : null,
-    
+
     regexText : "",
-    
+
     emptyText : null,
-    
+
     emptyClass : 'x-form-empty-field',
 
     // private
@@ -469,7 +469,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field,  {
         }
     },
 
-    
+
     reset : function(){
         Ext.form.TextField.superclass.reset.call(this);
         this.applyEmptyText();
@@ -522,7 +522,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field,  {
         Ext.form.TextField.superclass.setValue.apply(this, arguments);
     },
 
-    
+
     validateValue : function(value){
         if(value.length < 1 || value === this.emptyText){ // if it's blank
              if(this.allowBlank){
@@ -562,7 +562,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field,  {
         return true;
     },
 
-    
+
     selectText : function(start, end){
         var v = this.getRawValue();
         if(v.length > 0){
@@ -580,7 +580,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field,  {
         }
     },
 
-    
+
     autoSize : function(){
         if(!this.grow || !this.rendered){
             return;
@@ -604,17 +604,17 @@ Ext.form.TriggerField = function(config){
 };
 
 Ext.extend(Ext.form.TriggerField, Ext.form.TextField,  {
-    
+
     // private
     defaultAutoCreate : {tag: "input", type: "text", size: "16", autocomplete: "off"},
-    
+
     hideTrigger:false,
 
-    
-    
-    
 
-    
+
+
+
+
     autoSize: Ext.emptyFn,
 
     monitorTab : true,
@@ -720,10 +720,10 @@ Ext.extend(Ext.form.TriggerField, Ext.form.TextField,  {
         Ext.form.TriggerField.superclass.onBlur.call(this);
     },
 
-    beforeBlur : Ext.emptyFn, 
+    beforeBlur : Ext.emptyFn,
 
     // private
-    // This should be overriden by any subclass that needs to check whether or not the field can be blurred.
+    // This should be overridden by any subclass that needs to check whether or not the field can be blurred.
     validateBlur : function(e, t){
         return true;
     },
@@ -755,7 +755,7 @@ Ext.extend(Ext.form.TriggerField, Ext.form.TextField,  {
         this.wrap.dom.style.display = 'none';
     },
 
-    
+
     onTriggerClick : Ext.emptyFn
 });
 
@@ -819,11 +819,11 @@ Ext.form.TextArea = function(config){
 };
 
 Ext.extend(Ext.form.TextArea, Ext.form.TextField,  {
-    
+
     growMin : 60,
-    
+
     growMax: 1000,
-    
+
     preventScrollbars: false,
 
     // private
@@ -861,7 +861,7 @@ Ext.extend(Ext.form.TextArea, Ext.form.TextField,  {
         }
     },
 
-    
+
     autoSize : function(){
         if(!this.grow || !this.textSizeEl){
             return;
@@ -899,25 +899,25 @@ Ext.form.NumberField = function(config){
 };
 
 Ext.extend(Ext.form.NumberField, Ext.form.TextField,  {
-    
+
     fieldClass: "x-form-field x-form-num-field",
-    
+
     allowDecimals : true,
-    
+
     decimalSeparator : ".",
-    
+
     decimalPrecision : 2,
-    
+
     allowNegative : true,
-    
+
     minValue : Number.NEGATIVE_INFINITY,
-    
+
     maxValue : Number.MAX_VALUE,
-    
+
     minText : "The minimum value for this field is {0}",
-    
+
     maxText : "The maximum value for this field is {0}",
-    
+
     nanText : "{0} is not a valid number",
 
     // private
@@ -1013,31 +1013,31 @@ Ext.form.DateField = function(config){
 };
 
 Ext.extend(Ext.form.DateField, Ext.form.TriggerField,  {
-    
+
     format : "m/d/y",
-    
+
     altFormats : "m/d/Y|m-d-y|m-d-Y|m/d|m-d|md|mdy|mdY|d",
-    
+
     disabledDays : null,
-    
+
     disabledDaysText : "Disabled",
-    
+
     disabledDates : null,
-    
+
     disabledDatesText : "Disabled",
-    
+
     minValue : null,
-    
+
     maxValue : null,
-    
+
     minText : "The date in this field must be after {0}",
-    
+
     maxText : "The date in this field must be before {0}",
-    
+
     invalidText : "{0} is not a valid date - it must be in the format {1}",
-    
+
     triggerClass : 'x-form-date-trigger',
-    
+
 
     // private
     defaultAutoCreate : {tag: "input", type: "text", size: "10", autocomplete: "off"},
@@ -1089,12 +1089,12 @@ Ext.extend(Ext.form.DateField, Ext.form.TriggerField,  {
         return !this.menu || !this.menu.isVisible();
     },
 
-    
+
     getValue : function(){
         return this.parseDate(Ext.form.DateField.superclass.getValue.call(this)) || "";
     },
 
-    
+
     setValue : function(date){
         Ext.form.DateField.superclass.setValue.call(this, this.formatDate(this.parseDate(date)));
     },
@@ -1177,24 +1177,24 @@ Ext.extend(Ext.form.DateField, Ext.form.TriggerField,  {
 Ext.form.Checkbox = function(config){
     Ext.form.Checkbox.superclass.constructor.call(this, config);
     this.addEvents({
-        
+
         check : true
     });
 };
 
 Ext.extend(Ext.form.Checkbox, Ext.form.Field,  {
-    
+
     focusClass : "x-form-check-focus",
-    
+
     fieldClass: "x-form-field",
-    
+
     checked: false,
 
     // private
     defaultAutoCreate : { tag: "input", type: 'checkbox', autocomplete: "off"},
-    
+
     boxLabel : undefined,
-    
+
     //
     onResize : function(){
         Ext.form.Checkbox.superclass.onResize.apply(this, arguments);
@@ -1209,7 +1209,7 @@ Ext.extend(Ext.form.Checkbox, Ext.form.Field,  {
         this.el.on("change", this.onClick,  this);
     },
 
-    
+
     getResizeEl : function(){
         return this.wrap;
     },
@@ -1236,7 +1236,7 @@ Ext.extend(Ext.form.Checkbox, Ext.form.Field,  {
     // private
     initValue : Ext.emptyFn,
 
-    
+
     getValue : function(){
         if(this.rendered){
             return this.el.dom.checked;
@@ -1250,7 +1250,7 @@ Ext.extend(Ext.form.Checkbox, Ext.form.Field,  {
         }
     },
 
-    
+
     setValue : function(v){
         this.checked = (v === true || v === 'true' || v == '1');
         if(this.el && this.el.dom){
@@ -1266,7 +1266,7 @@ Ext.form.Radio = function(){
 Ext.extend(Ext.form.Radio, Ext.form.Checkbox, {
     inputType: 'radio',
 
-    
+
     getGroupValue : function(){
         return this.el.up('form').child('input[name='+this.el.dom.name+']:checked', true).value;
     }
@@ -1275,15 +1275,15 @@ Ext.extend(Ext.form.Radio, Ext.form.Checkbox, {
 Ext.form.ComboBox = function(config){
     Ext.form.ComboBox.superclass.constructor.call(this, config);
     this.addEvents({
-        
+
         'expand' : true,
-        
+
         'collapse' : true,
-        
+
         'beforeselect' : true,
-        
+
         'select' : true,
-        
+
         'beforequery': true
     });
     if(this.transform){
@@ -1333,65 +1333,65 @@ Ext.form.ComboBox = function(config){
 };
 
 Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
-    
-    
-    
+
+
+
 
     // private
     defaultAutoCreate : {tag: "input", type: "text", size: "24", autocomplete: "off"},
-    
+
     listWidth: undefined,
-    
+
     displayField: undefined,
-    
+
     valueField: undefined,
-    
+
     hiddenName: undefined,
-    
+
     listClass: '',
-    
+
     selectedClass: 'x-combo-selected',
-    
+
     triggerClass : 'x-form-arrow-trigger',
-    
+
     shadow:'sides',
-    
+
     listAlign: 'tl-bl?',
-    
+
     maxHeight: 300,
-    
+
     triggerAction: 'query',
-    
+
     minChars : 4,
-    
+
     typeAhead: false,
-    
+
     queryDelay: 500,
-    
+
     pageSize: 0,
-    
+
     selectOnFocus:false,
-    
+
     queryParam: 'query',
-    
+
     loadingText: 'Loading...',
-    
+
     resizable: false,
-    
+
     handleHeight : 8,
-    
+
     editable: true,
-    
+
     allQuery: '',
-    
+
     mode: 'remote',
-    
+
     minListWidth : 70,
-    
+
     forceSelection:false,
-    
+
     typeAheadDelay : 250,
-    
+
     valueNotFoundText : undefined,
 
     // private
@@ -1561,7 +1561,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         }
     },
 
-    
+
     setEditable : function(value){
         if(value == this.editable){
             return;
@@ -1639,7 +1639,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         }
     },
 
-    
+
     getValue : function(){
         if(this.valueField){
             return typeof this.value != 'undefined' ? this.value : '';
@@ -1648,7 +1648,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         }
     },
 
-    
+
     clearValue : function(){
         if(this.hiddenField){
             this.hiddenField.value = '';
@@ -1657,7 +1657,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         this.lastSelectionText = '';
     },
 
-    
+
     setValue : function(v){
         var text = v;
         if(this.valueField){
@@ -1736,12 +1736,12 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         this.collapse();
     },
 
-    
+
     isExpanded : function(){
         return this.list.isVisible();
     },
 
-    
+
     selectByValue : function(v, scrollIntoView){
         if(v !== undefined && v !== null){
             var r = this.findRecord(this.valueField || this.displayField, v);
@@ -1753,7 +1753,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         return false;
     },
 
-    
+
     select : function(index, scrollIntoView){
         this.selectedIndex = index;
         this.view.select(index);
@@ -1799,7 +1799,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
 
     // private
     validateBlur : function(){
-        return !this.list || !this.list.isVisible();   
+        return !this.list || !this.list.isVisible();
     },
 
     // private
@@ -1816,7 +1816,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         }
     },
 
-    
+
     doQuery : function(q, forceAll){
         if(q === undefined || q === null){
             q = '';
@@ -1852,7 +1852,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
                 }
             }else{
                 this.selectedIndex = -1;
-                this.onLoad();   
+                this.onLoad();
             }
         }
     },
@@ -1868,7 +1868,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         return p;
     },
 
-    
+
     collapse : function(){
         if(!this.isExpanded()){
             return;
@@ -1885,7 +1885,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
         }
     },
 
-    
+
     expand : function(){
         if(this.isExpanded() || !this.hasFocus){
             return;
@@ -1921,31 +1921,31 @@ Ext.Editor = function(field, config){
     Ext.Editor.superclass.constructor.call(this, config);
     this.field = field;
     this.addEvents({
-        
+
         "beforestartedit" : true,
-        
+
         "startedit" : true,
-        
+
         "beforecomplete" : true,
-        
+
         "complete" : true,
-        
+
         "specialkey" : true
     });
 };
 
 Ext.extend(Ext.Editor, Ext.Component, {
-    
-    
-    
-    
-    
+
+
+
+
+
     value : "",
-    
+
     alignment: "c-c?",
-    
+
     shadow : "frame",
-    
+
     constrain : false,
 
     // private
@@ -2013,7 +2013,7 @@ Ext.extend(Ext.Editor, Ext.Component, {
         this.show();
     },
 
-    
+
     setSize : function(w, h){
         this.field.setSize(w, h);
         if(this.el){
@@ -2021,12 +2021,12 @@ Ext.extend(Ext.Editor, Ext.Component, {
         }
     },
 
-    
+
     realign : function(){
         this.el.alignTo(this.boundEl, this.alignment);
     },
 
-    
+
     completeEdit : function(remainVisible){
         if(!this.editing){
             return;
@@ -2075,7 +2075,7 @@ Ext.extend(Ext.Editor, Ext.Component, {
         }
     },
 
-    
+
     cancelEdit : function(remainVisible){
         if(this.editing){
             this.setValue(this.startValue);
@@ -2111,12 +2111,12 @@ Ext.extend(Ext.Editor, Ext.Component, {
         }
     },
 
-    
+
     setValue : function(v){
         this.field.setValue(v);
     },
 
-    
+
     getValue : function(){
         return this.field.getValue();
     }
@@ -2124,16 +2124,16 @@ Ext.extend(Ext.Editor, Ext.Component, {
 
 Ext.form.BasicForm = function(el, config){
     Ext.apply(this, config);
-    
+
     this.items = new Ext.util.MixedCollection(false, function(o){
         return o.id || (o.id = Ext.id());
     });
     this.addEvents({
-        
+
         beforeaction: true,
-        
+
         actionfailed : true,
-        
+
         actioncomplete : true
     });
     if(el){
@@ -2143,22 +2143,22 @@ Ext.form.BasicForm = function(el, config){
 };
 
 Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
     timeout: 30,
 
     // private
     activeAction : null,
 
-    
+
     trackResetOnLoad : false,
 
-    
+
     waitMsgTarget : undefined,
 
     // private
@@ -2174,7 +2174,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         e.stopEvent();
     },
 
-    
+
     isValid : function(){
         var valid = true;
         this.items.each(function(f){
@@ -2185,7 +2185,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return valid;
     },
 
-    
+
     isDirty : function(){
         var dirty = false;
         this.items.each(function(f){
@@ -2197,7 +2197,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return dirty;
     },
 
-    
+
     doAction : function(action, options){
         if(typeof action == 'string'){
             action = new Ext.form.Action.ACTION_TYPES[action](this, options);
@@ -2209,19 +2209,19 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     submit : function(options){
         this.doAction('submit', options);
         return this;
     },
 
-    
+
     load : function(options){
         this.doAction('load', options);
         return this;
     },
 
-    
+
     updateRecord : function(record){
         record.beginEdit();
         var fs = record.fields;
@@ -2235,7 +2235,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     loadRecord : function(record){
         this.setValues(record.data);
         return this;
@@ -2282,7 +2282,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         }
     },
 
-    
+
     findField : function(id){
         var field = this.items.get(id);
         if(!field){
@@ -2297,7 +2297,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
     },
 
 
-    
+
     markInvalid : function(errors){
         if(errors instanceof Array){
             for(var i = 0, len = errors.length; i < len; i++){
@@ -2318,7 +2318,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     setValues : function(values){
         if(values instanceof Array){ // array of objects
             for(var i = 0, len = values.length; i < len; i++){
@@ -2345,7 +2345,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     getValues : function(asString){
         var fs = Ext.lib.Ajax.serializeForm(this.el.dom);
         if(asString === true){
@@ -2354,7 +2354,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return Ext.urlDecode(fs);
     },
 
-    
+
     clearInvalid : function(){
         this.items.each(function(f){
            f.clearInvalid();
@@ -2362,7 +2362,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     reset : function(){
         this.items.each(function(f){
             f.reset();
@@ -2370,20 +2370,20 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     add : function(){
         this.items.addAll(Array.prototype.slice.call(arguments, 0));
         return this;
     },
 
 
-    
+
     remove : function(field){
         this.items.remove(field);
         return this;
     },
 
-    
+
     render : function(){
         this.items.each(function(f){
             if(f.isFormField && !f.rendered && document.getElementById(f.id)){ // if the element exists
@@ -2393,7 +2393,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     applyToFields : function(o){
         this.items.each(function(f){
            Ext.apply(f, o);
@@ -2401,7 +2401,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
         return this;
     },
 
-    
+
     applyIfToFields : function(o){
         this.items.each(function(f){
            Ext.applyIf(f, o);
@@ -2422,33 +2422,33 @@ Ext.form.Form = function(config){
         }, config));
     }
     this.active = this.root;
-    
+
     this.buttons = [];
     this.addEvents({
-        
+
         clientvalidation: true
     });
 };
 
 Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
-    
-    
-    
+
+
+
     buttonAlign:'center',
 
-    
+
     minButtonWidth:75,
 
-    
+
     labelAlign:'left',
 
-    
+
     monitorValid : false,
 
-    
+
     monitorPoll : 200,
 
-    
+
     column : function(c){
         var col = new Ext.form.Column(c);
         this.start(col);
@@ -2459,7 +2459,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return col;
     },
 
-    
+
     fieldset : function(c){
         var fs = new Ext.form.FieldSet(c);
         this.start(fs);
@@ -2470,7 +2470,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return fs;
     },
 
-    
+
     container : function(c){
         var l = new Ext.form.Layout(c);
         this.start(l);
@@ -2481,7 +2481,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return l;
     },
 
-    
+
     start : function(c){
         // cascade label info
         Ext.applyIf(c, {'labelAlign': this.active.labelAlign, 'labelWidth': this.active.labelWidth, 'itemCls': this.active.itemCls});
@@ -2491,7 +2491,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return this;
     },
 
-    
+
     end : function(){
         if(this.active == this.root){
             return this;
@@ -2500,7 +2500,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return this;
     },
 
-    
+
     add : function(){
         this.active.stack.push.apply(this.active.stack, arguments);
         var r = [];
@@ -2515,7 +2515,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return this;
     },
 
-    
+
     render : function(ct){
         ct = Ext.get(ct);
         var o = this.autoCreate || {
@@ -2551,7 +2551,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return this;
     },
 
-    
+
     addButton : function(config, handler, scope){
         var bc = {
             handler: handler,
@@ -2569,7 +2569,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         return btn;
     },
 
-    
+
     startMonitoring : function(){
         if(!this.bound){
             this.bound = true;
@@ -2581,7 +2581,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
         }
     },
 
-    
+
     stopMonitoring : function(){
         this.bound = false;
     },
@@ -2815,15 +2815,15 @@ Ext.form.Layout = function(config){
 };
 
 Ext.extend(Ext.form.Layout, Ext.Component, {
-    
-    
-    
-    
-    
+
+
+
+
+
     clear : true,
-    
+
     labelSeparator : ':',
-    
+
     hideLabels : false,
 
     // private
@@ -2907,8 +2907,8 @@ Ext.form.Column = function(config){
 };
 
 Ext.extend(Ext.form.Column, Ext.form.Layout, {
-    
-    
+
+
 
     // private
     defaultAutoCreate : {tag: 'div', cls: 'x-form-ct x-form-column'},
@@ -2928,8 +2928,8 @@ Ext.form.FieldSet = function(config){
 };
 
 Ext.extend(Ext.form.FieldSet, Ext.form.Layout, {
-    
-    
+
+
 
     // private
     defaultAutoCreate : {tag: 'fieldset', cn: {tag:'legend'}},
@@ -2959,38 +2959,38 @@ Ext.form.VTypes = function(){
 
     // All these messages and functions are configurable
     return {
-        
+
         'email' : function(v){
             return email.test(v);
         },
-        
+
         'emailText' : 'This field should be an e-mail address in the format "user@domain.com"',
-        
+
         'emailMask' : /[a-z0-9_\.\-@]/i,
 
-        
+
         'url' : function(v){
             return url.test(v);
         },
-        
+
         'urlText' : 'This field should be a URL in the format "http:/'+'/www.domain.com"',
-        
-        
+
+
         'alpha' : function(v){
             return alpha.test(v);
         },
-        
+
         'alphaText' : 'This field should only contain letters and _',
-        
+
         'alphaMask' : /[a-z_]/i,
 
-        
+
         'alphanum' : function(v){
             return alphanum.test(v);
         },
-        
+
         'alphanumText' : 'This field should only contain letters, numbers and _',
-        
+
         'alphanumMask' : /[a-z0-9_]/i
     };
 }();
diff --git a/pub/lib/jquery/jquery-ui.js b/pub/lib/jquery/jquery-ui.js
index 3cda3683de1906e73ce668d4595df70b1b2d09f2..d556f0d7f605fcc1ab4dad10ebd7ee6d3e5bc35c 100644
--- a/pub/lib/jquery/jquery-ui.js
+++ b/pub/lib/jquery/jquery-ui.js
@@ -1017,7 +1017,7 @@ $.widget("ui.mouse", {
 		return this.mouseDelayMet;
 	},
 
-	// These are placeholder methods, to be overriden by extending plugin
+	// These are placeholder methods, to be overridden by extending plugin
 	_mouseStart: function(event) {},
 	_mouseDrag: function(event) {},
 	_mouseStop: function(event) {},
diff --git a/pub/lib/lib/flex.js b/pub/lib/lib/flex.js
index 72aeabe0b21cbf6c1c5d1558234f23b9238a1029..cebbf59c97408848106f470d945fad29156ec604 100644
--- a/pub/lib/lib/flex.js
+++ b/pub/lib/lib/flex.js
@@ -214,7 +214,7 @@ Flex.Object = Class.create({
     /**
      * Set object attribute for generation of html tags
      *
-     * @param Sting name
+     * @param String name
      * @param Object value
      * @return void
      */
@@ -224,9 +224,9 @@ Flex.Object = Class.create({
         }
     },
     /**
-     * Retrive object attribute value used for generation in html tags
+     * Retrieve object attribute value used for generation in html tags
      *
-     * @param Sting name
+     * @param String name
      * @return Object
      */
     getAttribute : function( name ) {
diff --git a/pub/lib/mage/validation.js b/pub/lib/mage/validation.js
index 72571905ea64c25befa1fd80dfbe8e24557e46e2..f9ac9a0da79972251673e86763b78710487374f5 100644
--- a/pub/lib/mage/validation.js
+++ b/pub/lib/mage/validation.js
@@ -956,7 +956,7 @@
         ],
         "validate-cc-type": [
             /**
-             * Validate credit card number is for the currect credit card type
+             * Validate credit card number is for the correct credit card type
              * @param value - credit card number
              * @param element - element contains credit card number
              * @param params - selector for credit card type
diff --git a/pub/lib/prototype/tooltip_manager.js b/pub/lib/prototype/tooltip_manager.js
index 65e6106034c2733fbdcae4135ad26b41dc7d28b4..4c562c71b6e9e01c53b4df819d814c08e5fce656 100644
--- a/pub/lib/prototype/tooltip_manager.js
+++ b/pub/lib/prototype/tooltip_manager.js
@@ -1,17 +1,17 @@
 // Singleton class TooltipWindow
 // This class works with special className. The tooltip content could be in your HTML page as an hidden element or
-// can be retreive by an AJAX call.
+// can be retrieve by an AJAX call.
 //
 // To work, You just need to set two class name on elements that should show tooltips
 // - One to say to TooltipManager that this element must have a tooltip ('tooltip' by default)
 // - Another to indicate how to find the tooltip content
 //   It could be html_XXXX if tootltip content is somewhere hidden in your page, XXX must be DOM ID of this hidden element
-//   It could be ajax_XXXX if tootltip content must be find by an ajax request, XXX will be the string send as id parameter to your server. 
+//   It could be ajax_XXXX if tootltip content must be find by an ajax request, XXX will be the string send as id parameter to your server.
 // Check samples/tooltips/tooltip.html to see how it works
 //
 TooltipManager = {
   options: {cssClassName: 'tooltip', delayOver: 200, delayOut: 1000, shiftX: 10, shiftY: 10,
-            className: 'alphacube', width: 200, height: null, 
+            className: 'alphacube', width: 200, height: null,
             draggable: false, minimizable: false, maximizable: false, showEffect: Element.show, hideEffect: Element.hide},
   ajaxInfo: null,
   elements: null,
@@ -20,21 +20,21 @@ TooltipManager = {
 
   // Init tooltip manager
   // parameters:
-  // - cssClassName (string) : CSS class name where tooltip should be shown. 
-  // - ajaxOptions  (hash)   : Ajax options for ajax tooltip. 
-  //                           For examples {url: "/tooltip/get.php", options: {method: 'get'}} 
+  // - cssClassName (string) : CSS class name where tooltip should be shown.
+  // - ajaxOptions  (hash)   : Ajax options for ajax tooltip.
+  //                           For examples {url: "/tooltip/get.php", options: {method: 'get'}}
   //                           see Ajax.Request documentation for details
   //- tooltipOptions (hash)  : available keys
   //                           - delayOver: int in ms (default 10) delay before showing tooltip
   //                           - delayOut:  int in ms (default 1000) delay before hidding tooltip
-  //                           - shiftX:    int in pixels (default 10) left shift of the tooltip window 
-  //                           - shiftY:    int in pixels (default 10) top shift of the tooltip window 
+  //                           - shiftX:    int in pixels (default 10) left shift of the tooltip window
+  //                           - shiftY:    int in pixels (default 10) top shift of the tooltip window
   //                           and All window options like showEffect: Element.show, hideEffect: Element.hide to remove animation
   //                           default: {className: 'alphacube', width: 200, height: null, draggable: false, minimizable: false, maximizable: false}
-  
+
   init: function(cssClassName, ajaxInfo, tooltipOptions) {
     TooltipManager.options = Object.extend(TooltipManager.options, tooltipOptions || {});
-    
+
     cssClassName = TooltipManager.options.cssClassName || "tooltip";
     TooltipManager.ajaxInfo = ajaxInfo;
     TooltipManager.elements = $$("." + cssClassName);
@@ -53,66 +53,66 @@ TooltipManager = {
     });
     Windows.addObserver(this);
   },
-  
+
   addHTML: function(element, tooltipElement) {
     element = $(element);
     tooltipElement = $(tooltipElement);
     element.tooltipElement = tooltipElement;
-    
+
     element.observe("mouseover", TooltipManager._mouseOver);
     element.observe("mouseout", TooltipManager._mouseOut);
   },
-  
+
   addAjax: function(element, ajaxInfo) {
     element = $(element);
     element.ajaxInfo = ajaxInfo;
     element.observe("mouseover", TooltipManager._mouseOver);
-    element.observe("mouseout", TooltipManager._mouseOut);    
+    element.observe("mouseout", TooltipManager._mouseOut);
   },
-    
+
   addURL: function(element, url, width, height) {
     element = $(element);
     element.url = url;
     element.frameWidth = width;
     element.frameHeight = height;
     element.observe("mouseover", TooltipManager._mouseOver);
-    element.observe("mouseout", TooltipManager._mouseOut);    
+    element.observe("mouseout", TooltipManager._mouseOut);
   },
-    
+
   close: function() {
     if (TooltipManager.tooltipWindow)
       TooltipManager.tooltipWindow.hide();
   },
-  
+
   preloadImages: function(path, images, extension) {
     if (!extension)
       extension = ".gif";
-      
+
     //preload images
     $A(images).each(function(i) {
-      var image = new Image(); 
-      image.src= path + "/" + i + extension; 
+      var image = new Image();
+      image.src= path + "/" + i + extension;
     });
   },
-  
+
   _showTooltip: function(element) {
     if (this.element == element)
       return;
     // Get original element
-    while (element && (!element.tooltipElement && !element.ajaxInfo && !element.url)) 
+    while (element && (!element.tooltipElement && !element.ajaxInfo && !element.url))
       element = element.parentNode;
     this.element = element;
-    
+
     TooltipManager.showTimer = null;
     if (TooltipManager.hideTimer)
       clearTimeout(TooltipManager.hideTimer);
-    
+
     var position = Position.cumulativeOffset(element);
     var dimension = element.getDimensions();
 
     if (! this.tooltipWindow)
       this.tooltipWindow = new Window("__tooltip__", TooltipManager.options);
-      
+
     this.tooltipWindow.hide();
     this.tooltipWindow.setLocation(position[1] + dimension.height + TooltipManager.options.shiftY, position[0] + TooltipManager.options.shiftX);
 
@@ -127,7 +127,7 @@ TooltipManager = {
     if (element.ajaxInfo) {
       var p = element.ajaxInfo.options.parameters;
       var saveParam = p;
-      
+
       // Set by CSS
       if (element.ajaxId) {
         if (p)
@@ -138,8 +138,8 @@ TooltipManager = {
       element.ajaxInfo.options.parameters = p || "";
       this.tooltipWindow.setHTMLContent("");
       this.tooltipWindow.setAjaxContent(element.ajaxInfo.url, element.ajaxInfo.options);
-      element.ajaxInfo.options.parameters = saveParam;    
-    } 
+      element.ajaxInfo.options.parameters = saveParam;
+    }
     // URL content
     else if (element.url) {
       this.tooltipWindow.setURL(element.url);
@@ -158,22 +158,22 @@ TooltipManager = {
       this.tooltipWindow.toFront();
     }
   },
-  
+
   _hideTooltip: function(element) {
     if (this.tooltipWindow) {
       this.tooltipWindow.hide();
       this.element = null;
     }
   },
-  
+
   _mouseOver: function (event) {
     var element = Event.element(event);
-    if (TooltipManager.showTimer) 
+    if (TooltipManager.showTimer)
       clearTimeout(TooltipManager.showTimer);
-    
+
     TooltipManager.showTimer = setTimeout(function() {TooltipManager._showTooltip(element)}, TooltipManager.options.delayOver)
   },
-  
+
   _mouseOut: function(event) {
     var element = Event.element(event);
     if (TooltipManager.showTimer) {
@@ -184,37 +184,37 @@ TooltipManager = {
     if (TooltipManager.tooltipWindow)
       TooltipManager.hideTimer = setTimeout(function() {TooltipManager._hideTooltip(element)}, TooltipManager.options.delayOut)
   },
-  
+
   _tooltipOver: function(event, element) {
     if (TooltipManager.hideTimer) {
       clearTimeout(TooltipManager.hideTimer);
       TooltipManager.hideTimer = null;
     }
   },
-  
+
   _tooltipOut: function(event, element) {
     if (TooltipManager.hideTimer == null)
       TooltipManager.hideTimer = setTimeout(function() {TooltipManager._hideTooltip(element)}, TooltipManager.options.delayOut)
   },
-  
+
   _getInfo: function(element) {
     // Find html_ for static content
     var id = element.className.split(' ').detect(function(name) {return name.indexOf("html_") == 0});
     var ajax = true;
     if (id)
       ajax = false;
-    else 
+    else
       // Find ajax_ for ajax content
       id = element.className.split(' ').detect(function(name) {return name.indexOf("ajax_") == 0});
-    
+
     id = id.substr(id.indexOf('_')+1, id.length)
     return id ? {ajax: ajax, id: id} : null;
   },
-  
+
   onBeforeShow: function(eventName, win) {
      var top = parseFloat(win.getLocation().top);
      var dim = win.element.getDimensions();
-    
+
      if (top + dim.height > TooltipManager._getScrollTop() + TooltipManager._getPageHeight()) {
        var position = Position.cumulativeOffset(this.element);
 
@@ -226,7 +226,7 @@ TooltipManager = {
 	_getPageWidth: function(){
 		return window.innerWidth || document.documentElement.clientWidth || 0;
 	},
-	
+
 	_getPageHeight: function(){
 		return window.innerHeight || document.documentElement.clientHeight || 0;
 	},
@@ -237,5 +237,5 @@ TooltipManager = {
 
 	_getScrollLeft: function(){
 		return document.documentElement.scrollLeft || window.pageXOffset || 0;
-	}	
+	}
 };
diff --git a/pub/lib/tiny_mce/classes/Editor.js b/pub/lib/tiny_mce/classes/Editor.js
index 844ce1837c2e5797b7d78926a1c1e31df7986120..6ea9b2386e93b5218ec26ff2e09f358878b0f88b 100644
--- a/pub/lib/tiny_mce/classes/Editor.js
+++ b/pub/lib/tiny_mce/classes/Editor.js
@@ -23,20 +23,20 @@
 	 * @example
 	 * // Add a class to all paragraphs in the editor.
 	 * tinyMCE.activeEditor.dom.addClass(tinyMCE.activeEditor.dom.select('p'), 'someclass');
-	 * 
+	 *
 	 * // Gets the current editors selection as text
 	 * tinyMCE.activeEditor.selection.getContent({format : 'text'});
-	 * 
+	 *
 	 * // Creates a new editor instance
 	 * var ed = new tinymce.Editor('textareaid', {
 	 *     some_setting : 1
 	 * });
-	 * 
+	 *
 	 * // Select each item the user clicks on
 	 * ed.onClick.add(function(ed, e) {
 	 *     ed.selection.select(e.target);
 	 * });
-	 * 
+	 *
 	 * ed.render();
 	 */
 	tinymce.create('tinymce.Editor', {
@@ -53,7 +53,7 @@
 			var t = this;
 
 			/**
-			 * Editor instance id, normally the same as the div/textarea that was replaced. 
+			 * Editor instance id, normally the same as the div/textarea that was replaced.
 			 *
 			 * @property id
 			 * @type String
@@ -65,7 +65,7 @@
 			t.queryValueCommands = {};
 
 			/**
-			 * State to force the editor to return false on a isDirty call. 
+			 * State to force the editor to return false on a isDirty call.
 			 *
 			 * @property isNotDirty
 			 * @type Boolean
@@ -834,7 +834,7 @@
 			 * @example
 			 * // Get relative URL from the location of document_base_url
 			 * tinyMCE.activeEditor.documentBaseURI.toRelative('/somedir/somefile.htm');
-			 * 
+			 *
 			 * // Get absolute URL from the location of document_base_url
 			 * tinyMCE.activeEditor.documentBaseURI.toAbsolute('somefile.htm');
 			 */
@@ -850,7 +850,7 @@
 			 * @example
 			 * // Get relative URL from the location of the API
 			 * tinyMCE.activeEditor.baseURI.toRelative('/somedir/somefile.htm');
-			 * 
+			 *
 			 * // Get absolute URL from the location of the API
 			 * tinyMCE.activeEditor.baseURI.toAbsolute('somefile.htm');
 			 */
@@ -861,7 +861,7 @@
 			 *
 			 * @property contentCSS
 			 * @type Array
-			 */			
+			 */
 			t.contentCSS = [];
 
 			// Call setup
@@ -890,7 +890,7 @@
 			if (!t.getElement())
 				return;
 
-			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff 
+			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
 			// here since the browser says it has contentEditable support but there is no visible
 			// caret We will remove this check ones Apple implements full contentEditable support
 			if (tinymce.isIDevice && !tinymce.isIOS5)
@@ -908,7 +908,7 @@
 			 * @example
 			 * // Shows an alert message
 			 * tinyMCE.activeEditor.windowManager.alert('Hello world!');
-			 * 
+			 *
 			 * // Opens a new dialog with the file.htm file and the size 320x240
 			 * // It also adds a custom parameter this can be retrieved by using tinyMCEPopup.getWindowArg inside the dialog.
 			 * tinyMCE.activeEditor.windowManager.open({
@@ -992,7 +992,7 @@
 								var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};
 								var dep = PluginManager.createUrl(defaultSettings, dep);
 								PluginManager.load(dep.resource, dep);
-								
+
 							});
 						} else {
 							// Skip safari plugin, since it is removed as of 3.3b1
@@ -1029,7 +1029,7 @@
 			s.aria_label = s.aria_label || DOM.getAttrib(e, 'aria-label', t.getLang('aria.rich_text_area'));
 
 			/**
-			 * Reference to the theme instance that was used to generate the UI. 
+			 * Reference to the theme instance that was used to generate the UI.
 			 *
 			 * @property theme
 			 * @type tinymce.Theme
@@ -1061,7 +1061,7 @@
 					}
 				}
 			}
-			
+
 			// Create all plugins
 			each(explode(s.plugins.replace(/\-/g, '')), initPlugin);
 
@@ -1218,7 +1218,7 @@
 
 			// Create iframe
 			// TODO: ACC add the appropriate description on this.
-			n = DOM.add(o.iframeContainer, 'iframe', { 
+			n = DOM.add(o.iframeContainer, 'iframe', {
 				id : t.id + "_ifr",
 				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
 				frameBorder : '0',
@@ -1311,12 +1311,12 @@
 			if (!t.settings.allow_html_in_named_anchor) {
 				t.parser.addAttributeFilter('name', function(nodes, name) {
 					var i = nodes.length, sibling, prevSibling, parent, node;
-	
+
 					while (i--) {
 						node = nodes[i];
 						if (node.name === 'a' && node.firstChild) {
 							parent = node.parent;
-	
+
 							// Move children after current node
 							sibling = node.lastChild;
 							do {
@@ -1339,7 +1339,7 @@
 					internalName = 'data-mce-' + name;
 
 					// Add internal attribute if we need to we don't on a refresh of the document
-					if (!node.attributes.map[internalName]) {	
+					if (!node.attributes.map[internalName]) {
 						if (name === "style")
 							node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));
 						else
@@ -1497,7 +1497,7 @@
 			t.formatter.register(t.settings.formats);
 
 			/**
-			 * Undo manager instance, responsible for handling undo levels. 
+			 * Undo manager instance, responsible for handling undo levels.
 			 *
 			 * @property undoManager
 			 * @type tinymce.UndoManager
@@ -1649,7 +1649,7 @@
 					if (o.set)
 						o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
 
-					if (o.get)						
+					if (o.get)
 						o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
 				});
 			}
@@ -1951,7 +1951,7 @@
 		 *
 		 * @method getLang
 		 * @param {String} n Name/key to get from the language pack.
-		 * @param {String} dv Optional default value to retrive.
+		 * @param {String} dv Optional default value to retrieve.
 		 */
 		getLang : function(n, dv) {
 			return tinymce.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');
@@ -1961,14 +1961,14 @@
 		 * Returns a configuration parameter by name.
 		 *
 		 * @method getParam
-		 * @param {String} n Configruation parameter to retrive.
+		 * @param {String} n Configruation parameter to retrieve.
 		 * @param {String} dv Optional default value to return.
 		 * @param {String} ty Optional type parameter.
 		 * @return {String} Configuration parameter value or default value.
 		 * @example
 		 * // Returns a specific config value from the currently active editor
 		 * var someval = tinyMCE.activeEditor.getParam('myvalue');
-		 * 
+		 *
 		 * // Returns a specific config value from a specific editor instance by id
 		 * var someval2 = tinyMCE.get('my_editor').getParam('myvalue');
 		 */
@@ -2043,9 +2043,9 @@
 		 * // an alert box with the selected contents as plain text.
 		 * tinyMCE.init({
 		 *    ...
-		 * 
+		 *
 		 *    theme_advanced_buttons1 : 'example,..'
-		 * 
+		 *
 		 *    setup : function(ed) {
 		 *       // Register example button
 		 *       ed.addButton('example', {
@@ -2077,7 +2077,7 @@
 		 * // Adds a custom command that later can be executed using execCommand
 		 * tinyMCE.init({
 		 *    ...
-		 * 
+		 *
 		 *    setup : function(ed) {
 		 *       // Register example command
 		 *       ed.addCommand('mycommand', function(ui, v) {
@@ -2395,10 +2395,10 @@
 		 * @example
 		 * // Show progress for the active editor
 		 * tinyMCE.activeEditor.setProgressState(true);
-		 * 
+		 *
 		 * // Hide progress for the active editor
 		 * tinyMCE.activeEditor.setProgressState(false);
-		 * 
+		 *
 		 * // Show progress after 3 seconds
 		 * tinyMCE.activeEditor.setProgressState(true, 3000);
 		 */
@@ -2500,13 +2500,13 @@
 		 * @example
 		 * // Sets the HTML contents of the activeEditor editor
 		 * tinyMCE.activeEditor.setContent('<span>some</span> html');
-		 * 
+		 *
 		 * // Sets the raw contents of the activeEditor editor
 		 * tinyMCE.activeEditor.setContent('<span>some</span> html', {format : 'raw'});
-		 * 
+		 *
 		 * // Sets the content of a specific editor (my_editor in this example)
 		 * tinyMCE.get('my_editor').setContent(data);
-		 * 
+		 *
 		 * // Sets the bbcode contents of the activeEditor editor if the bbcode plugin was added
 		 * tinyMCE.activeEditor.setContent('[b]some[/b] html', {format : 'bbcode'});
 		 */
@@ -2570,10 +2570,10 @@
 		 * @example
 		 * // Get the HTML contents of the currently active editor
 		 * console.debug(tinyMCE.activeEditor.getContent());
-		 * 
+		 *
 		 * // Get the raw contents of the currently active editor
 		 * tinyMCE.activeEditor.getContent({format : 'raw'});
-		 * 
+		 *
 		 * // Get content of a specific editor:
 		 * tinyMCE.get('content id').getContent()
 		 */
@@ -2995,7 +2995,7 @@
 
 				while (n && n.nodeType && n.nodeType != 1 && n.parentNode)
 					n = n.parentNode;
-					
+
 				// Is the cursor at the beginning of a blockquote?
 				if (n && n.parentNode && n.parentNode.tagName === 'BLOCKQUOTE' && n.parentNode.firstChild == n && offset == 0) {
 					// Remove the blockquote
@@ -3009,7 +3009,7 @@
 					ed.selection.collapse(false);
 				}
 			});
- 
+
 
 
 			// Add reset handler
diff --git a/pub/lib/tiny_mce/classes/Formatter.js b/pub/lib/tiny_mce/classes/Formatter.js
index 4ef132393ed3ad916b37a3ca7398765126d20557..0cbca75ec504b1dac9fe1106c495ff573a302652 100644
--- a/pub/lib/tiny_mce/classes/Formatter.js
+++ b/pub/lib/tiny_mce/classes/Formatter.js
@@ -65,8 +65,8 @@
 		 * Returns the format by name or all formats if no name is specified.
 		 *
 		 * @method get
-		 * @param {String} name Optional name to retrive by.
-		 * @return {Array/Object} Array/Object with all registred formats or a specific format.
+		 * @param {String} name Optional name to retrieve by.
+		 * @return {Array/Object} Array/Object with all registered formats or a specific format.
 		 */
 		function get(name) {
 			return name ? formats[name] : formats;
@@ -229,10 +229,10 @@
 
 				return rng;
 			}
-			
+
 			function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){
 				var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;
-				
+
 				// find the index of the first child list.
 				each(node.childNodes, function(n, index) {
 					if (n.nodeName === "UL" || n.nodeName === "OL") {
@@ -241,7 +241,7 @@
 						return false;
 					}
 				});
-				
+
 				// get the index of the bookmarks
 				each(node.childNodes, function(n, index) {
 					if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {
@@ -252,29 +252,29 @@
 						}
 					}
 				});
-				
+
 				// if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally
 				if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {
 					each(tinymce.grep(node.childNodes), process);
 					return 0;
 				} else {
 					currentWrapElm = wrapElm.cloneNode(FALSE);
-					
+
 					// create a list of the nodes on the same side of the list as the selection
 					each(tinymce.grep(node.childNodes), function(n, index) {
 						if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {
-							nodes.push(n); 
+							nodes.push(n);
 							n.parentNode.removeChild(n);
 						}
 					});
-					
+
 					// insert the wrapping element either before or after the list.
 					if (startIndex < listIndex) {
 						node.insertBefore(currentWrapElm, list);
 					} else if (startIndex > listIndex) {
 						node.insertBefore(currentWrapElm, list.nextSibling);
 					}
-					
+
 					// add the new nodes to the list.
 					newWrappers.push(currentWrapElm);
 
@@ -285,7 +285,7 @@
 					return currentWrapElm;
 				}
 			};
-			
+
 			function applyRngStyle(rng, bookmark, node_specific) {
 				var newWrappers = [], wrapName, wrapElm;
 
@@ -1797,7 +1797,7 @@
 
 				return true;
 			};
-			
+
 			// Returns any parent caret container element
 			function getParentCaretContainer(node) {
 				while (node) {
@@ -1855,7 +1855,7 @@
 					selection.setRng(rng);
 				}
 			};
-			
+
 			// Applies formatting to the caret postion
 			function applyCaretFormat() {
 				var rng, caretContainer, textNode, offset, bookmark, container, text;
diff --git a/pub/lib/tiny_mce/classes/Popup.js b/pub/lib/tiny_mce/classes/Popup.js
index 0537c7c71742d48d6a38b6a96f45c6f5258ddb79..5667fc248cec0e2597dae7dccccd00c0d07af8b2 100644
--- a/pub/lib/tiny_mce/classes/Popup.js
+++ b/pub/lib/tiny_mce/classes/Popup.js
@@ -56,7 +56,7 @@ tinyMCEPopup = {
 		 * tinyMCEPopup.onInit.add(function(ed) {
 		 *     alert(ed.selection.getContent());
 		 * });
-		 * 
+		 *
 		 * // Executes the init method on page load in some object using the SomeObject scope
 		 * tinyMCEPopup.onInit.add(SomeObject.init, SomeObject);
 		 */
@@ -86,7 +86,7 @@ tinyMCEPopup = {
 	 * Returns a window argument/parameter by name.
 	 *
 	 * @method getWindowArg
-	 * @param {String} n Name of the window argument to retrive.
+	 * @param {String} n Name of the window argument to retrieve.
 	 * @param {String} dv Optional default value to return.
 	 * @return {String} Argument value or default value if it wasn't found.
 	 */
@@ -100,7 +100,7 @@ tinyMCEPopup = {
 	 * Returns a editor parameter/config option value.
 	 *
 	 * @method getParam
-	 * @param {String} n Name of the editor config option to retrive.
+	 * @param {String} n Name of the editor config option to retrieve.
 	 * @param {String} dv Optional default value to return.
 	 * @return {String} Parameter value or default value if it wasn't found.
 	 */
@@ -297,7 +297,7 @@ tinyMCEPopup = {
 			close();
 	},
 
-	// Internal functions	
+	// Internal functions
 
 	_restoreSelection : function() {
 		var e = window.event.srcElement;
diff --git a/pub/lib/tiny_mce/classes/WindowManager.js b/pub/lib/tiny_mce/classes/WindowManager.js
index fac072600f73f688d87cf593d521339277118a2c..e80de4e80dace7b9f396590a8a2be7eb91c695e9 100644
--- a/pub/lib/tiny_mce/classes/WindowManager.js
+++ b/pub/lib/tiny_mce/classes/WindowManager.js
@@ -25,10 +25,10 @@
 	 * }, {
 	 *    custom_param : 1
 	 * });
-	 * 
+	 *
 	 * // Displays an alert box using the active editors window manager instance
 	 * tinyMCE.activeEditor.windowManager.alert('Hello world!');
-	 * 
+	 *
 	 * // Displays an confirm box and an alert message will be displayed depending on what you choose in the confirm
 	 * tinyMCE.activeEditor.windowManager.confirm("Do you want to do something", function(s) {
 	 *    if (s)
@@ -60,19 +60,19 @@
 		 *
 		 * @method open
 		 * @param {Object} s Optional name/value settings collection contains things like width/height/url etc.
-		 * @option {String} title Window title. 
-		 * @option {String} file URL of the file to open in the window. 
-		 * @option {Number} width Width in pixels. 
-		 * @option {Number} height Height in pixels. 
-		 * @option {Boolean} resizable Specifies whether the popup window is resizable or not. 
-		 * @option {Boolean} maximizable Specifies whether the popup window has a "maximize" button and can get maximized or not. 
-		 * @option {Boolean} inline Specifies whether to display in-line (set to 1 or true for in-line display; requires inlinepopups plugin). 
-		 * @option {String/Boolean} popup_css Optional CSS to use in the popup. Set to false to remove the default one. 
-		 * @option {Boolean} translate_i18n Specifies whether translation should occur or not of i18 key strings. Default is true. 
-		 * @option {String/bool} close_previous Specifies whether a previously opened popup window is to be closed or not (like when calling the file browser window over the advlink popup). 
-		 * @option {String/bool} scrollbars Specifies whether the popup window can have scrollbars if required (i.e. content larger than the popup size specified). 
-		 * @param {Object} p Optional parameters/arguments collection can be used by the dialogs to retrive custom parameters.
-		 * @option {String} plugin_url url to plugin if opening plugin window that calls tinyMCEPopup.requireLangPack() and needs access to the plugin language js files 
+		 * @option {String} title Window title.
+		 * @option {String} file URL of the file to open in the window.
+		 * @option {Number} width Width in pixels.
+		 * @option {Number} height Height in pixels.
+		 * @option {Boolean} resizable Specifies whether the popup window is resizable or not.
+		 * @option {Boolean} maximizable Specifies whether the popup window has a "maximize" button and can get maximized or not.
+		 * @option {Boolean} inline Specifies whether to display in-line (set to 1 or true for in-line display; requires inlinepopups plugin).
+		 * @option {String/Boolean} popup_css Optional CSS to use in the popup. Set to false to remove the default one.
+		 * @option {Boolean} translate_i18n Specifies whether translation should occur or not of i18 key strings. Default is true.
+		 * @option {String/bool} close_previous Specifies whether a previously opened popup window is to be closed or not (like when calling the file browser window over the advlink popup).
+		 * @option {String/bool} scrollbars Specifies whether the popup window can have scrollbars if required (i.e. content larger than the popup size specified).
+		 * @param {Object} p Optional parameters/arguments collection can be used by the dialogs to retrieve custom parameters.
+		 * @option {String} plugin_url url to plugin if opening plugin window that calls tinyMCEPopup.requireLangPack() and needs access to the plugin language js files
 		 */
 		open : function(s, p) {
 			var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;
@@ -228,4 +228,4 @@
 			return tinymce.DOM.decode(s).replace(/\\n/g, '\n');
 		}
 	});
-}(tinymce));
\ No newline at end of file
+}(tinymce));
diff --git a/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js b/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js
index adae9dc7dbe186d2f11b74f09354f0f5adf2e1cd..1fceed4f3e86b2f5520bc524768c3d11f1851581 100644
--- a/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js
+++ b/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js
@@ -42,7 +42,7 @@
 			function attr(name, value) {
 				var self = this;
 
-				// Update/retrive data-mce- attribute variants
+				// Update/retrieve data-mce- attribute variants
 				if (attrRegExp.test(name)) {
 					if (value !== undefined) {
 						// Use TinyMCE behavior when setting the specifc attributes
diff --git a/pub/lib/tiny_mce/classes/ui/Container.js b/pub/lib/tiny_mce/classes/ui/Container.js
index aff916a60449e36ffae467943ccfc99d26baff68..de47b4018c3ade0fbba7dedf926563d60d23aeef 100644
--- a/pub/lib/tiny_mce/classes/ui/Container.js
+++ b/pub/lib/tiny_mce/classes/ui/Container.js
@@ -56,7 +56,7 @@ tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
 	 * Returns a control by id from the containers collection.
 	 *
 	 * @method get
-	 * @param {String} n Id for the control to retrive.
+	 * @param {String} n Id for the control to retrieve.
 	 * @return {tinymce.ui.Control} Control instance by the specified name or undefined if it wasn't found.
 	 */
 	get : function(n) {
diff --git a/pub/lib/tiny_mce/classes/util/Cookie.js b/pub/lib/tiny_mce/classes/util/Cookie.js
index 4004df20db66a296b2892099966434a24d338ead..82ca92cba4e127ea674cfccb969ee2e41c10d59d 100644
--- a/pub/lib/tiny_mce/classes/util/Cookie.js
+++ b/pub/lib/tiny_mce/classes/util/Cookie.js
@@ -19,10 +19,10 @@
 	 * @example
 	 * // Gets a cookie from the browser
 	 * console.debug(tinymce.util.Cookie.get('mycookie'));
-	 * 
+	 *
 	 * // Gets a hash table cookie from the browser and takes out the x parameter from it
 	 * console.debug(tinymce.util.Cookie.getHash('mycookie').x);
-	 * 
+	 *
 	 * // Sets a hash table cookie to the browser
 	 * tinymce.util.Cookie.setHash({x : '1', y : '2'});
 	 */
@@ -73,7 +73,7 @@
 		 * Gets the raw data of a cookie by name.
 		 *
 		 * @method get
-		 * @param {String} n Name of cookie to retrive.
+		 * @param {String} n Name of cookie to retrieve.
 		 * @return {String} Cookie data string.
 		 */
 		get : function(n) {
diff --git a/pub/lib/tiny_mce/classes/xml/Parser.js b/pub/lib/tiny_mce/classes/xml/Parser.js
index 49030e94a635aa07a988ceaeac380d12f2faaeff..e29965513aee76d9213a8ac3b289eeab7820c932 100644
--- a/pub/lib/tiny_mce/classes/xml/Parser.js
+++ b/pub/lib/tiny_mce/classes/xml/Parser.js
@@ -105,7 +105,7 @@
 		/**
 		 * Returns all string contents of a element concated together.
 		 *
-		 * @param {XMLNode} el XML element to retrive text from.
+		 * @param {XMLNode} el XML element to retrieve text from.
 		 * @return {string} XML element text contents.
 		 */
 		getText : function(el) {
diff --git a/pub/lib/tiny_mce/tiny_mce_jquery_src.js b/pub/lib/tiny_mce/tiny_mce_jquery_src.js
index 41f42c1986ccd0923696feffff7f04b4766800ec..af86a86669a3b7e307ff14c900fa5d7b4ad5a607 100644
--- a/pub/lib/tiny_mce/tiny_mce_jquery_src.js
+++ b/pub/lib/tiny_mce/tiny_mce_jquery_src.js
@@ -33,7 +33,7 @@
 			t.isAir = /adobeair/i.test(ua);
 
 			t.isIDevice = /(iPad|iPhone)/.test(ua);
-			
+
 			t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;
 
 			// TinyMCE .NET webcontrol might be setting the values for TinyMCE
@@ -474,7 +474,7 @@
 			function attr(name, value) {
 				var self = this;
 
-				// Update/retrive data-mce- attribute variants
+				// Update/retrieve data-mce- attribute variants
 				if (attrRegExp.test(name)) {
 					if (value !== undefined) {
 						// Use TinyMCE behavior when setting the specifc attributes
@@ -922,7 +922,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 
 			return o;
 		},
-	
+
 		toAbsolute : function(u, nh) {
 			var u = new tinymce.util.URI(u, {base_uri : this});
 
@@ -1832,7 +1832,7 @@ tinymce.html.Styles = function(settings, schema) {
 						if (name === 'font-weight' && value === '700')
 							value = 'bold';
 						else if (name === 'color' || name === 'background-color') // Lowercase colors like RED
-							value = value.toLowerCase();		
+							value = value.toLowerCase();
 
 						// Convert RGB colors to HEX
 						value = value.replace(rgbRegExp, toHex);
@@ -1957,8 +1957,8 @@ tinymce.html.Styles = function(settings, schema) {
 	};
 
 	// Build a lookup table for block elements both lowercase and uppercase
-	blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' + 
-						'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' + 
+	blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' +
+						'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' +
 						'noscript,menu,isindex,samp,header,footer,article,section,hgroup';
 	blockElementsMap = makeMap(blockElementsMap, ',', makeMap(blockElementsMap.toUpperCase()));
 
@@ -1996,89 +1996,89 @@ tinymce.html.Styles = function(settings, schema) {
 		C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',
 		B : 'lang|xml:lang|dir',
 		A : 'id|class|style|title'
-	}, 'script[id|charset|type|language|src|defer|xml:space][]' + 
-		'style[B|id|type|media|title|xml:space][]' + 
-		'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 
-		'param[id|name|value|valuetype|type][]' + 
-		'p[E|align][#|S]' + 
-		'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 
-		'br[A|clear][]' + 
-		'span[E][#|S]' + 
-		'bdo[A|C|B][#|S]' + 
-		'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 
-		'h1[E|align][#|S]' + 
-		'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 
-		'map[B|C|A|name][X|form|Q|area]' + 
-		'h2[E|align][#|S]' + 
-		'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 
-		'h3[E|align][#|S]' + 
-		'tt[E][#|S]' + 
-		'i[E][#|S]' + 
-		'b[E][#|S]' + 
-		'u[E][#|S]' + 
-		's[E][#|S]' + 
-		'strike[E][#|S]' + 
-		'big[E][#|S]' + 
-		'small[E][#|S]' + 
-		'font[A|B|size|color|face][#|S]' + 
-		'basefont[id|size|color|face][]' + 
-		'em[E][#|S]' + 
-		'strong[E][#|S]' + 
-		'dfn[E][#|S]' + 
-		'code[E][#|S]' + 
-		'q[E|cite][#|S]' + 
-		'samp[E][#|S]' + 
-		'kbd[E][#|S]' + 
-		'var[E][#|S]' + 
-		'cite[E][#|S]' + 
-		'abbr[E][#|S]' + 
-		'acronym[E][#|S]' + 
-		'sub[E][#|S]' + 
-		'sup[E][#|S]' + 
-		'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 
-		'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 
-		'optgroup[E|disabled|label][option]' + 
-		'option[E|selected|disabled|label|value][]' + 
-		'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 
-		'label[E|for|accesskey|onfocus|onblur][#|S]' + 
-		'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 
-		'h4[E|align][#|S]' + 
-		'ins[E|cite|datetime][#|Y]' + 
-		'h5[E|align][#|S]' + 
-		'del[E|cite|datetime][#|Y]' + 
-		'h6[E|align][#|S]' + 
-		'div[E|align][#|Y]' + 
-		'ul[E|type|compact][li]' + 
-		'li[E|type|value][#|Y]' + 
-		'ol[E|type|compact|start][li]' + 
-		'dl[E|compact][dt|dd]' + 
-		'dt[E][#|S]' + 
-		'dd[E][#|Y]' + 
-		'menu[E|compact][li]' + 
-		'dir[E|compact][li]' + 
-		'pre[E|width|xml:space][#|ZA]' + 
-		'hr[E|align|noshade|size|width][]' + 
-		'blockquote[E|cite][#|Y]' + 
-		'address[E][#|S|p]' + 
-		'center[E][#|Y]' + 
-		'noframes[E][#|Y]' + 
-		'isindex[A|B|prompt][]' + 
-		'fieldset[E][#|legend|Y]' + 
-		'legend[E|accesskey|align][#|S]' + 
-		'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 
-		'caption[E|align][#|S]' + 
-		'col[ZG][]' + 
-		'colgroup[ZG][col]' + 
-		'thead[ZF][tr]' + 
-		'tr[ZF|bgcolor][th|td]' + 
-		'th[E|ZE][#|Y]' + 
-		'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 
-		'noscript[E][#|Y]' + 
-		'td[E|ZE][#|Y]' + 
-		'tfoot[ZF][tr]' + 
-		'tbody[ZF][tr]' + 
-		'area[E|D|shape|coords|href|nohref|alt|target][]' + 
-		'base[id|href|target][]' + 
+	}, 'script[id|charset|type|language|src|defer|xml:space][]' +
+		'style[B|id|type|media|title|xml:space][]' +
+		'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' +
+		'param[id|name|value|valuetype|type][]' +
+		'p[E|align][#|S]' +
+		'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' +
+		'br[A|clear][]' +
+		'span[E][#|S]' +
+		'bdo[A|C|B][#|S]' +
+		'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' +
+		'h1[E|align][#|S]' +
+		'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' +
+		'map[B|C|A|name][X|form|Q|area]' +
+		'h2[E|align][#|S]' +
+		'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' +
+		'h3[E|align][#|S]' +
+		'tt[E][#|S]' +
+		'i[E][#|S]' +
+		'b[E][#|S]' +
+		'u[E][#|S]' +
+		's[E][#|S]' +
+		'strike[E][#|S]' +
+		'big[E][#|S]' +
+		'small[E][#|S]' +
+		'font[A|B|size|color|face][#|S]' +
+		'basefont[id|size|color|face][]' +
+		'em[E][#|S]' +
+		'strong[E][#|S]' +
+		'dfn[E][#|S]' +
+		'code[E][#|S]' +
+		'q[E|cite][#|S]' +
+		'samp[E][#|S]' +
+		'kbd[E][#|S]' +
+		'var[E][#|S]' +
+		'cite[E][#|S]' +
+		'abbr[E][#|S]' +
+		'acronym[E][#|S]' +
+		'sub[E][#|S]' +
+		'sup[E][#|S]' +
+		'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' +
+		'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' +
+		'optgroup[E|disabled|label][option]' +
+		'option[E|selected|disabled|label|value][]' +
+		'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' +
+		'label[E|for|accesskey|onfocus|onblur][#|S]' +
+		'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' +
+		'h4[E|align][#|S]' +
+		'ins[E|cite|datetime][#|Y]' +
+		'h5[E|align][#|S]' +
+		'del[E|cite|datetime][#|Y]' +
+		'h6[E|align][#|S]' +
+		'div[E|align][#|Y]' +
+		'ul[E|type|compact][li]' +
+		'li[E|type|value][#|Y]' +
+		'ol[E|type|compact|start][li]' +
+		'dl[E|compact][dt|dd]' +
+		'dt[E][#|S]' +
+		'dd[E][#|Y]' +
+		'menu[E|compact][li]' +
+		'dir[E|compact][li]' +
+		'pre[E|width|xml:space][#|ZA]' +
+		'hr[E|align|noshade|size|width][]' +
+		'blockquote[E|cite][#|Y]' +
+		'address[E][#|S|p]' +
+		'center[E][#|Y]' +
+		'noframes[E][#|Y]' +
+		'isindex[A|B|prompt][]' +
+		'fieldset[E][#|legend|Y]' +
+		'legend[E|accesskey|align][#|S]' +
+		'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' +
+		'caption[E|align][#|S]' +
+		'col[ZG][]' +
+		'colgroup[ZG][col]' +
+		'thead[ZF][tr]' +
+		'tr[ZF|bgcolor][th|td]' +
+		'th[E|ZE][#|Y]' +
+		'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' +
+		'noscript[E][#|Y]' +
+		'td[E|ZE][#|Y]' +
+		'tfoot[ZF][tr]' +
+		'tbody[ZF][tr]' +
+		'area[E|D|shape|coords|href|nohref|alt|target][]' +
+		'base[id|href|target][]' +
 		'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'
 	);
 
@@ -2474,7 +2474,7 @@ tinymce.html.Styles = function(settings, schema) {
 				pos = stack.length;
 				while (pos--) {
 					if (stack[pos].name === name)
-						break;						
+						break;
 				}
 
 				// Found parent
@@ -3331,7 +3331,7 @@ tinymce.html.Styles = function(settings, schema) {
 
 				doctype: function(text) {
 					var newNode;
-		
+
 					newNode = node.append(createNode('#doctype', 10));
 					newNode.value = text;
 					removeWhitespaceBefore(node);
@@ -3533,7 +3533,7 @@ tinymce.html.Styles = function(settings, schema) {
 								// Found a non BR element
 								if (prevName !== "br")
 									break;
-	
+
 								// Found another br it's a <br><br> structure then don't remove anything
 								if (prevName === 'br') {
 									node = null;
@@ -3830,7 +3830,7 @@ tinymce.html.Writer = function(settings) {
 				keep_values : false,
 				hex_colors : 1
 			}, s);
-			
+
 			t.schema = s.schema;
 			t.styles = new tinymce.html.Styles({
 				url_converter : s.url_converter,
@@ -4086,7 +4086,7 @@ tinymce.html.Writer = function(settings) {
 					case 'float':
 						isIE ? s.styleFloat = v : s.cssFloat = v;
 						break;
-					
+
 					default:
 						s[na] = v || '';
 				}
@@ -5164,17 +5164,17 @@ tinymce.html.Writer = function(settings) {
 			// Check START_TO_START
 			if (h === 0)
 				return _compareBoundaryPoints(sc, so, rsc, rso);
-	
+
 			// Check START_TO_END
 			if (h === 1)
 				return _compareBoundaryPoints(ec, eo, rsc, rso);
-	
+
 			// Check END_TO_END
 			if (h === 2)
 				return _compareBoundaryPoints(ec, eo, rec, reo);
-	
+
 			// Check END_TO_START
-			if (h === 3) 
+			if (h === 3)
 				return _compareBoundaryPoints(sc, so, rec, reo);
 		};
 
@@ -5267,7 +5267,7 @@ tinymce.html.Writer = function(settings) {
 
 		function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {
 			var c, offsetC, n, cmnRoot, childA, childB;
-			
+
 			// In the first case the boundary-points have the same container. A is before B
 			// if its offset is less than the offset of B, A is equal to B if its offset is
 			// equal to the offset of B, and A is after B if its offset is greater than the
@@ -6053,7 +6053,7 @@ tinymce.html.Writer = function(settings) {
 
 				return node;
 			};
-			
+
 			function setBookmarkEndPoint(start) {
 				var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef;
 
@@ -6472,9 +6472,9 @@ tinymce.html.Writer = function(settings) {
 			el = dom.get(t.id);
 
 		tinymce.each(
-				('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' + 
-				'setAttrib,setAttribs,getAttrib,addClass,removeClass,' + 
-				'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' + 
+				('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' +
+				'setAttrib,setAttribs,getAttrib,addClass,removeClass,' +
+				'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' +
 				'isHidden,setHTML,get').split(/,/)
 			, function(k) {
 				t[k] = function() {
@@ -7187,7 +7187,7 @@ tinymce.html.Writer = function(settings) {
 
 		setRng : function(r) {
 			var s, t = this;
-			
+
 			if (!t.tridentSel) {
 				s = t.getSel();
 
@@ -7247,7 +7247,7 @@ tinymce.html.Writer = function(settings) {
 					}
 
 					// If the anchor node is a element instead of a text node then return this element
-					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 
+					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1)
 					//	return sel.anchorNode.childNodes[sel.anchorOffset];
 
 					// Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.
@@ -7372,7 +7372,7 @@ tinymce.html.Writer = function(settings) {
 
 			// Normalize the end points
 			normalizeEndPoint(true);
-			
+
 			if (rng.collapsed)
 				normalizeEndPoint();
 
@@ -7753,7 +7753,7 @@ tinymce.html.Writer = function(settings) {
 
 				callback();
 			};
-			
+
 			function error() {
 				// Report the error so it's easier for people to spot loading errors
 				if (typeof(console) !== "undefined" && console.log)
@@ -7789,7 +7789,7 @@ tinymce.html.Writer = function(settings) {
 
 							done();
 						},
-						
+
 						error : error
 					});
 
@@ -8064,7 +8064,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 			// Find common ancestor and end points
 			ancestor = dom.findCommonAncestor(startContainer, endContainer);
-				
+
 			// Process left side
 			for (node = startContainer; node; node = node.parentNode) {
 				if (node === endContainer)
@@ -8189,17 +8189,17 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			itemFocussed = function(evt) {
 				focussedId = evt.target.id;
 			};
-			
+
 			itemBlurred = function(evt) {
 				dom.setAttrib(evt.target.id, 'tabindex', '-1');
 			};
-			
+
 			rootFocussed = function(evt) {
 				var item = dom.get(focussedId);
 				dom.setAttrib(item, 'tabindex', '0');
 				item.focus();
 			};
-			
+
 			t.focus = function() {
 				dom.get(focussedId).focus();
 			};
@@ -8216,7 +8216,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;
 				t.destroy = function() {};
 			};
-			
+
 			t.moveFocus = function(dir, evt) {
 				var idx = -1, controls = t.controls, newFocus;
 
@@ -8236,7 +8236,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				} else if (idx >= items.length) {
 					idx = 0;
 				}
-				
+
 				newFocus = items[idx];
 				dom.setAttrib(focussedId, 'tabindex', '-1');
 				dom.setAttrib(newFocus.id, 'tabindex', '0');
@@ -8249,19 +8249,19 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				if (evt)
 					Event.cancel(evt);
 			};
-			
+
 			rootKeydown = function(evt) {
 				var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;
-				
+
 				switch (evt.keyCode) {
 					case DOM_VK_LEFT:
 						if (enableLeftRight) t.moveFocus(-1);
 						break;
-	
+
 					case DOM_VK_RIGHT:
 						if (enableLeftRight) t.moveFocus(1);
 						break;
-	
+
 					case DOM_VK_UP:
 						if (enableUpDown) t.moveFocus(-1);
 						break;
@@ -8306,14 +8306,14 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				dom.setAttrib(item.id, 'tabindex', tabindex);
 				dom.bind(dom.get(item.id), 'focus', itemFocussed);
 			});
-			
+
 			// Setup initial state for root element.
 			if (items[0]){
 				focussedId = items[0].id;
 			}
 
 			dom.setAttrib(root, 'tabindex', '-1');
-			
+
 			// Setup listeners for root element.
 			dom.bind(dom.get(root), 'focus', rootFocussed);
 			dom.bind(dom.get(root), 'keydown', rootKeydown);
@@ -8337,14 +8337,14 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			this.active = 0;
 			this.editor = editor;
 		},
-		
+
 		setAriaProperty : function(property, value) {
 			var element = DOM.get(this.id + '_aria') || DOM.get(this.id);
 			if (element) {
 				DOM.setAttrib(element, 'aria-' + property, !!value);
 			}
 		},
-		
+
 		focus : function() {
 			DOM.get(this.id).focus();
 		},
@@ -8479,7 +8479,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 		postRender : function() {
 			var t = this;
-			
+
 			t.parent();
 
 			// Set pending state
@@ -8624,7 +8624,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 			return m;
 		},
-		
+
 		focus : function() {
 			var t = this;
 			if (t.keyboardNav) {
@@ -8754,13 +8754,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					}
 				});
 			}
-			
+
 			Event.add(co, 'keydown', t._keyHandler, t);
 
 			t.onShowMenu.dispatch(t);
 
-			if (s.keyboard_focus) { 
-				t._setupKeyboardNav(); 
+			if (s.keyboard_focus) {
+				t._setupKeyboardNav();
 			}
 		},
 
@@ -8855,7 +8855,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 		// Internal functions
 		_setupKeyboardNav : function(){
-			var contextMenu, menuItems, t=this; 
+			var contextMenu, menuItems, t=this;
 			contextMenu = DOM.select('#menu_' + t.id)[0];
 			menuItems = DOM.select('a[role=option]', 'menu_' + t.id);
 			menuItems.splice(0,0,contextMenu);
@@ -8957,7 +8957,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			else
 				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');
 
-			h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>'; 
+			h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>';
 			h += '</a>';
 			return h;
 		},
@@ -9073,7 +9073,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var h = '', t = this, s = t.settings, cp = t.classPrefix;
 
 			h = '<span role="listbox" aria-haspopup="true" aria-labelledby="' + t.id +'_voiceDesc" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
-			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title); 
+			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title);
 			h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
 			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';
 			h += '</tr></tbody></table></span>';
@@ -9381,7 +9381,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				if (tinymce.isWebKit && (e.keyCode==37 ||e.keyCode==39)) {
 					return Event.prevent(e);
 				}
-				
+
 				if (e.keyCode == 13 || e.keyCode == 32) {
 					onChange(e);
 					return Event.cancel(e);
@@ -9507,7 +9507,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 			h1 += DOM.createHTML('span', {'class': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);
 			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
-	
+
 			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');
 			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
 
@@ -9707,7 +9707,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}
 
 			DOM.addClass(m, 'mceColorSplitMenu');
-			
+
 			new tinymce.ui.KeyboardNavigation({
 				root: t.id + '_menu',
 				items: DOM.select('a', t.id + '_menu'),
@@ -9739,7 +9739,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			this.hideMenu();
 			this.settings.onselect(c);
 		},
-		
+
 		displayColor : function(c) {
 			var t = this;
 
@@ -9785,12 +9785,12 @@ tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
 
 		return h.join('');
 	},
-	
+
 	focus : function() {
 		var t = this;
 		dom.get(t.id).focus();
 	},
-	
+
 	postRender : function() {
 		var t = this, items = [];
 
@@ -9815,7 +9815,7 @@ tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
 			excludeFromTabOrder: !t.settings.tab_focus_toolbar
 		});
 	},
-	
+
 	destroy : function() {
 		var self = this;
 
@@ -9947,7 +9947,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		addComponents: function(pluginName, scripts) {
 			var pluginUrl = this.urls[pluginName];
 			tinymce.each(scripts, function(script){
-				tinymce.ScriptLoader.add(pluginUrl+"/"+script);	
+				tinymce.ScriptLoader.add(pluginUrl+"/"+script);
 			});
 		},
 
@@ -10138,7 +10138,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 						// All done
 						if (l == co)
-							execCallback(s, 'oninit');					
+							execCallback(s, 'oninit');
 					});
 				}
 			});
@@ -10495,7 +10495,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!t.getElement())
 				return;
 
-			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff 
+			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
 			// here since the browser says it has contentEditable support but there is no visible
 			// caret We will remove this check ones Apple implements full contentEditable support
 			if (tinymce.isIDevice && !tinymce.isIOS5)
@@ -10578,7 +10578,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 								var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};
 								var dep = PluginManager.createUrl(defaultSettings, dep);
 								PluginManager.load(dep.resource, dep);
-								
+
 							});
 						} else {
 							// Skip safari plugin, since it is removed as of 3.3b1
@@ -10631,7 +10631,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					}
 				}
 			}
-			
+
 			// Create all plugins
 			each(explode(s.plugins.replace(/\-/g, '')), initPlugin);
 
@@ -10770,7 +10770,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			// Create iframe
 			// TODO: ACC add the appropriate description on this.
-			n = DOM.add(o.iframeContainer, 'iframe', { 
+			n = DOM.add(o.iframeContainer, 'iframe', {
 				id : t.id + "_ifr",
 				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
 				frameBorder : '0',
@@ -10835,12 +10835,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!t.settings.allow_html_in_named_anchor) {
 				t.parser.addAttributeFilter('name', function(nodes, name) {
 					var i = nodes.length, sibling, prevSibling, parent, node;
-	
+
 					while (i--) {
 						node = nodes[i];
 						if (node.name === 'a' && node.firstChild) {
 							parent = node.parent;
-	
+
 							// Move children after current node
 							sibling = node.lastChild;
 							do {
@@ -10863,7 +10863,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					internalName = 'data-mce-' + name;
 
 					// Add internal attribute if we need to we don't on a refresh of the document
-					if (!node.attributes.map[internalName]) {	
+					if (!node.attributes.map[internalName]) {
 						if (name === "style")
 							node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));
 						else
@@ -11134,7 +11134,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					if (o.set)
 						o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
 
-					if (o.get)						
+					if (o.get)
 						o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
 				});
 			}
@@ -12009,7 +12009,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 				while (n && n.nodeType && n.nodeType != 1 && n.parentNode)
 					n = n.parentNode;
-					
+
 				// Is the cursor at the beginning of a blockquote?
 				if (n && n.parentNode && n.parentNode.tagName === 'BLOCKQUOTE' && n.parentNode.firstChild == n && offset == 0) {
 					// Remove the blockquote
@@ -12023,7 +12023,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					ed.selection.collapse(false);
 				}
 			});
- 
+
 
 
 			// Add reset handler
@@ -12749,7 +12749,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Remove existing links if there could be child links or that the href isn't specified
 				if (!anchor || !value.href) {
 					formatter.remove('link');
-				}		
+				}
 
 				// Apply new link to selection
 				if (value.href) {
@@ -13476,7 +13476,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				} else
 					e.innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there
 			};
-				
+
 			// Padd empty blocks
 			if (dom.isEmpty(bef))
 				appendStyles(bef, sn);
@@ -13918,16 +13918,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			return t.add(c);
 		},
-		
+
 		createToolbarGroup : function(id, s, cc) {
 			var c, t = this, cls;
 			id = t.prefix + id;
 			cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;
 			c = new cls(id, s, t.editor);
-			
+
 			if (t.get(id))
 				return null;
-			
+
 			return t.add(c);
 		},
 
@@ -13940,7 +13940,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		setControlType : function(n, c) {
 			return this._cls[n.toLowerCase()] = c;
 		},
-	
+
 		destroy : function() {
 			each(this.controls, function(c) {
 				c.destroy();
@@ -14241,10 +14241,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 				return rng;
 			}
-			
+
 			function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){
 				var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;
-				
+
 				// find the index of the first child list.
 				each(node.childNodes, function(n, index) {
 					if (n.nodeName === "UL" || n.nodeName === "OL") {
@@ -14253,7 +14253,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						return false;
 					}
 				});
-				
+
 				// get the index of the bookmarks
 				each(node.childNodes, function(n, index) {
 					if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {
@@ -14264,29 +14264,29 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}
 					}
 				});
-				
+
 				// if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally
 				if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {
 					each(tinymce.grep(node.childNodes), process);
 					return 0;
 				} else {
 					currentWrapElm = wrapElm.cloneNode(FALSE);
-					
+
 					// create a list of the nodes on the same side of the list as the selection
 					each(tinymce.grep(node.childNodes), function(n, index) {
 						if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {
-							nodes.push(n); 
+							nodes.push(n);
 							n.parentNode.removeChild(n);
 						}
 					});
-					
+
 					// insert the wrapping element either before or after the list.
 					if (startIndex < listIndex) {
 						node.insertBefore(currentWrapElm, list);
 					} else if (startIndex > listIndex) {
 						node.insertBefore(currentWrapElm, list.nextSibling);
 					}
-					
+
 					// add the new nodes to the list.
 					newWrappers.push(currentWrapElm);
 
@@ -14297,7 +14297,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					return currentWrapElm;
 				}
 			};
-			
+
 			function applyRngStyle(rng, bookmark, node_specific) {
 				var newWrappers = [], wrapName, wrapElm;
 
@@ -15626,7 +15626,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 				return true;
 			};
-			
+
 			// Returns any parent caret container element
 			function getParentCaretContainer(node) {
 				while (node) {
@@ -15684,7 +15684,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					selection.setRng(rng);
 				}
 			};
-			
+
 			// Applies formatting to the caret postion
 			function applyCaretFormat() {
 				var rng, caretContainer, textNode, offset, bookmark, container, text;