Index: src/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
===================================================================
--- src/webapp/WEB-INF/templates/layout/html/columns/layout.jsp	(revision 696042)
+++ src/webapp/WEB-INF/templates/layout/html/columns/layout.jsp	(working copy)
@@ -134,8 +134,7 @@
                               // TODO hack alert, we need to do this because PortletDecorationImpl has
                               // decorator.vm hard coded sigh!     
                               String _tempPath = _frag.getDecoration().getBasePath();
-                              String _portletJSP = _tempPath.substring(0,_tempPath.lastIndexOf('/')) +
-                                                   "/decorator.jsp";
+                              String _portletJSP = "/" + _frag.getDecoration().getResource("decorator.jsp");
                               pageContext.setAttribute("fragTemplateUrl", _portletJSP, PageContext.PAGE_SCOPE);
                           %>
                           
Index: src/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp
===================================================================
--- src/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp	(revision 696042)
+++ src/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp	(working copy)
@@ -70,8 +70,7 @@
       // TODO hack alert, we need to do this because PortletDecorationImpl has
       // decorator.vm hard coded sigh!     
       String _tempPath = maxFragment.getDecoration().getBasePath();
-      String _portletJSP = _tempPath.substring(0,_tempPath.lastIndexOf('/')) +
-                           "/decorator.jsp";
+      String _portletJSP = "/" + _frag.getDecoration().getResource("decorator.jsp");
       pageContext.setAttribute("fragTemplateUrl", _portletJSP, PageContext.PAGE_SCOPE);
     %>
     <c:import url="${fragTemplateUrl}"></c:import>
Index: src/webapp/WEB-INF/templates/layout/html/solo/layout.jsp
===================================================================
--- src/webapp/WEB-INF/templates/layout/html/solo/layout.jsp	(revision 696042)
+++ src/webapp/WEB-INF/templates/layout/html/solo/layout.jsp	(working copy)
@@ -83,8 +83,7 @@
               // TODO hack alert, we need to do this because PortletDecorationImpl has
               // decorator.vm hard coded sigh!     
               String _tempPath = maxFragment.getDecoration().getBasePath();
-              String _portletJSP = _tempPath.substring(0,_tempPath.lastIndexOf('/')) +
-                                   "/decorator.jsp";
+              String _portletJSP = "/" + _frag.getDecoration().getResource("decorator.jsp");
               pageContext.setAttribute("fragTemplateUrl", _portletJSP, PageContext.PAGE_SCOPE);
           %>