Index: applications/ecommerce/widget/CustomerScreens.xml
===================================================================
--- applications/ecommerce/widget/CustomerScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/CustomerScreens.xml	(working copy)
@@ -36,7 +36,7 @@
                 <set field="title-property" value="PageTitleAdditionalInfo"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/survey.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -52,7 +52,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/newcustomer.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newcustomer.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -68,7 +68,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewprofile.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -83,7 +83,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editcontactmech.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editcontactmech.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -99,7 +99,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editcreditcard.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -114,7 +114,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editeftaccount.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -129,7 +129,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editgiftcard.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -145,7 +145,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/changepassword.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/changepassword.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -160,7 +160,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editperson.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editperson.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -180,7 +180,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/giftcardbalance.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -199,7 +199,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/giftcardlink.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/giftcardlink.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -215,7 +215,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/customersurvey.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/customersurvey.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -236,7 +236,7 @@
                 <set field="submitRequest" value="contactsubmit"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newmsg.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -250,7 +250,7 @@
                 <set field="title-property" value="PageTitleMessageList"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-screen name="messagelist-include"/>
                     </decorator-section>
@@ -288,7 +288,7 @@
                 <entity-one entity-name="CommunicationEvent" value-name="communicationEvent" auto-field-map="true"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/messagedetail.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -308,7 +308,7 @@
                 <set field="partyIdTo" from-field="communicationEvent.partyIdFrom"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newmsg.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/ecommerce/widget/ShoppingListScreens.xml
===================================================================
--- applications/ecommerce/widget/ShoppingListScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/ShoppingListScreens.xml	(working copy)
@@ -37,7 +37,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/ecommerce/widget/CommonScreens.xml
===================================================================
--- applications/ecommerce/widget/CommonScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/CommonScreens.xml	(working copy)
@@ -123,7 +123,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/category.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://ecommerce/webapp/ecommerce/main.ftl"/></html>
@@ -141,7 +141,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://ecommerce/webapp/ecommerce/login.ftl"/></html>
Index: applications/ecommerce/widget/ForumScreens.xml
===================================================================
--- applications/ecommerce/widget/ForumScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/ForumScreens.xml	(working copy)
@@ -60,7 +60,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/listparamprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/showforum.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -88,7 +88,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/permprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/showforumarticle.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -135,7 +135,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentaddprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/createforumarticle.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -182,7 +182,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editforumarticle.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -228,7 +228,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/viewprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editforumarticle.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -279,7 +279,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ownercontentprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/createforumresponse.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -320,7 +320,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editforuminfo.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -373,7 +373,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editaddforumdata.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -419,7 +419,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/editaddprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/forum/editaddimage.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/ecommerce/widget/CartScreens.xml
===================================================================
--- applications/ecommerce/widget/CartScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/CartScreens.xml	(working copy)
@@ -74,7 +74,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showpromotext.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/cart/showcart.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -95,7 +95,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showpromotext.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showAllPromotions.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -116,7 +116,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/showPromotionDetails.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/ecommerce/widget/CatalogScreens.xml
===================================================================
--- applications/ecommerce/widget/CatalogScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/CatalogScreens.xml	(working copy)
@@ -168,7 +168,7 @@
                 <set field="title-property" value="PageTitleCategoryPage"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-screen name="breadcrumbs"/>
                         <include-screen name="category-include"/>
@@ -224,7 +224,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -282,7 +282,7 @@
                 <set field="title-property" value="PageTitleProductReview"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/productreview.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -301,7 +301,7 @@
                 <set field="title-property" value="PageTitleLastViewProducts"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -345,7 +345,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/quickadd.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/quickadd.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -378,7 +378,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/keywordsearch.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/keywordsearch.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -400,7 +400,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/ecommerce/widget/ContentScreens.xml
===================================================================
--- applications/ecommerce/widget/ContentScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/ContentScreens.xml	(working copy)
@@ -81,7 +81,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/content/contentprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/defaultcontent.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -104,7 +104,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/forum/nodetrailprep.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/showcontenttree.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -132,7 +132,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/content/search.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/searchContent.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -155,7 +155,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/includes/mruadd.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/viewcontent.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/ecommerce/widget/OrderScreens.xml
===================================================================
--- applications/ecommerce/widget/OrderScreens.xml	(revision 5328)
+++ applications/ecommerce/widget/OrderScreens.xml	(working copy)
@@ -73,7 +73,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/billsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -91,7 +91,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/shipsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -109,7 +109,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/custsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -127,7 +127,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/optionsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/optionsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -145,7 +145,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/confirmorder.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -163,7 +163,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutoptions.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -181,7 +181,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingaddress.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutshippingaddress.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -199,7 +199,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -218,7 +218,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutpayment.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -233,7 +233,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/splitship.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/splitship.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -249,7 +249,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutreview.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -264,7 +264,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/ordercomplete.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -283,7 +283,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderhistory.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderhistory.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -302,7 +302,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderstatus.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -320,7 +320,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://ecommerce/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/requestreturn.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
===================================================================
--- applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml	(revision 5328)
+++ applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml	(working copy)
@@ -1105,7 +1105,7 @@
 
     <!-- View Mappings -->
     <view-map name="error" page="/error/error.jsp"/>
-    <view-map name="main" type="screen" page="component://ecommerce/widget/CommonScreens.xml#main"/>
+    <view-map name="main" type="screen" page="component://hme//widget/CommonScreens.xml#main"/>
     <view-map name="login" type="screen" page="component://ecommerce/widget/CommonScreens.xml#login"/>
 
     <!-- Cart Views -->
Index: applications/ecommerce/webapp/ecommerce/WEB-INF/web.xml
===================================================================
--- applications/ecommerce/webapp/ecommerce/WEB-INF/web.xml	(revision 5328)
+++ applications/ecommerce/webapp/ecommerce/WEB-INF/web.xml	(working copy)
@@ -47,6 +47,12 @@
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
     </context-param>
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>ecommerce/widget</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
+    
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: applications/party/widget/partymgr/PaymentMethodScreens.xml
===================================================================
--- applications/party/widget/partymgr/PaymentMethodScreens.xml	(revision 5328)
+++ applications/party/widget/partymgr/PaymentMethodScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="headerItem" value="find"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -131,7 +131,7 @@
                 <entity-one entity-name="PartyIcsAvsOverride" value-name="avsOverride"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
Index: applications/party/widget/partymgr/VisitScreens.xml
===================================================================
--- applications/party/widget/partymgr/VisitScreens.xml	(revision 5328)
+++ applications/party/widget/partymgr/VisitScreens.xml	(working copy)
@@ -36,7 +36,7 @@
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/visit/showvisits.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -67,7 +67,7 @@
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/visit/visitdetail.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -89,4 +89,4 @@
         </section>
     </screen>
 </screens>
-    
\ No newline at end of file
+    
Index: applications/party/widget/partymgr/PartyScreens.xml
===================================================================
--- applications/party/widget/partymgr/PartyScreens.xml	(revision 5328)
+++ applications/party/widget/partymgr/PartyScreens.xml	(working copy)
@@ -37,7 +37,7 @@
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/findparty.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -71,7 +71,7 @@
                 <entity-one entity-name="PartyGroup" value-name="lookupGroup"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -289,7 +289,7 @@
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/editcontactmech.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -456,7 +456,7 @@
                 <set field="headerItem" value="create"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -494,7 +494,7 @@
                 <set field="previousParams" from-field="sessionAttributes._PREVIOUS_PARAMS_"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -514,4 +514,4 @@
         </section>
     </screen>
 </screens>
-    
\ No newline at end of file
+    
Index: applications/party/widget/partymgr/CommunicationScreens.xml
===================================================================
--- applications/party/widget/partymgr/CommunicationScreens.xml	(revision 5328)
+++ applications/party/widget/partymgr/CommunicationScreens.xml	(working copy)
@@ -35,7 +35,7 @@
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/pendingCommunications.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -66,7 +66,7 @@
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/listCommunications.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -106,7 +106,7 @@
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/editCommunication.bsh"/>                
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for PARTYMGR, _VIEW permission -->
@@ -137,4 +137,4 @@
         </section>
     </screen>
 </screens>
