Index: branches/1.1.x/in-bulletin/inc/styles.css
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/in-bulletin/inc/styles.css	(.../styles.css)	(revision 13088)
+++ branches/1.1.x/in-bulletin/inc/styles.css	(.../styles.css)	(revision 13481)
@@ -106,15 +106,15 @@
 
 /* --- Topic Button Styles --- */
 .big-button-left-border {
-	background: #EFEFEF url('../img/big_buttons/left_border.gif') repeat-y top left;
+	background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/left_border.gif') repeat-y top left;
 }
 
 .big-button-bottom td {
-	background: #EFEFEF url('../img/big_buttons/bottom_border.gif') repeat-x top left;
+	background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/bottom_border.gif') repeat-x top left;
 }
 
 .big-button-text {
-	background: #EFEFEF url('../img/big_buttons/top_border.gif') repeat-x top left;
+	background: #EFEFEF url('@templates_base@/in-bulletin/img/big_buttons/top_border.gif') repeat-x top left;
 	font: bold 11px Arial, sans-serif;
 	letter-spacing: 0px;
 	color: #1F569A;
@@ -127,11 +127,11 @@
 
 /* --- Post Button Styles --- */
 .small-button-bottom td {
-	background: #efefef url('../img/small_buttons/bottom_border.gif') repeat-x top left
+	background: #efefef url('@templates_base@/in-bulletin/img/small_buttons/bottom_border.gif') repeat-x top left
 }
 
 .small-button-text {
-	background: url('../img/small_buttons/top_border.gif') repeat-x top left;
+	background: url('@templates_base@/in-bulletin/img/small_buttons/top_border.gif') repeat-x top left;
 	font: 10px Arial, sans-serif;
 	color: #153C6A;
 	padding-top: 15px;
Index: branches/1.1.x/in-news/elements/html_head.elm.tpl
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/in-news/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-news/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13481)
@@ -1,3 +1,3 @@
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-News"/>inc/styles.css" type="text/css" />
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-News"/>inc/script.js"></script>-->
+<inp2:m_Compress files="in-news/inc/styles.css" to="all_css"/>
+<!--## <inp2:m_Compress files="in-news/inc/script.js" to="all_js"/> ##-->
 
Index: branches/1.1.x/platform/inc/dmenu.css
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/platform/inc/dmenu.css	(.../dmenu.css)	(revision 13088)
+++ branches/1.1.x/platform/inc/dmenu.css	(.../dmenu.css)	(revision 13481)
@@ -22,7 +22,7 @@
 
 .horz_nlsitemcontainerover {
     height: 37px;
-    background:url(../img/top_menu_select.gif);
+    background:url(@templates_base@/platform/img/top_menu_select.gif);
     padding: 0px 13px;
 }
 .horz_nlsiconcellover {width:16px;}
@@ -92,7 +92,7 @@
 .nlsitemcontainerover {
     height:25px;
     border: 1px solid #6291BB;
-    background:url(../img/top_menu_select.gif);
+    background:url(@templates_base@/platform/img/top_menu_select.gif);
     padding: 2px 10px 2px 10px;
 }
 .nlsiconcellover {width:22px;}
Index: branches/1.1.x/platform/elements/html_head.elm.tpl
===================================================================
diff -u -N -r13169 -r13481
--- branches/1.1.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13169)
+++ branches/1.1.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13481)
@@ -1,39 +1,49 @@
 
 <!--## Meta Info (Keywords and Description) ##-->
-<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
+<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
 
-<meta name="Description" content="<inp2:st_PageInfo type="meta_description"/>" />
-<meta name="Keywords" content="<inp2:st_PageInfo type="meta_keywords"/>" />
+<meta name="Description" content="<inp2:st_PageInfo type='meta_description'/>" />
+<meta name="Keywords" content="<inp2:st_PageInfo type='meta_keywords'/>" />
 <!--## /Meta Keywords and Description ##-->
 
 <inp2:theme.current_StylesheetFile/>
 
 <inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
