From 04d1503407c9b7727f5dfb4f01b581e29869489d Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <h.mackowiak@b3-it.de>
Date: Thu, 17 Apr 2025 13:47:58 +0200
Subject: [PATCH] Fix #1216 and the fallback theme
---
.phpstan.dist.baseline.neon | 244 +++++++++++++++---
.phpstan.dist.neon | 54 ++--
.../core/Mage/Adminhtml/Controller/Action.php | 8 +-
app/code/core/Mage/Adminhtml/etc/config.xml | 2 +-
.../core/Mage/Core/Model/Design/Fallback.php | 13 +
.../core/Mage/Core/Model/Layout/Update.php | 40 +++
.../adminhtml/base/default/etc/theme.xml | 12 +
.../default/layout/admin.xml | 0
.../default/layout/adminnotification.xml | 0
.../{default => base}/default/layout/api2.xml | 0
.../default/layout/authorizenet.xml | 0
.../default/layout/bundle.xml | 0
.../default/layout/captcha.xml | 0
.../default/layout/catalog.xml | 0
.../default/layout/centinel.xml | 0
.../{default => base}/default/layout/cms.xml | 0
.../default/layout/currencysymbol.xml | 0
.../default/layout/customer.xml | 0
.../default/layout/dataflow.xml | 0
.../default/layout/downloadable.xml | 0
.../default/layout/giftmessage.xml | 0
.../default/layout/importexport.xml | 0
.../default/layout/index.xml | 0
.../{default => base}/default/layout/main.xml | 0
.../default/layout/newsletter.xml | 0
.../default/layout/oauth.xml | 0
.../default/layout/promo.xml | 0
.../default/layout/report.xml | 0
.../{default => base}/default/layout/rss.xml | 0
.../default/layout/sales.xml | 0
.../default/layout/search.xml | 0
.../{default => base}/default/layout/tag.xml | 0
.../{default => base}/default/layout/tax.xml | 0
.../default/layout/widget.xml | 0
.../default/locale/en_US/translate.csv | 0
.../default/template/access_denied.phtml | 0
.../template/api/role_users_grid_js.phtml | 0
.../default/template/api/roleinfo.phtml | 0
.../default/template/api/roles.phtml | 0
.../default/template/api/rolesedit.phtml | 0
.../default/template/api/rolesusers.phtml | 0
.../template/api/user_roles_grid_js.phtml | 0
.../default/template/api/userinfo.phtml | 0
.../default/template/api/usernroles.phtml | 0
.../default/template/api/userroles.phtml | 0
.../default/template/api/users.phtml | 0
.../template/api2/attribute/buttons.phtml | 0
.../template/api2/attribute/resource.phtml | 0
.../permissions/user/edit/tab/roles/js.phtml | 0
.../default/template/api2/role/buttons.phtml | 0
.../template/api2/role/users_grid_js.phtml | 0
.../authorizenet/directpost/iframe.phtml | 0
.../authorizenet/directpost/info.phtml | 0
.../composite/fieldset/options/bundle.phtml | 0
.../fieldset/options/type/checkbox.phtml | 0
.../fieldset/options/type/multi.phtml | 0
.../fieldset/options/type/radio.phtml | 0
.../fieldset/options/type/select.phtml | 0
.../template/bundle/product/edit/bundle.phtml | 0
.../bundle/product/edit/bundle/option.phtml | 0
.../product/edit/bundle/option/search.phtml | 0
.../edit/bundle/option/selection.phtml | 0
.../creditmemo/create/items/renderer.phtml | 0
.../creditmemo/view/items/renderer.phtml | 0
.../sales/invoice/create/items/renderer.phtml | 0
.../sales/invoice/view/items/renderer.phtml | 0
.../sales/order/view/items/renderer.phtml | 0
.../shipment/create/items/renderer.phtml | 0
.../sales/shipment/view/items/renderer.phtml | 0
.../default/template/captcha/zend.phtml | 0
.../catalog/category/checkboxes/tree.phtml | 0
.../template/catalog/category/edit.phtml | 0
.../template/catalog/category/edit/form.phtml | 0
.../template/catalog/category/tree.phtml | 0
.../catalog/category/widget/tree.phtml | 0
.../form/renderer/fieldset/element.phtml | 0
.../default/template/catalog/product.phtml | 0
.../catalog/product/attribute/js.phtml | 0
.../product/attribute/new/created.phtml | 0
.../catalog/product/attribute/options.phtml | 0
.../catalog/product/attribute/set/main.phtml | 0
.../attribute/set/main/tree/attribute.phtml | 0
.../attribute/set/main/tree/group.phtml | 0
.../product/attribute/set/toolbar/add.phtml | 0
.../product/attribute/set/toolbar/main.phtml | 0
.../catalog/product/composite/configure.phtml | 0
.../composite/fieldset/configurable.phtml | 0
.../product/composite/fieldset/grouped.phtml | 0
.../product/composite/fieldset/options.phtml | 0
.../composite/fieldset/options/js.phtml | 0
.../fieldset/options/type/date.phtml | 0
.../fieldset/options/type/default.phtml | 0
.../fieldset/options/type/file.phtml | 0
.../fieldset/options/type/select.phtml | 0
.../fieldset/options/type/text.phtml | 0
.../product/composite/fieldset/qty.phtml | 0
.../template/catalog/product/created.phtml | 0
.../template/catalog/product/edit.phtml | 0
.../product/edit/action/attribute.phtml | 0
.../product/edit/action/inventory.phtml | 0
.../product/edit/action/websites.phtml | 0
.../catalog/product/edit/categories.phtml | 0
.../catalog/product/edit/options.phtml | 0
.../catalog/product/edit/options/option.phtml | 0
.../product/edit/options/type/date.phtml | 0
.../product/edit/options/type/file.phtml | 0
.../product/edit/options/type/select.phtml | 0
.../product/edit/options/type/text.phtml | 0
.../catalog/product/edit/price/group.phtml | 0
.../catalog/product/edit/price/tier.phtml | 0
.../catalog/product/edit/serializer.phtml | 0
.../catalog/product/edit/super/config.phtml | 0
.../catalog/product/edit/websites.phtml | 0
.../catalog/product/helper/gallery.phtml | 0
.../default/template/catalog/product/js.phtml | 0
.../template/catalog/product/price.phtml | 0
.../template/catalog/product/tab/alert.phtml | 0
.../catalog/product/tab/inventory.phtml | 0
.../product/widget/chooser/container.phtml | 0
.../default/template/catalog/wysiwyg/js.phtml | 0
.../centinel/authentication/complete.phtml | 0
.../centinel/authentication/start.phtml | 0
.../template/centinel/validation/form.phtml | 0
.../template/cms/browser/content.phtml | 0
.../template/cms/browser/content/files.phtml | 0
.../cms/browser/content/newfolder.phtml | 0
.../cms/browser/content/uploader.phtml | 0
.../default/template/cms/browser/js.phtml | 0
.../default/template/cms/browser/tree.phtml | 0
.../cms/page/edit/form/renderer/content.phtml | 0
.../default/template/coming.phtml | 0
.../template/currencysymbol/grid.phtml | 0
.../default/template/customer/edit/js.phtml | 0
.../tab/account/form/renderer/group.phtml | 0
.../customer/edit/tab/view/grid/item.phtml | 0
.../default/template/customer/online.phtml | 0
.../create/address/form/renderer/vat.phtml | 0
.../customer/system/config/validatevat.phtml | 0
.../template/customer/tab/addresses.phtml | 0
.../default/template/customer/tab/cart.phtml | 0
.../template/customer/tab/newsletter.phtml | 0
.../default/template/customer/tab/view.phtml | 0
.../template/customer/tab/view/sales.phtml | 0
.../template/customer/tab/wishlist.phtml | 0
.../default/template/dashboard/graph.phtml | 0
.../template/dashboard/graph/disabled.phtml | 0
.../default/template/dashboard/grid.phtml | 0
.../default/template/dashboard/index.phtml | 0
.../default/template/dashboard/salebar.phtml | 0
.../default/template/dashboard/searches.phtml | 0
.../template/dashboard/store/switcher.phtml | 0
.../default/template/dashboard/totalbar.phtml | 0
.../directory/js/optional_zip_countries.phtml | 0
.../composite/fieldset/downloadable.phtml | 0
.../product/edit/downloadable.phtml | 0
.../product/edit/downloadable/links.phtml | 0
.../product/edit/downloadable/samples.phtml | 0
.../column/downloadable/creditmemo/name.phtml | 0
.../column/downloadable/invoice/name.phtml | 0
.../items/column/downloadable/name.phtml | 0
.../create/items/renderer/downloadable.phtml | 0
.../view/items/renderer/downloadable.phtml | 0
.../create/items/renderer/downloadable.phtml | 0
.../view/items/renderer/downloadable.phtml | 0
.../view/items/renderer/downloadable.phtml | 0
.../template/eav/attribute/edit/js.phtml | 0
.../template/eav/attribute/options.phtml | 0
.../default/template/email/order/items.phtml | 0
.../default/template/empty.phtml | 0
.../default/template/forgotpassword.phtml | 0
.../default/template/formkey.phtml | 0
.../default/template/giftmessage/form.phtml | 0
.../giftmessage/giftoptionsform.phtml | 0
.../default/template/giftmessage/helper.phtml | 0
.../default/template/giftmessage/popup.phtml | 0
.../sales/order/create/giftoptions.phtml | 0
.../sales/order/create/items.phtml | 0
.../sales/order/view/giftoptions.phtml | 0
.../giftmessage/sales/order/view/items.phtml | 0
.../default/template/importexport/busy.phtml | 0
.../importexport/export/form/after.phtml | 0
.../importexport/export/form/before.phtml | 0
.../importexport/import/form/after.phtml | 0
.../importexport/import/form/before.phtml | 0
.../importexport/import/frame/result.phtml | 0
.../template/index/notifications.phtml | 0
.../default/template/login.phtml | 0
.../default/template/media/uploader.phtml | 0
.../newsletter/preview/iframeswitcher.phtml | 0
.../template/newsletter/preview/store.phtml | 0
.../template/newsletter/problem/list.phtml | 0
.../template/newsletter/queue/edit.phtml | 0
.../template/newsletter/queue/list.phtml | 0
.../template/newsletter/queue/preview.phtml | 0
.../template/newsletter/subscriber/list.phtml | 0
.../template/newsletter/template/edit.phtml | 0
.../template/newsletter/template/list.phtml | 0
.../newsletter/template/preview.phtml | 0
.../template/notification/baseurl.phtml | 0
.../default/template/notification/curl.phtml | 0
.../template/notification/formkey.phtml | 0
.../template/notification/security.phtml | 0
.../template/notification/toolbar.phtml | 0
.../template/notification/window.phtml | 0
.../oauth/authorize/button-simple.phtml | 0
.../template/oauth/authorize/button.phtml | 0
.../oauth/authorize/confirm-simple.phtml | 0
.../template/oauth/authorize/confirm.phtml | 0
.../oauth/authorize/form/login-simple.phtml | 0
.../template/oauth/authorize/form/login.phtml | 0
.../oauth/authorize/head-simple.phtml | 0
.../oauth/authorize/reject-simple.phtml | 0
.../template/oauth/authorize/reject.phtml | 0
.../default/template/overlay_popup.phtml | 0
.../default/template/page.phtml | 0
.../default/template/page/footer.phtml | 0
.../default/template/page/head.phtml | 0
.../default/template/page/header.phtml | 0
.../default/template/page/js/calendar.phtml | 0
.../default/template/page/js/translate.phtml | 0
.../default/template/page/menu.phtml | 0
.../default/template/page/notices.phtml | 0
.../default/template/paygate/form/cc.phtml | 0
.../default/template/paygate/info/cc.phtml | 0
.../default/template/paygate/info/pdf.phtml | 0
.../template/payment/form/banktransfer.phtml | 0
.../payment/form/cashondelivery.phtml | 0
.../default/template/payment/form/cc.phtml | 0
.../template/payment/form/ccsave.phtml | 0
.../template/payment/form/checkmo.phtml | 0
.../template/payment/form/purchaseorder.phtml | 0
.../template/payment/info/banktransfer.phtml | 0
.../template/payment/info/checkmo.phtml | 0
.../template/payment/info/default.phtml | 0
.../template/payment/info/pdf/checkmo.phtml | 0
.../template/payment/info/pdf/default.phtml | 0
.../payment/info/pdf/purchaseorder.phtml | 0
.../template/payment/info/purchaseorder.phtml | 0
.../paypal/system/config/api_wizard.phtml | 0
.../paypal/system/config/bml_api_wizard.phtml | 0
.../system/config/fieldset/global.phtml | 0
.../paypal/system/config/fieldset/hint.phtml | 0
.../paypal/system/config/fieldset/store.phtml | 0
.../system/config/payflowlink/advanced.phtml | 0
.../system/config/payflowlink/info.phtml | 0
.../permissions/role_users_grid_js.phtml | 0
.../template/permissions/roleinfo.phtml | 0
.../default/template/permissions/roles.phtml | 0
.../template/permissions/rolesedit.phtml | 0
.../template/permissions/rolesusers.phtml | 0
.../permissions/user_roles_grid_js.phtml | 0
.../template/permissions/userinfo.phtml | 0
.../template/permissions/usernroles.phtml | 0
.../template/permissions/userroles.phtml | 0
.../default/template/permissions/users.phtml | 0
.../default/template/popup.phtml | 0
.../default/template/promo/fieldset.phtml | 0
.../default/template/promo/form.phtml | 0
.../default/template/promo/js.phtml | 0
.../default/template/promo/salesrulejs.phtml | 0
.../default/template/rating/detailed.phtml | 0
.../default/template/rating/options.phtml | 0
.../template/rating/stars/detailed.phtml | 0
.../template/rating/stars/summary.phtml | 0
.../default/template/report/grid.phtml | 0
.../template/report/grid/container.phtml | 0
.../template/report/refresh/statistics.phtml | 0
.../template/report/store/switcher.phtml | 0
.../report/store/switcher/enhanced.phtml | 0
.../default/template/report/wishlist.phtml | 0
.../template/resetforgottenpassword.phtml | 0
.../default/template/review/add.phtml | 0
.../sales/billing/agreement/form.phtml | 0
.../sales/billing/agreement/view/form.phtml | 0
.../billing/agreement/view/tab/info.phtml | 0
.../template/sales/items/column/name.phtml | 0
.../template/sales/items/column/qty.phtml | 0
.../sales/items/renderer/default.phtml | 0
.../template/sales/order/address/form.phtml | 0
.../template/sales/order/comments/view.phtml | 0
.../sales/order/create/abstract.phtml | 0
.../order/create/billing/method/form.phtml | 0
.../template/sales/order/create/comment.phtml | 0
.../sales/order/create/coupons/form.phtml | 0
.../template/sales/order/create/data.phtml | 0
.../template/sales/order/create/form.phtml | 0
.../sales/order/create/form/account.phtml | 0
.../sales/order/create/form/address.phtml | 0
.../sales/order/create/giftmessage.phtml | 0
.../template/sales/order/create/items.phtml | 0
.../sales/order/create/items/grid.phtml | 0
.../template/sales/order/create/js.phtml | 0
.../sales/order/create/newsletter/form.phtml | 0
.../order/create/shipping/method/form.phtml | 0
.../template/sales/order/create/sidebar.phtml | 0
.../sales/order/create/sidebar/items.phtml | 0
.../sales/order/create/store/select.phtml | 0
.../template/sales/order/create/totals.phtml | 0
.../sales/order/create/totals/default.phtml | 0
.../order/create/totals/grandtotal.phtml | 0
.../sales/order/create/totals/shipping.phtml | 0
.../sales/order/create/totals/subtotal.phtml | 0
.../sales/order/create/totals/tax.phtml | 0
.../sales/order/creditmemo/create/form.phtml | 0
.../sales/order/creditmemo/create/items.phtml | 0
.../create/items/renderer/configurable.phtml | 0
.../create/items/renderer/default.phtml | 0
.../create/totals/adjustments.phtml | 0
.../sales/order/creditmemo/view/form.phtml | 0
.../sales/order/creditmemo/view/items.phtml | 0
.../view/items/renderer/configurable.phtml | 0
.../view/items/renderer/default.phtml | 0
.../template/sales/order/giftoptions.phtml | 0
.../sales/order/invoice/create/form.phtml | 0
.../sales/order/invoice/create/items.phtml | 0
.../create/items/renderer/configurable.phtml | 0
.../create/items/renderer/default.phtml | 0
.../sales/order/invoice/create/tracking.phtml | 0
.../sales/order/invoice/view/form.phtml | 0
.../sales/order/invoice/view/items.phtml | 0
.../view/items/renderer/configurable.phtml | 0
.../invoice/view/items/renderer/default.phtml | 0
.../sales/order/shipment/create/form.phtml | 0
.../sales/order/shipment/create/items.phtml | 0
.../create/items/renderer/configurable.phtml | 0
.../create/items/renderer/default.phtml | 0
.../order/shipment/create/tracking.phtml | 0
.../sales/order/shipment/packaging/grid.phtml | 0
.../order/shipment/packaging/packed.phtml | 0
.../order/shipment/packaging/popup.phtml | 0
.../sales/order/shipment/tracking/info.phtml | 0
.../sales/order/shipment/view/form.phtml | 0
.../sales/order/shipment/view/items.phtml | 0
.../view/items/renderer/configurable.phtml | 0
.../view/items/renderer/default.phtml | 0
.../sales/order/shipment/view/tracking.phtml | 0
.../template/sales/order/totalbar.phtml | 0
.../default/template/sales/order/totals.phtml | 0
.../sales/order/totals/discount.phtml | 0
.../template/sales/order/totals/due.phtml | 0
.../template/sales/order/totals/footer.phtml | 0
.../template/sales/order/totals/grand.phtml | 0
.../template/sales/order/totals/item.phtml | 0
.../template/sales/order/totals/main.phtml | 0
.../template/sales/order/totals/paid.phtml | 0
.../sales/order/totals/refunded.phtml | 0
.../sales/order/totals/shipping.phtml | 0
.../sales/order/totals/subtotal.phtml | 0
.../template/sales/order/totals/tax.phtml | 0
.../template/sales/order/view/form.phtml | 0
.../sales/order/view/giftmessage.phtml | 0
.../template/sales/order/view/history.phtml | 0
.../template/sales/order/view/info.phtml | 0
.../template/sales/order/view/items.phtml | 0
.../order/view/items/renderer/default.phtml | 0
.../sales/order/view/tab/history.phtml | 0
.../template/sales/order/view/tab/info.phtml | 0
.../template/sales/order/view/tracking.phtml | 0
.../payment/form/billing/agreement.phtml | 0
.../sales/recurring/profile/view.phtml | 0
.../sales/recurring/profile/view/info.phtml | 0
.../template/sales/transactions/detail.phtml | 0
.../default/template/store/switcher.phtml | 0
.../template/store/switcher/enhanced.phtml | 0
.../switcher/form/renderer/fieldset.phtml | 0
.../form/renderer/fieldset/element.phtml | 0
.../template/system/autocomplete.phtml | 0
.../template/system/cache/additional.phtml | 0
.../default/template/system/cache/edit.phtml | 0
.../template/system/cache/notifications.phtml | 0
.../default/template/system/config/edit.phtml | 0
.../system/config/form/field/array.phtml | 0
.../default/template/system/config/js.phtml | 0
.../template/system/config/switcher.phtml | 0
.../system/storage/media/synchronize.phtml | 0
.../default/template/system/config/tabs.phtml | 0
.../system/convert/profile/process.phtml | 0
.../template/system/convert/profile/run.phtml | 0
.../system/convert/profile/upload.phtml | 0
.../system/convert/profile/wizard.phtml | 0
.../system/currency/rate/matrix.phtml | 0
.../system/currency/rate/services.phtml | 0
.../template/system/currency/rates.phtml | 0
.../default/template/system/design/edit.phtml | 0
.../template/system/design/index.phtml | 0
.../template/system/email/template/edit.phtml | 0
.../template/system/email/template/list.phtml | 0
.../system/email/template/preview.phtml | 0
.../default/template/system/info.phtml | 0
.../system/shipping/applicable_country.phtml | 0
.../template/system/shipping/ups.phtml | 0
.../default/template/system/store/cell.phtml | 0
.../template/system/store/container.phtml | 0
.../default/template/system/store/tree.phtml | 0
.../default/template/system/variable/js.phtml | 0
.../default/template/tag/edit/container.phtml | 0
.../default/template/tag/index.phtml | 0
.../template/tax/class/page/edit.phtml | 0
.../default/template/tax/importExport.phtml | 0
.../default/template/tax/notifications.phtml | 0
.../default/template/tax/rate/form.phtml | 0
.../default/template/tax/rate/title.phtml | 0
.../template/tax/toolbar/class/add.phtml | 0
.../template/tax/toolbar/class/save.phtml | 0
.../template/tax/toolbar/rate/add.phtml | 0
.../template/tax/toolbar/rate/save.phtml | 0
.../template/tax/toolbar/rule/add.phtml | 0
.../template/tax/toolbar/rule/save.phtml | 0
.../template/urlrewrite/categories.phtml | 0
.../default/template/urlrewrite/edit.phtml | 0
.../template/urlrewrite/selector.phtml | 0
.../template/usa/dhl/unitofmeasure.phtml | 0
.../default/template/weee/renderer/tax.phtml | 0
.../default/template/widget/accordion.phtml | 0
.../default/template/widget/breadcrumbs.phtml | 0
.../default/template/widget/form.phtml | 0
.../template/widget/form/container.phtml | 0
.../template/widget/form/element.phtml | 0
.../widget/form/element/gallery.phtml | 0
.../widget/form/renderer/element.phtml | 0
.../widget/form/renderer/fieldset.phtml | 0
.../form/renderer/fieldset/element.phtml | 0
.../default/template/widget/grid.phtml | 0
.../template/widget/grid/container.phtml | 0
.../template/widget/grid/massaction.phtml | 0
.../template/widget/grid/serializer.phtml | 0
.../widget/instance/edit/layout.phtml | 0
.../default/template/widget/instance/js.phtml | 0
.../default/template/widget/tabs.phtml | 0
.../default/template/widget/tabshoriz.phtml | 0
.../default/template/widget/tabsleft.phtml | 0
.../template/widget/view/container.phtml | 0
.../adminhtml/default/default/etc/theme.xml | 17 +-
.../adminhtml/openmage/default/etc/theme.xml | 26 ++
.../default/layout/openmage.xml} | 0
.../template/eav/attribute/options.phtml | 0
.../default}/template/forgotpassword.phtml | 0
.../default}/template/login.phtml | 0
.../default}/template/page/header.phtml | 0
.../template/resetforgottenpassword.phtml | 0
.../{default => base}/default/boxes.css | 0
.../{default => base}/default/custom.css | 0
.../{default => base}/default/favicon.ico | Bin
.../default/images/accordion_close.gif | Bin
.../default/images/accordion_close.png | Bin
.../default/images/accordion_open.gif | Bin
.../default/images/accordion_open.png | Bin
.../default/images/add_btn_icon-disabled.gif | Bin
.../default/images/add_btn_icon.gif | Bin
.../default/images/address_list_li.gif | Bin
.../default/images/address_list_on_arrow.gif | Bin
.../images/address_list_over_arrow.gif | Bin
.../default/images/address_list_over_bg.gif | Bin
.../default/images/ajax-loader-tr.gif | Bin
.../default/images/ajax-loader.gif | Bin
.../default/images/application_view_tile.gif | Bin
.../default/images/arrow_sort_move.gif | Bin
.../default/images/bg_collapse.gif | Bin
.../default/images/bg_create_order_totals.gif | Bin
.../default/images/bg_notifications.gif | Bin
.../default/images/bg_window_mask.png | Bin
.../default/images/bkg_btn-close.gif | Bin
.../default/images/bkg_btn-close2.gif | Bin
.../default/images/bkg_config-advanced.png | Bin
.../default/images/bkg_config-nested.png | Bin
.../default/images/bkg_config-shaddow.png | Bin
.../default/images/bkg_tooltip.png | Bin
.../default/images/blank.gif | Bin
.../default/images/box_bg.gif | Bin
.../default/images/breadcrumb_bg.gif | Bin
.../default/images/btn_add-image_icon.gif | Bin
.../default/images/btn_add-variable_icon.gif | Bin
.../default/images/btn_add-widget_icon.gif | Bin
.../default/images/btn_add-widget_icon2.gif | Bin
.../default/images/btn_back_bg.gif | Bin
.../default/images/btn_bare_bg.gif | Bin
.../default/images/btn_bg-disabled.gif | Bin
.../default/images/btn_bg.gif | Bin
.../default/images/btn_bg.png | Bin
.../default/images/btn_cancel_bg.gif | Bin
.../default/images/btn_delete_bg.gif | Bin
.../default/images/btn_go.gif | Bin
.../default/images/btn_gr_bg.gif | Bin
.../default/images/btn_gr_on.gif | Bin
.../default/images/btn_gr_over.gif | Bin
.../default/images/btn_loading-icon.gif | Bin
.../default/images/btn_login.gif | Bin
.../default/images/btn_on_bg.gif | Bin
.../default/images/btn_over_bg.gif | Bin
.../default/images/btn_show-hide_icon.gif | Bin
.../default/images/btn_task_bg.gif | Bin
.../default/images/button-close.png | Bin
.../default/images/cancel_btn_active_bg.gif | Bin
.../default/images/cancel_btn_bg.gif | Bin
.../default/images/cancel_btn_icon.gif | Bin
.../default/images/cancel_btn_over_bg.gif | Bin
.../default/images/cancel_icon.gif | Bin
.../default/images/config_tab_dt_bg.gif | Bin
.../default/images/dashboard-close.gif | Bin
.../default/images/db-graph-bg.gif | Bin
.../default/images/db-graph-bottom-bg.gif | Bin
.../default/images/db-graph-line-bg.gif | Bin
.../default/images/db-graph-line2-bg.gif | Bin
.../default/images/db-graph-x-bg.png | Bin
.../default/images/db-header-bg.png | Bin
.../default/images/db-menu-bg-hov.gif | Bin
.../default/images/db-menu-bg-up.gif | Bin
.../default/images/db-menu-bg.gif | Bin
.../default/images/db-menu-sep-last.gif | Bin
.../default/images/db-menu-sep.gif | Bin
.../default/images/db-menu-start.gif | Bin
.../default/images/db-scroll-bg.gif | Bin
.../default/images/db-scroll-but-bot-roll.png | Bin
.../default/images/db-scroll-but-bot.png | Bin
.../default/images/db-scroll-but-top-roll.png | Bin
.../default/images/db-scroll-but-top.png | Bin
.../default/images/db-scroll-roller.png | Bin
.../default/images/db-tab-bottom-left-bg.gif | Bin
.../default/images/db-tab-bottom-mid-bg.gif | Bin
.../default/images/db-tab-bottom-right-bg.gif | Bin
.../default/images/db-tab-footer.gif | Bin
.../default/images/db-tab-header-sep.gif | Bin
.../default/images/db-tab-header.gif | Bin
.../default/images/db-tab-left.gif | Bin
.../default/images/db-tab-right.gif | Bin
.../default/images/dotted_divider_dark.gif | Bin
.../default/images/dotted_divider_light.gif | Bin
.../default/images/edit_icon.gif | Bin
.../images/entry_edit_head_arrow_down.gif | Bin
.../images/entry_edit_head_arrow_down2.gif | Bin
.../images/entry_edit_head_arrow_up.gif | Bin
.../default/images/entry_edit_head_bg.gif | Bin
.../default/images/error-msg.png | Bin
.../default/images/error_msg_icon.gif | Bin
.../default/images/fam_account.gif | Bin
.../images/fam_application_form_delete.png | Bin
.../images/fam_application_view_tile.gif | Bin
.../default/images/fam_asterisk_orange.gif | Bin
.../default/images/fam_bin.gif | Bin
.../default/images/fam_book_open.png | Bin
.../default/images/fam_bullet_disk.gif | Bin
.../default/images/fam_bullet_error.gif | Bin
.../default/images/fam_bullet_success.gif | Bin
.../default/images/fam_calendar.gif | Bin
.../default/images/fam_cart.gif | Bin
.../default/images/fam_comment.gif | Bin
.../default/images/fam_creditcards.gif | Bin
.../default/images/fam_folder_database.gif | Bin
.../default/images/fam_folder_palette.gif | Bin
.../default/images/fam_folder_table.gif | Bin
.../default/images/fam_group.gif | Bin
.../default/images/fam_help.gif | Bin
.../default/images/fam_house.gif | Bin
.../default/images/fam_layout.gif | Bin
.../default/images/fam_leaf.png | Bin
.../default/images/fam_link.gif | Bin
.../default/images/fam_lorry.gif | Bin
.../default/images/fam_magnifier.png | Bin
.../default/images/fam_money.gif | Bin
.../default/images/fam_money_add.gif | Bin
.../default/images/fam_monitor.gif | Bin
.../default/images/fam_newspaper.gif | Bin
.../default/images/fam_newspaper_delete.gif | Bin
.../default/images/fam_newspaper_error.gif | Bin
.../default/images/fam_newspaper_go.gif | Bin
.../default/images/fam_package.gif | Bin
.../default/images/fam_package_go.gif | Bin
.../default/images/fam_page_white.gif | Bin
.../default/images/fam_page_white_edit.gif | Bin
.../default/images/fam_rainbow.gif | Bin
.../default/images/fam_refresh.gif | Bin
.../default/images/fam_server_database.gif | Bin
.../default/images/fam_status_online.gif | Bin
.../default/images/fam_tag_orange.gif | Bin
.../default/images/fam_user.gif | Bin
.../default/images/fam_user_comment.gif | Bin
.../default/images/fam_user_edit.gif | Bin
.../default/images/filter_row_bg.gif | Bin
.../default/images/footer_bg.gif | Bin
.../default/images/gift-message-collapse.gif | Bin
.../default/images/gift-message-expand.gif | Bin
.../images/gift-message-grid-column-bg.gif | Bin
.../default/images/grid-cal.gif | Bin
.../default/images/grid_sort_asc.gif | Bin
.../default/images/grid_sort_desc.gif | Bin
.../default/images/grid_th_bg.gif | Bin
.../default/images/grid_th_onclick_bg.gif | Bin
.../default/images/grouped_to_order_icon.png | Bin
.../default/images/header_bg.gif | Bin
.../default/images/header_top_bg.gif | Bin
.../default/images/horiz_tabs_ul_bg.gif | Bin
.../default/images/i_notice.gif | Bin
.../default/images/i_question-mark.png | Bin
.../default/images/ico_success.gif | Bin
.../default/images/icon-enabled.png | Bin
.../default/images/icon-tooltip.png | Bin
.../default/images/icon_btn_add.gif | Bin
.../default/images/icon_btn_back.gif | Bin
.../default/images/icon_btn_delete.gif | Bin
.../default/images/icon_btn_save.gif | Bin
.../default/images/icon_edit_address.gif | Bin
.../default/images/icon_export.gif | Bin
.../default/images/icon_export.png | Bin
.../default/images/icon_feed.gif | Bin
.../default/images/icon_feed.png | Bin
.../default/images/icon_note_list.gif | Bin
.../default/images/icon_remove_address.gif | Bin
.../default/images/login_box_bg.gif | Bin
.../default/images/login_box_bg.jpg | Bin
.../default/images/login_box_bg_auth.jpg | Bin
.../default/images/login_box_bottom.jpg | Bin
.../default/images/login_box_legal_bg.gif | Bin
.../default/images/logo-large.gif | Bin
.../{default => base}/default/images/logo.svg | 0
.../default/images/logo_email.gif | Bin
.../default/images/logo_gray.svg | 0
.../default/images/logo_print.gif | Bin
.../default/images/massaction_bg.gif | Bin
.../default/images/massaction_button_bg.gif | Bin
.../images/massaction_links_delimiter.gif | Bin
.../default/images/middle_bg.gif | Bin
.../default/images/more_arrow.gif | Bin
.../default/images/nav1_active.gif | Bin
.../default/images/nav1_bg.gif | Bin
.../default/images/nav1_off.gif | Bin
.../default/images/nav1_on.gif | Bin
.../default/images/nav1_over.gif | Bin
.../default/images/nav1_sep.gif | Bin
.../default/images/nav2_last_li_bg.png | Bin
.../default/images/nav2_last_li_over_bg.png | Bin
.../default/images/nav2_li_bg.gif | Bin
.../default/images/nav2_li_bg.png | Bin
.../default/images/nav2_li_over_bg.png | Bin
.../default/images/nav2_link_bg.gif | Bin
.../default/images/nav2_parent_arrow.gif | Bin
.../default/images/nav3_bg.png | Bin
.../default/images/nav_bg.gif | Bin
.../default/images/nav_list_bg.gif | Bin
.../default/images/nav_nest_link_bg.gif | Bin
.../default/images/nav_nest_link_over_bg.gif | Bin
.../default/images/nav_on_bg.gif | Bin
.../default/images/nav_parent_arrow.gif | Bin
.../default/images/note_bg.gif | Bin
.../default/images/note_cell_bg.gif | Bin
.../default/images/note_msg_icon.gif | Bin
.../default/images/notice-msg.png | Bin
.../default/images/pager_arrow_left.gif | Bin
.../default/images/pager_arrow_left_off.gif | Bin
.../default/images/pager_arrow_right.gif | Bin
.../default/images/pager_arrow_right_off.gif | Bin
.../default/images/paypal/logo-paypal.png | Bin
.../default/images/paypal/pp-allinone.png | Bin
.../default/images/paypal/pp-alt.png | Bin
.../default/images/paypal/pp-gateways.png | Bin
.../default/images/paypal/pp-uk.png | Bin
.../default/images/paypal_logo.gif | Bin
.../default/images/paypal_section.png | Bin
.../default/images/paypal_tick.gif | Bin
.../default/images/placeholder/thumbnail.jpg | Bin
.../default/images/process_spinner.gif | Bin
.../images/product_rating_blank_star.gif | Bin
.../images/product_rating_full_star.gif | Bin
.../default/images/reload.png | Bin
.../default/images/rule-ajax-loader.gif | Bin
.../default/images/rule_chooser_trigger.gif | Bin
.../default/images/rule_component_add.gif | Bin
.../default/images/rule_component_apply.gif | Bin
.../default/images/rule_component_remove.gif | Bin
.../default/images/save_btn_icon.gif | Bin
.../default/images/sec_nav_bg.gif | Bin
.../default/images/section_menu_bg.gif | Bin
.../default/images/section_menu_bottom.gif | Bin
.../default/images/section_menu_link_bg.gif | Bin
.../images/section_menu_link_over_bg.gif | Bin
.../images/section_menu_over_span_bg.gif | Bin
.../default/images/section_menu_span_bg.gif | Bin
.../default/images/section_menu_ul_bg.gif | Bin
.../default/images/side_col_bg.gif | Bin
.../default/images/simple_container_bg.gif | Bin
.../default/images/sort-arrow-down.gif | Bin
.../default/images/sort-arrow-down.png | Bin
.../default/images/sort-arrow-up.gif | Bin
.../default/images/sort-arrow-up.png | Bin
.../default/images/sort_heading_bg.gif | Bin
.../default/images/sort_on_bg.gif | Bin
.../default/images/sort_row_bg.gif | Bin
.../default/images/spacer.gif | Bin
.../default/images/sub_button_bg.gif | Bin
.../default/images/success-msg.png | Bin
.../default/images/success_msg_icon.gif | Bin
.../default/images/tabs_link_bg.gif | Bin
.../default/images/tabs_link_over_bg.gif | Bin
.../default/images/tabs_span_bg.gif | Bin
.../default/images/tag_blue_edit.gif | Bin
.../default/images/tn_cancel_bg.gif | Bin
.../default/images/tooltip_bg.gif | Bin
.../default/images/tooltip_corner.gif | Bin
.../default/images/tooltip_top.gif | Bin
.../default/images/tree_icons/join.gif | Bin
.../default/images/tree_icons/joinbottom.gif | Bin
.../default/images/tree_icons/line.gif | Bin
.../default/images/tree_icons/minus.gif | Bin
.../default/images/tree_icons/minusbottom.gif | Bin
.../images/tree_icons/nolines_minus.gif | Bin
.../images/tree_icons/nolines_plus.gif | Bin
.../default/images/validation_advice_bg.gif | Bin
.../default/images/varien_logo.gif | Bin
.../default/images/warning_msg_icon.gif | Bin
.../widget/catalog__category_widget_link.gif | Bin
.../widget/catalog__product_widget_link.gif | Bin
.../widget/catalog__product_widget_new.gif | Bin
.../images/widget/cms__widget_block.gif | Bin
.../images/widget/cms__widget_page_link.gif | Bin
.../default/images/widget/default.gif | Bin
.../reports__product_widget_compared.gif | Bin
.../widget/reports__product_widget_viewed.gif | Bin
.../default/images/widget_placeholder.gif | Bin
.../default/images/window_close.png | Bin
.../default/images/window_content.png | Bin
.../default/images/window_top.png | Bin
.../default/images/wysiwyg/skin_image.png | Bin
.../lib/prototype/windows/themes/magento.css | 0
.../windows/themes/magento/btn_bg.gif | Bin
.../windows/themes/magento/content_bg.gif | Bin
.../windows/themes/magento/top_bg.gif | Bin
.../windows/themes/magento/window_close.png | Bin
.../{default => base}/default/menu.css | 0
.../default/oauth-simple.css | 0
.../{default => base}/default/print.css | 0
.../{default => base}/default/reset.css | 0
.../default}/calendar-blue2.css | 0
.../default}/calendar-blue2.css.map | 0
.../openmage => openmage/default}/favicon.ico | Bin
.../default}/fonts/opensans/License.txt | 0
.../default}/fonts/opensans/OpenSans-Bold.ttf | Bin
.../fonts/opensans/OpenSans-Bold.woff | Bin
.../fonts/opensans/OpenSans-Bold.woff2 | Bin
.../fonts/opensans/OpenSans-Light.ttf | Bin
.../fonts/opensans/OpenSans-Light.woff | Bin
.../fonts/opensans/OpenSans-Light.woff2 | Bin
.../fonts/opensans/OpenSans-Regular.ttf | Bin
.../fonts/opensans/OpenSans-Regular.woff | Bin
.../fonts/opensans/OpenSans-Regular.woff2 | Bin
.../fonts/opensans/OpenSans-SemiBold.ttf | Bin
.../fonts/opensans/OpenSans-SemiBold.woff | Bin
.../fonts/opensans/OpenSans-SemiBold.woff2 | Bin
.../openmage => openmage/default}/form.css | 0
.../default}/form.css.map | 0
.../default}/images/ajax-loader-tr.gif | Bin
.../default}/images/alert-circle.svg | 0
.../default}/images/icon-error.png | Bin
.../default}/images/information-variant.svg | 0
.../default}/images/login_background.jpg | Bin
.../default}/images/logo.svg | 0
.../lib/prototype/windows/themes/magento.css | 0
.../windows/themes/magento/btn_bg.gif | Bin
.../windows/themes/magento/content_bg.gif | Bin
.../windows/themes/magento/top_bg.gif | Bin
.../windows/themes/magento/window_close.png | Bin
.../openmage => openmage/default}/login.css | 0
.../default}/login.css.map | 0
.../openmage => openmage/default}/menu.css | 0
.../default}/menu.css.map | 0
.../default}/override.css | 0
.../default}/override.css.map | 0
.../default}/scss/_base.scss | 0
.../default}/scss/_fonts.scss | 0
.../default}/scss/_icons.scss | 0
.../default}/scss/_variables.scss | 0
.../default}/scss/calendar-blue2.scss | 0
.../default}/scss/form.scss | 0
.../default}/scss/login.scss | 0
.../default}/scss/menu.scss | 0
.../default}/scss/override.scss | 0
774 files changed, 341 insertions(+), 75 deletions(-)
create mode 100644 app/design/adminhtml/base/default/etc/theme.xml
rename app/design/adminhtml/{default => base}/default/layout/admin.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/adminnotification.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/api2.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/authorizenet.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/bundle.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/captcha.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/catalog.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/centinel.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/cms.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/currencysymbol.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/customer.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/dataflow.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/downloadable.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/giftmessage.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/importexport.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/index.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/main.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/newsletter.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/oauth.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/promo.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/report.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/rss.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/sales.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/search.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/tag.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/tax.xml (100%)
rename app/design/adminhtml/{default => base}/default/layout/widget.xml (100%)
rename app/design/adminhtml/{default => base}/default/locale/en_US/translate.csv (100%)
rename app/design/adminhtml/{default => base}/default/template/access_denied.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/role_users_grid_js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/roleinfo.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/roles.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/rolesedit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/rolesusers.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/user_roles_grid_js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/userinfo.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/usernroles.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/userroles.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api/users.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api2/attribute/buttons.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api2/attribute/resource.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api2/permissions/user/edit/tab/roles/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api2/role/buttons.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/api2/role/users_grid_js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/authorizenet/directpost/iframe.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/authorizenet/directpost/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/composite/fieldset/options/bundle.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/composite/fieldset/options/type/multi.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/composite/fieldset/options/type/radio.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/composite/fieldset/options/type/select.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/edit/bundle.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/edit/bundle/option.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/edit/bundle/option/search.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/product/edit/bundle/option/selection.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/sales/creditmemo/create/items/renderer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/sales/creditmemo/view/items/renderer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/sales/invoice/create/items/renderer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/sales/invoice/view/items/renderer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/sales/order/view/items/renderer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/sales/shipment/create/items/renderer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/bundle/sales/shipment/view/items/renderer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/captcha/zend.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/category/checkboxes/tree.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/category/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/category/edit/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/category/tree.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/category/widget/tree.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/form/renderer/fieldset/element.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/new/created.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/options.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/set/main.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/set/main/tree/attribute.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/set/main/tree/group.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/set/toolbar/add.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/attribute/set/toolbar/main.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/configure.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/configurable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/grouped.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/options.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/options/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/options/type/date.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/options/type/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/options/type/file.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/options/type/select.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/options/type/text.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/composite/fieldset/qty.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/created.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/action/attribute.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/action/inventory.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/action/websites.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/categories.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/options.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/options/option.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/options/type/date.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/options/type/file.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/options/type/select.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/options/type/text.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/price/group.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/price/tier.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/serializer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/super/config.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/edit/websites.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/helper/gallery.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/price.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/tab/alert.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/tab/inventory.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/product/widget/chooser/container.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/catalog/wysiwyg/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/centinel/authentication/complete.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/centinel/authentication/start.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/centinel/validation/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/cms/browser/content.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/cms/browser/content/files.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/cms/browser/content/newfolder.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/cms/browser/content/uploader.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/cms/browser/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/cms/browser/tree.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/cms/page/edit/form/renderer/content.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/coming.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/currencysymbol/grid.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/edit/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/edit/tab/account/form/renderer/group.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/edit/tab/view/grid/item.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/online.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/sales/order/create/address/form/renderer/vat.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/system/config/validatevat.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/tab/addresses.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/tab/cart.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/tab/newsletter.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/tab/view.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/tab/view/sales.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/customer/tab/wishlist.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/graph.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/graph/disabled.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/grid.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/index.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/salebar.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/searches.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/store/switcher.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/dashboard/totalbar.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/directory/js/optional_zip_countries.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/product/composite/fieldset/downloadable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/product/edit/downloadable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/product/edit/downloadable/links.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/product/edit/downloadable/samples.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/items/column/downloadable/name.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/eav/attribute/edit/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/eav/attribute/options.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/email/order/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/empty.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/forgotpassword.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/formkey.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/giftoptionsform.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/helper.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/popup.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/sales/order/create/giftoptions.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/sales/order/create/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/sales/order/view/giftoptions.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/giftmessage/sales/order/view/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/importexport/busy.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/importexport/export/form/after.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/importexport/export/form/before.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/importexport/import/form/after.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/importexport/import/form/before.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/importexport/import/frame/result.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/index/notifications.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/login.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/media/uploader.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/preview/iframeswitcher.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/preview/store.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/problem/list.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/queue/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/queue/list.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/queue/preview.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/subscriber/list.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/template/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/template/list.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/newsletter/template/preview.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/notification/baseurl.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/notification/curl.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/notification/formkey.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/notification/security.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/notification/toolbar.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/notification/window.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/button-simple.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/button.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/confirm-simple.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/confirm.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/form/login-simple.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/form/login.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/head-simple.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/reject-simple.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/oauth/authorize/reject.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/overlay_popup.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page/footer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page/head.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page/header.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page/js/calendar.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page/js/translate.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page/menu.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/page/notices.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paygate/form/cc.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paygate/info/cc.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paygate/info/pdf.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/form/banktransfer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/form/cashondelivery.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/form/cc.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/form/ccsave.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/form/checkmo.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/form/purchaseorder.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/info/banktransfer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/info/checkmo.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/info/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/info/pdf/checkmo.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/info/pdf/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/info/pdf/purchaseorder.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/payment/info/purchaseorder.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paypal/system/config/api_wizard.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paypal/system/config/bml_api_wizard.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paypal/system/config/fieldset/global.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paypal/system/config/fieldset/hint.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paypal/system/config/fieldset/store.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paypal/system/config/payflowlink/advanced.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/paypal/system/config/payflowlink/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/role_users_grid_js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/roleinfo.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/roles.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/rolesedit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/rolesusers.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/user_roles_grid_js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/userinfo.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/usernroles.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/userroles.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/permissions/users.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/popup.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/promo/fieldset.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/promo/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/promo/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/promo/salesrulejs.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/rating/detailed.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/rating/options.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/rating/stars/detailed.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/rating/stars/summary.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/report/grid.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/report/grid/container.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/report/refresh/statistics.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/report/store/switcher.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/report/store/switcher/enhanced.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/report/wishlist.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/resetforgottenpassword.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/review/add.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/billing/agreement/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/billing/agreement/view/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/billing/agreement/view/tab/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/items/column/name.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/items/column/qty.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/address/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/comments/view.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/abstract.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/billing/method/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/comment.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/coupons/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/data.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/form/account.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/form/address.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/giftmessage.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/items/grid.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/newsletter/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/shipping/method/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/sidebar.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/sidebar/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/store/select.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/totals.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/totals/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/totals/grandtotal.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/totals/shipping.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/totals/subtotal.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/create/totals/tax.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/create/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/create/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/create/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/create/totals/adjustments.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/view/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/view/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/creditmemo/view/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/giftoptions.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/create/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/create/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/create/items/renderer/configurable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/create/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/create/tracking.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/view/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/view/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/view/items/renderer/configurable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/invoice/view/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/create/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/create/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/create/items/renderer/configurable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/create/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/create/tracking.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/packaging/grid.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/packaging/packed.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/packaging/popup.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/tracking/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/view/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/view/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/view/items/renderer/configurable.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/view/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/shipment/view/tracking.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totalbar.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/discount.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/due.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/footer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/grand.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/item.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/main.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/paid.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/refunded.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/shipping.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/subtotal.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/totals/tax.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/giftmessage.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/history.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/items.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/items/renderer/default.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/tab/history.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/tab/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/order/view/tracking.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/payment/form/billing/agreement.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/recurring/profile/view.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/recurring/profile/view/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/sales/transactions/detail.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/store/switcher.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/store/switcher/enhanced.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/store/switcher/form/renderer/fieldset.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/store/switcher/form/renderer/fieldset/element.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/autocomplete.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/cache/additional.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/cache/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/cache/notifications.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/config/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/config/form/field/array.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/config/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/config/switcher.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/config/system/storage/media/synchronize.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/config/tabs.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/convert/profile/process.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/convert/profile/run.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/convert/profile/upload.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/convert/profile/wizard.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/currency/rate/matrix.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/currency/rate/services.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/currency/rates.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/design/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/design/index.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/email/template/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/email/template/list.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/email/template/preview.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/info.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/shipping/applicable_country.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/shipping/ups.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/store/cell.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/store/container.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/store/tree.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/system/variable/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tag/edit/container.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tag/index.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/class/page/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/importExport.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/notifications.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/rate/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/rate/title.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/toolbar/class/add.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/toolbar/class/save.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/toolbar/rate/add.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/toolbar/rate/save.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/toolbar/rule/add.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/tax/toolbar/rule/save.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/urlrewrite/categories.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/urlrewrite/edit.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/urlrewrite/selector.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/usa/dhl/unitofmeasure.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/weee/renderer/tax.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/accordion.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/breadcrumbs.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/form.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/form/container.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/form/element.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/form/element/gallery.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/form/renderer/element.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/form/renderer/fieldset.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/form/renderer/fieldset/element.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/grid.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/grid/container.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/grid/massaction.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/grid/serializer.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/instance/edit/layout.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/instance/js.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/tabs.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/tabshoriz.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/tabsleft.phtml (100%)
rename app/design/adminhtml/{default => base}/default/template/widget/view/container.phtml (100%)
create mode 100644 app/design/adminhtml/openmage/default/etc/theme.xml
rename app/design/adminhtml/{default/openmage/layout/local.xml => openmage/default/layout/openmage.xml} (100%)
rename app/design/adminhtml/{default/openmage => openmage/default}/template/eav/attribute/options.phtml (100%)
rename app/design/adminhtml/{default/openmage => openmage/default}/template/forgotpassword.phtml (100%)
rename app/design/adminhtml/{default/openmage => openmage/default}/template/login.phtml (100%)
rename app/design/adminhtml/{default/openmage => openmage/default}/template/page/header.phtml (100%)
rename app/design/adminhtml/{default/openmage => openmage/default}/template/resetforgottenpassword.phtml (100%)
rename skin/adminhtml/{default => base}/default/boxes.css (100%)
rename skin/adminhtml/{default => base}/default/custom.css (100%)
rename skin/adminhtml/{default => base}/default/favicon.ico (100%)
rename skin/adminhtml/{default => base}/default/images/accordion_close.gif (100%)
rename skin/adminhtml/{default => base}/default/images/accordion_close.png (100%)
rename skin/adminhtml/{default => base}/default/images/accordion_open.gif (100%)
rename skin/adminhtml/{default => base}/default/images/accordion_open.png (100%)
rename skin/adminhtml/{default => base}/default/images/add_btn_icon-disabled.gif (100%)
rename skin/adminhtml/{default => base}/default/images/add_btn_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/address_list_li.gif (100%)
rename skin/adminhtml/{default => base}/default/images/address_list_on_arrow.gif (100%)
rename skin/adminhtml/{default => base}/default/images/address_list_over_arrow.gif (100%)
rename skin/adminhtml/{default => base}/default/images/address_list_over_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/ajax-loader-tr.gif (100%)
rename skin/adminhtml/{default => base}/default/images/ajax-loader.gif (100%)
rename skin/adminhtml/{default => base}/default/images/application_view_tile.gif (100%)
rename skin/adminhtml/{default => base}/default/images/arrow_sort_move.gif (100%)
rename skin/adminhtml/{default => base}/default/images/bg_collapse.gif (100%)
rename skin/adminhtml/{default => base}/default/images/bg_create_order_totals.gif (100%)
rename skin/adminhtml/{default => base}/default/images/bg_notifications.gif (100%)
rename skin/adminhtml/{default => base}/default/images/bg_window_mask.png (100%)
rename skin/adminhtml/{default => base}/default/images/bkg_btn-close.gif (100%)
rename skin/adminhtml/{default => base}/default/images/bkg_btn-close2.gif (100%)
rename skin/adminhtml/{default => base}/default/images/bkg_config-advanced.png (100%)
rename skin/adminhtml/{default => base}/default/images/bkg_config-nested.png (100%)
rename skin/adminhtml/{default => base}/default/images/bkg_config-shaddow.png (100%)
rename skin/adminhtml/{default => base}/default/images/bkg_tooltip.png (100%)
rename skin/adminhtml/{default => base}/default/images/blank.gif (100%)
rename skin/adminhtml/{default => base}/default/images/box_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/breadcrumb_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_add-image_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_add-variable_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_add-widget_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_add-widget_icon2.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_back_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_bare_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_bg-disabled.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/btn_cancel_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_delete_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_go.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_gr_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_gr_on.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_gr_over.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_loading-icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_login.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_on_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_over_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_show-hide_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/btn_task_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/button-close.png (100%)
rename skin/adminhtml/{default => base}/default/images/cancel_btn_active_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/cancel_btn_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/cancel_btn_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/cancel_btn_over_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/cancel_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/config_tab_dt_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/dashboard-close.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-graph-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-graph-bottom-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-graph-line-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-graph-line2-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-graph-x-bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/db-header-bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/db-menu-bg-hov.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-menu-bg-up.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-menu-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-menu-sep-last.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-menu-sep.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-menu-start.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-scroll-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-scroll-but-bot-roll.png (100%)
rename skin/adminhtml/{default => base}/default/images/db-scroll-but-bot.png (100%)
rename skin/adminhtml/{default => base}/default/images/db-scroll-but-top-roll.png (100%)
rename skin/adminhtml/{default => base}/default/images/db-scroll-but-top.png (100%)
rename skin/adminhtml/{default => base}/default/images/db-scroll-roller.png (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-bottom-left-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-bottom-mid-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-bottom-right-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-footer.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-header-sep.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-header.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-left.gif (100%)
rename skin/adminhtml/{default => base}/default/images/db-tab-right.gif (100%)
rename skin/adminhtml/{default => base}/default/images/dotted_divider_dark.gif (100%)
rename skin/adminhtml/{default => base}/default/images/dotted_divider_light.gif (100%)
rename skin/adminhtml/{default => base}/default/images/edit_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/entry_edit_head_arrow_down.gif (100%)
rename skin/adminhtml/{default => base}/default/images/entry_edit_head_arrow_down2.gif (100%)
rename skin/adminhtml/{default => base}/default/images/entry_edit_head_arrow_up.gif (100%)
rename skin/adminhtml/{default => base}/default/images/entry_edit_head_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/error-msg.png (100%)
rename skin/adminhtml/{default => base}/default/images/error_msg_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_account.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_application_form_delete.png (100%)
rename skin/adminhtml/{default => base}/default/images/fam_application_view_tile.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_asterisk_orange.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_bin.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_book_open.png (100%)
rename skin/adminhtml/{default => base}/default/images/fam_bullet_disk.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_bullet_error.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_bullet_success.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_calendar.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_cart.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_comment.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_creditcards.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_folder_database.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_folder_palette.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_folder_table.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_group.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_help.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_house.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_layout.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_leaf.png (100%)
rename skin/adminhtml/{default => base}/default/images/fam_link.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_lorry.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_magnifier.png (100%)
rename skin/adminhtml/{default => base}/default/images/fam_money.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_money_add.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_monitor.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_newspaper.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_newspaper_delete.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_newspaper_error.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_newspaper_go.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_package.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_package_go.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_page_white.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_page_white_edit.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_rainbow.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_refresh.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_server_database.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_status_online.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_tag_orange.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_user.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_user_comment.gif (100%)
rename skin/adminhtml/{default => base}/default/images/fam_user_edit.gif (100%)
rename skin/adminhtml/{default => base}/default/images/filter_row_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/footer_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/gift-message-collapse.gif (100%)
rename skin/adminhtml/{default => base}/default/images/gift-message-expand.gif (100%)
rename skin/adminhtml/{default => base}/default/images/gift-message-grid-column-bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/grid-cal.gif (100%)
rename skin/adminhtml/{default => base}/default/images/grid_sort_asc.gif (100%)
rename skin/adminhtml/{default => base}/default/images/grid_sort_desc.gif (100%)
rename skin/adminhtml/{default => base}/default/images/grid_th_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/grid_th_onclick_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/grouped_to_order_icon.png (100%)
rename skin/adminhtml/{default => base}/default/images/header_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/header_top_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/horiz_tabs_ul_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/i_notice.gif (100%)
rename skin/adminhtml/{default => base}/default/images/i_question-mark.png (100%)
rename skin/adminhtml/{default => base}/default/images/ico_success.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon-enabled.png (100%)
rename skin/adminhtml/{default => base}/default/images/icon-tooltip.png (100%)
rename skin/adminhtml/{default => base}/default/images/icon_btn_add.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_btn_back.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_btn_delete.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_btn_save.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_edit_address.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_export.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_export.png (100%)
rename skin/adminhtml/{default => base}/default/images/icon_feed.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_feed.png (100%)
rename skin/adminhtml/{default => base}/default/images/icon_note_list.gif (100%)
rename skin/adminhtml/{default => base}/default/images/icon_remove_address.gif (100%)
rename skin/adminhtml/{default => base}/default/images/login_box_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/login_box_bg.jpg (100%)
rename skin/adminhtml/{default => base}/default/images/login_box_bg_auth.jpg (100%)
rename skin/adminhtml/{default => base}/default/images/login_box_bottom.jpg (100%)
rename skin/adminhtml/{default => base}/default/images/login_box_legal_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/logo-large.gif (100%)
rename skin/adminhtml/{default => base}/default/images/logo.svg (100%)
rename skin/adminhtml/{default => base}/default/images/logo_email.gif (100%)
rename skin/adminhtml/{default => base}/default/images/logo_gray.svg (100%)
rename skin/adminhtml/{default => base}/default/images/logo_print.gif (100%)
rename skin/adminhtml/{default => base}/default/images/massaction_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/massaction_button_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/massaction_links_delimiter.gif (100%)
rename skin/adminhtml/{default => base}/default/images/middle_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/more_arrow.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav1_active.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav1_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav1_off.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav1_on.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav1_over.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav1_sep.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav2_last_li_bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/nav2_last_li_over_bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/nav2_li_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav2_li_bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/nav2_li_over_bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/nav2_link_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav2_parent_arrow.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav3_bg.png (100%)
rename skin/adminhtml/{default => base}/default/images/nav_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav_list_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav_nest_link_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav_nest_link_over_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav_on_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/nav_parent_arrow.gif (100%)
rename skin/adminhtml/{default => base}/default/images/note_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/note_cell_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/note_msg_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/notice-msg.png (100%)
rename skin/adminhtml/{default => base}/default/images/pager_arrow_left.gif (100%)
rename skin/adminhtml/{default => base}/default/images/pager_arrow_left_off.gif (100%)
rename skin/adminhtml/{default => base}/default/images/pager_arrow_right.gif (100%)
rename skin/adminhtml/{default => base}/default/images/pager_arrow_right_off.gif (100%)
rename skin/adminhtml/{default => base}/default/images/paypal/logo-paypal.png (100%)
rename skin/adminhtml/{default => base}/default/images/paypal/pp-allinone.png (100%)
rename skin/adminhtml/{default => base}/default/images/paypal/pp-alt.png (100%)
rename skin/adminhtml/{default => base}/default/images/paypal/pp-gateways.png (100%)
rename skin/adminhtml/{default => base}/default/images/paypal/pp-uk.png (100%)
rename skin/adminhtml/{default => base}/default/images/paypal_logo.gif (100%)
rename skin/adminhtml/{default => base}/default/images/paypal_section.png (100%)
rename skin/adminhtml/{default => base}/default/images/paypal_tick.gif (100%)
rename skin/adminhtml/{default => base}/default/images/placeholder/thumbnail.jpg (100%)
rename skin/adminhtml/{default => base}/default/images/process_spinner.gif (100%)
rename skin/adminhtml/{default => base}/default/images/product_rating_blank_star.gif (100%)
rename skin/adminhtml/{default => base}/default/images/product_rating_full_star.gif (100%)
rename skin/adminhtml/{default => base}/default/images/reload.png (100%)
rename skin/adminhtml/{default => base}/default/images/rule-ajax-loader.gif (100%)
rename skin/adminhtml/{default => base}/default/images/rule_chooser_trigger.gif (100%)
rename skin/adminhtml/{default => base}/default/images/rule_component_add.gif (100%)
rename skin/adminhtml/{default => base}/default/images/rule_component_apply.gif (100%)
rename skin/adminhtml/{default => base}/default/images/rule_component_remove.gif (100%)
rename skin/adminhtml/{default => base}/default/images/save_btn_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/sec_nav_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/section_menu_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/section_menu_bottom.gif (100%)
rename skin/adminhtml/{default => base}/default/images/section_menu_link_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/section_menu_link_over_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/section_menu_over_span_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/section_menu_span_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/section_menu_ul_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/side_col_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/simple_container_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/sort-arrow-down.gif (100%)
rename skin/adminhtml/{default => base}/default/images/sort-arrow-down.png (100%)
rename skin/adminhtml/{default => base}/default/images/sort-arrow-up.gif (100%)
rename skin/adminhtml/{default => base}/default/images/sort-arrow-up.png (100%)
rename skin/adminhtml/{default => base}/default/images/sort_heading_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/sort_on_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/sort_row_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/spacer.gif (100%)
rename skin/adminhtml/{default => base}/default/images/sub_button_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/success-msg.png (100%)
rename skin/adminhtml/{default => base}/default/images/success_msg_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tabs_link_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tabs_link_over_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tabs_span_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tag_blue_edit.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tn_cancel_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tooltip_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tooltip_corner.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tooltip_top.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tree_icons/join.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tree_icons/joinbottom.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tree_icons/line.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tree_icons/minus.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tree_icons/minusbottom.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tree_icons/nolines_minus.gif (100%)
rename skin/adminhtml/{default => base}/default/images/tree_icons/nolines_plus.gif (100%)
rename skin/adminhtml/{default => base}/default/images/validation_advice_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/images/varien_logo.gif (100%)
rename skin/adminhtml/{default => base}/default/images/warning_msg_icon.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/catalog__category_widget_link.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/catalog__product_widget_link.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/catalog__product_widget_new.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/cms__widget_block.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/cms__widget_page_link.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/default.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/reports__product_widget_compared.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget/reports__product_widget_viewed.gif (100%)
rename skin/adminhtml/{default => base}/default/images/widget_placeholder.gif (100%)
rename skin/adminhtml/{default => base}/default/images/window_close.png (100%)
rename skin/adminhtml/{default => base}/default/images/window_content.png (100%)
rename skin/adminhtml/{default => base}/default/images/window_top.png (100%)
rename skin/adminhtml/{default => base}/default/images/wysiwyg/skin_image.png (100%)
rename skin/adminhtml/{default => base}/default/lib/prototype/windows/themes/magento.css (100%)
rename skin/adminhtml/{default => base}/default/lib/prototype/windows/themes/magento/btn_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/lib/prototype/windows/themes/magento/content_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/lib/prototype/windows/themes/magento/top_bg.gif (100%)
rename skin/adminhtml/{default => base}/default/lib/prototype/windows/themes/magento/window_close.png (100%)
rename skin/adminhtml/{default => base}/default/menu.css (100%)
rename skin/adminhtml/{default => base}/default/oauth-simple.css (100%)
rename skin/adminhtml/{default => base}/default/print.css (100%)
rename skin/adminhtml/{default => base}/default/reset.css (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/calendar-blue2.css (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/calendar-blue2.css.map (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/favicon.ico (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/License.txt (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Bold.ttf (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Bold.woff (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Bold.woff2 (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Light.ttf (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Light.woff (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Light.woff2 (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Regular.ttf (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Regular.woff (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-Regular.woff2 (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-SemiBold.ttf (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-SemiBold.woff (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/fonts/opensans/OpenSans-SemiBold.woff2 (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/form.css (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/form.css.map (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/images/ajax-loader-tr.gif (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/images/alert-circle.svg (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/images/icon-error.png (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/images/information-variant.svg (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/images/login_background.jpg (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/images/logo.svg (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/lib/prototype/windows/themes/magento.css (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/lib/prototype/windows/themes/magento/btn_bg.gif (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/lib/prototype/windows/themes/magento/content_bg.gif (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/lib/prototype/windows/themes/magento/top_bg.gif (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/lib/prototype/windows/themes/magento/window_close.png (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/login.css (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/login.css.map (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/menu.css (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/menu.css.map (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/override.css (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/override.css.map (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/_base.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/_fonts.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/_icons.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/_variables.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/calendar-blue2.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/form.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/login.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/menu.scss (100%)
rename skin/adminhtml/{default/openmage => openmage/default}/scss/override.scss (100%)
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
index 2629281782e..5a71ab23cc5 100644
--- a/.phpstan.dist.baseline.neon
+++ b/.phpstan.dist.baseline.neon
@@ -5308,229 +5308,397 @@ parameters:
message: '#^Call to an undefined method Mage_Core_Block_Abstract\:\:_getUsers\(\)\.$#'
identifier: method.notFound
count: 1
- path: app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml
+ path: app/design/adminhtml/base/default/template/api/role_users_grid_js.phtml
-
message: '#^Call to protected method _getGridHtml\(\) of class Mage_Adminhtml_Block_Api_Tab_Rolesusers\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/api/rolesusers.phtml
+ path: app/design/adminhtml/base/default/template/api/rolesusers.phtml
-
message: '#^Call to an undefined method Mage_Core_Block_Abstract\:\:_getSelectedRoles\(\)\.$#'
identifier: method.notFound
count: 1
- path: app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml
+ path: app/design/adminhtml/base/default/template/api/user_roles_grid_js.phtml
+
+ -
+ message: '#^Variable \$roles might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/api/userroles.phtml
+
+ -
+ message: '#^Variable \$user_roles might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/api/userroles.phtml
-
message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
-
message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/multi.phtml
-
message: '#^Call to protected method _getDefaultValues\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
-
message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
-
message: '#^Call to protected method _showSingle\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
-
message: '#^Call to protected method _getDefaultValues\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/select.phtml
-
message: '#^Call to protected method _isSelected\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/select.phtml
-
message: '#^Call to protected method _showSingle\(\) of class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml
+ path: app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/select.phtml
-
message: '#^Call to protected method _getHeader\(\) of class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/attribute/set/main.phtml
-
message: '#^Call to protected method _getHeader\(\) of class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/add.phtml
-
message: '#^Call to protected method _getHeader\(\) of class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/main.phtml
-
message: '#^Access to an undefined property Mage_Catalog_Model_Product_Option\:\:\$decoratedIsLast\.$#'
identifier: property.notFound
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/date.phtml
-
message: '#^Access to an undefined property Mage_Catalog_Model_Product_Option\:\:\$decoratedIsLast\.$#'
identifier: property.notFound
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/file.phtml
-
message: '#^Access to an undefined property Mage_Catalog_Model_Product_Option\:\:\$decoratedIsLast\.$#'
identifier: property.notFound
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/select.phtml
-
message: '#^Access to an undefined property Mage_Catalog_Model_Product_Option\:\:\$decoratedIsLast\.$#'
identifier: property.notFound
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/text.phtml
-
message: '#^Parameter \#2 \$store of method Mage_Core_Helper_Data\:\:currencyByStore\(\) expects int\|Mage_Core_Model_Store\|null, true given\.$#'
identifier: argument.type
count: 1
- path: app/design/adminhtml/default/default/template/catalog/product/price.phtml
+ path: app/design/adminhtml/base/default/template/catalog/product/price.phtml
+
+ -
+ message: '#^Variable \$_weeeTaxAttributes might not be defined\.$#'
+ identifier: variable.undefined
+ count: 9
+ path: app/design/adminhtml/base/default/template/catalog/product/price.phtml
+
+ -
+ message: '#^Variable \$addressCollection might not be defined\.$#'
+ identifier: variable.undefined
+ count: 4
+ path: app/design/adminhtml/base/default/template/customer/tab/addresses.phtml
+
+ -
+ message: '#^Variable \$customer might not be defined\.$#'
+ identifier: variable.undefined
+ count: 2
+ path: app/design/adminhtml/base/default/template/customer/tab/addresses.phtml
-
message: '#^Call to an undefined method Mage_GiftMessage_Block_Message_Helper\:\:prepareAsIs\(\)\.$#'
identifier: method.notFound
count: 2
- path: app/design/adminhtml/default/default/template/giftmessage/helper.phtml
+ path: app/design/adminhtml/base/default/template/giftmessage/helper.phtml
-
message: '#^Parameter \#1 \$value of method Mage_GiftMessage_Block_Message_Helper\:\:setScriptIncluded\(\) expects string, true given\.$#'
identifier: argument.type
count: 1
- path: app/design/adminhtml/default/default/template/giftmessage/helper.phtml
+ path: app/design/adminhtml/base/default/template/giftmessage/helper.phtml
-
message: '#^Call to an undefined method Mage_Core_Block_Abstract\:\:_getUsers\(\)\.$#'
identifier: method.notFound
count: 1
- path: app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
+ path: app/design/adminhtml/base/default/template/permissions/role_users_grid_js.phtml
-
message: '#^Call to protected method _getGridHtml\(\) of class Mage_Adminhtml_Block_Permissions_Tab_Rolesusers\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
+ path: app/design/adminhtml/base/default/template/permissions/rolesusers.phtml
-
message: '#^Call to an undefined method Mage_Core_Block_Abstract\:\:_getSelectedRoles\(\)\.$#'
identifier: method.notFound
count: 1
- path: app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml
+ path: app/design/adminhtml/base/default/template/permissions/user_roles_grid_js.phtml
+
+ -
+ message: '#^Variable \$roles might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/permissions/userroles.phtml
+
+ -
+ message: '#^Variable \$user_roles might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/permissions/userroles.phtml
+
+ -
+ message: '#^Variable \$options might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/rating/options.phtml
-
message: '#^Comparison operation "\>" between int\<1, max\> and 0 is always true\.$#'
identifier: greater.alwaysTrue
count: 1
- path: app/design/adminhtml/default/default/template/report/grid.phtml
+ path: app/design/adminhtml/base/default/template/report/grid.phtml
+
+ -
+ message: '#^Variable \$minAdminPasswordLength might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/resetforgottenpassword.phtml
+
+ -
+ message: '#^Variable \$resetPasswordLinkToken might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/resetforgottenpassword.phtml
+
+ -
+ message: '#^Variable \$userId might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/resetforgottenpassword.phtml
-
message: '#^Method Mage_Adminhtml_Block_Sales_Order_Create_Abstract\:\:formatPrice\(\) invoked with 3 parameters, 1 required\.$#'
identifier: arguments.count
count: 18
- path: app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
+ path: app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml
-
message: '#^Unreachable statement \- code above always terminates\.$#'
identifier: deadCode.unreachable
count: 1
- path: app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
+ path: app/design/adminhtml/base/default/template/sales/order/shipment/packaging/grid.phtml
-
message: '#^Access to an undefined property Mage_Adminhtml_Block_Sales_Order_Shipment_Tracking_Info\:\:\$trackingInfo\.$#'
identifier: property.notFound
count: 1
- path: app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml
+ path: app/design/adminhtml/base/default/template/sales/order/shipment/tracking/info.phtml
+
+ -
+ message: '#^Variable \$items might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/system/autocomplete.phtml
-
message: '#^Access to protected property Mage_Adminhtml_Block_System_Config_Form_Field_Regexceptions\|Mage_CatalogInventory_Block_Adminhtml_Form_Field_Minsaleqty\:\:\$_addAfter\.$#'
identifier: property.protected
count: 3
- path: app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
+ path: app/design/adminhtml/base/default/template/system/config/form/field/array.phtml
-
message: '#^Access to protected property Mage_Adminhtml_Block_System_Config_Form_Field_Regexceptions\|Mage_CatalogInventory_Block_Adminhtml_Form_Field_Minsaleqty\:\:\$_addButtonLabel\.$#'
identifier: property.protected
count: 2
- path: app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
+ path: app/design/adminhtml/base/default/template/system/config/form/field/array.phtml
-
message: '#^Access to protected property Mage_Adminhtml_Block_System_Config_Form_Field_Regexceptions\|Mage_CatalogInventory_Block_Adminhtml_Form_Field_Minsaleqty\:\:\$_columns\.$#'
identifier: property.protected
count: 4
- path: app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
+ path: app/design/adminhtml/base/default/template/system/config/form/field/array.phtml
-
message: '#^Call to protected method _renderCellTemplate\(\) of class Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract\.$#'
identifier: method.protected
count: 1
- path: app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
+ path: app/design/adminhtml/base/default/template/system/config/form/field/array.phtml
-
message: '#^Unreachable statement \- code above always terminates\.$#'
identifier: deadCode.unreachable
count: 1
- path: app/design/adminhtml/default/default/template/system/config/switcher.phtml
+ path: app/design/adminhtml/base/default/template/system/config/switcher.phtml
-
message: '#^Negated boolean expression is always true\.$#'
identifier: booleanNot.alwaysTrue
count: 2
- path: app/design/adminhtml/default/default/template/system/store/tree.phtml
+ path: app/design/adminhtml/base/default/template/system/store/tree.phtml
-
message: '#^Unreachable statement \- code above always terminates\.$#'
identifier: deadCode.unreachable
count: 2
- path: app/design/adminhtml/default/default/template/system/store/tree.phtml
+ path: app/design/adminhtml/base/default/template/system/store/tree.phtml
+
+ -
+ message: '#^Variable \$createUrl might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/class/add.phtml
+
+ -
+ message: '#^Variable \$header might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/class/add.phtml
+
+ -
+ message: '#^Variable \$form might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml
+
+ -
+ message: '#^Variable \$header might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml
+
+ -
+ message: '#^Variable \$createUrl might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/rule/add.phtml
+
+ -
+ message: '#^Variable \$header might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/rule/add.phtml
+
+ -
+ message: '#^Variable \$form might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml
+
+ -
+ message: '#^Variable \$header might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml
+
+ -
+ message: '#^Variable \$element might not be defined\.$#'
+ identifier: variable.undefined
+ count: 62
+ path: app/design/adminhtml/base/default/template/widget/form/element.phtml
+
+ -
+ message: '#^Variable \$formBlock might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/widget/form/element.phtml
-
message: '#^Method Mage_Adminhtml_Block_Widget_Grid\:\:getEmptyCellColspan\(\) invoked with 1 parameter, 0 required\.$#'
identifier: arguments.count
count: 1
- path: app/design/adminhtml/default/default/template/widget/grid.phtml
+ path: app/design/adminhtml/base/default/template/widget/grid.phtml
-
message: '#^Method Mage_Adminhtml_Block_Widget_Grid\:\:getMultipleRowColumns\(\) invoked with 1 parameter, 0 required\.$#'
identifier: arguments.count
count: 1
- path: app/design/adminhtml/default/default/template/widget/grid.phtml
+ path: app/design/adminhtml/base/default/template/widget/grid.phtml
-
message: '#^Call to an undefined method Mage_Adminhtml_Block_Widget_Grid_Massaction\:\:canDisplayContainer\(\)\.$#'
identifier: method.notFound
count: 1
- path: app/design/adminhtml/default/default/template/widget/grid/massaction.phtml
+ path: app/design/adminhtml/base/default/template/widget/grid/massaction.phtml
+
+ -
+ message: '#^Variable \$id might not be defined\.$#'
+ identifier: variable.undefined
+ count: 4
+ path: app/design/adminhtml/base/default/template/widget/tabsleft.phtml
+
+ -
+ message: '#^Variable \$sections might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/base/default/template/widget/tabsleft.phtml
+
+ -
+ message: '#^Variable \$minAdminPasswordLength might not be defined\.$#'
+ identifier: variable.undefined
+ count: 2
+ path: app/design/adminhtml/openmage/default/template/resetforgottenpassword.phtml
+
+ -
+ message: '#^Variable \$resetPasswordLinkToken might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/openmage/default/template/resetforgottenpassword.phtml
+
+ -
+ message: '#^Variable \$userId might not be defined\.$#'
+ identifier: variable.undefined
+ count: 1
+ path: app/design/adminhtml/openmage/default/template/resetforgottenpassword.phtml
+
+ -
+ message: '#^Variable \$_weeeTaxAttributes might not be defined\.$#'
+ identifier: variable.undefined
+ count: 8
+ path: app/design/frontend/base/default/template/bundle/catalog/product/price.phtml
-
message: '#^Method Mage_Catalog_Block_Product_Abstract\:\:getTierPrices\(\) invoked with 2 parameters, 0\-1 required\.$#'
diff --git a/.phpstan.dist.neon b/.phpstan.dist.neon
index ac155db64d8..5acbd2ff9a2 100644
--- a/.phpstan.dist.neon
+++ b/.phpstan.dist.neon
@@ -77,33 +77,33 @@ parameters:
# @todo add classes to widgets
message: '#^Variable \$this might not be defined\.$#'
paths:
- - app/design/adminhtml/default/default/template/api/usernroles.phtml
- - app/design/adminhtml/default/default/template/dashboard/searches.phtml
- - app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
- - app/design/adminhtml/default/default/template/empty.phtml
- - app/design/adminhtml/default/default/template/overlay_popup.phtml
- - app/design/adminhtml/default/default/template/popup.phtml
- - app/design/adminhtml/default/default/template/promo/form.phtml
- - app/design/adminhtml/default/default/template/rating/stars/detailed.phtml
- - app/design/adminhtml/default/default/template/review/add.phtml
- - app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml
- - app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
- - app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/due.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/item.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/main.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml
- - app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml
- - app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml
- - app/design/adminhtml/default/default/template/system/info.phtml
- - app/design/adminhtml/default/default/template/tax/class/page/edit.phtml
- - app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
- - app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
+ - app/design/adminhtml/base/default/template/api/usernroles.phtml
+ - app/design/adminhtml/base/default/template/dashboard/searches.phtml
+ - app/design/adminhtml/base/default/template/dashboard/store/switcher.phtml
+ - app/design/adminhtml/base/default/template/empty.phtml
+ - app/design/adminhtml/base/default/template/overlay_popup.phtml
+ - app/design/adminhtml/base/default/template/popup.phtml
+ - app/design/adminhtml/base/default/template/promo/form.phtml
+ - app/design/adminhtml/base/default/template/rating/stars/detailed.phtml
+ - app/design/adminhtml/base/default/template/review/add.phtml
+ - app/design/adminhtml/base/default/template/sales/billing/agreement/form.phtml
+ - app/design/adminhtml/base/default/template/sales/items/renderer/default.phtml
+ - app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/discount.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/due.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/footer.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/grand.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/item.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/main.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/paid.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/refunded.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/shipping.phtml
+ - app/design/adminhtml/base/default/template/sales/order/totals/subtotal.phtml
+ - app/design/adminhtml/base/default/template/sales/order/view/tracking.phtml
+ - app/design/adminhtml/base/default/template/system/info.phtml
+ - app/design/adminhtml/base/default/template/tax/class/page/edit.phtml
+ - app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml
+ - app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml
- app/design/frontend/base/default/template/bundle/catalog/product/list/partof.phtml
- app/design/frontend/base/default/template/bundle/catalog/product/view/options/notice.phtml
- app/design/frontend/base/default/template/catalog/category/page.phtml
diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php
index 25fe64eb343..0f56b53ac60 100644
--- a/app/code/core/Mage/Adminhtml/Controller/Action.php
+++ b/app/code/core/Mage/Adminhtml/Controller/Action.php
@@ -145,15 +145,15 @@ public function preDispatch()
{
// get legacy theme choice form backend config
if (Mage::getStoreConfigFlag('admin/design/use_legacy_theme')) {
- $theme = Mage::getConfig()->getNode('stores/admin/design/theme/default');
+ $package = Mage::getConfig()->getNode('stores/admin/design/package/name');
} else {
- $theme = Mage::getConfig()->getNode('stores/admin/design/theme/openmage');
+ $package = Mage::getConfig()->getNode('stores/admin/design/package/openmage');
}
Mage::getDesign()
->setArea($this->_currentArea)
- ->setPackageName((string) Mage::getConfig()->getNode('stores/admin/design/package/name'))
- ->setTheme((string) $theme);
+ ->setPackageName((string) $package)
+ ->setTheme((string) Mage::getConfig()->getNode('stores/admin/design/theme/default'));
foreach (['layout', 'template', 'skin', 'locale'] as $type) {
if ($value = (string) Mage::getConfig()->getNode("stores/admin/design/theme/{$type}")) {
Mage::getDesign()->setTheme($type, $value);
diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
index 4307ff1e209..d1d7a04f80d 100644
--- a/app/code/core/Mage/Adminhtml/etc/config.xml
+++ b/app/code/core/Mage/Adminhtml/etc/config.xml
@@ -224,10 +224,10 @@
<design>
<package>
<name>default</name>
+ <openmage>openmage</openmage>
</package>
<theme>
<default>default</default>
- <openmage>openmage</openmage>
</theme>
</design>
</admin>
diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php
index d62a67c2332..da8fc1c76ce 100644
--- a/app/code/core/Mage/Core/Model/Design/Fallback.php
+++ b/app/code/core/Mage/Core/Model/Design/Fallback.php
@@ -80,11 +80,24 @@ public function getFallbackScheme($area, $package, $theme)
$cacheKey = $area . '/' . $package . '/' . $theme;
if (!isset($this->_cachedSchemes[$cacheKey])) {
+
+ //First we have to check if theme exists
+ $path = $area . DS . $package . DS . $theme;
+ $fallback = false;
+ if (!is_dir(Mage::getBaseDir('design') . DS . $path)) {
+ //Fallback to default
+ $theme = (string) Mage::getConfig()->getNode('stores/admin/design/theme/default');
+ $fallback = true;
+ }
if ($this->_isInheritanceDefined($area, $package, $theme)) {
$scheme = $this->_getFallbackScheme($area, $package, $theme);
} else {
$scheme = $this->_getLegacyFallbackScheme();
}
+ if ($fallback) {
+ $first = array_shift($scheme);
+ $scheme = array_merge([$first], [['_package' => $package, '_theme' => $theme]], $scheme);
+ }
$this->_cachedSchemes[$cacheKey] = $scheme;
}
diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php
index 2cde5a543a0..5c6f1c509c3 100644
--- a/app/code/core/Mage/Core/Model/Layout/Update.php
+++ b/app/code/core/Mage/Core/Model/Layout/Update.php
@@ -425,6 +425,7 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null
$layoutXml = null;
$elementClass = $this->getElementClass();
$updatesRoot = Mage::app()->getConfig()->getNode($area . '/layout/updates');
+ $updatesRoot = $this->addFallbackThemesLayoutUpdates($updatesRoot);
Mage::dispatchEvent('core_layout_update_updates_get_after', ['updates' => $updatesRoot]);
$updates = $updatesRoot->asArray();
$themeUpdates = Mage::getSingleton('core/design_config')->getNode("$area/$package/$theme/layout/updates");
@@ -465,4 +466,43 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null
}
return simplexml_load_string('<layouts>' . $layoutStr . '</layouts>', $elementClass);
}
+
+ /**
+ * Add layout files added via theme.xml to layout updates
+ * for all themes that are parents of this theme.
+ */
+ public function addFallbackThemesLayoutUpdates(Mage_Core_Model_Config_Element $updates)
+ {
+ /* @var $designPackage Mage_Core_Model_Design_Package */
+ $designPackage = Mage::getSingleton('core/design_package');
+ /* @var $fallback Mage_Core_Model_Design_Fallback */
+ $fallback = Mage::getModel('core/design_fallback');
+
+ $fallbacks = $fallback->getFallbackScheme($designPackage->getArea(), $designPackage->getPackageName(), $designPackage->getTheme('layout'));
+
+ for ($i = count($fallbacks) - 1; $i >= 0; $i--) {
+ $fallback = $fallbacks[$i];
+ if (!isset($fallback['_package'], $fallback['_theme'])) {
+ continue;
+ }
+
+ $fallbackPackage = $fallback['_package'];
+ $fallbackTheme = $fallback['_theme'];
+
+ $themeUpdateGroups = Mage::getSingleton('core/design_config')->getNode("{$designPackage->getArea()}/$fallbackPackage/$fallbackTheme/layout/updates");
+
+ if (!$themeUpdateGroups) {
+ continue;
+ }
+
+ foreach ($themeUpdateGroups as $themeUpdateGroup) {
+ foreach ($themeUpdateGroup->asArray() as $key => $themeUpdate) {
+ $updateNode = $updates->addChild($key);
+ $updateNode->addChild('file', $themeUpdate['file']);
+ }
+ }
+ }
+
+ return $updates;
+ }
}
diff --git a/app/design/adminhtml/base/default/etc/theme.xml b/app/design/adminhtml/base/default/etc/theme.xml
new file mode 100644
index 00000000000..edac8f1400e
--- /dev/null
+++ b/app/design/adminhtml/base/default/etc/theme.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * @copyright For copyright and license information, read the COPYING.txt file.
+ * @link /COPYING.txt
+ * @license Academic Free License (AFL 3.0)
+ * @package default_default
+ */
+-->
+<theme>
+ <parent />
+</theme>
diff --git a/app/design/adminhtml/default/default/layout/admin.xml b/app/design/adminhtml/base/default/layout/admin.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/admin.xml
rename to app/design/adminhtml/base/default/layout/admin.xml
diff --git a/app/design/adminhtml/default/default/layout/adminnotification.xml b/app/design/adminhtml/base/default/layout/adminnotification.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/adminnotification.xml
rename to app/design/adminhtml/base/default/layout/adminnotification.xml
diff --git a/app/design/adminhtml/default/default/layout/api2.xml b/app/design/adminhtml/base/default/layout/api2.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/api2.xml
rename to app/design/adminhtml/base/default/layout/api2.xml
diff --git a/app/design/adminhtml/default/default/layout/authorizenet.xml b/app/design/adminhtml/base/default/layout/authorizenet.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/authorizenet.xml
rename to app/design/adminhtml/base/default/layout/authorizenet.xml
diff --git a/app/design/adminhtml/default/default/layout/bundle.xml b/app/design/adminhtml/base/default/layout/bundle.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/bundle.xml
rename to app/design/adminhtml/base/default/layout/bundle.xml
diff --git a/app/design/adminhtml/default/default/layout/captcha.xml b/app/design/adminhtml/base/default/layout/captcha.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/captcha.xml
rename to app/design/adminhtml/base/default/layout/captcha.xml
diff --git a/app/design/adminhtml/default/default/layout/catalog.xml b/app/design/adminhtml/base/default/layout/catalog.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/catalog.xml
rename to app/design/adminhtml/base/default/layout/catalog.xml
diff --git a/app/design/adminhtml/default/default/layout/centinel.xml b/app/design/adminhtml/base/default/layout/centinel.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/centinel.xml
rename to app/design/adminhtml/base/default/layout/centinel.xml
diff --git a/app/design/adminhtml/default/default/layout/cms.xml b/app/design/adminhtml/base/default/layout/cms.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/cms.xml
rename to app/design/adminhtml/base/default/layout/cms.xml
diff --git a/app/design/adminhtml/default/default/layout/currencysymbol.xml b/app/design/adminhtml/base/default/layout/currencysymbol.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/currencysymbol.xml
rename to app/design/adminhtml/base/default/layout/currencysymbol.xml
diff --git a/app/design/adminhtml/default/default/layout/customer.xml b/app/design/adminhtml/base/default/layout/customer.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/customer.xml
rename to app/design/adminhtml/base/default/layout/customer.xml
diff --git a/app/design/adminhtml/default/default/layout/dataflow.xml b/app/design/adminhtml/base/default/layout/dataflow.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/dataflow.xml
rename to app/design/adminhtml/base/default/layout/dataflow.xml
diff --git a/app/design/adminhtml/default/default/layout/downloadable.xml b/app/design/adminhtml/base/default/layout/downloadable.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/downloadable.xml
rename to app/design/adminhtml/base/default/layout/downloadable.xml
diff --git a/app/design/adminhtml/default/default/layout/giftmessage.xml b/app/design/adminhtml/base/default/layout/giftmessage.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/giftmessage.xml
rename to app/design/adminhtml/base/default/layout/giftmessage.xml
diff --git a/app/design/adminhtml/default/default/layout/importexport.xml b/app/design/adminhtml/base/default/layout/importexport.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/importexport.xml
rename to app/design/adminhtml/base/default/layout/importexport.xml
diff --git a/app/design/adminhtml/default/default/layout/index.xml b/app/design/adminhtml/base/default/layout/index.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/index.xml
rename to app/design/adminhtml/base/default/layout/index.xml
diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/base/default/layout/main.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/main.xml
rename to app/design/adminhtml/base/default/layout/main.xml
diff --git a/app/design/adminhtml/default/default/layout/newsletter.xml b/app/design/adminhtml/base/default/layout/newsletter.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/newsletter.xml
rename to app/design/adminhtml/base/default/layout/newsletter.xml
diff --git a/app/design/adminhtml/default/default/layout/oauth.xml b/app/design/adminhtml/base/default/layout/oauth.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/oauth.xml
rename to app/design/adminhtml/base/default/layout/oauth.xml
diff --git a/app/design/adminhtml/default/default/layout/promo.xml b/app/design/adminhtml/base/default/layout/promo.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/promo.xml
rename to app/design/adminhtml/base/default/layout/promo.xml
diff --git a/app/design/adminhtml/default/default/layout/report.xml b/app/design/adminhtml/base/default/layout/report.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/report.xml
rename to app/design/adminhtml/base/default/layout/report.xml
diff --git a/app/design/adminhtml/default/default/layout/rss.xml b/app/design/adminhtml/base/default/layout/rss.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/rss.xml
rename to app/design/adminhtml/base/default/layout/rss.xml
diff --git a/app/design/adminhtml/default/default/layout/sales.xml b/app/design/adminhtml/base/default/layout/sales.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/sales.xml
rename to app/design/adminhtml/base/default/layout/sales.xml
diff --git a/app/design/adminhtml/default/default/layout/search.xml b/app/design/adminhtml/base/default/layout/search.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/search.xml
rename to app/design/adminhtml/base/default/layout/search.xml
diff --git a/app/design/adminhtml/default/default/layout/tag.xml b/app/design/adminhtml/base/default/layout/tag.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/tag.xml
rename to app/design/adminhtml/base/default/layout/tag.xml
diff --git a/app/design/adminhtml/default/default/layout/tax.xml b/app/design/adminhtml/base/default/layout/tax.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/tax.xml
rename to app/design/adminhtml/base/default/layout/tax.xml
diff --git a/app/design/adminhtml/default/default/layout/widget.xml b/app/design/adminhtml/base/default/layout/widget.xml
similarity index 100%
rename from app/design/adminhtml/default/default/layout/widget.xml
rename to app/design/adminhtml/base/default/layout/widget.xml
diff --git a/app/design/adminhtml/default/default/locale/en_US/translate.csv b/app/design/adminhtml/base/default/locale/en_US/translate.csv
similarity index 100%
rename from app/design/adminhtml/default/default/locale/en_US/translate.csv
rename to app/design/adminhtml/base/default/locale/en_US/translate.csv
diff --git a/app/design/adminhtml/default/default/template/access_denied.phtml b/app/design/adminhtml/base/default/template/access_denied.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/access_denied.phtml
rename to app/design/adminhtml/base/default/template/access_denied.phtml
diff --git a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml b/app/design/adminhtml/base/default/template/api/role_users_grid_js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml
rename to app/design/adminhtml/base/default/template/api/role_users_grid_js.phtml
diff --git a/app/design/adminhtml/default/default/template/api/roleinfo.phtml b/app/design/adminhtml/base/default/template/api/roleinfo.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/roleinfo.phtml
rename to app/design/adminhtml/base/default/template/api/roleinfo.phtml
diff --git a/app/design/adminhtml/default/default/template/api/roles.phtml b/app/design/adminhtml/base/default/template/api/roles.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/roles.phtml
rename to app/design/adminhtml/base/default/template/api/roles.phtml
diff --git a/app/design/adminhtml/default/default/template/api/rolesedit.phtml b/app/design/adminhtml/base/default/template/api/rolesedit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/rolesedit.phtml
rename to app/design/adminhtml/base/default/template/api/rolesedit.phtml
diff --git a/app/design/adminhtml/default/default/template/api/rolesusers.phtml b/app/design/adminhtml/base/default/template/api/rolesusers.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/rolesusers.phtml
rename to app/design/adminhtml/base/default/template/api/rolesusers.phtml
diff --git a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml b/app/design/adminhtml/base/default/template/api/user_roles_grid_js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml
rename to app/design/adminhtml/base/default/template/api/user_roles_grid_js.phtml
diff --git a/app/design/adminhtml/default/default/template/api/userinfo.phtml b/app/design/adminhtml/base/default/template/api/userinfo.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/userinfo.phtml
rename to app/design/adminhtml/base/default/template/api/userinfo.phtml
diff --git a/app/design/adminhtml/default/default/template/api/usernroles.phtml b/app/design/adminhtml/base/default/template/api/usernroles.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/usernroles.phtml
rename to app/design/adminhtml/base/default/template/api/usernroles.phtml
diff --git a/app/design/adminhtml/default/default/template/api/userroles.phtml b/app/design/adminhtml/base/default/template/api/userroles.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/userroles.phtml
rename to app/design/adminhtml/base/default/template/api/userroles.phtml
diff --git a/app/design/adminhtml/default/default/template/api/users.phtml b/app/design/adminhtml/base/default/template/api/users.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api/users.phtml
rename to app/design/adminhtml/base/default/template/api/users.phtml
diff --git a/app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml b/app/design/adminhtml/base/default/template/api2/attribute/buttons.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml
rename to app/design/adminhtml/base/default/template/api2/attribute/buttons.phtml
diff --git a/app/design/adminhtml/default/default/template/api2/attribute/resource.phtml b/app/design/adminhtml/base/default/template/api2/attribute/resource.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api2/attribute/resource.phtml
rename to app/design/adminhtml/base/default/template/api2/attribute/resource.phtml
diff --git a/app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml b/app/design/adminhtml/base/default/template/api2/permissions/user/edit/tab/roles/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml
rename to app/design/adminhtml/base/default/template/api2/permissions/user/edit/tab/roles/js.phtml
diff --git a/app/design/adminhtml/default/default/template/api2/role/buttons.phtml b/app/design/adminhtml/base/default/template/api2/role/buttons.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api2/role/buttons.phtml
rename to app/design/adminhtml/base/default/template/api2/role/buttons.phtml
diff --git a/app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml b/app/design/adminhtml/base/default/template/api2/role/users_grid_js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml
rename to app/design/adminhtml/base/default/template/api2/role/users_grid_js.phtml
diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml b/app/design/adminhtml/base/default/template/authorizenet/directpost/iframe.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml
rename to app/design/adminhtml/base/default/template/authorizenet/directpost/iframe.phtml
diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml b/app/design/adminhtml/base/default/template/authorizenet/directpost/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml
rename to app/design/adminhtml/base/default/template/authorizenet/directpost/info.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/bundle.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/bundle.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/multi.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/multi.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/radio.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/select.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/select.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/search.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/search.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/selection.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml
rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/selection.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
rename to app/design/adminhtml/base/default/template/bundle/sales/creditmemo/create/items/renderer.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
rename to app/design/adminhtml/base/default/template/bundle/sales/creditmemo/view/items/renderer.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/invoice/create/items/renderer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml
rename to app/design/adminhtml/base/default/template/bundle/sales/invoice/create/items/renderer.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/invoice/view/items/renderer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml
rename to app/design/adminhtml/base/default/template/bundle/sales/invoice/view/items/renderer.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/order/view/items/renderer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml
rename to app/design/adminhtml/base/default/template/bundle/sales/order/view/items/renderer.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/shipment/create/items/renderer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml
rename to app/design/adminhtml/base/default/template/bundle/sales/shipment/create/items/renderer.phtml
diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/shipment/view/items/renderer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml
rename to app/design/adminhtml/base/default/template/bundle/sales/shipment/view/items/renderer.phtml
diff --git a/app/design/adminhtml/default/default/template/captcha/zend.phtml b/app/design/adminhtml/base/default/template/captcha/zend.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/captcha/zend.phtml
rename to app/design/adminhtml/base/default/template/captcha/zend.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml b/app/design/adminhtml/base/default/template/catalog/category/checkboxes/tree.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml
rename to app/design/adminhtml/base/default/template/catalog/category/checkboxes/tree.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit.phtml b/app/design/adminhtml/base/default/template/catalog/category/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/category/edit.phtml
rename to app/design/adminhtml/base/default/template/catalog/category/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/base/default/template/catalog/category/edit/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml
rename to app/design/adminhtml/base/default/template/catalog/category/edit/form.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml b/app/design/adminhtml/base/default/template/catalog/category/tree.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/category/tree.phtml
rename to app/design/adminhtml/base/default/template/catalog/category/tree.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml b/app/design/adminhtml/base/default/template/catalog/category/widget/tree.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml
rename to app/design/adminhtml/base/default/template/catalog/category/widget/tree.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml b/app/design/adminhtml/base/default/template/catalog/form/renderer/fieldset/element.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml
rename to app/design/adminhtml/base/default/template/catalog/form/renderer/fieldset/element.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product.phtml b/app/design/adminhtml/base/default/template/catalog/product.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product.phtml
rename to app/design/adminhtml/base/default/template/catalog/product.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/js.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/new/created.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/new/created.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/options.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/options.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/main.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/main.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/attribute.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/attribute.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/group.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/group.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/add.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/add.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/main.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/main.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/configure.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/configure.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/configurable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/configurable.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/grouped.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/grouped.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/js.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/date.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/date.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/default.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/file.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/file.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/select.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/select.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/text.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/text.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/qty.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/qty.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/created.phtml b/app/design/adminhtml/base/default/template/catalog/product/created.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/created.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/created.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/action/attribute.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/action/attribute.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/action/inventory.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/action/inventory.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/action/websites.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/action/websites.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/categories.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/categories.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/options.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/option.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/option.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/date.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/date.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/file.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/file.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/select.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/select.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/text.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/text.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/price/group.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/price/group.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/price/tier.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/price/tier.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/serializer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/serializer.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/super/config.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/super/config.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/websites.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/edit/websites.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml b/app/design/adminhtml/base/default/template/catalog/product/helper/gallery.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/helper/gallery.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/js.phtml b/app/design/adminhtml/base/default/template/catalog/product/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/js.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/js.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/price.phtml b/app/design/adminhtml/base/default/template/catalog/product/price.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/price.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/price.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml b/app/design/adminhtml/base/default/template/catalog/product/tab/alert.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/tab/alert.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml b/app/design/adminhtml/base/default/template/catalog/product/tab/inventory.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/tab/inventory.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml b/app/design/adminhtml/base/default/template/catalog/product/widget/chooser/container.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml
rename to app/design/adminhtml/base/default/template/catalog/product/widget/chooser/container.phtml
diff --git a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml b/app/design/adminhtml/base/default/template/catalog/wysiwyg/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml
rename to app/design/adminhtml/base/default/template/catalog/wysiwyg/js.phtml
diff --git a/app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml b/app/design/adminhtml/base/default/template/centinel/authentication/complete.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml
rename to app/design/adminhtml/base/default/template/centinel/authentication/complete.phtml
diff --git a/app/design/adminhtml/default/default/template/centinel/authentication/start.phtml b/app/design/adminhtml/base/default/template/centinel/authentication/start.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/centinel/authentication/start.phtml
rename to app/design/adminhtml/base/default/template/centinel/authentication/start.phtml
diff --git a/app/design/adminhtml/default/default/template/centinel/validation/form.phtml b/app/design/adminhtml/base/default/template/centinel/validation/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/centinel/validation/form.phtml
rename to app/design/adminhtml/base/default/template/centinel/validation/form.phtml
diff --git a/app/design/adminhtml/default/default/template/cms/browser/content.phtml b/app/design/adminhtml/base/default/template/cms/browser/content.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/cms/browser/content.phtml
rename to app/design/adminhtml/base/default/template/cms/browser/content.phtml
diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/files.phtml b/app/design/adminhtml/base/default/template/cms/browser/content/files.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/cms/browser/content/files.phtml
rename to app/design/adminhtml/base/default/template/cms/browser/content/files.phtml
diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml b/app/design/adminhtml/base/default/template/cms/browser/content/newfolder.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml
rename to app/design/adminhtml/base/default/template/cms/browser/content/newfolder.phtml
diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml b/app/design/adminhtml/base/default/template/cms/browser/content/uploader.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml
rename to app/design/adminhtml/base/default/template/cms/browser/content/uploader.phtml
diff --git a/app/design/adminhtml/default/default/template/cms/browser/js.phtml b/app/design/adminhtml/base/default/template/cms/browser/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/cms/browser/js.phtml
rename to app/design/adminhtml/base/default/template/cms/browser/js.phtml
diff --git a/app/design/adminhtml/default/default/template/cms/browser/tree.phtml b/app/design/adminhtml/base/default/template/cms/browser/tree.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/cms/browser/tree.phtml
rename to app/design/adminhtml/base/default/template/cms/browser/tree.phtml
diff --git a/app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml b/app/design/adminhtml/base/default/template/cms/page/edit/form/renderer/content.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml
rename to app/design/adminhtml/base/default/template/cms/page/edit/form/renderer/content.phtml
diff --git a/app/design/adminhtml/default/default/template/coming.phtml b/app/design/adminhtml/base/default/template/coming.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/coming.phtml
rename to app/design/adminhtml/base/default/template/coming.phtml
diff --git a/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml b/app/design/adminhtml/base/default/template/currencysymbol/grid.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/currencysymbol/grid.phtml
rename to app/design/adminhtml/base/default/template/currencysymbol/grid.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/edit/js.phtml b/app/design/adminhtml/base/default/template/customer/edit/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/edit/js.phtml
rename to app/design/adminhtml/base/default/template/customer/edit/js.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml b/app/design/adminhtml/base/default/template/customer/edit/tab/account/form/renderer/group.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml
rename to app/design/adminhtml/base/default/template/customer/edit/tab/account/form/renderer/group.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml b/app/design/adminhtml/base/default/template/customer/edit/tab/view/grid/item.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml
rename to app/design/adminhtml/base/default/template/customer/edit/tab/view/grid/item.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/online.phtml b/app/design/adminhtml/base/default/template/customer/online.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/online.phtml
rename to app/design/adminhtml/base/default/template/customer/online.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml b/app/design/adminhtml/base/default/template/customer/sales/order/create/address/form/renderer/vat.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml
rename to app/design/adminhtml/base/default/template/customer/sales/order/create/address/form/renderer/vat.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml b/app/design/adminhtml/base/default/template/customer/system/config/validatevat.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml
rename to app/design/adminhtml/base/default/template/customer/system/config/validatevat.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/base/default/template/customer/tab/addresses.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
rename to app/design/adminhtml/base/default/template/customer/tab/addresses.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml b/app/design/adminhtml/base/default/template/customer/tab/cart.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/tab/cart.phtml
rename to app/design/adminhtml/base/default/template/customer/tab/cart.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml b/app/design/adminhtml/base/default/template/customer/tab/newsletter.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml
rename to app/design/adminhtml/base/default/template/customer/tab/newsletter.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/tab/view.phtml b/app/design/adminhtml/base/default/template/customer/tab/view.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/tab/view.phtml
rename to app/design/adminhtml/base/default/template/customer/tab/view.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml b/app/design/adminhtml/base/default/template/customer/tab/view/sales.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml
rename to app/design/adminhtml/base/default/template/customer/tab/view/sales.phtml
diff --git a/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml b/app/design/adminhtml/base/default/template/customer/tab/wishlist.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml
rename to app/design/adminhtml/base/default/template/customer/tab/wishlist.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/graph.phtml b/app/design/adminhtml/base/default/template/dashboard/graph.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/graph.phtml
rename to app/design/adminhtml/base/default/template/dashboard/graph.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml b/app/design/adminhtml/base/default/template/dashboard/graph/disabled.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml
rename to app/design/adminhtml/base/default/template/dashboard/graph/disabled.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/grid.phtml b/app/design/adminhtml/base/default/template/dashboard/grid.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/grid.phtml
rename to app/design/adminhtml/base/default/template/dashboard/grid.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/index.phtml b/app/design/adminhtml/base/default/template/dashboard/index.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/index.phtml
rename to app/design/adminhtml/base/default/template/dashboard/index.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml b/app/design/adminhtml/base/default/template/dashboard/salebar.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/salebar.phtml
rename to app/design/adminhtml/base/default/template/dashboard/salebar.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/searches.phtml b/app/design/adminhtml/base/default/template/dashboard/searches.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/searches.phtml
rename to app/design/adminhtml/base/default/template/dashboard/searches.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml b/app/design/adminhtml/base/default/template/dashboard/store/switcher.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
rename to app/design/adminhtml/base/default/template/dashboard/store/switcher.phtml
diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/base/default/template/dashboard/totalbar.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
rename to app/design/adminhtml/base/default/template/dashboard/totalbar.phtml
diff --git a/app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml b/app/design/adminhtml/base/default/template/directory/js/optional_zip_countries.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml
rename to app/design/adminhtml/base/default/template/directory/js/optional_zip_countries.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/product/composite/fieldset/downloadable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml
rename to app/design/adminhtml/base/default/template/downloadable/product/composite/fieldset/downloadable.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml
rename to app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/links.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
rename to app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/links.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml b/app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/samples.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml
rename to app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/samples.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/name.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/name.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml
diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml
rename to app/design/adminhtml/base/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml
diff --git a/app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml b/app/design/adminhtml/base/default/template/eav/attribute/edit/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml
rename to app/design/adminhtml/base/default/template/eav/attribute/edit/js.phtml
diff --git a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml b/app/design/adminhtml/base/default/template/eav/attribute/options.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/eav/attribute/options.phtml
rename to app/design/adminhtml/base/default/template/eav/attribute/options.phtml
diff --git a/app/design/adminhtml/default/default/template/email/order/items.phtml b/app/design/adminhtml/base/default/template/email/order/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/email/order/items.phtml
rename to app/design/adminhtml/base/default/template/email/order/items.phtml
diff --git a/app/design/adminhtml/default/default/template/empty.phtml b/app/design/adminhtml/base/default/template/empty.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/empty.phtml
rename to app/design/adminhtml/base/default/template/empty.phtml
diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/base/default/template/forgotpassword.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/forgotpassword.phtml
rename to app/design/adminhtml/base/default/template/forgotpassword.phtml
diff --git a/app/design/adminhtml/default/default/template/formkey.phtml b/app/design/adminhtml/base/default/template/formkey.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/formkey.phtml
rename to app/design/adminhtml/base/default/template/formkey.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/form.phtml b/app/design/adminhtml/base/default/template/giftmessage/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/form.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/form.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml b/app/design/adminhtml/base/default/template/giftmessage/giftoptionsform.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/giftoptionsform.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml b/app/design/adminhtml/base/default/template/giftmessage/helper.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/helper.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/helper.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/popup.phtml b/app/design/adminhtml/base/default/template/giftmessage/popup.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/popup.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/popup.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/create/giftoptions.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/create/giftoptions.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/create/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/create/items.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/view/giftoptions.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/view/giftoptions.phtml
diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/view/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml
rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/view/items.phtml
diff --git a/app/design/adminhtml/default/default/template/importexport/busy.phtml b/app/design/adminhtml/base/default/template/importexport/busy.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/importexport/busy.phtml
rename to app/design/adminhtml/base/default/template/importexport/busy.phtml
diff --git a/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml b/app/design/adminhtml/base/default/template/importexport/export/form/after.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/importexport/export/form/after.phtml
rename to app/design/adminhtml/base/default/template/importexport/export/form/after.phtml
diff --git a/app/design/adminhtml/default/default/template/importexport/export/form/before.phtml b/app/design/adminhtml/base/default/template/importexport/export/form/before.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/importexport/export/form/before.phtml
rename to app/design/adminhtml/base/default/template/importexport/export/form/before.phtml
diff --git a/app/design/adminhtml/default/default/template/importexport/import/form/after.phtml b/app/design/adminhtml/base/default/template/importexport/import/form/after.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/importexport/import/form/after.phtml
rename to app/design/adminhtml/base/default/template/importexport/import/form/after.phtml
diff --git a/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml b/app/design/adminhtml/base/default/template/importexport/import/form/before.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/importexport/import/form/before.phtml
rename to app/design/adminhtml/base/default/template/importexport/import/form/before.phtml
diff --git a/app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml b/app/design/adminhtml/base/default/template/importexport/import/frame/result.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml
rename to app/design/adminhtml/base/default/template/importexport/import/frame/result.phtml
diff --git a/app/design/adminhtml/default/default/template/index/notifications.phtml b/app/design/adminhtml/base/default/template/index/notifications.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/index/notifications.phtml
rename to app/design/adminhtml/base/default/template/index/notifications.phtml
diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/base/default/template/login.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/login.phtml
rename to app/design/adminhtml/base/default/template/login.phtml
diff --git a/app/design/adminhtml/default/default/template/media/uploader.phtml b/app/design/adminhtml/base/default/template/media/uploader.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/media/uploader.phtml
rename to app/design/adminhtml/base/default/template/media/uploader.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml b/app/design/adminhtml/base/default/template/newsletter/preview/iframeswitcher.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml
rename to app/design/adminhtml/base/default/template/newsletter/preview/iframeswitcher.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/store.phtml b/app/design/adminhtml/base/default/template/newsletter/preview/store.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/preview/store.phtml
rename to app/design/adminhtml/base/default/template/newsletter/preview/store.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml b/app/design/adminhtml/base/default/template/newsletter/problem/list.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/problem/list.phtml
rename to app/design/adminhtml/base/default/template/newsletter/problem/list.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml b/app/design/adminhtml/base/default/template/newsletter/queue/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml
rename to app/design/adminhtml/base/default/template/newsletter/queue/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml b/app/design/adminhtml/base/default/template/newsletter/queue/list.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/queue/list.phtml
rename to app/design/adminhtml/base/default/template/newsletter/queue/list.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml b/app/design/adminhtml/base/default/template/newsletter/queue/preview.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml
rename to app/design/adminhtml/base/default/template/newsletter/queue/preview.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml b/app/design/adminhtml/base/default/template/newsletter/subscriber/list.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml
rename to app/design/adminhtml/base/default/template/newsletter/subscriber/list.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml b/app/design/adminhtml/base/default/template/newsletter/template/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/template/edit.phtml
rename to app/design/adminhtml/base/default/template/newsletter/template/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml b/app/design/adminhtml/base/default/template/newsletter/template/list.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/template/list.phtml
rename to app/design/adminhtml/base/default/template/newsletter/template/list.phtml
diff --git a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml b/app/design/adminhtml/base/default/template/newsletter/template/preview.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/newsletter/template/preview.phtml
rename to app/design/adminhtml/base/default/template/newsletter/template/preview.phtml
diff --git a/app/design/adminhtml/default/default/template/notification/baseurl.phtml b/app/design/adminhtml/base/default/template/notification/baseurl.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/notification/baseurl.phtml
rename to app/design/adminhtml/base/default/template/notification/baseurl.phtml
diff --git a/app/design/adminhtml/default/default/template/notification/curl.phtml b/app/design/adminhtml/base/default/template/notification/curl.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/notification/curl.phtml
rename to app/design/adminhtml/base/default/template/notification/curl.phtml
diff --git a/app/design/adminhtml/default/default/template/notification/formkey.phtml b/app/design/adminhtml/base/default/template/notification/formkey.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/notification/formkey.phtml
rename to app/design/adminhtml/base/default/template/notification/formkey.phtml
diff --git a/app/design/adminhtml/default/default/template/notification/security.phtml b/app/design/adminhtml/base/default/template/notification/security.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/notification/security.phtml
rename to app/design/adminhtml/base/default/template/notification/security.phtml
diff --git a/app/design/adminhtml/default/default/template/notification/toolbar.phtml b/app/design/adminhtml/base/default/template/notification/toolbar.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/notification/toolbar.phtml
rename to app/design/adminhtml/base/default/template/notification/toolbar.phtml
diff --git a/app/design/adminhtml/default/default/template/notification/window.phtml b/app/design/adminhtml/base/default/template/notification/window.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/notification/window.phtml
rename to app/design/adminhtml/base/default/template/notification/window.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/button-simple.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/button-simple.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/button.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/button.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/button.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/confirm-simple.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/confirm-simple.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/confirm.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/confirm.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/form/login-simple.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/form/login-simple.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/form/login.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/form/login.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/head-simple.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/head-simple.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/reject-simple.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/reject-simple.phtml
diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/reject.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml
rename to app/design/adminhtml/base/default/template/oauth/authorize/reject.phtml
diff --git a/app/design/adminhtml/default/default/template/overlay_popup.phtml b/app/design/adminhtml/base/default/template/overlay_popup.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/overlay_popup.phtml
rename to app/design/adminhtml/base/default/template/overlay_popup.phtml
diff --git a/app/design/adminhtml/default/default/template/page.phtml b/app/design/adminhtml/base/default/template/page.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page.phtml
rename to app/design/adminhtml/base/default/template/page.phtml
diff --git a/app/design/adminhtml/default/default/template/page/footer.phtml b/app/design/adminhtml/base/default/template/page/footer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page/footer.phtml
rename to app/design/adminhtml/base/default/template/page/footer.phtml
diff --git a/app/design/adminhtml/default/default/template/page/head.phtml b/app/design/adminhtml/base/default/template/page/head.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page/head.phtml
rename to app/design/adminhtml/base/default/template/page/head.phtml
diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/base/default/template/page/header.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page/header.phtml
rename to app/design/adminhtml/base/default/template/page/header.phtml
diff --git a/app/design/adminhtml/default/default/template/page/js/calendar.phtml b/app/design/adminhtml/base/default/template/page/js/calendar.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page/js/calendar.phtml
rename to app/design/adminhtml/base/default/template/page/js/calendar.phtml
diff --git a/app/design/adminhtml/default/default/template/page/js/translate.phtml b/app/design/adminhtml/base/default/template/page/js/translate.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page/js/translate.phtml
rename to app/design/adminhtml/base/default/template/page/js/translate.phtml
diff --git a/app/design/adminhtml/default/default/template/page/menu.phtml b/app/design/adminhtml/base/default/template/page/menu.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page/menu.phtml
rename to app/design/adminhtml/base/default/template/page/menu.phtml
diff --git a/app/design/adminhtml/default/default/template/page/notices.phtml b/app/design/adminhtml/base/default/template/page/notices.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/page/notices.phtml
rename to app/design/adminhtml/base/default/template/page/notices.phtml
diff --git a/app/design/adminhtml/default/default/template/paygate/form/cc.phtml b/app/design/adminhtml/base/default/template/paygate/form/cc.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paygate/form/cc.phtml
rename to app/design/adminhtml/base/default/template/paygate/form/cc.phtml
diff --git a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml b/app/design/adminhtml/base/default/template/paygate/info/cc.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paygate/info/cc.phtml
rename to app/design/adminhtml/base/default/template/paygate/info/cc.phtml
diff --git a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml b/app/design/adminhtml/base/default/template/paygate/info/pdf.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paygate/info/pdf.phtml
rename to app/design/adminhtml/base/default/template/paygate/info/pdf.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml b/app/design/adminhtml/base/default/template/payment/form/banktransfer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml
rename to app/design/adminhtml/base/default/template/payment/form/banktransfer.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml b/app/design/adminhtml/base/default/template/payment/form/cashondelivery.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml
rename to app/design/adminhtml/base/default/template/payment/form/cashondelivery.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/form/cc.phtml b/app/design/adminhtml/base/default/template/payment/form/cc.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/form/cc.phtml
rename to app/design/adminhtml/base/default/template/payment/form/cc.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml b/app/design/adminhtml/base/default/template/payment/form/ccsave.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/form/ccsave.phtml
rename to app/design/adminhtml/base/default/template/payment/form/ccsave.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml b/app/design/adminhtml/base/default/template/payment/form/checkmo.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/form/checkmo.phtml
rename to app/design/adminhtml/base/default/template/payment/form/checkmo.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml b/app/design/adminhtml/base/default/template/payment/form/purchaseorder.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml
rename to app/design/adminhtml/base/default/template/payment/form/purchaseorder.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml b/app/design/adminhtml/base/default/template/payment/info/banktransfer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml
rename to app/design/adminhtml/base/default/template/payment/info/banktransfer.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml b/app/design/adminhtml/base/default/template/payment/info/checkmo.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/info/checkmo.phtml
rename to app/design/adminhtml/base/default/template/payment/info/checkmo.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/info/default.phtml b/app/design/adminhtml/base/default/template/payment/info/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/info/default.phtml
rename to app/design/adminhtml/base/default/template/payment/info/default.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml b/app/design/adminhtml/base/default/template/payment/info/pdf/checkmo.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml
rename to app/design/adminhtml/base/default/template/payment/info/pdf/checkmo.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml b/app/design/adminhtml/base/default/template/payment/info/pdf/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml
rename to app/design/adminhtml/base/default/template/payment/info/pdf/default.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml b/app/design/adminhtml/base/default/template/payment/info/pdf/purchaseorder.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml
rename to app/design/adminhtml/base/default/template/payment/info/pdf/purchaseorder.phtml
diff --git a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml b/app/design/adminhtml/base/default/template/payment/info/purchaseorder.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
rename to app/design/adminhtml/base/default/template/payment/info/purchaseorder.phtml
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/api_wizard.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml
rename to app/design/adminhtml/base/default/template/paypal/system/config/api_wizard.phtml
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/bml_api_wizard.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml
rename to app/design/adminhtml/base/default/template/paypal/system/config/bml_api_wizard.phtml
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/fieldset/global.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml
rename to app/design/adminhtml/base/default/template/paypal/system/config/fieldset/global.phtml
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/fieldset/hint.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml
rename to app/design/adminhtml/base/default/template/paypal/system/config/fieldset/hint.phtml
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/fieldset/store.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml
rename to app/design/adminhtml/base/default/template/paypal/system/config/fieldset/store.phtml
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/advanced.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml
rename to app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/advanced.phtml
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml
rename to app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/info.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml b/app/design/adminhtml/base/default/template/permissions/role_users_grid_js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
rename to app/design/adminhtml/base/default/template/permissions/role_users_grid_js.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml b/app/design/adminhtml/base/default/template/permissions/roleinfo.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/roleinfo.phtml
rename to app/design/adminhtml/base/default/template/permissions/roleinfo.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/roles.phtml b/app/design/adminhtml/base/default/template/permissions/roles.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/roles.phtml
rename to app/design/adminhtml/base/default/template/permissions/roles.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml b/app/design/adminhtml/base/default/template/permissions/rolesedit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/rolesedit.phtml
rename to app/design/adminhtml/base/default/template/permissions/rolesedit.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml b/app/design/adminhtml/base/default/template/permissions/rolesusers.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
rename to app/design/adminhtml/base/default/template/permissions/rolesusers.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml b/app/design/adminhtml/base/default/template/permissions/user_roles_grid_js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml
rename to app/design/adminhtml/base/default/template/permissions/user_roles_grid_js.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml b/app/design/adminhtml/base/default/template/permissions/userinfo.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/userinfo.phtml
rename to app/design/adminhtml/base/default/template/permissions/userinfo.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml b/app/design/adminhtml/base/default/template/permissions/usernroles.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/usernroles.phtml
rename to app/design/adminhtml/base/default/template/permissions/usernroles.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/userroles.phtml b/app/design/adminhtml/base/default/template/permissions/userroles.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/userroles.phtml
rename to app/design/adminhtml/base/default/template/permissions/userroles.phtml
diff --git a/app/design/adminhtml/default/default/template/permissions/users.phtml b/app/design/adminhtml/base/default/template/permissions/users.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/permissions/users.phtml
rename to app/design/adminhtml/base/default/template/permissions/users.phtml
diff --git a/app/design/adminhtml/default/default/template/popup.phtml b/app/design/adminhtml/base/default/template/popup.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/popup.phtml
rename to app/design/adminhtml/base/default/template/popup.phtml
diff --git a/app/design/adminhtml/default/default/template/promo/fieldset.phtml b/app/design/adminhtml/base/default/template/promo/fieldset.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/promo/fieldset.phtml
rename to app/design/adminhtml/base/default/template/promo/fieldset.phtml
diff --git a/app/design/adminhtml/default/default/template/promo/form.phtml b/app/design/adminhtml/base/default/template/promo/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/promo/form.phtml
rename to app/design/adminhtml/base/default/template/promo/form.phtml
diff --git a/app/design/adminhtml/default/default/template/promo/js.phtml b/app/design/adminhtml/base/default/template/promo/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/promo/js.phtml
rename to app/design/adminhtml/base/default/template/promo/js.phtml
diff --git a/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml b/app/design/adminhtml/base/default/template/promo/salesrulejs.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/promo/salesrulejs.phtml
rename to app/design/adminhtml/base/default/template/promo/salesrulejs.phtml
diff --git a/app/design/adminhtml/default/default/template/rating/detailed.phtml b/app/design/adminhtml/base/default/template/rating/detailed.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/rating/detailed.phtml
rename to app/design/adminhtml/base/default/template/rating/detailed.phtml
diff --git a/app/design/adminhtml/default/default/template/rating/options.phtml b/app/design/adminhtml/base/default/template/rating/options.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/rating/options.phtml
rename to app/design/adminhtml/base/default/template/rating/options.phtml
diff --git a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml b/app/design/adminhtml/base/default/template/rating/stars/detailed.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/rating/stars/detailed.phtml
rename to app/design/adminhtml/base/default/template/rating/stars/detailed.phtml
diff --git a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml b/app/design/adminhtml/base/default/template/rating/stars/summary.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/rating/stars/summary.phtml
rename to app/design/adminhtml/base/default/template/rating/stars/summary.phtml
diff --git a/app/design/adminhtml/default/default/template/report/grid.phtml b/app/design/adminhtml/base/default/template/report/grid.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/report/grid.phtml
rename to app/design/adminhtml/base/default/template/report/grid.phtml
diff --git a/app/design/adminhtml/default/default/template/report/grid/container.phtml b/app/design/adminhtml/base/default/template/report/grid/container.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/report/grid/container.phtml
rename to app/design/adminhtml/base/default/template/report/grid/container.phtml
diff --git a/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml b/app/design/adminhtml/base/default/template/report/refresh/statistics.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/report/refresh/statistics.phtml
rename to app/design/adminhtml/base/default/template/report/refresh/statistics.phtml
diff --git a/app/design/adminhtml/default/default/template/report/store/switcher.phtml b/app/design/adminhtml/base/default/template/report/store/switcher.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/report/store/switcher.phtml
rename to app/design/adminhtml/base/default/template/report/store/switcher.phtml
diff --git a/app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml b/app/design/adminhtml/base/default/template/report/store/switcher/enhanced.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml
rename to app/design/adminhtml/base/default/template/report/store/switcher/enhanced.phtml
diff --git a/app/design/adminhtml/default/default/template/report/wishlist.phtml b/app/design/adminhtml/base/default/template/report/wishlist.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/report/wishlist.phtml
rename to app/design/adminhtml/base/default/template/report/wishlist.phtml
diff --git a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml b/app/design/adminhtml/base/default/template/resetforgottenpassword.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
rename to app/design/adminhtml/base/default/template/resetforgottenpassword.phtml
diff --git a/app/design/adminhtml/default/default/template/review/add.phtml b/app/design/adminhtml/base/default/template/review/add.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/review/add.phtml
rename to app/design/adminhtml/base/default/template/review/add.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml b/app/design/adminhtml/base/default/template/sales/billing/agreement/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml
rename to app/design/adminhtml/base/default/template/sales/billing/agreement/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml b/app/design/adminhtml/base/default/template/sales/billing/agreement/view/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml
rename to app/design/adminhtml/base/default/template/sales/billing/agreement/view/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml b/app/design/adminhtml/base/default/template/sales/billing/agreement/view/tab/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml
rename to app/design/adminhtml/base/default/template/sales/billing/agreement/view/tab/info.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml b/app/design/adminhtml/base/default/template/sales/items/column/name.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/items/column/name.phtml
rename to app/design/adminhtml/base/default/template/sales/items/column/name.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml b/app/design/adminhtml/base/default/template/sales/items/column/qty.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/items/column/qty.phtml
rename to app/design/adminhtml/base/default/template/sales/items/column/qty.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/address/form.phtml b/app/design/adminhtml/base/default/template/sales/order/address/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/address/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/address/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml b/app/design/adminhtml/base/default/template/sales/order/comments/view.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/comments/view.phtml
rename to app/design/adminhtml/base/default/template/sales/order/comments/view.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml b/app/design/adminhtml/base/default/template/sales/order/create/abstract.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/abstract.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/billing/method/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/billing/method/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml b/app/design/adminhtml/base/default/template/sales/order/create/comment.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/comment.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/comment.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/coupons/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/coupons/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml b/app/design/adminhtml/base/default/template/sales/order/create/data.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/data.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/data.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml b/app/design/adminhtml/base/default/template/sales/order/create/form/account.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/form/account.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml b/app/design/adminhtml/base/default/template/sales/order/create/form/address.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/form/address.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml b/app/design/adminhtml/base/default/template/sales/order/create/giftmessage.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/giftmessage.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/create/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/js.phtml b/app/design/adminhtml/base/default/template/sales/order/create/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/js.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/js.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/newsletter/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/newsletter/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/shipping/method/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/shipping/method/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml b/app/design/adminhtml/base/default/template/sales/order/create/sidebar.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/sidebar.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml b/app/design/adminhtml/base/default/template/sales/order/create/sidebar/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/sidebar/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml b/app/design/adminhtml/base/default/template/sales/order/create/store/select.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/store/select.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/totals.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/totals.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/totals/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/grandtotal.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/totals/grandtotal.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/shipping.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/totals/shipping.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/subtotal.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/totals/subtotal.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/tax.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml
rename to app/design/adminhtml/base/default/template/sales/order/create/totals/tax.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/totals/adjustments.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/totals/adjustments.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml b/app/design/adminhtml/base/default/template/sales/order/giftoptions.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml
rename to app/design/adminhtml/base/default/template/sales/order/giftoptions.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/configurable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/configurable.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/tracking.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/tracking.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/configurable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/configurable.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/tracking.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/tracking.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/packaging/grid.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/packaging/grid.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/packaging/packed.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/packaging/packed.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/packaging/popup.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/packaging/popup.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/tracking/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/tracking/info.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/configurable.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/configurable.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/tracking.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml
rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/tracking.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml b/app/design/adminhtml/base/default/template/sales/order/totalbar.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totalbar.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totalbar.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals.phtml b/app/design/adminhtml/base/default/template/sales/order/totals.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/discount.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/discount.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/due.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/due.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/due.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/footer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/footer.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/grand.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/grand.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/item.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/item.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/item.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/main.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/main.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/main.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/paid.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/paid.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/refunded.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/refunded.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/shipping.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/shipping.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/subtotal.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/subtotal.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/tax.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml
rename to app/design/adminhtml/base/default/template/sales/order/totals/tax.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/view/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/form.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/form.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml b/app/design/adminhtml/base/default/template/sales/order/view/giftmessage.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/giftmessage.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml b/app/design/adminhtml/base/default/template/sales/order/view/history.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/history.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/history.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/base/default/template/sales/order/view/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/info.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/info.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/view/items.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/items.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/items.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/view/items/renderer/default.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/items/renderer/default.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml b/app/design/adminhtml/base/default/template/sales/order/view/tab/history.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/tab/history.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/base/default/template/sales/order/view/tab/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/tab/info.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/view/tracking.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml
rename to app/design/adminhtml/base/default/template/sales/order/view/tracking.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml b/app/design/adminhtml/base/default/template/sales/payment/form/billing/agreement.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml
rename to app/design/adminhtml/base/default/template/sales/payment/form/billing/agreement.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml b/app/design/adminhtml/base/default/template/sales/recurring/profile/view.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml
rename to app/design/adminhtml/base/default/template/sales/recurring/profile/view.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml b/app/design/adminhtml/base/default/template/sales/recurring/profile/view/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml
rename to app/design/adminhtml/base/default/template/sales/recurring/profile/view/info.phtml
diff --git a/app/design/adminhtml/default/default/template/sales/transactions/detail.phtml b/app/design/adminhtml/base/default/template/sales/transactions/detail.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/sales/transactions/detail.phtml
rename to app/design/adminhtml/base/default/template/sales/transactions/detail.phtml
diff --git a/app/design/adminhtml/default/default/template/store/switcher.phtml b/app/design/adminhtml/base/default/template/store/switcher.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/store/switcher.phtml
rename to app/design/adminhtml/base/default/template/store/switcher.phtml
diff --git a/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml b/app/design/adminhtml/base/default/template/store/switcher/enhanced.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml
rename to app/design/adminhtml/base/default/template/store/switcher/enhanced.phtml
diff --git a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml b/app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml
rename to app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset.phtml
diff --git a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml b/app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset/element.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml
rename to app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset/element.phtml
diff --git a/app/design/adminhtml/default/default/template/system/autocomplete.phtml b/app/design/adminhtml/base/default/template/system/autocomplete.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/autocomplete.phtml
rename to app/design/adminhtml/base/default/template/system/autocomplete.phtml
diff --git a/app/design/adminhtml/default/default/template/system/cache/additional.phtml b/app/design/adminhtml/base/default/template/system/cache/additional.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/cache/additional.phtml
rename to app/design/adminhtml/base/default/template/system/cache/additional.phtml
diff --git a/app/design/adminhtml/default/default/template/system/cache/edit.phtml b/app/design/adminhtml/base/default/template/system/cache/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/cache/edit.phtml
rename to app/design/adminhtml/base/default/template/system/cache/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/system/cache/notifications.phtml b/app/design/adminhtml/base/default/template/system/cache/notifications.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/cache/notifications.phtml
rename to app/design/adminhtml/base/default/template/system/cache/notifications.phtml
diff --git a/app/design/adminhtml/default/default/template/system/config/edit.phtml b/app/design/adminhtml/base/default/template/system/config/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/config/edit.phtml
rename to app/design/adminhtml/base/default/template/system/config/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml b/app/design/adminhtml/base/default/template/system/config/form/field/array.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/config/form/field/array.phtml
rename to app/design/adminhtml/base/default/template/system/config/form/field/array.phtml
diff --git a/app/design/adminhtml/default/default/template/system/config/js.phtml b/app/design/adminhtml/base/default/template/system/config/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/config/js.phtml
rename to app/design/adminhtml/base/default/template/system/config/js.phtml
diff --git a/app/design/adminhtml/default/default/template/system/config/switcher.phtml b/app/design/adminhtml/base/default/template/system/config/switcher.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/config/switcher.phtml
rename to app/design/adminhtml/base/default/template/system/config/switcher.phtml
diff --git a/app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml b/app/design/adminhtml/base/default/template/system/config/system/storage/media/synchronize.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml
rename to app/design/adminhtml/base/default/template/system/config/system/storage/media/synchronize.phtml
diff --git a/app/design/adminhtml/default/default/template/system/config/tabs.phtml b/app/design/adminhtml/base/default/template/system/config/tabs.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/config/tabs.phtml
rename to app/design/adminhtml/base/default/template/system/config/tabs.phtml
diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/process.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/process.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/convert/profile/process.phtml
rename to app/design/adminhtml/base/default/template/system/convert/profile/process.phtml
diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/run.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/convert/profile/run.phtml
rename to app/design/adminhtml/base/default/template/system/convert/profile/run.phtml
diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/upload.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml
rename to app/design/adminhtml/base/default/template/system/convert/profile/upload.phtml
diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/wizard.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml
rename to app/design/adminhtml/base/default/template/system/convert/profile/wizard.phtml
diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml b/app/design/adminhtml/base/default/template/system/currency/rate/matrix.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml
rename to app/design/adminhtml/base/default/template/system/currency/rate/matrix.phtml
diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/services.phtml b/app/design/adminhtml/base/default/template/system/currency/rate/services.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/currency/rate/services.phtml
rename to app/design/adminhtml/base/default/template/system/currency/rate/services.phtml
diff --git a/app/design/adminhtml/default/default/template/system/currency/rates.phtml b/app/design/adminhtml/base/default/template/system/currency/rates.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/currency/rates.phtml
rename to app/design/adminhtml/base/default/template/system/currency/rates.phtml
diff --git a/app/design/adminhtml/default/default/template/system/design/edit.phtml b/app/design/adminhtml/base/default/template/system/design/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/design/edit.phtml
rename to app/design/adminhtml/base/default/template/system/design/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/system/design/index.phtml b/app/design/adminhtml/base/default/template/system/design/index.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/design/index.phtml
rename to app/design/adminhtml/base/default/template/system/design/index.phtml
diff --git a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml b/app/design/adminhtml/base/default/template/system/email/template/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/email/template/edit.phtml
rename to app/design/adminhtml/base/default/template/system/email/template/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/system/email/template/list.phtml b/app/design/adminhtml/base/default/template/system/email/template/list.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/email/template/list.phtml
rename to app/design/adminhtml/base/default/template/system/email/template/list.phtml
diff --git a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml b/app/design/adminhtml/base/default/template/system/email/template/preview.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/email/template/preview.phtml
rename to app/design/adminhtml/base/default/template/system/email/template/preview.phtml
diff --git a/app/design/adminhtml/default/default/template/system/info.phtml b/app/design/adminhtml/base/default/template/system/info.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/info.phtml
rename to app/design/adminhtml/base/default/template/system/info.phtml
diff --git a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml b/app/design/adminhtml/base/default/template/system/shipping/applicable_country.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml
rename to app/design/adminhtml/base/default/template/system/shipping/applicable_country.phtml
diff --git a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml b/app/design/adminhtml/base/default/template/system/shipping/ups.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/shipping/ups.phtml
rename to app/design/adminhtml/base/default/template/system/shipping/ups.phtml
diff --git a/app/design/adminhtml/default/default/template/system/store/cell.phtml b/app/design/adminhtml/base/default/template/system/store/cell.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/store/cell.phtml
rename to app/design/adminhtml/base/default/template/system/store/cell.phtml
diff --git a/app/design/adminhtml/default/default/template/system/store/container.phtml b/app/design/adminhtml/base/default/template/system/store/container.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/store/container.phtml
rename to app/design/adminhtml/base/default/template/system/store/container.phtml
diff --git a/app/design/adminhtml/default/default/template/system/store/tree.phtml b/app/design/adminhtml/base/default/template/system/store/tree.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/store/tree.phtml
rename to app/design/adminhtml/base/default/template/system/store/tree.phtml
diff --git a/app/design/adminhtml/default/default/template/system/variable/js.phtml b/app/design/adminhtml/base/default/template/system/variable/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/system/variable/js.phtml
rename to app/design/adminhtml/base/default/template/system/variable/js.phtml
diff --git a/app/design/adminhtml/default/default/template/tag/edit/container.phtml b/app/design/adminhtml/base/default/template/tag/edit/container.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tag/edit/container.phtml
rename to app/design/adminhtml/base/default/template/tag/edit/container.phtml
diff --git a/app/design/adminhtml/default/default/template/tag/index.phtml b/app/design/adminhtml/base/default/template/tag/index.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tag/index.phtml
rename to app/design/adminhtml/base/default/template/tag/index.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml b/app/design/adminhtml/base/default/template/tax/class/page/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/class/page/edit.phtml
rename to app/design/adminhtml/base/default/template/tax/class/page/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/importExport.phtml b/app/design/adminhtml/base/default/template/tax/importExport.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/importExport.phtml
rename to app/design/adminhtml/base/default/template/tax/importExport.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/notifications.phtml b/app/design/adminhtml/base/default/template/tax/notifications.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/notifications.phtml
rename to app/design/adminhtml/base/default/template/tax/notifications.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/rate/form.phtml b/app/design/adminhtml/base/default/template/tax/rate/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/rate/form.phtml
rename to app/design/adminhtml/base/default/template/tax/rate/form.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/rate/title.phtml b/app/design/adminhtml/base/default/template/tax/rate/title.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/rate/title.phtml
rename to app/design/adminhtml/base/default/template/tax/rate/title.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/class/add.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml
rename to app/design/adminhtml/base/default/template/tax/toolbar/class/add.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
rename to app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rate/add.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
rename to app/design/adminhtml/base/default/template/tax/toolbar/rate/add.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rate/save.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
rename to app/design/adminhtml/base/default/template/tax/toolbar/rate/save.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rule/add.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml
rename to app/design/adminhtml/base/default/template/tax/toolbar/rule/add.phtml
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
rename to app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml
diff --git a/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml b/app/design/adminhtml/base/default/template/urlrewrite/categories.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/urlrewrite/categories.phtml
rename to app/design/adminhtml/base/default/template/urlrewrite/categories.phtml
diff --git a/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml b/app/design/adminhtml/base/default/template/urlrewrite/edit.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/urlrewrite/edit.phtml
rename to app/design/adminhtml/base/default/template/urlrewrite/edit.phtml
diff --git a/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml b/app/design/adminhtml/base/default/template/urlrewrite/selector.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/urlrewrite/selector.phtml
rename to app/design/adminhtml/base/default/template/urlrewrite/selector.phtml
diff --git a/app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml b/app/design/adminhtml/base/default/template/usa/dhl/unitofmeasure.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml
rename to app/design/adminhtml/base/default/template/usa/dhl/unitofmeasure.phtml
diff --git a/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml b/app/design/adminhtml/base/default/template/weee/renderer/tax.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/weee/renderer/tax.phtml
rename to app/design/adminhtml/base/default/template/weee/renderer/tax.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/accordion.phtml b/app/design/adminhtml/base/default/template/widget/accordion.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/accordion.phtml
rename to app/design/adminhtml/base/default/template/widget/accordion.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml b/app/design/adminhtml/base/default/template/widget/breadcrumbs.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
rename to app/design/adminhtml/base/default/template/widget/breadcrumbs.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/form.phtml b/app/design/adminhtml/base/default/template/widget/form.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/form.phtml
rename to app/design/adminhtml/base/default/template/widget/form.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/form/container.phtml b/app/design/adminhtml/base/default/template/widget/form/container.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/form/container.phtml
rename to app/design/adminhtml/base/default/template/widget/form/container.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/form/element.phtml b/app/design/adminhtml/base/default/template/widget/form/element.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/form/element.phtml
rename to app/design/adminhtml/base/default/template/widget/form/element.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml b/app/design/adminhtml/base/default/template/widget/form/element/gallery.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml
rename to app/design/adminhtml/base/default/template/widget/form/element/gallery.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml b/app/design/adminhtml/base/default/template/widget/form/renderer/element.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml
rename to app/design/adminhtml/base/default/template/widget/form/renderer/element.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml b/app/design/adminhtml/base/default/template/widget/form/renderer/fieldset.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml
rename to app/design/adminhtml/base/default/template/widget/form/renderer/fieldset.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml b/app/design/adminhtml/base/default/template/widget/form/renderer/fieldset/element.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml
rename to app/design/adminhtml/base/default/template/widget/form/renderer/fieldset/element.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/grid.phtml b/app/design/adminhtml/base/default/template/widget/grid.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/grid.phtml
rename to app/design/adminhtml/base/default/template/widget/grid.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/grid/container.phtml b/app/design/adminhtml/base/default/template/widget/grid/container.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/grid/container.phtml
rename to app/design/adminhtml/base/default/template/widget/grid/container.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml b/app/design/adminhtml/base/default/template/widget/grid/massaction.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/grid/massaction.phtml
rename to app/design/adminhtml/base/default/template/widget/grid/massaction.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/grid/serializer.phtml b/app/design/adminhtml/base/default/template/widget/grid/serializer.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/grid/serializer.phtml
rename to app/design/adminhtml/base/default/template/widget/grid/serializer.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml b/app/design/adminhtml/base/default/template/widget/instance/edit/layout.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml
rename to app/design/adminhtml/base/default/template/widget/instance/edit/layout.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/instance/js.phtml b/app/design/adminhtml/base/default/template/widget/instance/js.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/instance/js.phtml
rename to app/design/adminhtml/base/default/template/widget/instance/js.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/tabs.phtml b/app/design/adminhtml/base/default/template/widget/tabs.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/tabs.phtml
rename to app/design/adminhtml/base/default/template/widget/tabs.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml b/app/design/adminhtml/base/default/template/widget/tabshoriz.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/tabshoriz.phtml
rename to app/design/adminhtml/base/default/template/widget/tabshoriz.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/tabsleft.phtml b/app/design/adminhtml/base/default/template/widget/tabsleft.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/tabsleft.phtml
rename to app/design/adminhtml/base/default/template/widget/tabsleft.phtml
diff --git a/app/design/adminhtml/default/default/template/widget/view/container.phtml b/app/design/adminhtml/base/default/template/widget/view/container.phtml
similarity index 100%
rename from app/design/adminhtml/default/default/template/widget/view/container.phtml
rename to app/design/adminhtml/base/default/template/widget/view/container.phtml
diff --git a/app/design/adminhtml/default/default/etc/theme.xml b/app/design/adminhtml/default/default/etc/theme.xml
index edac8f1400e..b38f8fb22b0 100644
--- a/app/design/adminhtml/default/default/etc/theme.xml
+++ b/app/design/adminhtml/default/default/etc/theme.xml
@@ -1,12 +1,19 @@
<?xml version="1.0"?>
<!--
/**
- * @copyright For copyright and license information, read the COPYING.txt file.
- * @link /COPYING.txt
- * @license Academic Free License (AFL 3.0)
+ * OpenMage
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available at https://opensource.org/license/afl-3-0-php
+ *
+ * @category design
* @package default_default
+ * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
+ * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
+ * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
<theme>
- <parent />
-</theme>
+ <parent>base/default</parent>
+</theme>
\ No newline at end of file
diff --git a/app/design/adminhtml/openmage/default/etc/theme.xml b/app/design/adminhtml/openmage/default/etc/theme.xml
new file mode 100644
index 00000000000..dff371da863
--- /dev/null
+++ b/app/design/adminhtml/openmage/default/etc/theme.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available at https://opensource.org/license/afl-3-0-php
+ *
+ * @category design
+ * @package default_default
+ * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
+ * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
+ * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<theme>
+ <parent>default/default</parent>
+ <layout>
+ <updates>
+ <openmage_adminhtml_default>
+ <file>openmage.xml</file>
+ </openmage_adminhtml_default>
+ </updates>
+ </layout>
+</theme>
\ No newline at end of file
diff --git a/app/design/adminhtml/default/openmage/layout/local.xml b/app/design/adminhtml/openmage/default/layout/openmage.xml
similarity index 100%
rename from app/design/adminhtml/default/openmage/layout/local.xml
rename to app/design/adminhtml/openmage/default/layout/openmage.xml
diff --git a/app/design/adminhtml/default/openmage/template/eav/attribute/options.phtml b/app/design/adminhtml/openmage/default/template/eav/attribute/options.phtml
similarity index 100%
rename from app/design/adminhtml/default/openmage/template/eav/attribute/options.phtml
rename to app/design/adminhtml/openmage/default/template/eav/attribute/options.phtml
diff --git a/app/design/adminhtml/default/openmage/template/forgotpassword.phtml b/app/design/adminhtml/openmage/default/template/forgotpassword.phtml
similarity index 100%
rename from app/design/adminhtml/default/openmage/template/forgotpassword.phtml
rename to app/design/adminhtml/openmage/default/template/forgotpassword.phtml
diff --git a/app/design/adminhtml/default/openmage/template/login.phtml b/app/design/adminhtml/openmage/default/template/login.phtml
similarity index 100%
rename from app/design/adminhtml/default/openmage/template/login.phtml
rename to app/design/adminhtml/openmage/default/template/login.phtml
diff --git a/app/design/adminhtml/default/openmage/template/page/header.phtml b/app/design/adminhtml/openmage/default/template/page/header.phtml
similarity index 100%
rename from app/design/adminhtml/default/openmage/template/page/header.phtml
rename to app/design/adminhtml/openmage/default/template/page/header.phtml
diff --git a/app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml b/app/design/adminhtml/openmage/default/template/resetforgottenpassword.phtml
similarity index 100%
rename from app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml
rename to app/design/adminhtml/openmage/default/template/resetforgottenpassword.phtml
diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/base/default/boxes.css
similarity index 100%
rename from skin/adminhtml/default/default/boxes.css
rename to skin/adminhtml/base/default/boxes.css
diff --git a/skin/adminhtml/default/default/custom.css b/skin/adminhtml/base/default/custom.css
similarity index 100%
rename from skin/adminhtml/default/default/custom.css
rename to skin/adminhtml/base/default/custom.css
diff --git a/skin/adminhtml/default/default/favicon.ico b/skin/adminhtml/base/default/favicon.ico
similarity index 100%
rename from skin/adminhtml/default/default/favicon.ico
rename to skin/adminhtml/base/default/favicon.ico
diff --git a/skin/adminhtml/default/default/images/accordion_close.gif b/skin/adminhtml/base/default/images/accordion_close.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/accordion_close.gif
rename to skin/adminhtml/base/default/images/accordion_close.gif
diff --git a/skin/adminhtml/default/default/images/accordion_close.png b/skin/adminhtml/base/default/images/accordion_close.png
similarity index 100%
rename from skin/adminhtml/default/default/images/accordion_close.png
rename to skin/adminhtml/base/default/images/accordion_close.png
diff --git a/skin/adminhtml/default/default/images/accordion_open.gif b/skin/adminhtml/base/default/images/accordion_open.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/accordion_open.gif
rename to skin/adminhtml/base/default/images/accordion_open.gif
diff --git a/skin/adminhtml/default/default/images/accordion_open.png b/skin/adminhtml/base/default/images/accordion_open.png
similarity index 100%
rename from skin/adminhtml/default/default/images/accordion_open.png
rename to skin/adminhtml/base/default/images/accordion_open.png
diff --git a/skin/adminhtml/default/default/images/add_btn_icon-disabled.gif b/skin/adminhtml/base/default/images/add_btn_icon-disabled.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/add_btn_icon-disabled.gif
rename to skin/adminhtml/base/default/images/add_btn_icon-disabled.gif
diff --git a/skin/adminhtml/default/default/images/add_btn_icon.gif b/skin/adminhtml/base/default/images/add_btn_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/add_btn_icon.gif
rename to skin/adminhtml/base/default/images/add_btn_icon.gif
diff --git a/skin/adminhtml/default/default/images/address_list_li.gif b/skin/adminhtml/base/default/images/address_list_li.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/address_list_li.gif
rename to skin/adminhtml/base/default/images/address_list_li.gif
diff --git a/skin/adminhtml/default/default/images/address_list_on_arrow.gif b/skin/adminhtml/base/default/images/address_list_on_arrow.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/address_list_on_arrow.gif
rename to skin/adminhtml/base/default/images/address_list_on_arrow.gif
diff --git a/skin/adminhtml/default/default/images/address_list_over_arrow.gif b/skin/adminhtml/base/default/images/address_list_over_arrow.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/address_list_over_arrow.gif
rename to skin/adminhtml/base/default/images/address_list_over_arrow.gif
diff --git a/skin/adminhtml/default/default/images/address_list_over_bg.gif b/skin/adminhtml/base/default/images/address_list_over_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/address_list_over_bg.gif
rename to skin/adminhtml/base/default/images/address_list_over_bg.gif
diff --git a/skin/adminhtml/default/default/images/ajax-loader-tr.gif b/skin/adminhtml/base/default/images/ajax-loader-tr.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/ajax-loader-tr.gif
rename to skin/adminhtml/base/default/images/ajax-loader-tr.gif
diff --git a/skin/adminhtml/default/default/images/ajax-loader.gif b/skin/adminhtml/base/default/images/ajax-loader.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/ajax-loader.gif
rename to skin/adminhtml/base/default/images/ajax-loader.gif
diff --git a/skin/adminhtml/default/default/images/application_view_tile.gif b/skin/adminhtml/base/default/images/application_view_tile.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/application_view_tile.gif
rename to skin/adminhtml/base/default/images/application_view_tile.gif
diff --git a/skin/adminhtml/default/default/images/arrow_sort_move.gif b/skin/adminhtml/base/default/images/arrow_sort_move.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/arrow_sort_move.gif
rename to skin/adminhtml/base/default/images/arrow_sort_move.gif
diff --git a/skin/adminhtml/default/default/images/bg_collapse.gif b/skin/adminhtml/base/default/images/bg_collapse.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/bg_collapse.gif
rename to skin/adminhtml/base/default/images/bg_collapse.gif
diff --git a/skin/adminhtml/default/default/images/bg_create_order_totals.gif b/skin/adminhtml/base/default/images/bg_create_order_totals.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/bg_create_order_totals.gif
rename to skin/adminhtml/base/default/images/bg_create_order_totals.gif
diff --git a/skin/adminhtml/default/default/images/bg_notifications.gif b/skin/adminhtml/base/default/images/bg_notifications.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/bg_notifications.gif
rename to skin/adminhtml/base/default/images/bg_notifications.gif
diff --git a/skin/adminhtml/default/default/images/bg_window_mask.png b/skin/adminhtml/base/default/images/bg_window_mask.png
similarity index 100%
rename from skin/adminhtml/default/default/images/bg_window_mask.png
rename to skin/adminhtml/base/default/images/bg_window_mask.png
diff --git a/skin/adminhtml/default/default/images/bkg_btn-close.gif b/skin/adminhtml/base/default/images/bkg_btn-close.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/bkg_btn-close.gif
rename to skin/adminhtml/base/default/images/bkg_btn-close.gif
diff --git a/skin/adminhtml/default/default/images/bkg_btn-close2.gif b/skin/adminhtml/base/default/images/bkg_btn-close2.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/bkg_btn-close2.gif
rename to skin/adminhtml/base/default/images/bkg_btn-close2.gif
diff --git a/skin/adminhtml/default/default/images/bkg_config-advanced.png b/skin/adminhtml/base/default/images/bkg_config-advanced.png
similarity index 100%
rename from skin/adminhtml/default/default/images/bkg_config-advanced.png
rename to skin/adminhtml/base/default/images/bkg_config-advanced.png
diff --git a/skin/adminhtml/default/default/images/bkg_config-nested.png b/skin/adminhtml/base/default/images/bkg_config-nested.png
similarity index 100%
rename from skin/adminhtml/default/default/images/bkg_config-nested.png
rename to skin/adminhtml/base/default/images/bkg_config-nested.png
diff --git a/skin/adminhtml/default/default/images/bkg_config-shaddow.png b/skin/adminhtml/base/default/images/bkg_config-shaddow.png
similarity index 100%
rename from skin/adminhtml/default/default/images/bkg_config-shaddow.png
rename to skin/adminhtml/base/default/images/bkg_config-shaddow.png
diff --git a/skin/adminhtml/default/default/images/bkg_tooltip.png b/skin/adminhtml/base/default/images/bkg_tooltip.png
similarity index 100%
rename from skin/adminhtml/default/default/images/bkg_tooltip.png
rename to skin/adminhtml/base/default/images/bkg_tooltip.png
diff --git a/skin/adminhtml/default/default/images/blank.gif b/skin/adminhtml/base/default/images/blank.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/blank.gif
rename to skin/adminhtml/base/default/images/blank.gif
diff --git a/skin/adminhtml/default/default/images/box_bg.gif b/skin/adminhtml/base/default/images/box_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/box_bg.gif
rename to skin/adminhtml/base/default/images/box_bg.gif
diff --git a/skin/adminhtml/default/default/images/breadcrumb_bg.gif b/skin/adminhtml/base/default/images/breadcrumb_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/breadcrumb_bg.gif
rename to skin/adminhtml/base/default/images/breadcrumb_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_add-image_icon.gif b/skin/adminhtml/base/default/images/btn_add-image_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_add-image_icon.gif
rename to skin/adminhtml/base/default/images/btn_add-image_icon.gif
diff --git a/skin/adminhtml/default/default/images/btn_add-variable_icon.gif b/skin/adminhtml/base/default/images/btn_add-variable_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_add-variable_icon.gif
rename to skin/adminhtml/base/default/images/btn_add-variable_icon.gif
diff --git a/skin/adminhtml/default/default/images/btn_add-widget_icon.gif b/skin/adminhtml/base/default/images/btn_add-widget_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_add-widget_icon.gif
rename to skin/adminhtml/base/default/images/btn_add-widget_icon.gif
diff --git a/skin/adminhtml/default/default/images/btn_add-widget_icon2.gif b/skin/adminhtml/base/default/images/btn_add-widget_icon2.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_add-widget_icon2.gif
rename to skin/adminhtml/base/default/images/btn_add-widget_icon2.gif
diff --git a/skin/adminhtml/default/default/images/btn_back_bg.gif b/skin/adminhtml/base/default/images/btn_back_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_back_bg.gif
rename to skin/adminhtml/base/default/images/btn_back_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_bare_bg.gif b/skin/adminhtml/base/default/images/btn_bare_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_bare_bg.gif
rename to skin/adminhtml/base/default/images/btn_bare_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_bg-disabled.gif b/skin/adminhtml/base/default/images/btn_bg-disabled.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_bg-disabled.gif
rename to skin/adminhtml/base/default/images/btn_bg-disabled.gif
diff --git a/skin/adminhtml/default/default/images/btn_bg.gif b/skin/adminhtml/base/default/images/btn_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_bg.gif
rename to skin/adminhtml/base/default/images/btn_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_bg.png b/skin/adminhtml/base/default/images/btn_bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_bg.png
rename to skin/adminhtml/base/default/images/btn_bg.png
diff --git a/skin/adminhtml/default/default/images/btn_cancel_bg.gif b/skin/adminhtml/base/default/images/btn_cancel_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_cancel_bg.gif
rename to skin/adminhtml/base/default/images/btn_cancel_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_delete_bg.gif b/skin/adminhtml/base/default/images/btn_delete_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_delete_bg.gif
rename to skin/adminhtml/base/default/images/btn_delete_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_go.gif b/skin/adminhtml/base/default/images/btn_go.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_go.gif
rename to skin/adminhtml/base/default/images/btn_go.gif
diff --git a/skin/adminhtml/default/default/images/btn_gr_bg.gif b/skin/adminhtml/base/default/images/btn_gr_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_gr_bg.gif
rename to skin/adminhtml/base/default/images/btn_gr_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_gr_on.gif b/skin/adminhtml/base/default/images/btn_gr_on.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_gr_on.gif
rename to skin/adminhtml/base/default/images/btn_gr_on.gif
diff --git a/skin/adminhtml/default/default/images/btn_gr_over.gif b/skin/adminhtml/base/default/images/btn_gr_over.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_gr_over.gif
rename to skin/adminhtml/base/default/images/btn_gr_over.gif
diff --git a/skin/adminhtml/default/default/images/btn_loading-icon.gif b/skin/adminhtml/base/default/images/btn_loading-icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_loading-icon.gif
rename to skin/adminhtml/base/default/images/btn_loading-icon.gif
diff --git a/skin/adminhtml/default/default/images/btn_login.gif b/skin/adminhtml/base/default/images/btn_login.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_login.gif
rename to skin/adminhtml/base/default/images/btn_login.gif
diff --git a/skin/adminhtml/default/default/images/btn_on_bg.gif b/skin/adminhtml/base/default/images/btn_on_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_on_bg.gif
rename to skin/adminhtml/base/default/images/btn_on_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_over_bg.gif b/skin/adminhtml/base/default/images/btn_over_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_over_bg.gif
rename to skin/adminhtml/base/default/images/btn_over_bg.gif
diff --git a/skin/adminhtml/default/default/images/btn_show-hide_icon.gif b/skin/adminhtml/base/default/images/btn_show-hide_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_show-hide_icon.gif
rename to skin/adminhtml/base/default/images/btn_show-hide_icon.gif
diff --git a/skin/adminhtml/default/default/images/btn_task_bg.gif b/skin/adminhtml/base/default/images/btn_task_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/btn_task_bg.gif
rename to skin/adminhtml/base/default/images/btn_task_bg.gif
diff --git a/skin/adminhtml/default/default/images/button-close.png b/skin/adminhtml/base/default/images/button-close.png
similarity index 100%
rename from skin/adminhtml/default/default/images/button-close.png
rename to skin/adminhtml/base/default/images/button-close.png
diff --git a/skin/adminhtml/default/default/images/cancel_btn_active_bg.gif b/skin/adminhtml/base/default/images/cancel_btn_active_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/cancel_btn_active_bg.gif
rename to skin/adminhtml/base/default/images/cancel_btn_active_bg.gif
diff --git a/skin/adminhtml/default/default/images/cancel_btn_bg.gif b/skin/adminhtml/base/default/images/cancel_btn_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/cancel_btn_bg.gif
rename to skin/adminhtml/base/default/images/cancel_btn_bg.gif
diff --git a/skin/adminhtml/default/default/images/cancel_btn_icon.gif b/skin/adminhtml/base/default/images/cancel_btn_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/cancel_btn_icon.gif
rename to skin/adminhtml/base/default/images/cancel_btn_icon.gif
diff --git a/skin/adminhtml/default/default/images/cancel_btn_over_bg.gif b/skin/adminhtml/base/default/images/cancel_btn_over_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/cancel_btn_over_bg.gif
rename to skin/adminhtml/base/default/images/cancel_btn_over_bg.gif
diff --git a/skin/adminhtml/default/default/images/cancel_icon.gif b/skin/adminhtml/base/default/images/cancel_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/cancel_icon.gif
rename to skin/adminhtml/base/default/images/cancel_icon.gif
diff --git a/skin/adminhtml/default/default/images/config_tab_dt_bg.gif b/skin/adminhtml/base/default/images/config_tab_dt_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/config_tab_dt_bg.gif
rename to skin/adminhtml/base/default/images/config_tab_dt_bg.gif
diff --git a/skin/adminhtml/default/default/images/dashboard-close.gif b/skin/adminhtml/base/default/images/dashboard-close.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/dashboard-close.gif
rename to skin/adminhtml/base/default/images/dashboard-close.gif
diff --git a/skin/adminhtml/default/default/images/db-graph-bg.gif b/skin/adminhtml/base/default/images/db-graph-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-graph-bg.gif
rename to skin/adminhtml/base/default/images/db-graph-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-graph-bottom-bg.gif b/skin/adminhtml/base/default/images/db-graph-bottom-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-graph-bottom-bg.gif
rename to skin/adminhtml/base/default/images/db-graph-bottom-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-graph-line-bg.gif b/skin/adminhtml/base/default/images/db-graph-line-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-graph-line-bg.gif
rename to skin/adminhtml/base/default/images/db-graph-line-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-graph-line2-bg.gif b/skin/adminhtml/base/default/images/db-graph-line2-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-graph-line2-bg.gif
rename to skin/adminhtml/base/default/images/db-graph-line2-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-graph-x-bg.png b/skin/adminhtml/base/default/images/db-graph-x-bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/db-graph-x-bg.png
rename to skin/adminhtml/base/default/images/db-graph-x-bg.png
diff --git a/skin/adminhtml/default/default/images/db-header-bg.png b/skin/adminhtml/base/default/images/db-header-bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/db-header-bg.png
rename to skin/adminhtml/base/default/images/db-header-bg.png
diff --git a/skin/adminhtml/default/default/images/db-menu-bg-hov.gif b/skin/adminhtml/base/default/images/db-menu-bg-hov.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-menu-bg-hov.gif
rename to skin/adminhtml/base/default/images/db-menu-bg-hov.gif
diff --git a/skin/adminhtml/default/default/images/db-menu-bg-up.gif b/skin/adminhtml/base/default/images/db-menu-bg-up.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-menu-bg-up.gif
rename to skin/adminhtml/base/default/images/db-menu-bg-up.gif
diff --git a/skin/adminhtml/default/default/images/db-menu-bg.gif b/skin/adminhtml/base/default/images/db-menu-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-menu-bg.gif
rename to skin/adminhtml/base/default/images/db-menu-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-menu-sep-last.gif b/skin/adminhtml/base/default/images/db-menu-sep-last.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-menu-sep-last.gif
rename to skin/adminhtml/base/default/images/db-menu-sep-last.gif
diff --git a/skin/adminhtml/default/default/images/db-menu-sep.gif b/skin/adminhtml/base/default/images/db-menu-sep.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-menu-sep.gif
rename to skin/adminhtml/base/default/images/db-menu-sep.gif
diff --git a/skin/adminhtml/default/default/images/db-menu-start.gif b/skin/adminhtml/base/default/images/db-menu-start.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-menu-start.gif
rename to skin/adminhtml/base/default/images/db-menu-start.gif
diff --git a/skin/adminhtml/default/default/images/db-scroll-bg.gif b/skin/adminhtml/base/default/images/db-scroll-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-scroll-bg.gif
rename to skin/adminhtml/base/default/images/db-scroll-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-scroll-but-bot-roll.png b/skin/adminhtml/base/default/images/db-scroll-but-bot-roll.png
similarity index 100%
rename from skin/adminhtml/default/default/images/db-scroll-but-bot-roll.png
rename to skin/adminhtml/base/default/images/db-scroll-but-bot-roll.png
diff --git a/skin/adminhtml/default/default/images/db-scroll-but-bot.png b/skin/adminhtml/base/default/images/db-scroll-but-bot.png
similarity index 100%
rename from skin/adminhtml/default/default/images/db-scroll-but-bot.png
rename to skin/adminhtml/base/default/images/db-scroll-but-bot.png
diff --git a/skin/adminhtml/default/default/images/db-scroll-but-top-roll.png b/skin/adminhtml/base/default/images/db-scroll-but-top-roll.png
similarity index 100%
rename from skin/adminhtml/default/default/images/db-scroll-but-top-roll.png
rename to skin/adminhtml/base/default/images/db-scroll-but-top-roll.png
diff --git a/skin/adminhtml/default/default/images/db-scroll-but-top.png b/skin/adminhtml/base/default/images/db-scroll-but-top.png
similarity index 100%
rename from skin/adminhtml/default/default/images/db-scroll-but-top.png
rename to skin/adminhtml/base/default/images/db-scroll-but-top.png
diff --git a/skin/adminhtml/default/default/images/db-scroll-roller.png b/skin/adminhtml/base/default/images/db-scroll-roller.png
similarity index 100%
rename from skin/adminhtml/default/default/images/db-scroll-roller.png
rename to skin/adminhtml/base/default/images/db-scroll-roller.png
diff --git a/skin/adminhtml/default/default/images/db-tab-bottom-left-bg.gif b/skin/adminhtml/base/default/images/db-tab-bottom-left-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-bottom-left-bg.gif
rename to skin/adminhtml/base/default/images/db-tab-bottom-left-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-tab-bottom-mid-bg.gif b/skin/adminhtml/base/default/images/db-tab-bottom-mid-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-bottom-mid-bg.gif
rename to skin/adminhtml/base/default/images/db-tab-bottom-mid-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-tab-bottom-right-bg.gif b/skin/adminhtml/base/default/images/db-tab-bottom-right-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-bottom-right-bg.gif
rename to skin/adminhtml/base/default/images/db-tab-bottom-right-bg.gif
diff --git a/skin/adminhtml/default/default/images/db-tab-footer.gif b/skin/adminhtml/base/default/images/db-tab-footer.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-footer.gif
rename to skin/adminhtml/base/default/images/db-tab-footer.gif
diff --git a/skin/adminhtml/default/default/images/db-tab-header-sep.gif b/skin/adminhtml/base/default/images/db-tab-header-sep.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-header-sep.gif
rename to skin/adminhtml/base/default/images/db-tab-header-sep.gif
diff --git a/skin/adminhtml/default/default/images/db-tab-header.gif b/skin/adminhtml/base/default/images/db-tab-header.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-header.gif
rename to skin/adminhtml/base/default/images/db-tab-header.gif
diff --git a/skin/adminhtml/default/default/images/db-tab-left.gif b/skin/adminhtml/base/default/images/db-tab-left.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-left.gif
rename to skin/adminhtml/base/default/images/db-tab-left.gif
diff --git a/skin/adminhtml/default/default/images/db-tab-right.gif b/skin/adminhtml/base/default/images/db-tab-right.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/db-tab-right.gif
rename to skin/adminhtml/base/default/images/db-tab-right.gif
diff --git a/skin/adminhtml/default/default/images/dotted_divider_dark.gif b/skin/adminhtml/base/default/images/dotted_divider_dark.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/dotted_divider_dark.gif
rename to skin/adminhtml/base/default/images/dotted_divider_dark.gif
diff --git a/skin/adminhtml/default/default/images/dotted_divider_light.gif b/skin/adminhtml/base/default/images/dotted_divider_light.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/dotted_divider_light.gif
rename to skin/adminhtml/base/default/images/dotted_divider_light.gif
diff --git a/skin/adminhtml/default/default/images/edit_icon.gif b/skin/adminhtml/base/default/images/edit_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/edit_icon.gif
rename to skin/adminhtml/base/default/images/edit_icon.gif
diff --git a/skin/adminhtml/default/default/images/entry_edit_head_arrow_down.gif b/skin/adminhtml/base/default/images/entry_edit_head_arrow_down.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/entry_edit_head_arrow_down.gif
rename to skin/adminhtml/base/default/images/entry_edit_head_arrow_down.gif
diff --git a/skin/adminhtml/default/default/images/entry_edit_head_arrow_down2.gif b/skin/adminhtml/base/default/images/entry_edit_head_arrow_down2.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/entry_edit_head_arrow_down2.gif
rename to skin/adminhtml/base/default/images/entry_edit_head_arrow_down2.gif
diff --git a/skin/adminhtml/default/default/images/entry_edit_head_arrow_up.gif b/skin/adminhtml/base/default/images/entry_edit_head_arrow_up.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/entry_edit_head_arrow_up.gif
rename to skin/adminhtml/base/default/images/entry_edit_head_arrow_up.gif
diff --git a/skin/adminhtml/default/default/images/entry_edit_head_bg.gif b/skin/adminhtml/base/default/images/entry_edit_head_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/entry_edit_head_bg.gif
rename to skin/adminhtml/base/default/images/entry_edit_head_bg.gif
diff --git a/skin/adminhtml/default/default/images/error-msg.png b/skin/adminhtml/base/default/images/error-msg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/error-msg.png
rename to skin/adminhtml/base/default/images/error-msg.png
diff --git a/skin/adminhtml/default/default/images/error_msg_icon.gif b/skin/adminhtml/base/default/images/error_msg_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/error_msg_icon.gif
rename to skin/adminhtml/base/default/images/error_msg_icon.gif
diff --git a/skin/adminhtml/default/default/images/fam_account.gif b/skin/adminhtml/base/default/images/fam_account.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_account.gif
rename to skin/adminhtml/base/default/images/fam_account.gif
diff --git a/skin/adminhtml/default/default/images/fam_application_form_delete.png b/skin/adminhtml/base/default/images/fam_application_form_delete.png
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_application_form_delete.png
rename to skin/adminhtml/base/default/images/fam_application_form_delete.png
diff --git a/skin/adminhtml/default/default/images/fam_application_view_tile.gif b/skin/adminhtml/base/default/images/fam_application_view_tile.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_application_view_tile.gif
rename to skin/adminhtml/base/default/images/fam_application_view_tile.gif
diff --git a/skin/adminhtml/default/default/images/fam_asterisk_orange.gif b/skin/adminhtml/base/default/images/fam_asterisk_orange.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_asterisk_orange.gif
rename to skin/adminhtml/base/default/images/fam_asterisk_orange.gif
diff --git a/skin/adminhtml/default/default/images/fam_bin.gif b/skin/adminhtml/base/default/images/fam_bin.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_bin.gif
rename to skin/adminhtml/base/default/images/fam_bin.gif
diff --git a/skin/adminhtml/default/default/images/fam_book_open.png b/skin/adminhtml/base/default/images/fam_book_open.png
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_book_open.png
rename to skin/adminhtml/base/default/images/fam_book_open.png
diff --git a/skin/adminhtml/default/default/images/fam_bullet_disk.gif b/skin/adminhtml/base/default/images/fam_bullet_disk.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_bullet_disk.gif
rename to skin/adminhtml/base/default/images/fam_bullet_disk.gif
diff --git a/skin/adminhtml/default/default/images/fam_bullet_error.gif b/skin/adminhtml/base/default/images/fam_bullet_error.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_bullet_error.gif
rename to skin/adminhtml/base/default/images/fam_bullet_error.gif
diff --git a/skin/adminhtml/default/default/images/fam_bullet_success.gif b/skin/adminhtml/base/default/images/fam_bullet_success.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_bullet_success.gif
rename to skin/adminhtml/base/default/images/fam_bullet_success.gif
diff --git a/skin/adminhtml/default/default/images/fam_calendar.gif b/skin/adminhtml/base/default/images/fam_calendar.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_calendar.gif
rename to skin/adminhtml/base/default/images/fam_calendar.gif
diff --git a/skin/adminhtml/default/default/images/fam_cart.gif b/skin/adminhtml/base/default/images/fam_cart.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_cart.gif
rename to skin/adminhtml/base/default/images/fam_cart.gif
diff --git a/skin/adminhtml/default/default/images/fam_comment.gif b/skin/adminhtml/base/default/images/fam_comment.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_comment.gif
rename to skin/adminhtml/base/default/images/fam_comment.gif
diff --git a/skin/adminhtml/default/default/images/fam_creditcards.gif b/skin/adminhtml/base/default/images/fam_creditcards.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_creditcards.gif
rename to skin/adminhtml/base/default/images/fam_creditcards.gif
diff --git a/skin/adminhtml/default/default/images/fam_folder_database.gif b/skin/adminhtml/base/default/images/fam_folder_database.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_folder_database.gif
rename to skin/adminhtml/base/default/images/fam_folder_database.gif
diff --git a/skin/adminhtml/default/default/images/fam_folder_palette.gif b/skin/adminhtml/base/default/images/fam_folder_palette.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_folder_palette.gif
rename to skin/adminhtml/base/default/images/fam_folder_palette.gif
diff --git a/skin/adminhtml/default/default/images/fam_folder_table.gif b/skin/adminhtml/base/default/images/fam_folder_table.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_folder_table.gif
rename to skin/adminhtml/base/default/images/fam_folder_table.gif
diff --git a/skin/adminhtml/default/default/images/fam_group.gif b/skin/adminhtml/base/default/images/fam_group.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_group.gif
rename to skin/adminhtml/base/default/images/fam_group.gif
diff --git a/skin/adminhtml/default/default/images/fam_help.gif b/skin/adminhtml/base/default/images/fam_help.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_help.gif
rename to skin/adminhtml/base/default/images/fam_help.gif
diff --git a/skin/adminhtml/default/default/images/fam_house.gif b/skin/adminhtml/base/default/images/fam_house.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_house.gif
rename to skin/adminhtml/base/default/images/fam_house.gif
diff --git a/skin/adminhtml/default/default/images/fam_layout.gif b/skin/adminhtml/base/default/images/fam_layout.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_layout.gif
rename to skin/adminhtml/base/default/images/fam_layout.gif
diff --git a/skin/adminhtml/default/default/images/fam_leaf.png b/skin/adminhtml/base/default/images/fam_leaf.png
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_leaf.png
rename to skin/adminhtml/base/default/images/fam_leaf.png
diff --git a/skin/adminhtml/default/default/images/fam_link.gif b/skin/adminhtml/base/default/images/fam_link.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_link.gif
rename to skin/adminhtml/base/default/images/fam_link.gif
diff --git a/skin/adminhtml/default/default/images/fam_lorry.gif b/skin/adminhtml/base/default/images/fam_lorry.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_lorry.gif
rename to skin/adminhtml/base/default/images/fam_lorry.gif
diff --git a/skin/adminhtml/default/default/images/fam_magnifier.png b/skin/adminhtml/base/default/images/fam_magnifier.png
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_magnifier.png
rename to skin/adminhtml/base/default/images/fam_magnifier.png
diff --git a/skin/adminhtml/default/default/images/fam_money.gif b/skin/adminhtml/base/default/images/fam_money.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_money.gif
rename to skin/adminhtml/base/default/images/fam_money.gif
diff --git a/skin/adminhtml/default/default/images/fam_money_add.gif b/skin/adminhtml/base/default/images/fam_money_add.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_money_add.gif
rename to skin/adminhtml/base/default/images/fam_money_add.gif
diff --git a/skin/adminhtml/default/default/images/fam_monitor.gif b/skin/adminhtml/base/default/images/fam_monitor.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_monitor.gif
rename to skin/adminhtml/base/default/images/fam_monitor.gif
diff --git a/skin/adminhtml/default/default/images/fam_newspaper.gif b/skin/adminhtml/base/default/images/fam_newspaper.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_newspaper.gif
rename to skin/adminhtml/base/default/images/fam_newspaper.gif
diff --git a/skin/adminhtml/default/default/images/fam_newspaper_delete.gif b/skin/adminhtml/base/default/images/fam_newspaper_delete.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_newspaper_delete.gif
rename to skin/adminhtml/base/default/images/fam_newspaper_delete.gif
diff --git a/skin/adminhtml/default/default/images/fam_newspaper_error.gif b/skin/adminhtml/base/default/images/fam_newspaper_error.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_newspaper_error.gif
rename to skin/adminhtml/base/default/images/fam_newspaper_error.gif
diff --git a/skin/adminhtml/default/default/images/fam_newspaper_go.gif b/skin/adminhtml/base/default/images/fam_newspaper_go.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_newspaper_go.gif
rename to skin/adminhtml/base/default/images/fam_newspaper_go.gif
diff --git a/skin/adminhtml/default/default/images/fam_package.gif b/skin/adminhtml/base/default/images/fam_package.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_package.gif
rename to skin/adminhtml/base/default/images/fam_package.gif
diff --git a/skin/adminhtml/default/default/images/fam_package_go.gif b/skin/adminhtml/base/default/images/fam_package_go.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_package_go.gif
rename to skin/adminhtml/base/default/images/fam_package_go.gif
diff --git a/skin/adminhtml/default/default/images/fam_page_white.gif b/skin/adminhtml/base/default/images/fam_page_white.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_page_white.gif
rename to skin/adminhtml/base/default/images/fam_page_white.gif
diff --git a/skin/adminhtml/default/default/images/fam_page_white_edit.gif b/skin/adminhtml/base/default/images/fam_page_white_edit.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_page_white_edit.gif
rename to skin/adminhtml/base/default/images/fam_page_white_edit.gif
diff --git a/skin/adminhtml/default/default/images/fam_rainbow.gif b/skin/adminhtml/base/default/images/fam_rainbow.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_rainbow.gif
rename to skin/adminhtml/base/default/images/fam_rainbow.gif
diff --git a/skin/adminhtml/default/default/images/fam_refresh.gif b/skin/adminhtml/base/default/images/fam_refresh.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_refresh.gif
rename to skin/adminhtml/base/default/images/fam_refresh.gif
diff --git a/skin/adminhtml/default/default/images/fam_server_database.gif b/skin/adminhtml/base/default/images/fam_server_database.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_server_database.gif
rename to skin/adminhtml/base/default/images/fam_server_database.gif
diff --git a/skin/adminhtml/default/default/images/fam_status_online.gif b/skin/adminhtml/base/default/images/fam_status_online.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_status_online.gif
rename to skin/adminhtml/base/default/images/fam_status_online.gif
diff --git a/skin/adminhtml/default/default/images/fam_tag_orange.gif b/skin/adminhtml/base/default/images/fam_tag_orange.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_tag_orange.gif
rename to skin/adminhtml/base/default/images/fam_tag_orange.gif
diff --git a/skin/adminhtml/default/default/images/fam_user.gif b/skin/adminhtml/base/default/images/fam_user.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_user.gif
rename to skin/adminhtml/base/default/images/fam_user.gif
diff --git a/skin/adminhtml/default/default/images/fam_user_comment.gif b/skin/adminhtml/base/default/images/fam_user_comment.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_user_comment.gif
rename to skin/adminhtml/base/default/images/fam_user_comment.gif
diff --git a/skin/adminhtml/default/default/images/fam_user_edit.gif b/skin/adminhtml/base/default/images/fam_user_edit.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/fam_user_edit.gif
rename to skin/adminhtml/base/default/images/fam_user_edit.gif
diff --git a/skin/adminhtml/default/default/images/filter_row_bg.gif b/skin/adminhtml/base/default/images/filter_row_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/filter_row_bg.gif
rename to skin/adminhtml/base/default/images/filter_row_bg.gif
diff --git a/skin/adminhtml/default/default/images/footer_bg.gif b/skin/adminhtml/base/default/images/footer_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/footer_bg.gif
rename to skin/adminhtml/base/default/images/footer_bg.gif
diff --git a/skin/adminhtml/default/default/images/gift-message-collapse.gif b/skin/adminhtml/base/default/images/gift-message-collapse.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/gift-message-collapse.gif
rename to skin/adminhtml/base/default/images/gift-message-collapse.gif
diff --git a/skin/adminhtml/default/default/images/gift-message-expand.gif b/skin/adminhtml/base/default/images/gift-message-expand.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/gift-message-expand.gif
rename to skin/adminhtml/base/default/images/gift-message-expand.gif
diff --git a/skin/adminhtml/default/default/images/gift-message-grid-column-bg.gif b/skin/adminhtml/base/default/images/gift-message-grid-column-bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/gift-message-grid-column-bg.gif
rename to skin/adminhtml/base/default/images/gift-message-grid-column-bg.gif
diff --git a/skin/adminhtml/default/default/images/grid-cal.gif b/skin/adminhtml/base/default/images/grid-cal.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/grid-cal.gif
rename to skin/adminhtml/base/default/images/grid-cal.gif
diff --git a/skin/adminhtml/default/default/images/grid_sort_asc.gif b/skin/adminhtml/base/default/images/grid_sort_asc.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/grid_sort_asc.gif
rename to skin/adminhtml/base/default/images/grid_sort_asc.gif
diff --git a/skin/adminhtml/default/default/images/grid_sort_desc.gif b/skin/adminhtml/base/default/images/grid_sort_desc.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/grid_sort_desc.gif
rename to skin/adminhtml/base/default/images/grid_sort_desc.gif
diff --git a/skin/adminhtml/default/default/images/grid_th_bg.gif b/skin/adminhtml/base/default/images/grid_th_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/grid_th_bg.gif
rename to skin/adminhtml/base/default/images/grid_th_bg.gif
diff --git a/skin/adminhtml/default/default/images/grid_th_onclick_bg.gif b/skin/adminhtml/base/default/images/grid_th_onclick_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/grid_th_onclick_bg.gif
rename to skin/adminhtml/base/default/images/grid_th_onclick_bg.gif
diff --git a/skin/adminhtml/default/default/images/grouped_to_order_icon.png b/skin/adminhtml/base/default/images/grouped_to_order_icon.png
similarity index 100%
rename from skin/adminhtml/default/default/images/grouped_to_order_icon.png
rename to skin/adminhtml/base/default/images/grouped_to_order_icon.png
diff --git a/skin/adminhtml/default/default/images/header_bg.gif b/skin/adminhtml/base/default/images/header_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/header_bg.gif
rename to skin/adminhtml/base/default/images/header_bg.gif
diff --git a/skin/adminhtml/default/default/images/header_top_bg.gif b/skin/adminhtml/base/default/images/header_top_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/header_top_bg.gif
rename to skin/adminhtml/base/default/images/header_top_bg.gif
diff --git a/skin/adminhtml/default/default/images/horiz_tabs_ul_bg.gif b/skin/adminhtml/base/default/images/horiz_tabs_ul_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/horiz_tabs_ul_bg.gif
rename to skin/adminhtml/base/default/images/horiz_tabs_ul_bg.gif
diff --git a/skin/adminhtml/default/default/images/i_notice.gif b/skin/adminhtml/base/default/images/i_notice.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/i_notice.gif
rename to skin/adminhtml/base/default/images/i_notice.gif
diff --git a/skin/adminhtml/default/default/images/i_question-mark.png b/skin/adminhtml/base/default/images/i_question-mark.png
similarity index 100%
rename from skin/adminhtml/default/default/images/i_question-mark.png
rename to skin/adminhtml/base/default/images/i_question-mark.png
diff --git a/skin/adminhtml/default/default/images/ico_success.gif b/skin/adminhtml/base/default/images/ico_success.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/ico_success.gif
rename to skin/adminhtml/base/default/images/ico_success.gif
diff --git a/skin/adminhtml/default/default/images/icon-enabled.png b/skin/adminhtml/base/default/images/icon-enabled.png
similarity index 100%
rename from skin/adminhtml/default/default/images/icon-enabled.png
rename to skin/adminhtml/base/default/images/icon-enabled.png
diff --git a/skin/adminhtml/default/default/images/icon-tooltip.png b/skin/adminhtml/base/default/images/icon-tooltip.png
similarity index 100%
rename from skin/adminhtml/default/default/images/icon-tooltip.png
rename to skin/adminhtml/base/default/images/icon-tooltip.png
diff --git a/skin/adminhtml/default/default/images/icon_btn_add.gif b/skin/adminhtml/base/default/images/icon_btn_add.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_btn_add.gif
rename to skin/adminhtml/base/default/images/icon_btn_add.gif
diff --git a/skin/adminhtml/default/default/images/icon_btn_back.gif b/skin/adminhtml/base/default/images/icon_btn_back.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_btn_back.gif
rename to skin/adminhtml/base/default/images/icon_btn_back.gif
diff --git a/skin/adminhtml/default/default/images/icon_btn_delete.gif b/skin/adminhtml/base/default/images/icon_btn_delete.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_btn_delete.gif
rename to skin/adminhtml/base/default/images/icon_btn_delete.gif
diff --git a/skin/adminhtml/default/default/images/icon_btn_save.gif b/skin/adminhtml/base/default/images/icon_btn_save.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_btn_save.gif
rename to skin/adminhtml/base/default/images/icon_btn_save.gif
diff --git a/skin/adminhtml/default/default/images/icon_edit_address.gif b/skin/adminhtml/base/default/images/icon_edit_address.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_edit_address.gif
rename to skin/adminhtml/base/default/images/icon_edit_address.gif
diff --git a/skin/adminhtml/default/default/images/icon_export.gif b/skin/adminhtml/base/default/images/icon_export.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_export.gif
rename to skin/adminhtml/base/default/images/icon_export.gif
diff --git a/skin/adminhtml/default/default/images/icon_export.png b/skin/adminhtml/base/default/images/icon_export.png
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_export.png
rename to skin/adminhtml/base/default/images/icon_export.png
diff --git a/skin/adminhtml/default/default/images/icon_feed.gif b/skin/adminhtml/base/default/images/icon_feed.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_feed.gif
rename to skin/adminhtml/base/default/images/icon_feed.gif
diff --git a/skin/adminhtml/default/default/images/icon_feed.png b/skin/adminhtml/base/default/images/icon_feed.png
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_feed.png
rename to skin/adminhtml/base/default/images/icon_feed.png
diff --git a/skin/adminhtml/default/default/images/icon_note_list.gif b/skin/adminhtml/base/default/images/icon_note_list.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_note_list.gif
rename to skin/adminhtml/base/default/images/icon_note_list.gif
diff --git a/skin/adminhtml/default/default/images/icon_remove_address.gif b/skin/adminhtml/base/default/images/icon_remove_address.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/icon_remove_address.gif
rename to skin/adminhtml/base/default/images/icon_remove_address.gif
diff --git a/skin/adminhtml/default/default/images/login_box_bg.gif b/skin/adminhtml/base/default/images/login_box_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/login_box_bg.gif
rename to skin/adminhtml/base/default/images/login_box_bg.gif
diff --git a/skin/adminhtml/default/default/images/login_box_bg.jpg b/skin/adminhtml/base/default/images/login_box_bg.jpg
similarity index 100%
rename from skin/adminhtml/default/default/images/login_box_bg.jpg
rename to skin/adminhtml/base/default/images/login_box_bg.jpg
diff --git a/skin/adminhtml/default/default/images/login_box_bg_auth.jpg b/skin/adminhtml/base/default/images/login_box_bg_auth.jpg
similarity index 100%
rename from skin/adminhtml/default/default/images/login_box_bg_auth.jpg
rename to skin/adminhtml/base/default/images/login_box_bg_auth.jpg
diff --git a/skin/adminhtml/default/default/images/login_box_bottom.jpg b/skin/adminhtml/base/default/images/login_box_bottom.jpg
similarity index 100%
rename from skin/adminhtml/default/default/images/login_box_bottom.jpg
rename to skin/adminhtml/base/default/images/login_box_bottom.jpg
diff --git a/skin/adminhtml/default/default/images/login_box_legal_bg.gif b/skin/adminhtml/base/default/images/login_box_legal_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/login_box_legal_bg.gif
rename to skin/adminhtml/base/default/images/login_box_legal_bg.gif
diff --git a/skin/adminhtml/default/default/images/logo-large.gif b/skin/adminhtml/base/default/images/logo-large.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/logo-large.gif
rename to skin/adminhtml/base/default/images/logo-large.gif
diff --git a/skin/adminhtml/default/default/images/logo.svg b/skin/adminhtml/base/default/images/logo.svg
similarity index 100%
rename from skin/adminhtml/default/default/images/logo.svg
rename to skin/adminhtml/base/default/images/logo.svg
diff --git a/skin/adminhtml/default/default/images/logo_email.gif b/skin/adminhtml/base/default/images/logo_email.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/logo_email.gif
rename to skin/adminhtml/base/default/images/logo_email.gif
diff --git a/skin/adminhtml/default/default/images/logo_gray.svg b/skin/adminhtml/base/default/images/logo_gray.svg
similarity index 100%
rename from skin/adminhtml/default/default/images/logo_gray.svg
rename to skin/adminhtml/base/default/images/logo_gray.svg
diff --git a/skin/adminhtml/default/default/images/logo_print.gif b/skin/adminhtml/base/default/images/logo_print.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/logo_print.gif
rename to skin/adminhtml/base/default/images/logo_print.gif
diff --git a/skin/adminhtml/default/default/images/massaction_bg.gif b/skin/adminhtml/base/default/images/massaction_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/massaction_bg.gif
rename to skin/adminhtml/base/default/images/massaction_bg.gif
diff --git a/skin/adminhtml/default/default/images/massaction_button_bg.gif b/skin/adminhtml/base/default/images/massaction_button_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/massaction_button_bg.gif
rename to skin/adminhtml/base/default/images/massaction_button_bg.gif
diff --git a/skin/adminhtml/default/default/images/massaction_links_delimiter.gif b/skin/adminhtml/base/default/images/massaction_links_delimiter.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/massaction_links_delimiter.gif
rename to skin/adminhtml/base/default/images/massaction_links_delimiter.gif
diff --git a/skin/adminhtml/default/default/images/middle_bg.gif b/skin/adminhtml/base/default/images/middle_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/middle_bg.gif
rename to skin/adminhtml/base/default/images/middle_bg.gif
diff --git a/skin/adminhtml/default/default/images/more_arrow.gif b/skin/adminhtml/base/default/images/more_arrow.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/more_arrow.gif
rename to skin/adminhtml/base/default/images/more_arrow.gif
diff --git a/skin/adminhtml/default/default/images/nav1_active.gif b/skin/adminhtml/base/default/images/nav1_active.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav1_active.gif
rename to skin/adminhtml/base/default/images/nav1_active.gif
diff --git a/skin/adminhtml/default/default/images/nav1_bg.gif b/skin/adminhtml/base/default/images/nav1_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav1_bg.gif
rename to skin/adminhtml/base/default/images/nav1_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav1_off.gif b/skin/adminhtml/base/default/images/nav1_off.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav1_off.gif
rename to skin/adminhtml/base/default/images/nav1_off.gif
diff --git a/skin/adminhtml/default/default/images/nav1_on.gif b/skin/adminhtml/base/default/images/nav1_on.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav1_on.gif
rename to skin/adminhtml/base/default/images/nav1_on.gif
diff --git a/skin/adminhtml/default/default/images/nav1_over.gif b/skin/adminhtml/base/default/images/nav1_over.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav1_over.gif
rename to skin/adminhtml/base/default/images/nav1_over.gif
diff --git a/skin/adminhtml/default/default/images/nav1_sep.gif b/skin/adminhtml/base/default/images/nav1_sep.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav1_sep.gif
rename to skin/adminhtml/base/default/images/nav1_sep.gif
diff --git a/skin/adminhtml/default/default/images/nav2_last_li_bg.png b/skin/adminhtml/base/default/images/nav2_last_li_bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/nav2_last_li_bg.png
rename to skin/adminhtml/base/default/images/nav2_last_li_bg.png
diff --git a/skin/adminhtml/default/default/images/nav2_last_li_over_bg.png b/skin/adminhtml/base/default/images/nav2_last_li_over_bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/nav2_last_li_over_bg.png
rename to skin/adminhtml/base/default/images/nav2_last_li_over_bg.png
diff --git a/skin/adminhtml/default/default/images/nav2_li_bg.gif b/skin/adminhtml/base/default/images/nav2_li_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav2_li_bg.gif
rename to skin/adminhtml/base/default/images/nav2_li_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav2_li_bg.png b/skin/adminhtml/base/default/images/nav2_li_bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/nav2_li_bg.png
rename to skin/adminhtml/base/default/images/nav2_li_bg.png
diff --git a/skin/adminhtml/default/default/images/nav2_li_over_bg.png b/skin/adminhtml/base/default/images/nav2_li_over_bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/nav2_li_over_bg.png
rename to skin/adminhtml/base/default/images/nav2_li_over_bg.png
diff --git a/skin/adminhtml/default/default/images/nav2_link_bg.gif b/skin/adminhtml/base/default/images/nav2_link_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav2_link_bg.gif
rename to skin/adminhtml/base/default/images/nav2_link_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav2_parent_arrow.gif b/skin/adminhtml/base/default/images/nav2_parent_arrow.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav2_parent_arrow.gif
rename to skin/adminhtml/base/default/images/nav2_parent_arrow.gif
diff --git a/skin/adminhtml/default/default/images/nav3_bg.png b/skin/adminhtml/base/default/images/nav3_bg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/nav3_bg.png
rename to skin/adminhtml/base/default/images/nav3_bg.png
diff --git a/skin/adminhtml/default/default/images/nav_bg.gif b/skin/adminhtml/base/default/images/nav_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav_bg.gif
rename to skin/adminhtml/base/default/images/nav_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav_list_bg.gif b/skin/adminhtml/base/default/images/nav_list_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav_list_bg.gif
rename to skin/adminhtml/base/default/images/nav_list_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav_nest_link_bg.gif b/skin/adminhtml/base/default/images/nav_nest_link_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav_nest_link_bg.gif
rename to skin/adminhtml/base/default/images/nav_nest_link_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav_nest_link_over_bg.gif b/skin/adminhtml/base/default/images/nav_nest_link_over_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav_nest_link_over_bg.gif
rename to skin/adminhtml/base/default/images/nav_nest_link_over_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav_on_bg.gif b/skin/adminhtml/base/default/images/nav_on_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav_on_bg.gif
rename to skin/adminhtml/base/default/images/nav_on_bg.gif
diff --git a/skin/adminhtml/default/default/images/nav_parent_arrow.gif b/skin/adminhtml/base/default/images/nav_parent_arrow.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/nav_parent_arrow.gif
rename to skin/adminhtml/base/default/images/nav_parent_arrow.gif
diff --git a/skin/adminhtml/default/default/images/note_bg.gif b/skin/adminhtml/base/default/images/note_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/note_bg.gif
rename to skin/adminhtml/base/default/images/note_bg.gif
diff --git a/skin/adminhtml/default/default/images/note_cell_bg.gif b/skin/adminhtml/base/default/images/note_cell_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/note_cell_bg.gif
rename to skin/adminhtml/base/default/images/note_cell_bg.gif
diff --git a/skin/adminhtml/default/default/images/note_msg_icon.gif b/skin/adminhtml/base/default/images/note_msg_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/note_msg_icon.gif
rename to skin/adminhtml/base/default/images/note_msg_icon.gif
diff --git a/skin/adminhtml/default/default/images/notice-msg.png b/skin/adminhtml/base/default/images/notice-msg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/notice-msg.png
rename to skin/adminhtml/base/default/images/notice-msg.png
diff --git a/skin/adminhtml/default/default/images/pager_arrow_left.gif b/skin/adminhtml/base/default/images/pager_arrow_left.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/pager_arrow_left.gif
rename to skin/adminhtml/base/default/images/pager_arrow_left.gif
diff --git a/skin/adminhtml/default/default/images/pager_arrow_left_off.gif b/skin/adminhtml/base/default/images/pager_arrow_left_off.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/pager_arrow_left_off.gif
rename to skin/adminhtml/base/default/images/pager_arrow_left_off.gif
diff --git a/skin/adminhtml/default/default/images/pager_arrow_right.gif b/skin/adminhtml/base/default/images/pager_arrow_right.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/pager_arrow_right.gif
rename to skin/adminhtml/base/default/images/pager_arrow_right.gif
diff --git a/skin/adminhtml/default/default/images/pager_arrow_right_off.gif b/skin/adminhtml/base/default/images/pager_arrow_right_off.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/pager_arrow_right_off.gif
rename to skin/adminhtml/base/default/images/pager_arrow_right_off.gif
diff --git a/skin/adminhtml/default/default/images/paypal/logo-paypal.png b/skin/adminhtml/base/default/images/paypal/logo-paypal.png
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal/logo-paypal.png
rename to skin/adminhtml/base/default/images/paypal/logo-paypal.png
diff --git a/skin/adminhtml/default/default/images/paypal/pp-allinone.png b/skin/adminhtml/base/default/images/paypal/pp-allinone.png
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal/pp-allinone.png
rename to skin/adminhtml/base/default/images/paypal/pp-allinone.png
diff --git a/skin/adminhtml/default/default/images/paypal/pp-alt.png b/skin/adminhtml/base/default/images/paypal/pp-alt.png
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal/pp-alt.png
rename to skin/adminhtml/base/default/images/paypal/pp-alt.png
diff --git a/skin/adminhtml/default/default/images/paypal/pp-gateways.png b/skin/adminhtml/base/default/images/paypal/pp-gateways.png
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal/pp-gateways.png
rename to skin/adminhtml/base/default/images/paypal/pp-gateways.png
diff --git a/skin/adminhtml/default/default/images/paypal/pp-uk.png b/skin/adminhtml/base/default/images/paypal/pp-uk.png
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal/pp-uk.png
rename to skin/adminhtml/base/default/images/paypal/pp-uk.png
diff --git a/skin/adminhtml/default/default/images/paypal_logo.gif b/skin/adminhtml/base/default/images/paypal_logo.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal_logo.gif
rename to skin/adminhtml/base/default/images/paypal_logo.gif
diff --git a/skin/adminhtml/default/default/images/paypal_section.png b/skin/adminhtml/base/default/images/paypal_section.png
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal_section.png
rename to skin/adminhtml/base/default/images/paypal_section.png
diff --git a/skin/adminhtml/default/default/images/paypal_tick.gif b/skin/adminhtml/base/default/images/paypal_tick.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/paypal_tick.gif
rename to skin/adminhtml/base/default/images/paypal_tick.gif
diff --git a/skin/adminhtml/default/default/images/placeholder/thumbnail.jpg b/skin/adminhtml/base/default/images/placeholder/thumbnail.jpg
similarity index 100%
rename from skin/adminhtml/default/default/images/placeholder/thumbnail.jpg
rename to skin/adminhtml/base/default/images/placeholder/thumbnail.jpg
diff --git a/skin/adminhtml/default/default/images/process_spinner.gif b/skin/adminhtml/base/default/images/process_spinner.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/process_spinner.gif
rename to skin/adminhtml/base/default/images/process_spinner.gif
diff --git a/skin/adminhtml/default/default/images/product_rating_blank_star.gif b/skin/adminhtml/base/default/images/product_rating_blank_star.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/product_rating_blank_star.gif
rename to skin/adminhtml/base/default/images/product_rating_blank_star.gif
diff --git a/skin/adminhtml/default/default/images/product_rating_full_star.gif b/skin/adminhtml/base/default/images/product_rating_full_star.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/product_rating_full_star.gif
rename to skin/adminhtml/base/default/images/product_rating_full_star.gif
diff --git a/skin/adminhtml/default/default/images/reload.png b/skin/adminhtml/base/default/images/reload.png
similarity index 100%
rename from skin/adminhtml/default/default/images/reload.png
rename to skin/adminhtml/base/default/images/reload.png
diff --git a/skin/adminhtml/default/default/images/rule-ajax-loader.gif b/skin/adminhtml/base/default/images/rule-ajax-loader.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/rule-ajax-loader.gif
rename to skin/adminhtml/base/default/images/rule-ajax-loader.gif
diff --git a/skin/adminhtml/default/default/images/rule_chooser_trigger.gif b/skin/adminhtml/base/default/images/rule_chooser_trigger.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/rule_chooser_trigger.gif
rename to skin/adminhtml/base/default/images/rule_chooser_trigger.gif
diff --git a/skin/adminhtml/default/default/images/rule_component_add.gif b/skin/adminhtml/base/default/images/rule_component_add.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/rule_component_add.gif
rename to skin/adminhtml/base/default/images/rule_component_add.gif
diff --git a/skin/adminhtml/default/default/images/rule_component_apply.gif b/skin/adminhtml/base/default/images/rule_component_apply.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/rule_component_apply.gif
rename to skin/adminhtml/base/default/images/rule_component_apply.gif
diff --git a/skin/adminhtml/default/default/images/rule_component_remove.gif b/skin/adminhtml/base/default/images/rule_component_remove.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/rule_component_remove.gif
rename to skin/adminhtml/base/default/images/rule_component_remove.gif
diff --git a/skin/adminhtml/default/default/images/save_btn_icon.gif b/skin/adminhtml/base/default/images/save_btn_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/save_btn_icon.gif
rename to skin/adminhtml/base/default/images/save_btn_icon.gif
diff --git a/skin/adminhtml/default/default/images/sec_nav_bg.gif b/skin/adminhtml/base/default/images/sec_nav_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/sec_nav_bg.gif
rename to skin/adminhtml/base/default/images/sec_nav_bg.gif
diff --git a/skin/adminhtml/default/default/images/section_menu_bg.gif b/skin/adminhtml/base/default/images/section_menu_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/section_menu_bg.gif
rename to skin/adminhtml/base/default/images/section_menu_bg.gif
diff --git a/skin/adminhtml/default/default/images/section_menu_bottom.gif b/skin/adminhtml/base/default/images/section_menu_bottom.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/section_menu_bottom.gif
rename to skin/adminhtml/base/default/images/section_menu_bottom.gif
diff --git a/skin/adminhtml/default/default/images/section_menu_link_bg.gif b/skin/adminhtml/base/default/images/section_menu_link_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/section_menu_link_bg.gif
rename to skin/adminhtml/base/default/images/section_menu_link_bg.gif
diff --git a/skin/adminhtml/default/default/images/section_menu_link_over_bg.gif b/skin/adminhtml/base/default/images/section_menu_link_over_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/section_menu_link_over_bg.gif
rename to skin/adminhtml/base/default/images/section_menu_link_over_bg.gif
diff --git a/skin/adminhtml/default/default/images/section_menu_over_span_bg.gif b/skin/adminhtml/base/default/images/section_menu_over_span_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/section_menu_over_span_bg.gif
rename to skin/adminhtml/base/default/images/section_menu_over_span_bg.gif
diff --git a/skin/adminhtml/default/default/images/section_menu_span_bg.gif b/skin/adminhtml/base/default/images/section_menu_span_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/section_menu_span_bg.gif
rename to skin/adminhtml/base/default/images/section_menu_span_bg.gif
diff --git a/skin/adminhtml/default/default/images/section_menu_ul_bg.gif b/skin/adminhtml/base/default/images/section_menu_ul_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/section_menu_ul_bg.gif
rename to skin/adminhtml/base/default/images/section_menu_ul_bg.gif
diff --git a/skin/adminhtml/default/default/images/side_col_bg.gif b/skin/adminhtml/base/default/images/side_col_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/side_col_bg.gif
rename to skin/adminhtml/base/default/images/side_col_bg.gif
diff --git a/skin/adminhtml/default/default/images/simple_container_bg.gif b/skin/adminhtml/base/default/images/simple_container_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/simple_container_bg.gif
rename to skin/adminhtml/base/default/images/simple_container_bg.gif
diff --git a/skin/adminhtml/default/default/images/sort-arrow-down.gif b/skin/adminhtml/base/default/images/sort-arrow-down.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/sort-arrow-down.gif
rename to skin/adminhtml/base/default/images/sort-arrow-down.gif
diff --git a/skin/adminhtml/default/default/images/sort-arrow-down.png b/skin/adminhtml/base/default/images/sort-arrow-down.png
similarity index 100%
rename from skin/adminhtml/default/default/images/sort-arrow-down.png
rename to skin/adminhtml/base/default/images/sort-arrow-down.png
diff --git a/skin/adminhtml/default/default/images/sort-arrow-up.gif b/skin/adminhtml/base/default/images/sort-arrow-up.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/sort-arrow-up.gif
rename to skin/adminhtml/base/default/images/sort-arrow-up.gif
diff --git a/skin/adminhtml/default/default/images/sort-arrow-up.png b/skin/adminhtml/base/default/images/sort-arrow-up.png
similarity index 100%
rename from skin/adminhtml/default/default/images/sort-arrow-up.png
rename to skin/adminhtml/base/default/images/sort-arrow-up.png
diff --git a/skin/adminhtml/default/default/images/sort_heading_bg.gif b/skin/adminhtml/base/default/images/sort_heading_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/sort_heading_bg.gif
rename to skin/adminhtml/base/default/images/sort_heading_bg.gif
diff --git a/skin/adminhtml/default/default/images/sort_on_bg.gif b/skin/adminhtml/base/default/images/sort_on_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/sort_on_bg.gif
rename to skin/adminhtml/base/default/images/sort_on_bg.gif
diff --git a/skin/adminhtml/default/default/images/sort_row_bg.gif b/skin/adminhtml/base/default/images/sort_row_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/sort_row_bg.gif
rename to skin/adminhtml/base/default/images/sort_row_bg.gif
diff --git a/skin/adminhtml/default/default/images/spacer.gif b/skin/adminhtml/base/default/images/spacer.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/spacer.gif
rename to skin/adminhtml/base/default/images/spacer.gif
diff --git a/skin/adminhtml/default/default/images/sub_button_bg.gif b/skin/adminhtml/base/default/images/sub_button_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/sub_button_bg.gif
rename to skin/adminhtml/base/default/images/sub_button_bg.gif
diff --git a/skin/adminhtml/default/default/images/success-msg.png b/skin/adminhtml/base/default/images/success-msg.png
similarity index 100%
rename from skin/adminhtml/default/default/images/success-msg.png
rename to skin/adminhtml/base/default/images/success-msg.png
diff --git a/skin/adminhtml/default/default/images/success_msg_icon.gif b/skin/adminhtml/base/default/images/success_msg_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/success_msg_icon.gif
rename to skin/adminhtml/base/default/images/success_msg_icon.gif
diff --git a/skin/adminhtml/default/default/images/tabs_link_bg.gif b/skin/adminhtml/base/default/images/tabs_link_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tabs_link_bg.gif
rename to skin/adminhtml/base/default/images/tabs_link_bg.gif
diff --git a/skin/adminhtml/default/default/images/tabs_link_over_bg.gif b/skin/adminhtml/base/default/images/tabs_link_over_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tabs_link_over_bg.gif
rename to skin/adminhtml/base/default/images/tabs_link_over_bg.gif
diff --git a/skin/adminhtml/default/default/images/tabs_span_bg.gif b/skin/adminhtml/base/default/images/tabs_span_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tabs_span_bg.gif
rename to skin/adminhtml/base/default/images/tabs_span_bg.gif
diff --git a/skin/adminhtml/default/default/images/tag_blue_edit.gif b/skin/adminhtml/base/default/images/tag_blue_edit.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tag_blue_edit.gif
rename to skin/adminhtml/base/default/images/tag_blue_edit.gif
diff --git a/skin/adminhtml/default/default/images/tn_cancel_bg.gif b/skin/adminhtml/base/default/images/tn_cancel_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tn_cancel_bg.gif
rename to skin/adminhtml/base/default/images/tn_cancel_bg.gif
diff --git a/skin/adminhtml/default/default/images/tooltip_bg.gif b/skin/adminhtml/base/default/images/tooltip_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tooltip_bg.gif
rename to skin/adminhtml/base/default/images/tooltip_bg.gif
diff --git a/skin/adminhtml/default/default/images/tooltip_corner.gif b/skin/adminhtml/base/default/images/tooltip_corner.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tooltip_corner.gif
rename to skin/adminhtml/base/default/images/tooltip_corner.gif
diff --git a/skin/adminhtml/default/default/images/tooltip_top.gif b/skin/adminhtml/base/default/images/tooltip_top.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tooltip_top.gif
rename to skin/adminhtml/base/default/images/tooltip_top.gif
diff --git a/skin/adminhtml/default/default/images/tree_icons/join.gif b/skin/adminhtml/base/default/images/tree_icons/join.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tree_icons/join.gif
rename to skin/adminhtml/base/default/images/tree_icons/join.gif
diff --git a/skin/adminhtml/default/default/images/tree_icons/joinbottom.gif b/skin/adminhtml/base/default/images/tree_icons/joinbottom.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tree_icons/joinbottom.gif
rename to skin/adminhtml/base/default/images/tree_icons/joinbottom.gif
diff --git a/skin/adminhtml/default/default/images/tree_icons/line.gif b/skin/adminhtml/base/default/images/tree_icons/line.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tree_icons/line.gif
rename to skin/adminhtml/base/default/images/tree_icons/line.gif
diff --git a/skin/adminhtml/default/default/images/tree_icons/minus.gif b/skin/adminhtml/base/default/images/tree_icons/minus.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tree_icons/minus.gif
rename to skin/adminhtml/base/default/images/tree_icons/minus.gif
diff --git a/skin/adminhtml/default/default/images/tree_icons/minusbottom.gif b/skin/adminhtml/base/default/images/tree_icons/minusbottom.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tree_icons/minusbottom.gif
rename to skin/adminhtml/base/default/images/tree_icons/minusbottom.gif
diff --git a/skin/adminhtml/default/default/images/tree_icons/nolines_minus.gif b/skin/adminhtml/base/default/images/tree_icons/nolines_minus.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tree_icons/nolines_minus.gif
rename to skin/adminhtml/base/default/images/tree_icons/nolines_minus.gif
diff --git a/skin/adminhtml/default/default/images/tree_icons/nolines_plus.gif b/skin/adminhtml/base/default/images/tree_icons/nolines_plus.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/tree_icons/nolines_plus.gif
rename to skin/adminhtml/base/default/images/tree_icons/nolines_plus.gif
diff --git a/skin/adminhtml/default/default/images/validation_advice_bg.gif b/skin/adminhtml/base/default/images/validation_advice_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/validation_advice_bg.gif
rename to skin/adminhtml/base/default/images/validation_advice_bg.gif
diff --git a/skin/adminhtml/default/default/images/varien_logo.gif b/skin/adminhtml/base/default/images/varien_logo.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/varien_logo.gif
rename to skin/adminhtml/base/default/images/varien_logo.gif
diff --git a/skin/adminhtml/default/default/images/warning_msg_icon.gif b/skin/adminhtml/base/default/images/warning_msg_icon.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/warning_msg_icon.gif
rename to skin/adminhtml/base/default/images/warning_msg_icon.gif
diff --git a/skin/adminhtml/default/default/images/widget/catalog__category_widget_link.gif b/skin/adminhtml/base/default/images/widget/catalog__category_widget_link.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/catalog__category_widget_link.gif
rename to skin/adminhtml/base/default/images/widget/catalog__category_widget_link.gif
diff --git a/skin/adminhtml/default/default/images/widget/catalog__product_widget_link.gif b/skin/adminhtml/base/default/images/widget/catalog__product_widget_link.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/catalog__product_widget_link.gif
rename to skin/adminhtml/base/default/images/widget/catalog__product_widget_link.gif
diff --git a/skin/adminhtml/default/default/images/widget/catalog__product_widget_new.gif b/skin/adminhtml/base/default/images/widget/catalog__product_widget_new.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/catalog__product_widget_new.gif
rename to skin/adminhtml/base/default/images/widget/catalog__product_widget_new.gif
diff --git a/skin/adminhtml/default/default/images/widget/cms__widget_block.gif b/skin/adminhtml/base/default/images/widget/cms__widget_block.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/cms__widget_block.gif
rename to skin/adminhtml/base/default/images/widget/cms__widget_block.gif
diff --git a/skin/adminhtml/default/default/images/widget/cms__widget_page_link.gif b/skin/adminhtml/base/default/images/widget/cms__widget_page_link.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/cms__widget_page_link.gif
rename to skin/adminhtml/base/default/images/widget/cms__widget_page_link.gif
diff --git a/skin/adminhtml/default/default/images/widget/default.gif b/skin/adminhtml/base/default/images/widget/default.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/default.gif
rename to skin/adminhtml/base/default/images/widget/default.gif
diff --git a/skin/adminhtml/default/default/images/widget/reports__product_widget_compared.gif b/skin/adminhtml/base/default/images/widget/reports__product_widget_compared.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/reports__product_widget_compared.gif
rename to skin/adminhtml/base/default/images/widget/reports__product_widget_compared.gif
diff --git a/skin/adminhtml/default/default/images/widget/reports__product_widget_viewed.gif b/skin/adminhtml/base/default/images/widget/reports__product_widget_viewed.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget/reports__product_widget_viewed.gif
rename to skin/adminhtml/base/default/images/widget/reports__product_widget_viewed.gif
diff --git a/skin/adminhtml/default/default/images/widget_placeholder.gif b/skin/adminhtml/base/default/images/widget_placeholder.gif
similarity index 100%
rename from skin/adminhtml/default/default/images/widget_placeholder.gif
rename to skin/adminhtml/base/default/images/widget_placeholder.gif
diff --git a/skin/adminhtml/default/default/images/window_close.png b/skin/adminhtml/base/default/images/window_close.png
similarity index 100%
rename from skin/adminhtml/default/default/images/window_close.png
rename to skin/adminhtml/base/default/images/window_close.png
diff --git a/skin/adminhtml/default/default/images/window_content.png b/skin/adminhtml/base/default/images/window_content.png
similarity index 100%
rename from skin/adminhtml/default/default/images/window_content.png
rename to skin/adminhtml/base/default/images/window_content.png
diff --git a/skin/adminhtml/default/default/images/window_top.png b/skin/adminhtml/base/default/images/window_top.png
similarity index 100%
rename from skin/adminhtml/default/default/images/window_top.png
rename to skin/adminhtml/base/default/images/window_top.png
diff --git a/skin/adminhtml/default/default/images/wysiwyg/skin_image.png b/skin/adminhtml/base/default/images/wysiwyg/skin_image.png
similarity index 100%
rename from skin/adminhtml/default/default/images/wysiwyg/skin_image.png
rename to skin/adminhtml/base/default/images/wysiwyg/skin_image.png
diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento.css
similarity index 100%
rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css
rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento.css
diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/btn_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif
rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/btn_bg.gif
diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/content_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif
rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/content_bg.gif
diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/top_bg.gif
similarity index 100%
rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif
rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/top_bg.gif
diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/window_close.png
similarity index 100%
rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png
rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/window_close.png
diff --git a/skin/adminhtml/default/default/menu.css b/skin/adminhtml/base/default/menu.css
similarity index 100%
rename from skin/adminhtml/default/default/menu.css
rename to skin/adminhtml/base/default/menu.css
diff --git a/skin/adminhtml/default/default/oauth-simple.css b/skin/adminhtml/base/default/oauth-simple.css
similarity index 100%
rename from skin/adminhtml/default/default/oauth-simple.css
rename to skin/adminhtml/base/default/oauth-simple.css
diff --git a/skin/adminhtml/default/default/print.css b/skin/adminhtml/base/default/print.css
similarity index 100%
rename from skin/adminhtml/default/default/print.css
rename to skin/adminhtml/base/default/print.css
diff --git a/skin/adminhtml/default/default/reset.css b/skin/adminhtml/base/default/reset.css
similarity index 100%
rename from skin/adminhtml/default/default/reset.css
rename to skin/adminhtml/base/default/reset.css
diff --git a/skin/adminhtml/default/openmage/calendar-blue2.css b/skin/adminhtml/openmage/default/calendar-blue2.css
similarity index 100%
rename from skin/adminhtml/default/openmage/calendar-blue2.css
rename to skin/adminhtml/openmage/default/calendar-blue2.css
diff --git a/skin/adminhtml/default/openmage/calendar-blue2.css.map b/skin/adminhtml/openmage/default/calendar-blue2.css.map
similarity index 100%
rename from skin/adminhtml/default/openmage/calendar-blue2.css.map
rename to skin/adminhtml/openmage/default/calendar-blue2.css.map
diff --git a/skin/adminhtml/default/openmage/favicon.ico b/skin/adminhtml/openmage/default/favicon.ico
similarity index 100%
rename from skin/adminhtml/default/openmage/favicon.ico
rename to skin/adminhtml/openmage/default/favicon.ico
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/License.txt b/skin/adminhtml/openmage/default/fonts/opensans/License.txt
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/License.txt
rename to skin/adminhtml/openmage/default/fonts/opensans/License.txt
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.ttf
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.ttf
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.ttf
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff2
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff2
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff2
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.ttf
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.ttf
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.ttf
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff2
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff2
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff2
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.ttf
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.ttf
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.ttf
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff2
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff2
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff2
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.ttf
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.ttf
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.ttf
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff
diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff2
similarity index 100%
rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff2
rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff2
diff --git a/skin/adminhtml/default/openmage/form.css b/skin/adminhtml/openmage/default/form.css
similarity index 100%
rename from skin/adminhtml/default/openmage/form.css
rename to skin/adminhtml/openmage/default/form.css
diff --git a/skin/adminhtml/default/openmage/form.css.map b/skin/adminhtml/openmage/default/form.css.map
similarity index 100%
rename from skin/adminhtml/default/openmage/form.css.map
rename to skin/adminhtml/openmage/default/form.css.map
diff --git a/skin/adminhtml/default/openmage/images/ajax-loader-tr.gif b/skin/adminhtml/openmage/default/images/ajax-loader-tr.gif
similarity index 100%
rename from skin/adminhtml/default/openmage/images/ajax-loader-tr.gif
rename to skin/adminhtml/openmage/default/images/ajax-loader-tr.gif
diff --git a/skin/adminhtml/default/openmage/images/alert-circle.svg b/skin/adminhtml/openmage/default/images/alert-circle.svg
similarity index 100%
rename from skin/adminhtml/default/openmage/images/alert-circle.svg
rename to skin/adminhtml/openmage/default/images/alert-circle.svg
diff --git a/skin/adminhtml/default/openmage/images/icon-error.png b/skin/adminhtml/openmage/default/images/icon-error.png
similarity index 100%
rename from skin/adminhtml/default/openmage/images/icon-error.png
rename to skin/adminhtml/openmage/default/images/icon-error.png
diff --git a/skin/adminhtml/default/openmage/images/information-variant.svg b/skin/adminhtml/openmage/default/images/information-variant.svg
similarity index 100%
rename from skin/adminhtml/default/openmage/images/information-variant.svg
rename to skin/adminhtml/openmage/default/images/information-variant.svg
diff --git a/skin/adminhtml/default/openmage/images/login_background.jpg b/skin/adminhtml/openmage/default/images/login_background.jpg
similarity index 100%
rename from skin/adminhtml/default/openmage/images/login_background.jpg
rename to skin/adminhtml/openmage/default/images/login_background.jpg
diff --git a/skin/adminhtml/default/openmage/images/logo.svg b/skin/adminhtml/openmage/default/images/logo.svg
similarity index 100%
rename from skin/adminhtml/default/openmage/images/logo.svg
rename to skin/adminhtml/openmage/default/images/logo.svg
diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento.css b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento.css
similarity index 100%
rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento.css
rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento.css
diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/btn_bg.gif b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/btn_bg.gif
similarity index 100%
rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/btn_bg.gif
rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/btn_bg.gif
diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/content_bg.gif b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/content_bg.gif
similarity index 100%
rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/content_bg.gif
rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/content_bg.gif
diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/top_bg.gif b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/top_bg.gif
similarity index 100%
rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/top_bg.gif
rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/top_bg.gif
diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/window_close.png b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/window_close.png
similarity index 100%
rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/window_close.png
rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/window_close.png
diff --git a/skin/adminhtml/default/openmage/login.css b/skin/adminhtml/openmage/default/login.css
similarity index 100%
rename from skin/adminhtml/default/openmage/login.css
rename to skin/adminhtml/openmage/default/login.css
diff --git a/skin/adminhtml/default/openmage/login.css.map b/skin/adminhtml/openmage/default/login.css.map
similarity index 100%
rename from skin/adminhtml/default/openmage/login.css.map
rename to skin/adminhtml/openmage/default/login.css.map
diff --git a/skin/adminhtml/default/openmage/menu.css b/skin/adminhtml/openmage/default/menu.css
similarity index 100%
rename from skin/adminhtml/default/openmage/menu.css
rename to skin/adminhtml/openmage/default/menu.css
diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/openmage/default/menu.css.map
similarity index 100%
rename from skin/adminhtml/default/openmage/menu.css.map
rename to skin/adminhtml/openmage/default/menu.css.map
diff --git a/skin/adminhtml/default/openmage/override.css b/skin/adminhtml/openmage/default/override.css
similarity index 100%
rename from skin/adminhtml/default/openmage/override.css
rename to skin/adminhtml/openmage/default/override.css
diff --git a/skin/adminhtml/default/openmage/override.css.map b/skin/adminhtml/openmage/default/override.css.map
similarity index 100%
rename from skin/adminhtml/default/openmage/override.css.map
rename to skin/adminhtml/openmage/default/override.css.map
diff --git a/skin/adminhtml/default/openmage/scss/_base.scss b/skin/adminhtml/openmage/default/scss/_base.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/_base.scss
rename to skin/adminhtml/openmage/default/scss/_base.scss
diff --git a/skin/adminhtml/default/openmage/scss/_fonts.scss b/skin/adminhtml/openmage/default/scss/_fonts.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/_fonts.scss
rename to skin/adminhtml/openmage/default/scss/_fonts.scss
diff --git a/skin/adminhtml/default/openmage/scss/_icons.scss b/skin/adminhtml/openmage/default/scss/_icons.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/_icons.scss
rename to skin/adminhtml/openmage/default/scss/_icons.scss
diff --git a/skin/adminhtml/default/openmage/scss/_variables.scss b/skin/adminhtml/openmage/default/scss/_variables.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/_variables.scss
rename to skin/adminhtml/openmage/default/scss/_variables.scss
diff --git a/skin/adminhtml/default/openmage/scss/calendar-blue2.scss b/skin/adminhtml/openmage/default/scss/calendar-blue2.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/calendar-blue2.scss
rename to skin/adminhtml/openmage/default/scss/calendar-blue2.scss
diff --git a/skin/adminhtml/default/openmage/scss/form.scss b/skin/adminhtml/openmage/default/scss/form.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/form.scss
rename to skin/adminhtml/openmage/default/scss/form.scss
diff --git a/skin/adminhtml/default/openmage/scss/login.scss b/skin/adminhtml/openmage/default/scss/login.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/login.scss
rename to skin/adminhtml/openmage/default/scss/login.scss
diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/openmage/default/scss/menu.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/menu.scss
rename to skin/adminhtml/openmage/default/scss/menu.scss
diff --git a/skin/adminhtml/default/openmage/scss/override.scss b/skin/adminhtml/openmage/default/scss/override.scss
similarity index 100%
rename from skin/adminhtml/default/openmage/scss/override.scss
rename to skin/adminhtml/openmage/default/scss/override.scss