-    
\ No newline at end of file
+    
Index: applications/party/widget/partymgr/SecurityScreens.xml
===================================================================
--- applications/party/widget/partymgr/SecurityScreens.xml	(revision 5328)
+++ applications/party/widget/partymgr/SecurityScreens.xml	(working copy)
@@ -37,7 +37,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -67,7 +67,7 @@
                 <set field="headerItem" value="security"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://party/widget/partymgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -164,4 +164,4 @@
         </section>
     </screen>
 </screens>
-    
\ No newline at end of file
+    
Index: applications/party/widget/partymgr/CommonScreens.xml
===================================================================
--- applications/party/widget/partymgr/CommonScreens.xml	(revision 5328)
+++ applications/party/widget/partymgr/CommonScreens.xml	(working copy)
@@ -67,7 +67,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/party/webapp/partymgr/WEB-INF/web.xml
===================================================================
--- applications/party/webapp/partymgr/WEB-INF/web.xml	(revision 5328)
+++ applications/party/webapp/partymgr/WEB-INF/web.xml	(working copy)
@@ -47,7 +47,13 @@
     <param-value>/WEB-INF/bsh</param-value>
     <description>BeanShell Script Location</description>
   </context-param>    
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>party/widget/partymgr</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
+
     <filter>
         <filter-name>ContextFilter</filter-name>
         <display-name>ContextFilter</display-name>
Index: applications/product/widget/facility/FacilityGroupScreens.xml
===================================================================
--- applications/product/widget/facility/FacilityGroupScreens.xml	(revision 5328)
+++ applications/product/widget/facility/FacilityGroupScreens.xml	(working copy)
@@ -34,7 +34,7 @@
                 </entity-and>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/facility/group/FindFacilityGroup.ftl"/></html>
@@ -52,7 +52,7 @@
                 <entity-one entity-name="FacilityGroup" value-name="facilityGroup"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
Index: applications/product/widget/facility/FacilityScreens.xml
===================================================================
--- applications/product/widget/facility/FacilityScreens.xml	(revision 5328)
+++ applications/product/widget/facility/FacilityScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <script location="component://product/webapp/facility/WEB-INF/actions/facility/FindFacility.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/facility/facility/FindFacility.ftl"/></html>
@@ -50,7 +50,7 @@
                 <entity-one entity-name="Facility" value-name="facility"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
Index: applications/product/widget/facility/ShipmentScreens.xml
===================================================================
--- applications/product/widget/facility/ShipmentScreens.xml	(revision 5328)
+++ applications/product/widget/facility/ShipmentScreens.xml	(working copy)
@@ -33,7 +33,7 @@
                 <script location="component://product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/facility/shipment/FindShipment.ftl"/></html>
@@ -51,7 +51,7 @@
                 <entity-one entity-name="Shipment" value-name="shipment"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -241,7 +241,7 @@
                 <script location="component://product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/facility/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/facility/shipment/QuickShipOrder.ftl"/></html>
Index: applications/product/widget/facility/CommonScreens.xml
===================================================================
--- applications/product/widget/facility/CommonScreens.xml	(revision 5328)
+++ applications/product/widget/facility/CommonScreens.xml	(working copy)
@@ -70,7 +70,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/product/widget/catalog/CategoryScreens.xml
===================================================================
--- applications/product/widget/catalog/CategoryScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/CategoryScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/widget/catalog/FindScreens.xml
===================================================================
--- applications/product/widget/catalog/FindScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/FindScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
@@ -111,7 +111,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://product/webapp/catalog/find/FindProductById.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/product/widget/catalog/ProductScreens.xml
===================================================================
--- applications/product/widget/catalog/ProductScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/ProductScreens.xml	(working copy)
@@ -35,7 +35,7 @@
                 <entity-one entity-name="Product" value-name="product"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
@@ -739,7 +739,7 @@
                 <set field="leftbarScreenName" value="leftbar"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-screen name="CreateVirtualWithVariantsFormInclude"/>
                     </decorator-section>
Index: applications/product/widget/catalog/ReviewScreens.xml
===================================================================
--- applications/product/widget/catalog/ReviewScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/ReviewScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/widget/catalog/PriceScreens.xml
===================================================================
--- applications/product/widget/catalog/PriceScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/PriceScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/widget/catalog/ThesaurusScreens.xml
===================================================================
--- applications/product/widget/catalog/ThesaurusScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/ThesaurusScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/widget/catalog/ConfigScreens.xml
===================================================================
--- applications/product/widget/catalog/ConfigScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/ConfigScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/widget/catalog/CommonScreens.xml
===================================================================
--- applications/product/widget/catalog/CommonScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/CommonScreens.xml	(working copy)
@@ -139,7 +139,7 @@
                 <script location="component://product/webapp/catalog/WEB-INF/actions/ChooseTopCategory.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://product/webapp/catalog/ChooseTopCategory.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -157,7 +157,7 @@
                 <script location="component://product/webapp/catalog/WEB-INF/actions/FastLoadCache.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://product/webapp/catalog/FastLoadCache.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -177,7 +177,7 @@
                 <entity-one entity-name="Product" value-name="product"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/catalog/main.ftl"/></html>
@@ -190,7 +190,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/product/widget/catalog/CatalogScreens.xml
===================================================================
--- applications/product/widget/catalog/CatalogScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/CatalogScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
@@ -193,7 +193,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
@@ -215,4 +215,4 @@
         </section>
     </screen>
 </screens>
-    
\ No newline at end of file
+    
Index: applications/product/widget/catalog/FeatureScreens.xml
===================================================================
--- applications/product/widget/catalog/FeatureScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/FeatureScreens.xml	(working copy)
@@ -35,7 +35,7 @@
                 <!--<entity-one entity-name="Product" value-name="product"/>-->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/widget/catalog/PromoScreens.xml
===================================================================
--- applications/product/widget/catalog/PromoScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/PromoScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/widget/catalog/StoreScreens.xml
===================================================================
--- applications/product/widget/catalog/StoreScreens.xml	(revision 5328)
+++ applications/product/widget/catalog/StoreScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <set field="MainColumnStyle" value="leftonly"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://product/widget/catalog/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for CATALOG, _VIEW permission -->
Index: applications/product/webapp/facility/WEB-INF/web.xml
===================================================================
--- applications/product/webapp/facility/WEB-INF/web.xml	(revision 5328)
+++ applications/product/webapp/facility/WEB-INF/web.xml	(working copy)
@@ -42,6 +42,11 @@
         <param-value>/WEB-INF/services.xml</param-value>
         <description>Configuration File(s) For The Service Dispatcher</description>
     </context-param>   
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>product/widget/facility</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: applications/product/webapp/catalog/WEB-INF/web.xml
===================================================================
--- applications/product/webapp/catalog/WEB-INF/web.xml	(revision 5328)
+++ applications/product/webapp/catalog/WEB-INF/web.xml	(working copy)
@@ -42,6 +42,11 @@
         <param-value>/WEB-INF/services.xml</param-value>
         <description>Configuration File(s) For The Service Dispatcher</description>
     </context-param> 
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>product/widget/catalog</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: applications/marketing/widget/CommonScreens.xml
===================================================================
--- applications/marketing/widget/CommonScreens.xml	(revision 5328)
+++ applications/marketing/widget/CommonScreens.xml	(working copy)
@@ -67,7 +67,7 @@
     <screen name="main">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-header">
@@ -85,7 +85,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/marketing/webapp/marketing/WEB-INF/web.xml
===================================================================
--- applications/marketing/webapp/marketing/WEB-INF/web.xml	(revision 5328)
+++ applications/marketing/webapp/marketing/WEB-INF/web.xml	(working copy)
@@ -47,7 +47,13 @@
     <param-value>/WEB-INF/bsh</param-value>
     <description>BeanShell Script Location</description>
   </context-param>    
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>marketing/widget</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
+
     <filter>
         <filter-name>ContextFilter</filter-name>
         <display-name>ContextFilter</display-name>