-	<link rel="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.css" type="text/css" media="screen" />
+	<inp2:m_Compress files="platform/inc/jquery/thickbox/thickbox.css" to="all_css"/>
 </inp2:m_ifnot>
 
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/styles.css" type="text/css" />
+<inp2:m_Compress files="platform/inc/styles.css" to="all_css"/>
 
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/script.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/ajax.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/calendar.js"></script>
+<inp2:m_Compress files="platform/inc/script.js|platform/inc/ajax.js|platform/inc/calendar.js" to="all_js"/>
 
 <script type="text/javascript">var inportalBase = '<inp2:m_TemplatesBase module="In-Portal"/>';</script>
 <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery.pack.js"></script>
 
 <inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
-	<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/thickbox/thickbox.js"></script>
+	<inp2:m_Compress files="platform/inc/jquery/thickbox/thickbox.js" to="all_js"/>
 </inp2:m_ifnot>
 
 <script type="text/javascript">
-	var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
+	var aRatingManager = null;
 
+	$(document).ready(
+		function () {
+			aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
+		}
+	);
+
 	<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
 		<inp2:m_DefineElement name="ml_selector_language_element">
 			<inp2:Field name="LanguageId"/>: {'on': '<inp2:Field name="IconURL" js_ecape="1"/>', 'off': '<inp2:Field name="IconDisabledURL" js_ecape="1"/>'}
 			<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
 		</inp2:m_DefineElement>
 
-		var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+		var aMultiLanguageSelector = null;
+
+		$(document).ready(
+			function () {
+				aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+			}
+		);
 	</inp2:m_Cache>
 </script>
Index: branches/1.1.x/platform/inc/styles.css
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/platform/inc/styles.css	(.../styles.css)	(revision 13088)
+++ branches/1.1.x/platform/inc/styles.css	(.../styles.css)	(revision 13481)
@@ -31,11 +31,11 @@
 }
 
 .horizontal-separator {
-	background: url('../img/horizontal_dashed_line.gif') bottom repeat-x;
+	background: url('@templates_base@/platform/img/horizontal_dashed_line.gif') bottom repeat-x;
 }
 
 .vertical-separator {
-	background: url('../img/vertical_dashed_line.gif') top center repeat-y;
+	background: url('@templates_base@/platform/img/vertical_dashed_line.gif') top center repeat-y;
 }
 
 img, img A {
@@ -47,7 +47,7 @@
 }
 
 .top-background {
-	background: url('../img/top_background.gif') right repeat-y;
+	background: url('@templates_base@/platform/img/top_background.gif') right repeat-y;
 }
 
 .top-baner-cell
@@ -57,7 +57,7 @@
 	}
 
 .menu-background {
-	background: url('../img/menu_background.gif') top repeat-x #1865AC;
+	background: url('@templates_base@/platform/img/menu_background.gif') top repeat-x #1865AC;
 	width: 100%;
 }
 
@@ -66,7 +66,7 @@
 }
 
 .footer-table td {
-	background: url('../img/footer_blue.gif') top repeat-x;
+	background: url('@templates_base@/platform/img/footer_blue.gif') top repeat-x;
 	height: 26px;
 	color: #F7EEE4;
 	font-size: 10px;
@@ -115,7 +115,7 @@
 
 /* --- Side Box Styles --- */
 .side-box-header {
-	background: url('../img/side_boxes_background.gif') bottom repeat-x #83AFD6;
+	background: url('@templates_base@/platform/img/side_boxes_background.gif') bottom repeat-x #83AFD6;
 	height: 29px;
 	padding: 0px 8px 0px 20px;
 }
@@ -137,7 +137,7 @@
 }
 
 .side-box-content {
-	background: url('../img/side_boxes_content.gif') top repeat-x;
+	background: url('@templates_base@/platform/img/side_boxes_content.gif') top repeat-x;
 	padding: 20px 20px;
 }
 