Index: applications/manufacturing/widget/manufacturing/BomScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/BomScreens.xml	(revision 5328)
+++ applications/manufacturing/widget/manufacturing/BomScreens.xml	(working copy)
@@ -31,7 +31,7 @@
                 <!-- <set field="leftbarScreenLocation" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for MANUFACTURING, _VIEW permission -->
Index: applications/manufacturing/widget/manufacturing/MrpScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/MrpScreens.xml	(revision 5328)
+++ applications/manufacturing/widget/manufacturing/MrpScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <!-- <set field="leftbarScreenLocation" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for MANUFACTURING, _VIEW permission -->
Index: applications/manufacturing/widget/manufacturing/RequirementScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/RequirementScreens.xml	(revision 5328)
+++ applications/manufacturing/widget/manufacturing/RequirementScreens.xml	(working copy)
@@ -35,7 +35,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.ManufacturingApproveRequirements}</label>
Index: applications/manufacturing/widget/manufacturing/JobshopScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/JobshopScreens.xml	(revision 5328)
+++ applications/manufacturing/widget/manufacturing/JobshopScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <!-- <set field="leftbarScreenLocation" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for MANUFACTURING, _VIEW permission -->
Index: applications/manufacturing/widget/manufacturing/RoutingScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/RoutingScreens.xml	(revision 5328)
+++ applications/manufacturing/widget/manufacturing/RoutingScreens.xml	(working copy)
@@ -35,7 +35,7 @@
 
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for MANUFACTURING, _VIEW permission -->
@@ -67,7 +67,7 @@
                 <entity-one entity-name="WorkEffort" value-name="routingTask"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for MANUFACTURING, _VIEW permission -->
@@ -107,7 +107,7 @@
                 <set field="requestParameters.currentStatusId" to-scope="screen" default-value="ROU_ACTIVE"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.ManufacturingRoutings}</label>
@@ -158,7 +158,7 @@
                 <set field="requestParameters.currentStatusId" to-scope="screen" default-value="ROU_ACTIVE"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.ManufacturingRoutingTasks}</label>
Index: applications/manufacturing/widget/manufacturing/CommonScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/CommonScreens.xml	(revision 5328)
+++ applications/manufacturing/widget/manufacturing/CommonScreens.xml	(working copy)
@@ -66,7 +66,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/manufacturing/widget/manufacturing/CalendarScreens.xml
===================================================================
--- applications/manufacturing/widget/manufacturing/CalendarScreens.xml	(revision 5328)
+++ applications/manufacturing/widget/manufacturing/CalendarScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <!-- <set field="leftbarScreenLocation" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://manufacturing/widget/manufacturing/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for MANUFACTURING, _VIEW permission -->
Index: applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
===================================================================
--- applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml	(revision 5328)
+++ applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml	(working copy)
@@ -41,7 +41,12 @@
         <param-name>serviceReaderUrls</param-name>
         <param-value>/WEB-INF/services.xml</param-value>
         <description>Configuration File(s) For The Service Dispatcher</description>
-    </context-param>   
+    </context-param>
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>manufacturing/widget/manufacturing</param-value>
+        <description>Variable that allows for the main decorator to be the component specified</description>
+    </context-param>       
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: applications/workeffort/widget/CommonScreens.xml
===================================================================
--- applications/workeffort/widget/CommonScreens.xml	(revision 5328)
+++ applications/workeffort/widget/CommonScreens.xml	(working copy)
@@ -67,7 +67,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
@@ -83,7 +83,7 @@
                 <set field="headerItem" value="main"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://workeffort/webapp/workeffort/main.ftl"/></html>
Index: applications/workeffort/widget/RequestScreens.xml
===================================================================
--- applications/workeffort/widget/RequestScreens.xml	(revision 5328)
+++ applications/workeffort/widget/RequestScreens.xml	(working copy)
@@ -39,7 +39,7 @@
                 <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/request/requestlist.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.WorkEffortMyRequestList}</label>
Index: applications/workeffort/widget/CalendarScreens.xml
===================================================================
--- applications/workeffort/widget/CalendarScreens.xml	(revision 5328)
+++ applications/workeffort/widget/CalendarScreens.xml	(working copy)
@@ -30,7 +30,7 @@
             <actions>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
Index: applications/workeffort/webapp/workeffort/WEB-INF/web.xml
===================================================================
--- applications/workeffort/webapp/workeffort/WEB-INF/web.xml	(revision 5328)
+++ applications/workeffort/webapp/workeffort/WEB-INF/web.xml	(working copy)
@@ -47,6 +47,11 @@
     <param-value>/WEB-INF/bsh</param-value>
     <description>BeanShell Script Location</description>
   </context-param>    
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>workeffort/widget</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: applications/accounting/widget/BillingAccountScreens.xml
===================================================================
--- applications/accounting/widget/BillingAccountScreens.xml	(revision 5328)
+++ applications/accounting/widget/BillingAccountScreens.xml	(working copy)
@@ -28,7 +28,7 @@
     <screen name="CommonBillingAccountDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ACCOUNTING, _VIEW permission -->
@@ -63,7 +63,7 @@
                 <script location="component://accounting/webapp/accounting/WEB-INF/actions/billingaccount/FindBillingAccount.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl"/></html>
Index: applications/accounting/widget/FixedAssetScreens.xml
===================================================================
--- applications/accounting/widget/FixedAssetScreens.xml	(revision 5328)
+++ applications/accounting/widget/FixedAssetScreens.xml	(working copy)
@@ -28,7 +28,7 @@
     <screen name="CommonFixedAssetDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ACCOUNTING, _VIEW permission -->
Index: applications/accounting/widget/AgreementScreens.xml
===================================================================
--- applications/accounting/widget/AgreementScreens.xml	(revision 5328)
+++ applications/accounting/widget/AgreementScreens.xml	(working copy)
@@ -27,7 +27,7 @@
     <screen name="CommonAgreementDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ACCOUNTING, _VIEW permission -->
@@ -66,7 +66,7 @@
 
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.AccountingAgreements}</label>
Index: applications/accounting/widget/CommonScreens.xml
===================================================================
--- applications/accounting/widget/CommonScreens.xml	(revision 5328)
+++ applications/accounting/widget/CommonScreens.xml	(working copy)
@@ -84,7 +84,7 @@
                 </entity-condition>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-header">
@@ -100,7 +100,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/accounting/widget/SimpleScreens.xml
===================================================================
--- applications/accounting/widget/SimpleScreens.xml	(revision 5328)
+++ applications/accounting/widget/SimpleScreens.xml	(working copy)
@@ -35,7 +35,7 @@
             </actions>
             <widgets>
 				<!-- main defines the regions of the HTML page -->
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
 				<!-- body is the primary display for this page and is called recursively -->
                     <decorator-section name="body">
                         <section>
@@ -87,7 +87,7 @@
                 <decorator-screen name="GenericDecorator">
                     <decorator-section name="body">
                         <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
-            			<!-- include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
+            			<!-- include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
                         
                         <!-- include the duplicate product form template -->
                         <!-- platform-specific>
Index: applications/accounting/widget/AccountingScreens.xml
===================================================================
--- applications/accounting/widget/AccountingScreens.xml	(revision 5328)
+++ applications/accounting/widget/AccountingScreens.xml	(working copy)
@@ -1,281 +1,281 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Copyright (c) 2004 The Open For Business Project - www.ofbiz.org
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a
- *  copy of this software and associated documentation files (the "Software"),
- *  to deal in the Software without restriction, including without limitation
- *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
- *  and/or sell copies of the Software, and to permit persons to whom the
- *  Software is furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included
- *  in all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *  $Id: AccountingScreens.xml,v 1.4 2004/07/31 12:17:42 jonesde Exp $
--->
-
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
-
-    <screen name="GenericDecorator">
-        <section>
-            <actions>
-                <!--set field="leftbarScreenName" value="leftbar"/ -->
-            </actions>
-            <widgets>
-                <!-- main defines the regions of the HTML page -->
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
-                <!-- body is the primary display for this page and is called recursively -->
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
-                                </platform-specific>
-            
-                                <container>
-                                    <!-- label style="head1">List Accounts</label -->
-                                    <label style="head1">${uiLabelMap.${labelTitleProperty}}</label>
-                                </container>
-                                
-                                <!-- Now call the SimpleScreen form -->
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <!--
-                            <fail-widgets>
-                                <label style="head3">${uiLabelMap.XxxxViewPermissionError}</label>
-                            </fail-widgets>
-                            -->
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="CommonAccountDecorator">
-        <section>
-            <actions>
-                <set field="leftbarScreenName" value="leftbar"/>
-                <!-- <set field="leftbarScreenLocation" value=""/> -->
-    
-                <set field="glAccountId" from-field="parameters.glAccountId"/>
-                <entity-one entity-name="GlAccount" value-name="glAccount"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <section>
-                            <!-- do check for CATALOG, _VIEW permission -->
-                            <!-- condition>
-                                <if-has-permission permission="CATALOG" action="_VIEW"/>
-                            </condition -->
-                            <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
-                                </platform-specific>
-            
-                                <container>
-                                    <label style="head1">${uiLabelMap.${labelTitleProperty}} ${product.internalName} [${uiLabelMap.CommonId}:${productId}]</label>
-                                </container>
-                                
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <!--
-                            <fail-widgets>
-                                <label style="head3">${uiLabelMap.XxxxViewPermissionError}</label>
-                            </fail-widgets>
-                            -->
-                        </section>                    
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="EditGlJournalEntry">
-        <section>
-            <actions>
-                <set field="title" value="Edit GlJournal Entry"/>
-                <set field="titleProperty" value="Edit Gl Journal Entry"/>
-                <set field="tabButtonItem" value="EditGlJournalEntry"/>
-                <set field="labelTitleProperty" value="ListGlAccountOrganization"/>
-                <!-- entity-condition entity-name="GlAccountOrganization" list-name="entityList" use-cache="true" >
-                    <condition-expr field-name="glAccountId" operator="greater" value="0" />
-                </entity-condition -->
-                <entity-condition entity-name="GlAccount" list-name="entityList" use-cache="true" >
-                    <condition-expr field-name="glAccountId" operator="greater" value="0" />
-                    <!--limit-range start="0" size="25" / -->
-                </entity-condition>
-            </actions>
-            <widgets>
-                <decorator-screen name="GenericDecorator">
-                    <decorator-section name="body">
-                        <include-form name="EditGlJournalEntry" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="ListGlAccountOrganization">
-        <section>
-            <actions>
-                <set field="title" value="List GlAccountOrganization"/>
-                <set field="titleProperty" value="List GlAccountOrganization"/>
-                <set field="tabButtonItem" value="EditProduct"/>
-                <set field="labelTitleProperty" value="ListGlAccountOrganization"/>
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="GenericDecorator">
-                    <decorator-section name="body">
-                        <include-form name="ListGlAccountOrganization" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                        <!-- include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="AssignGlAccount">
-        <section>
-            <actions>
-                <set field="title" value="Assign GlAccount"/>
-                <!-- <set field="titleProperty" value=""/> -->
-                <set field="headerItem" value="chartofaccounts"/>
-                <set field="labelTitleProperty" value="Assign Account"/>
-    
-                <!-- <set field="accountId" from-field="parameters.accountId"/> -->
-            </actions>
-            <widgets>
-                <decorator-screen name="GenericDecorator">
-                    <decorator-section name="body">
-                        <include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-      
-    <screen name="GlAccountNavigate">
-        <section>
-            <actions>
-                <set field="title" value="Test AddGlAccount"/>
-                <!-- <set field="titleProperty" value=""/> -->
-                <set field="headerItem" value="chartofaccounts"/>
-                <set field="labelTitleProperty" value="ListAccounts"/>
-                <!-- parameters includes requestAttributes and parameter map -->
-                <!-- requestParameters is just the parameter map -->
-                <set field="glAccountId" from-field="requestParameters.glAccountId"/>
-                <set field="trail" from-field="requestParameters.trail"/>
-
-                <entity-one entity-name="GlAccount" value-name="glAccount"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <container style="column-left-wide">
-                            <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" /> 
-                        </container>
-                        <platform-specific>
-                            <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
-                        </platform-specific>
-                        <include-form name="EditGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                        <!-- include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
-                     </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="AddGlAccount">
-        <section>
-            <actions>
-                <set field="title" value="Test AddGlAccount"/>
-                <set field="titleProperty" value=""/>
-                <set field="tabButtonItem" value=""/>
-                <set field="labelTitleProperty" value=""/>
-            </actions>
-
-            <widgets>
-                <decorator-screen name="main-decorator" location="component://accounting/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <include-form name="EditGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                        
-                        <!-- include-screen screen-name="ListGlAccounts" name="ListGlAccounts" / --> 
-                    
-                        <!-- tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/ --> 
-                     </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="ListGlAccounts">
-        <section>
-            <actions>
-                <set field="title" value="List Accounts"/>
-                <set field="titleProperty" value="List Accounts"/>
-                <set field="tabButtonItem" value=""/>
-                <set field="labelTitleProperty" value="ListAccounts"/>
-                <!-- no longer works requies a fieldMap entity-and entity-name="GlAccount" list-name="entityList" use-cache="true" >
-                    <limit-range start="0" size="20" />
-                </entity-and -->
-                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
-                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="GenericDecorator">
-                    <decorator-section name="body">
-                        <include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="GlAccountDetail">
-        <section>
-            <actions>
-                <entity-one entity-name="GlAccount" value-name="currentValue" use-cache="true">
-                    <field-map env-name="glAccountId" />
-                </entity-one>
-            </actions>
-            <widgets>
-                <label text="Account Name: ${currentValue.accountName}"/>
-            </widgets>
-        </section>
-    </screen>
-    
-    <screen name="EditGlobalGlAccount">
-        <section>
-            <actions>
-                <!-- <set field="title" value="Edit GlAccount"/>
-                <set field="titleProperty" value=""/>
-                <set field="tabButtonItem" value=""/>
-                <set field="labelTitleProperty" value=""/> -->
-    
-                <set field="glAccountId" from-field="parameters.glAccountId"/>
-                <entity-one entity-name="GlAccount" value-name="glAccount"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonAccountDecorator">
-                    <decorator-section name="body">
-                        <include-form name="EditGlobalAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-</screens>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *  Copyright (c) 2004 The Open For Business Project - www.ofbiz.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ *  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *  $Id: AccountingScreens.xml,v 1.4 2004/07/31 12:17:42 jonesde Exp $
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+
+    <screen name="GenericDecorator">
+        <section>
+            <actions>
+                <!--set field="leftbarScreenName" value="leftbar"/ -->
+            </actions>
+            <widgets>
+                <!-- main defines the regions of the HTML page -->
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
+                <!-- body is the primary display for this page and is called recursively -->
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <platform-specific>
+                                    <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
+                                </platform-specific>
+            
+                                <container>
+                                    <!-- label style="head1">List Accounts</label -->
+                                    <label style="head1">${uiLabelMap.${labelTitleProperty}}</label>
+                                </container>
+                                
+                                <!-- Now call the SimpleScreen form -->
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <!--
+                            <fail-widgets>
+                                <label style="head3">${uiLabelMap.XxxxViewPermissionError}</label>
+                            </fail-widgets>
+                            -->
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="CommonAccountDecorator">
+        <section>
+            <actions>
+                <set field="leftbarScreenName" value="leftbar"/>
+                <!-- <set field="leftbarScreenLocation" value=""/> -->
+    
+                <set field="glAccountId" from-field="parameters.glAccountId"/>
+                <entity-one entity-name="GlAccount" value-name="glAccount"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for CATALOG, _VIEW permission -->
+                            <!-- condition>
+                                <if-has-permission permission="CATALOG" action="_VIEW"/>
+                            </condition -->
+                            <widgets>
+                                <platform-specific>
+                                    <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
+                                </platform-specific>
+            
+                                <container>
+                                    <label style="head1">${uiLabelMap.${labelTitleProperty}} ${product.internalName} [${uiLabelMap.CommonId}:${productId}]</label>
+                                </container>
+                                
+                                <decorator-section-include name="body"/>
+                            </widgets>
+                            <!--
+                            <fail-widgets>
+                                <label style="head3">${uiLabelMap.XxxxViewPermissionError}</label>
+                            </fail-widgets>
+                            -->
+                        </section>                    
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="EditGlJournalEntry">
+        <section>
+            <actions>
+                <set field="title" value="Edit GlJournal Entry"/>
+                <set field="titleProperty" value="Edit Gl Journal Entry"/>
+                <set field="tabButtonItem" value="EditGlJournalEntry"/>
+                <set field="labelTitleProperty" value="ListGlAccountOrganization"/>
+                <!-- entity-condition entity-name="GlAccountOrganization" list-name="entityList" use-cache="true" >
+                    <condition-expr field-name="glAccountId" operator="greater" value="0" />
+                </entity-condition -->
+                <entity-condition entity-name="GlAccount" list-name="entityList" use-cache="true" >
+                    <condition-expr field-name="glAccountId" operator="greater" value="0" />
+                    <!--limit-range start="0" size="25" / -->
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="GenericDecorator">
+                    <decorator-section name="body">
+                        <include-form name="EditGlJournalEntry" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="ListGlAccountOrganization">
+        <section>
+            <actions>
+                <set field="title" value="List GlAccountOrganization"/>
+                <set field="titleProperty" value="List GlAccountOrganization"/>
+                <set field="tabButtonItem" value="EditProduct"/>
+                <set field="labelTitleProperty" value="ListGlAccountOrganization"/>
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="GenericDecorator">
+                    <decorator-section name="body">
+                        <include-form name="ListGlAccountOrganization" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                        <!-- include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="AssignGlAccount">
+        <section>
+            <actions>
+                <set field="title" value="Assign GlAccount"/>
+                <!-- <set field="titleProperty" value=""/> -->
+                <set field="headerItem" value="chartofaccounts"/>
+                <set field="labelTitleProperty" value="Assign Account"/>
+    
+                <!-- <set field="accountId" from-field="parameters.accountId"/> -->
+            </actions>
+            <widgets>
+                <decorator-screen name="GenericDecorator">
+                    <decorator-section name="body">
+                        <include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+      
+    <screen name="GlAccountNavigate">
+        <section>
+            <actions>
+                <set field="title" value="Test AddGlAccount"/>
+                <!-- <set field="titleProperty" value=""/> -->
+                <set field="headerItem" value="chartofaccounts"/>
+                <set field="labelTitleProperty" value="ListAccounts"/>
+                <!-- parameters includes requestAttributes and parameter map -->
+                <!-- requestParameters is just the parameter map -->
+                <set field="glAccountId" from-field="requestParameters.glAccountId"/>
+                <set field="trail" from-field="requestParameters.trail"/>
+
+                <entity-one entity-name="GlAccount" value-name="glAccount"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <container style="column-left-wide">
+                            <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" /> 
+                        </container>
+                        <platform-specific>
+                            <html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
+                        </platform-specific>
+                        <include-form name="EditGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                        <!-- include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
+                     </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="AddGlAccount">
+        <section>
+            <actions>
+                <set field="title" value="Test AddGlAccount"/>
+                <set field="titleProperty" value=""/>
+                <set field="tabButtonItem" value=""/>
+                <set field="labelTitleProperty" value=""/>
+            </actions>
+
+            <widgets>
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <include-form name="EditGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                        
+                        <!-- include-screen screen-name="ListGlAccounts" name="ListGlAccounts" / --> 
+                    
+                        <!-- tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/ --> 
+                     </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="ListGlAccounts">
+        <section>
+            <actions>
+                <set field="title" value="List Accounts"/>
+                <set field="titleProperty" value="List Accounts"/>
+                <set field="tabButtonItem" value=""/>
+                <set field="labelTitleProperty" value="ListAccounts"/>
+                <!-- no longer works requies a fieldMap entity-and entity-name="GlAccount" list-name="entityList" use-cache="true" >
+                    <limit-range start="0" size="20" />
+                </entity-and -->
+                <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+                <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="GenericDecorator">
+                    <decorator-section name="body">
+                        <include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="GlAccountDetail">
+        <section>
+            <actions>
+                <entity-one entity-name="GlAccount" value-name="currentValue" use-cache="true">
+                    <field-map env-name="glAccountId" />
+                </entity-one>
+            </actions>
+            <widgets>
+                <label text="Account Name: ${currentValue.accountName}"/>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="EditGlobalGlAccount">
+        <section>
+            <actions>
+                <!-- <set field="title" value="Edit GlAccount"/>
+                <set field="titleProperty" value=""/>
+                <set field="tabButtonItem" value=""/>
+                <set field="labelTitleProperty" value=""/> -->
+    
+                <set field="glAccountId" from-field="parameters.glAccountId"/>
+                <entity-one entity-name="GlAccount" value-name="glAccount"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonAccountDecorator">
+                    <decorator-section name="body">
+                        <include-form name="EditGlobalAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>
+
Index: applications/accounting/webapp/accounting/WEB-INF/web.xml
===================================================================
--- applications/accounting/webapp/accounting/WEB-INF/web.xml	(revision 5328)
+++ applications/accounting/webapp/accounting/WEB-INF/web.xml	(working copy)
@@ -42,6 +42,11 @@
         <param-value>/WEB-INF/services.xml</param-value>
         <description>Configuration File(s) For The Service Dispatcher</description>
     </context-param>   
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>accounting/widget</param-value>
+        <description>Variable that allows for the main decorator to be the component specified</description>
+    </context-param>
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: applications/content/widget/cms/CMSScreens.xml
===================================================================
--- applications/content/widget/cms/CMSScreens.xml	(revision 5328)
+++ applications/content/widget/cms/CMSScreens.xml	(working copy)
@@ -32,7 +32,7 @@
 		    <set field="headerItem" value="CMS"/>
 		</actions>
                   <widgets>