@@ -162,7 +162,7 @@
 
 /* --- Form Control Styles --- */
 .input-text, .input-textarea {
-	background: url('../img/input_text_background.gif') top repeat-x #FFFFFF;
+	background: url('@templates_base@/platform/img/input_text_background.gif') top repeat-x #FFFFFF;
 	border: 1px solid #7091B9;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -178,15 +178,15 @@
 }
 
 .button {
-	background: url('../img/input_button_background.gif') bottom repeat-x #efefef;
+	background: url('@templates_base@/platform/img/input_button_background.gif') bottom repeat-x #efefef;
 	border: 1px solid #688BAC;
 	padding: 0px;
 	font-size: 11px;
 	padding: 0px 5px;
 }
 
 .delete-button {
-	background: url('../img/delete_button_background.gif') bottom repeat-x #FF6D6D;
+	background: url('@templates_base@/platform/img/delete_button_background.gif') bottom repeat-x #FF6D6D;
 	color: #FFFFFF;
 	border: 1px solid #CC0000;
 	padding: 0px;
@@ -247,7 +247,7 @@
 
 /* --- Navigation Bar Styles --- */
 .navigation-bar {
-	background: url('../img/side_boxes_background.gif') bottom repeat-x #83AFD6;
+	background: url('@templates_base@/platform/img/side_boxes_background.gif') bottom repeat-x #83AFD6;
 	height: 29px;
 	padding: 0px 20px;
 	font-size: 12px;
@@ -264,7 +264,7 @@
 
 /* --- Top Right Menu Styles --- */
 .menu-top-active-icon, .menu-top-active-text {
-	background: url('../img/top_menu_select.gif');
+	background: url('@templates_base@/platform/img/top_menu_select.gif');
 }
 
 td.top-menu-padding {
@@ -309,7 +309,7 @@
 }
 
 .tab-bottom-line {
-	background: url('../img/pixel_blue.gif') bottom repeat-x;
+	background: url('@templates_base@/platform/img/pixel_blue.gif') bottom repeat-x;
 }
 
 .tab-bottom-content {
@@ -337,15 +337,15 @@
 
 /* --- Item Listing Page & Item Details Page Styles --- */
 .item-listing {
-	background: url('../img/gradient_background.gif') top repeat-x #FFFFFF;
+	background: url('@templates_base@/platform/img/gradient_background.gif') top repeat-x #FFFFFF;
 }
 
 .item-listing-featured {
-	background: url('../img/gradient_background_gr.gif') top repeat-x #FFFFFF;
+	background: url('@templates_base@/platform/img/gradient_background_gr.gif') top repeat-x #FFFFFF;
 }
 
 .item-listing-lead {
-	background: url('../img/gradient_background_red.gif') top repeat-x #FFFFFF;
+	background: url('@templates_base@/platform/img/gradient_background_red.gif') top repeat-x #FFFFFF;
 }
 
 .item-padding {
@@ -537,7 +537,7 @@
 .star-rating a:active,
 .star-rating a:focus,
 .star-rating .current-rating{
-	background: url('../img/starrating.gif') left -1000px repeat-x;
+	background: url('@templates_base@/platform/img/starrating.gif') left -1000px repeat-x;
 }
 .star-rating {
 	position:relative;
Index: branches/1.1.x/in-commerce/elements/html_head.elm.tpl
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/in-commerce/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-commerce/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13481)
@@ -1,6 +1,6 @@
 <!--## CSS & JAVASCRIPT FOR IN-COMMERCE ##-->
 
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Commerce"/>inc/styles.css" type="text/css" />
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Commerce"/>inc/script.js"></script>-->
+<inp2:m_Compress files="in-commerce/inc/styles.css" to="all_css"/>
+<!--## <inp2:m_Compress files="in-commerce/inc/script.js" to="all_js"/> ##-->
 
 <!--## /CSS & JAVASCRIPT FOR IN-COMMERCE ##-->
Index: branches/1.1.x/in-link/elements/html_head.elm.tpl
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/in-link/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-link/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13481)
@@ -1,11 +1,11 @@
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Link"/>inc/styles.css" type="text/css" />
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Link"/>inc/script.js"></script>-->
+<inp2:m_Compress files="in-link/inc/styles.css" to="all_css"/>
+<!--## <inp2:m_Compress files="in-link/inc/script.js" to="all_js"/> ##-->
 
 <!--## GOOGLE MAPS API INTEGRATION ##-->
 <inp2:m_if check="m_IsActive" t="in-link/detail">
 	<inp2:m_if check="m_GetConfig" name="l_EnableGoogleMaps">
-<script type="text/javascript" src="http://www.google.com/jsapi?key=<inp2:m_GetConfig name="l_GoogleMapsAPIKey"/>"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Link"/>inc/googlemaps.js"></script>
+		<script type="text/javascript" src="http://www.google.com/jsapi?key=<inp2:m_GetConfig name='l_GoogleMapsAPIKey'/>"></script>
+		<inp2:m_Compress files="in-link/inc/googlemaps.js" to="all_js"/>
 	</inp2:m_if>
 </inp2:m_if>
 <!--## GOOGLE MAPS API INTEGRATION ##-->
Index: branches/1.1.x/platform/elements/menu.elm.tpl
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/platform/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 13088)
+++ branches/1.1.x/platform/elements/menu.elm.tpl	(.../menu.elm.tpl)	(revision 13481)
@@ -4,12 +4,14 @@
 			<table style="width: auto;">
 				<tr>
 					<td>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenu.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenueffect.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_dyn.js"></script>
-						<script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/nlsmenuext_xml.js"></script>
+						<script type="text/javascript" src="<inp2:m_Compress files='
+							platform/inc/nlsmenu.js|
+							platform/inc/nlsmenueffect.js|
+							platform/inc/nlsmenuext_dyn.js|
+							platform/inc/nlsmenuext_xml.js
+						'/>"></script>
 
-						<link rel="StyleSheet" href="<inp2:m_TemplatesBase module='In-Portal'/>inc/dmenu.css" type="text/css" />
+						<link rel="StyleSheet" href="<inp2:m_Compress files='platform/inc/dmenu.css'/>" type="text/css" />
 						<div id="xmlMenuDiv"></div>
 
 				        <script type="text/javascript">
Index: branches/1.1.x/in-bulletin/elements/html_head.elm.tpl
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/in-bulletin/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13088)
+++ branches/1.1.x/in-bulletin/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 13481)
@@ -1,6 +1,12 @@
-<link rel="stylesheet" rev="stylesheet" href="<inp2:m_TemplatesBase module="In-Bulletin"/>inc/styles.css" type="text/css" />
-<script type="text/javascript" src="<inp2:m_TemplatesBase module="In-Bulletin"/>inc/script.js"></script>
+<inp2:m_Compress files="in-bulletin/inc/styles.css" to="all_css"/>
+<inp2:m_Compress files="in-bulletin/inc/script.js" to="all_js"/>
 
 <script type="text/javascript">
-	var aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1"/>');
+	var aPollManager = null;
+
+	$(document).ready(
+		function () {
+			aPollManager = new PollManager('<inp2:m_Link template="in-bulletin/elements/side_boxes/poll_results.elm" events[#PREFIX#]="OnMakeVote" poll_id="#POLL_ID#" option_id="#OPTION_ID#" no_amp="1"/>');
+		}
+	);
 </script>
\ No newline at end of file
Index: branches/1.1.x/platform/designs/default_design.des.tpl
===================================================================
diff -u -N -r13088 -r13481
--- branches/1.1.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 13088)
+++ branches/1.1.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 13481)
@@ -15,6 +15,9 @@
 		<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
 		<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
 
+		<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress from='all_css'/>" type="text/css" />
+		<script type="text/javascript" src="<inp2:m_Compress from='all_js'/>"></script>
+
 		<inp2:st_EditingScripts/>
 		<!--## /Include module specific HEADER template ##-->
 	</head>