-                       <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml" >
+                       <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                          <decorator-section name="body">
                            <include-menu name="cms" location="component://content/webapp/content/cms/CMSMenus.xml" />
                            <decorator-section-include name="body"/>
Index: applications/content/widget/content/ContentScreens.xml
===================================================================
--- applications/content/widget/content/ContentScreens.xml	(revision 5328)
+++ applications/content/widget/content/ContentScreens.xml	(working copy)
@@ -31,7 +31,7 @@
                 <set field="currentContentMenuItemName" from-field="currentContentMenuItemName" from-scope="user"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-menu name="content" location="component://content/webapp/content/content/ContentMenus.xml"/>
                         <decorator-section-include name="body"/>
Index: applications/content/widget/CommonScreens.xml
===================================================================
--- applications/content/widget/CommonScreens.xml	(revision 5328)
+++ applications/content/widget/CommonScreens.xml	(working copy)
@@ -70,7 +70,7 @@
     <screen name="main">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-header">
@@ -88,7 +88,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/content/widget/contentsetup/ContentSetupScreens.xml
===================================================================
--- applications/content/widget/contentsetup/ContentSetupScreens.xml	(revision 5328)
+++ applications/content/widget/contentsetup/ContentSetupScreens.xml	(working copy)
@@ -34,7 +34,7 @@
 		    <set field="currentMenuItemName" from-field="currentMenuItemName" from-scope="user"/>
 		</actions>
              <widgets>
-                 <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml">
+                 <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                      <decorator-section name="body">
                          <include-menu name="contentsetup" location="component://content/webapp/content/contentsetup/ContentSetupMenus.xml"/>
                          <decorator-section-include name="body"/>
Index: applications/content/webapp/content/WEB-INF/web.xml
===================================================================
--- applications/content/webapp/content/WEB-INF/web.xml	(revision 5328)
+++ applications/content/webapp/content/WEB-INF/web.xml	(working copy)
@@ -46,7 +46,12 @@
         <param-name>serviceReaderUrls</param-name>
         <param-value>/WEB-INF/services.xml</param-value>
         <description>Configuration File(s) For The Service Dispatcher</description>
-    </context-param>   
+    </context-param>
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>content/widget</param-value>
+        <description>Variable that allows for the main decorator to be the component specified</description>
+    </context-param>       
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: applications/order/widget/ordermgr/QuoteScreens.xml
===================================================================
--- applications/order/widget/ordermgr/QuoteScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/QuoteScreens.xml	(working copy)
@@ -27,7 +27,7 @@
     <screen name="CommonQuoteDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ORDERMGR, _VIEW permission -->
@@ -65,7 +65,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.OrderOrderQuotes}</label>
Index: applications/order/widget/ordermgr/OrderEntryScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderEntryScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderEntryScreens.xml	(working copy)
@@ -31,7 +31,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkinits.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/checkinits.ftl"/></html></platform-specific>
                     </decorator-section>
Index: applications/order/widget/ordermgr/OrderTaskScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderTaskScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderTaskScreens.xml	(working copy)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderTaskDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
Index: applications/order/widget/ordermgr/RequirementScreens.xml
===================================================================
--- applications/order/widget/ordermgr/RequirementScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/RequirementScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <!-- <set field="leftbarScreenLocation" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!-- do check for ORDERMGR, _VIEW permission -->
@@ -67,7 +67,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.OrderRequirements}</label>
Index: applications/order/widget/ordermgr/OrderViewScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderViewScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderViewScreens.xml	(working copy)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderViewDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
Index: applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderEntryCommonScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderEntryCommonScreens.xml	(working copy)
@@ -33,7 +33,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
@@ -58,7 +58,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
Index: applications/order/widget/ordermgr/OrderReportScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderReportScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderReportScreens.xml	(working copy)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderReportDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
Index: applications/order/widget/ordermgr/OrderReturnScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderReturnScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderReturnScreens.xml	(working copy)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderReturnDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
Index: applications/order/widget/ordermgr/ReportScreens.xml
===================================================================
--- applications/order/widget/ordermgr/ReportScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/ReportScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <!-- <set field="titleProperty" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1" text="Order Reports"/>
Index: applications/order/widget/ordermgr/CommonScreens.xml
===================================================================
--- applications/order/widget/ordermgr/CommonScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/CommonScreens.xml	(working copy)
@@ -80,7 +80,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: applications/order/widget/ordermgr/RequestScreens.xml
===================================================================
--- applications/order/widget/ordermgr/RequestScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/RequestScreens.xml	(working copy)
@@ -32,7 +32,7 @@
                 <!-- <set field="leftbarScreenLocation" value=""/> -->
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <!--
@@ -69,7 +69,7 @@
                 <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container>
                             <label style="head1">${uiLabelMap.OrderRequestList}</label>
Index: applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderEntryOrderScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderEntryOrderScreens.xml	(working copy)
@@ -34,7 +34,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetCheckOutTabBar.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
@@ -189,7 +189,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/orderstatus.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                 <!--<decorator-screen name="CommonOrderCheckoutDecorator">-->
                     <decorator-section name="body">
                       <platform-specific>
Index: applications/order/widget/ordermgr/OrderSetupScreens.xml
===================================================================
--- applications/order/widget/ordermgr/OrderSetupScreens.xml	(revision 5328)
+++ applications/order/widget/ordermgr/OrderSetupScreens.xml	(working copy)
@@ -26,7 +26,7 @@
     <screen name="CommonOrderSetupDecorator">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://order/widget/ordermgr/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <widgets>
Index: applications/order/webapp/ordermgr/WEB-INF/web.xml
===================================================================
--- applications/order/webapp/ordermgr/WEB-INF/web.xml	(revision 5328)
+++ applications/order/webapp/ordermgr/WEB-INF/web.xml	(working copy)
@@ -47,7 +47,13 @@
         <param-value>/WEB-INF/services.xml</param-value>
         <description>Configuration File(s) For The Service Dispatcher</description>
     </context-param>   
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>order/widget/ordermgr</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
+
     <filter>
         <filter-name>ContextFilter</filter-name>
         <display-name>ContextFilter</display-name>
Index: specialized/wholesale/webapp/wholesale/WEB-INF/web.xml
===================================================================
--- specialized/wholesale/webapp/wholesale/WEB-INF/web.xml	(revision 5328)
+++ specialized/wholesale/webapp/wholesale/WEB-INF/web.xml	(working copy)
@@ -47,6 +47,11 @@
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
     </context-param>
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>wholesale/widget/wholesale</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: specialized/wholesale/webapp/salesrep/WEB-INF/web.xml
===================================================================
--- specialized/wholesale/webapp/salesrep/WEB-INF/web.xml	(revision 5328)
+++ specialized/wholesale/webapp/salesrep/WEB-INF/web.xml	(working copy)
@@ -53,6 +53,11 @@
     <param-value>/WEB-INF/bsh</param-value>
     <description>BeanShell Script Location</description>
   </context-param>    
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>wholesale/widget/salesrep</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: specialized/opentravelsystem/webapp/website/WEB-INF/web.xml
===================================================================
--- specialized/opentravelsystem/webapp/website/WEB-INF/web.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/website/WEB-INF/web.xml	(working copy)
@@ -44,6 +44,11 @@
         <param-value>hotelbackend</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>    
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>opentravelsystem/webapp/website/screens</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/web.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/web.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/web.xml	(working copy)
@@ -44,6 +44,11 @@
         <param-value>hotelbackend</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>    
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>opentravelsystem/webapp/hotelbackend/screens</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: specialized/opentravelsystem/webapp/hotelfrontend/screens/CustomerScreens.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelfrontend/screens/CustomerScreens.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelfrontend/screens/CustomerScreens.xml	(working copy)
@@ -36,7 +36,7 @@
                 <set field="title" value="Additional Info"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/survey.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -52,7 +52,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/newcustomer.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newcustomer.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -68,7 +68,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewprofile.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -83,7 +83,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editcontactmech.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editcontactmech.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -99,7 +99,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editcreditcard.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -114,7 +114,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editeftaccount.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -129,7 +129,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editgiftcard.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -145,7 +145,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/changepassword.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/changepassword.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -160,7 +160,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editperson.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/editperson.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -180,7 +180,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/giftcardbalance.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -199,7 +199,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/giftcardlink.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/giftcardlink.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -215,7 +215,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/customersurvey.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/customersurvey.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -236,7 +236,7 @@
                 <set field="submitRequest" value="/contactsubmit"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newmsg.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -250,7 +250,7 @@
                 <set field="title" value="Message List"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-screen name="messagelist-include"/>
                     </decorator-section>
@@ -276,7 +276,7 @@
                 <set field="useSentTo" value="true"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-screen name="messagelist-include"/>
                     </decorator-section>
@@ -291,7 +291,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/messagedetail.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/messagedetail.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -308,7 +308,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/messagecreate.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/messagecreate.ftl"/></html></platform-specific>
                     </decorator-section>
Index: specialized/opentravelsystem/webapp/hotelfrontend/screens/ShoppingListScreens.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelfrontend/screens/ShoppingListScreens.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelfrontend/screens/ShoppingListScreens.xml	(working copy)
@@ -37,7 +37,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl"/></html></platform-specific>
                     </decorator-section>
Index: specialized/opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml	(working copy)
@@ -78,7 +78,7 @@
                 <set field="randomSurveyGroup" value="testSurveyGroup"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html>
@@ -157,7 +157,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/category.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://ecommerce/webapp/ecommerce/main.ftl"/></html>
@@ -176,7 +176,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/login.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://ecommerce/webapp/ecommerce/login.ftl"/></html>
Index: specialized/opentravelsystem/webapp/hotelfrontend/screens/CartScreens.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelfrontend/screens/CartScreens.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelfrontend/screens/CartScreens.xml	(working copy)
@@ -74,7 +74,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showpromotext.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/cart/showcart.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -95,7 +95,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showpromotext.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showAllPromotions.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -116,7 +116,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/showPromotionDetails.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/showPromotionDetails.ftl"/></html></platform-specific>
                     </decorator-section>
Index: specialized/opentravelsystem/webapp/hotelfrontend/screens/CatalogScreens.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelfrontend/screens/CatalogScreens.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelfrontend/screens/CatalogScreens.xml	(working copy)
@@ -138,7 +138,7 @@
                 <set field="title-property" value="PageTitleCategoryPage"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-screen name="breadcrumbs"/>
                         <include-screen name="category-include"/>
@@ -190,7 +190,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/product.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <section>
                             <condition>
@@ -245,7 +245,7 @@
                 <set field="title-property" value="PageTitleProductReview"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/productreview.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -263,7 +263,7 @@
                 <set field="title-property" value="PageTitleLastViewProducts"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/lastviewedproducts.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -299,7 +299,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/quickadd.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/quickadd.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -331,7 +331,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/keywordsearch.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/keywordsearch.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -352,7 +352,7 @@
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/advancedsearchoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl"/></html></platform-specific>
                     </decorator-section>
Index: specialized/opentravelsystem/webapp/hotelfrontend/screens/OrderScreens.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelfrontend/screens/OrderScreens.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelfrontend/screens/OrderScreens.xml	(working copy)
@@ -72,7 +72,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/billsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/billsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -90,7 +90,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/shipsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -108,7 +108,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/custsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -126,7 +126,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/optionsettings.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/optionsettings.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -144,7 +144,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/confirmorder.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -161,7 +161,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutoptions.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -179,7 +179,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingaddress.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutshippingaddress.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -197,7 +197,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutshippingoptions.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -215,7 +215,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutpayment.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -230,7 +230,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/splitship.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/splitship.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -246,7 +246,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutreview.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/checkoutreview.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -261,7 +261,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/ordercomplete.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -280,7 +280,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderhistory.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderhistory.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -299,7 +299,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/orderstatus.ftl"/></html></platform-specific>
                     </decorator-section>
@@ -317,7 +317,7 @@
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="component://opentravelsystem/webapp/hotelfrontend/screens/CommonScreens.xml">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/order/requestreturn.ftl"/></html></platform-specific>
                     </decorator-section>
Index: specialized/opentravelsystem/webapp/hotelfrontend/WEB-INF/web.xml
===================================================================
--- specialized/opentravelsystem/webapp/hotelfrontend/WEB-INF/web.xml	(revision 5328)
+++ specialized/opentravelsystem/webapp/hotelfrontend/WEB-INF/web.xml	(working copy)
@@ -47,6 +47,11 @@
         <param-value>default</param-value>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
     </context-param>
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>opentravelsystem/webapp/hotelfrontend/screens</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: specialized/component-load.xml
===================================================================
--- specialized/component-load.xml	(revision 5328)
+++ specialized/component-load.xml	(working copy)
@@ -32,4 +32,5 @@
     <load-component component-location="${ofbiz.home}/specialized/opentravelsystem"/>
     <load-component component-location="${ofbiz.home}/specialized/wholesale"/>
 -->
+    <load-component component-location="${ofbiz.home}/specialized/hme"/>
 </component-loader>
Index: framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
===================================================================
--- framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java	(revision 5328)
+++ framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java	(working copy)
@@ -194,6 +194,8 @@
             String rootDir = (String) context.get("rootDir");
             String webSiteId = (String) context.get("webSiteId");
             String https = (String) context.get("https");
+            String decoratorComponent = (String)context.get("decoratorComponent");
+            
             if (UtilValidate.isEmpty(rootDir)) {
                 rootDir = servletContext.getRealPath("/");
                 context.put("rootDir", rootDir);
Index: framework/widget/src/org/ofbiz/widget/screen/ScreenWidgetViewHandler.java
===================================================================
--- framework/widget/src/org/ofbiz/widget/screen/ScreenWidgetViewHandler.java	(revision 5328)
+++ framework/widget/src/org/ofbiz/widget/screen/ScreenWidgetViewHandler.java	(working copy)
@@ -27,20 +27,42 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilJ2eeCompat;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.base.util.collections.MapStack;
+import org.ofbiz.entity.GenericEntity;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.webapp.control.LoginWorker;
 import org.ofbiz.webapp.view.ViewHandler;
 import org.ofbiz.webapp.view.ViewHandlerException;
+import org.ofbiz.widget.html.HtmlFormRenderer;
 import org.ofbiz.widget.html.HtmlScreenRenderer;
 import org.xml.sax.SAXException;
 
+import freemarker.ext.beans.BeansWrapper;
+import freemarker.ext.jsp.TaglibFactory;
+import freemarker.ext.servlet.HttpRequestHashModel;
+import freemarker.ext.servlet.HttpSessionHashModel;
+
 /**
  * Handles view rendering for the Screen Widget
  *
@@ -80,8 +102,9 @@
                 writer = response.getWriter();
             }
 
-            ScreenRenderer screens = new ScreenRenderer(writer, null, htmlScreenRenderer);
-            screens.populateContextForRequest(request, response, servletContext);
+            MapStack context = MapStack.create();
+            ScreenRenderer screens = new ScreenRenderer(writer, context, htmlScreenRenderer);
+            populateContext(context, screens, request, response, servletContext);
             screens.render(page);
         } catch (IOException e) {
             throw new ViewHandlerException("Error in the response writer/output stream: " + e.toString(), e);
@@ -93,4 +116,155 @@
             throw new ViewHandlerException("Lower level error rendering page: " + e.toString(), e);
         } 
     }
+
+    public static void populateContext(MapStack context, ScreenRenderer screens, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) {
+        HttpSession session = request.getSession();
+        // ========== setup values that should always be in a screen context
+
+        // include an object to more easily render screens
+        context.put("screens", screens);
+
+        // make a reference for high level variables, a global context
+        context.put("globalContext", context.standAloneStack());
+
+        Map parameterMap = UtilHttp.getParameterMap(request);
+        // go through all request attributes and for each name that is not already in the parameters Map add the attribute value
+        Enumeration attrNames = request.getAttributeNames();
+        while (attrNames.hasMoreElements()) {
+            String attrName = (String) attrNames.nextElement();
+            Object param = (String) parameterMap.get(attrName);
+            if (param == null) {
+                parameterMap.put(attrName, request.getAttribute(attrName));
+            } else if (param instanceof String && ((String) param).length() == 0) {
+                // also put the attribute value in if the parameter is empty
+                parameterMap.put(attrName, request.getAttribute(attrName));
+            } else {
+                // do nothing, just log something
+                Debug.logInfo("Found request attribute that conflicts with parameter name, leaving request parameter in place for name: " + attrName, module);
+            }
+        }
+        context.put("parameters", parameterMap);
+
+        context.put("delegator", request.getAttribute("delegator"));
+        context.put("dispatcher", request.getAttribute("dispatcher"));
+        context.put("security", request.getAttribute("security"));
+
+        // make sure the "nullField" object is in there for entity ops; note this is nullField and not null because as null causes problems in FreeMarker and such...
+        context.put("nullField", GenericEntity.NULL_FIELD);
+
+        GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
+        context.put("userLogin", userLogin);
+        context.put("autoUserLogin", session.getAttribute("autoUserLogin"));
+        context.put("person", session.getAttribute("person"));
+        context.put("partyGroup", session.getAttribute("partyGroup"));
+
+        // some things also seem to require this, so here it is:
+        request.setAttribute("userLogin", userLogin);
+
+        // ========== setup values that are specific to OFBiz webapps
+        context.put("request", request);
+        context.put("response", response);
+        context.put("session", session);
+        context.put("application", servletContext);
+        if (servletContext != null) {
+            String rootDir = (String)context.get("rootDir");
+            String webSiteId = (String)context.get("webSiteId");
+            String https = (String)context.get("https");
+            String decoratorComponent = (String)context.get("decoratorComponent");
+            if (UtilValidate.isEmpty(rootDir)) {
+                rootDir = servletContext.getRealPath("/");
+                context.put("rootDir", rootDir);
+            }
+            if (UtilValidate.isEmpty(webSiteId)) {
+                webSiteId = (String) servletContext.getAttribute("webSiteId");
+                context.put("webSiteId", webSiteId);
+            }
+            if (UtilValidate.isEmpty(https)) {
+                https = (String) servletContext.getAttribute("https");
+                context.put("https", https);
+            }
+            if (UtilValidate.isEmpty(decoratorComponent)) {
+                decoratorComponent = (String) servletContext.getAttribute("decoratorComponent");
+                context.put("decoratorComponent", decoratorComponent);
+            }
+        }
+
+        // these ones are FreeMarker specific and will only work in FTL templates, mainly here for backward compatibility
+        BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
+        context.put("sessionAttributes", new HttpSessionHashModel(session, wrapper));
+        context.put("requestAttributes", new HttpRequestHashModel(request, wrapper));
+        TaglibFactory JspTaglibs = new TaglibFactory(servletContext);
+        context.put("JspTaglibs", JspTaglibs);
+        context.put("requestParameters",  UtilHttp.getParameterMap(request));
+
+        // this is a dummy object to stand-in for the JPublish page object for backward compatibility
+        context.put("page", new HashMap());
+
+        context.put("formStringRenderer", new HtmlFormRenderer(request, response));
+
+        // make sure the locale is in the context
+        context.put("locale", UtilHttp.getLocale(request));
+
+        // get all locale information
+        context.put("availableLocales", UtilMisc.availableLocales());
+
+        // some information from/about the ControlServlet environment
+        context.put("controlPath", request.getAttribute("_CONTROL_PATH_"));
+        context.put("contextRoot", request.getAttribute("_CONTEXT_ROOT_"));
+        context.put("serverRoot", request.getAttribute("_SERVER_ROOT_URL_"));
+        context.put("checkLoginUrl", LoginWorker.makeLoginUrl(request, "checkLogin"));
+        String externalLoginKey = LoginWorker.getExternalLoginKey(request);
+        String externalKeyParam = externalLoginKey == null ? "" : "&externalLoginKey=" + externalLoginKey;
+        context.put("externalLoginKey", externalLoginKey);
+        context.put("externalKeyParam", externalKeyParam);
+
+        // setup message lists
+        List eventMessageList = (List) request.getAttribute("eventMessageList");
+        if (eventMessageList == null) eventMessageList = new LinkedList();
+        List errorMessageList = (List) request.getAttribute("errorMessageList");
+        if (errorMessageList == null) errorMessageList = new LinkedList();
+
+        if (request.getAttribute("_EVENT_MESSAGE_") != null) {
+            eventMessageList.add(UtilFormatOut.replaceString((String) request.getAttribute("_EVENT_MESSAGE_"), "\n", "<br/>"));
+            request.removeAttribute("_EVENT_MESSAGE_");
+        }
+        if (request.getAttribute("_EVENT_MESSAGE_LIST_") != null) {
+            eventMessageList.addAll((List) request.getAttribute("_EVENT_MESSAGE_LIST_"));
+            request.removeAttribute("_EVENT_MESSAGE_LIST_");
+        }
+        if (request.getAttribute("_ERROR_MESSAGE_") != null) {
+            errorMessageList.add(UtilFormatOut.replaceString((String) request.getAttribute("_ERROR_MESSAGE_"), "\n", "<br/>"));
+            request.removeAttribute("_ERROR_MESSAGE_");
+        }
+        if (session.getAttribute("_ERROR_MESSAGE_") != null) {
+            errorMessageList.add(UtilFormatOut.replaceString((String) session.getAttribute("_ERROR_MESSAGE_"), "\n", "<br/>"));
+            session.removeAttribute("_ERROR_MESSAGE_");
+        }
+        if (request.getAttribute("_ERROR_MESSAGE_LIST_") != null) {
+            errorMessageList.addAll((List) request.getAttribute("_ERROR_MESSAGE_LIST_"));
+            request.removeAttribute("_ERROR_MESSAGE_LIST_");
+        }
+        context.put("eventMessageList", eventMessageList);
+        context.put("errorMessageList", errorMessageList);
+
+        if (request.getAttribute("serviceValidationException") != null) {
+            context.put("serviceValidationException", request.getAttribute("serviceValidationException"));
+            request.removeAttribute("serviceValidationException");
+        }
+
+        // if there was an error message, this is an error
+        if (errorMessageList.size() > 0) {
+            context.put("isError", Boolean.TRUE);
+        } else {
+            context.put("isError", Boolean.FALSE);
+        }
+        // if a parameter was passed saying this is an error, it is an error
+        if ("true".equals((String) parameterMap.get("isError"))) {
+            context.put("isError", Boolean.TRUE);
+        }
+        context.put("nowTimestamp", UtilDateTime.nowTimestamp());
+
+        // to preserve these values, push the MapStack
+        context.push();
+    }
 }
Index: framework/example/widget/example/CommonScreens.xml
===================================================================
--- framework/example/widget/example/CommonScreens.xml	(revision 5328)
+++ framework/example/widget/example/CommonScreens.xml	(working copy)
@@ -67,7 +67,7 @@
     <screen name="main">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-header">
@@ -91,7 +91,7 @@
     <screen name="login">
         <section>
             <widgets>
-                <decorator-screen name="main-decorator">
+                <decorator-screen name="main-decorator" location="component://${decoratorComponent}/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://common/webcommon/login.ftl"/></html>
Index: framework/example/webapp/example/WEB-INF/web.xml
===================================================================
--- framework/example/webapp/example/WEB-INF/web.xml	(revision 5328)
+++ framework/example/webapp/example/WEB-INF/web.xml	(working copy)
@@ -37,6 +37,11 @@
         <param-value>example</param-value>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
     </context-param>    
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>example/widget/example</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
 
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: framework/webtools/webapp/webtools/WEB-INF/web.xml
===================================================================
--- framework/webtools/webapp/webtools/WEB-INF/web.xml	(revision 5328)
+++ framework/webtools/webapp/webtools/WEB-INF/web.xml	(working copy)
@@ -47,6 +47,11 @@
     <param-value>/WEB-INF/bsh</param-value>
     <description>BeanShell Script Location</description>
   </context-param>   
+    <context-param>
+        <param-name>decoratorComponent</param-name>
+        <param-value>webtools/widget</param-value>
+        <description>The location of the decoratorComponent  to use</description>
+    </context-param>         
   
     <filter>
         <filter-name>ContextFilter</filter-name>
Index: framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
===================================================================
--- framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java	(revision 5328)
+++ framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java	(working copy)
@@ -118,6 +118,9 @@
         // set the webSiteId in the session
         httpRequest.getSession().setAttribute("webSiteId", getWebSiteId());
 
+        // set the decoratorComponent in the session
+        httpRequest.getSession().setAttribute("decoratorComponent", getdecoratorComponent());
+        
         // set the ServletContext in the request for future use
         request.setAttribute("servletContext", config.getServletContext());
 
@@ -339,6 +342,18 @@
         return webSiteId;
     }
 
+    protected String getdecoratorComponent() {
+        String decoratorComponent = (String) config.getServletContext().getAttribute("decoratorComponent");
+        if (decoratorComponent == null) {
+            decoratorComponent = config.getServletContext().getInitParameter("decoratorComponent");
+            config.getServletContext().setAttribute("decoratorComponent", decoratorComponent);
+            if (decoratorComponent == null) {
+                //Debug.logError("[ContextFilter.init] ERROR: decoratorComponent not defined for context.", module);
+            }
+        }
+        return decoratorComponent;
+    }    
+    
     protected String getServerId() {
         String serverId = (String) config.getServletContext().getAttribute("_serverId");
         if (serverId == null) {
