Index: branches/5.0.x/themes/simple/inc/content.css
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/inc/content.css	(.../content.css)	(revision 12579)
+++ branches/5.0.x/themes/simple/inc/content.css	(.../content.css)	(revision 12609)
@@ -213,309 +213,3 @@
 float: left;
 width: 245px;
 }
-
-/* -- !Events -- */
-#block-events {
-position:relative;
-}
-
-#block-events h3 {
-border:none;
-}
-
-#block-events h3 strong {
-color:#a60d03;
-}
-
-#block-events .link-rss {
-position:absolute;
-margin:21px;
-right:0;
-top:0;
-}
-
-#block-events .link {
-text-align:right;
-}
-
-#block-events ul.event-listing li.last-child {
-border:none;
-padding-bottom:0;
-}
-
-/* !Intro
---------------------- */
-#content .teaser {
-margin:0 0 45px;
-}
-
-/* !Events
---------------------- */
-#events {
-width:692px;
-}
-
-/* -- !Header -- */
-#events .header {
-background:#e5e9f4 url('../img/bg-events-header.png') no-repeat left top;
-padding:20px 15px 0 8px;
-}
-
-#events .header h2 {
-border:none;
-padding:0;
-color:#485357;
-float:left;
-font-size:1em;
-font-weight:700;
-line-height:20px;
-margin:0;
-width:auto;
-}
-
-/* Select Year */
-#events .header #select-year {
-float:right;
-}
-
-#events .header form {
-display:inline;
-}
-
-#events .header #select-year label,#events .header #select-year select,#events .header #select-year .submit {
-float:left;
-margin:0 0 0 8px;
-}
-
-#events .header #select-year label {
-color:#485357;
-font-weight:700;
-line-height:20px;
-}
-
-#events .header #select-year .submit input {
-background:#7e7e7e url('../img/bg-form-go.png') no-repeat left top;
-border:none;
-color:#FFF;
-cursor:pointer;
-display:block;
-font-size:11px;
-height:19px;
-padding:0;
-width:29px;
-}
-
-/* Select Month */
-#events .header #select-month {
-background:url('../img/bg-events-header-ul.png') repeat-x left bottom;
-clear:both;
-float:left;
-margin:15px -16px 0 -9px;
-padding:0 16px 1px 9px;
-width:100%;
-}
-
-#events .header #select-month li {
-background:none;
-display:inline;
-margin:0;
-padding:0;
-}
-
-#events .header #select-month a {
-background:#e7e9ee url('../img/bg-events-header-month.png') no-repeat left top;
-border:1px solid #bfc1ce;
-border-width:1px 1px 0;
-color:#485357;
-display:block;
-float:left;
-margin:0 0 0 5px;
-padding:2px 0 0;
-line-height:20px;
-text-align:center;
-text-decoration:none;
-width:49px;
-}
-
-#events .header #select-month li.first-child a,#events .header #select-month li:first-child a {
-margin-left:0;
-}
-
-#events .header #select-month a.active,#events .header #select-month a.active:hover,#events .header #select-month .ui-tabs-selected a,#events .header #select-month a:hover {
-background:#a60d03;
-bottom:-1px;
-color:#FFF;
-font-weight:700;
-height:21px;
-margin-top:-1px;
-position:relative;
-}
-
-#events .header #select-month a:hover {
-font-weight:400;
-}
-
-/* -- !Content -- */
-#events .content {
-border:1px solid #d9dbea;
-border-width:0 1px 1px;
-padding:20px 15px 15px;
-}
-
-#events .content h3 {
-color:#485357;
-font-size:1.17em;
-font-weight:700;
-line-height:1;
-margin:0;
-}
-
-/* Event Listing */
-#content ul.event-listing {
-margin:15px 0 0;
-padding:0;
-}
-
-#content ul.event-listing li,#content .event-listing div.event {
-background:none;
-border-bottom:2px solid #f3f3f1;
-list-style:none;
-margin:0 0 15px;
-padding:0 0 15px 85px;
-}
-
-/* Date */
-.event-listing .date {
-background:#f2f2f2;
-font-weight:400;
-float:left;
-margin:0 0 0 -85px;
-padding:8px 0;
-text-align:center;
-width:52px;
-}
-
-.event-listing .date .day {
-color:#a60d03;
-display:block;
-font-size:24px;
-line-height:1;
-margin:0 0 2px;
-}
-
-.event-listing .date .month {
-color:#575757;
-display:block;
-font-size:10px;
-line-height:1;
-text-transform:uppercase;
-}
-
-/* Event Details */
-.event-listing h4,.event-listing p {
-margin:0;
-}
-
-/* Pad Underline on events page */
-#events .event-listing h4 {
-margin:0 0 10px;
-}
-
-#events .event-listing h4 a {
-text-decoration:underline;
-}
-
-.event-listing h4 {
-font-weight:400;
-font-size:1em;
-}
-
-.event-listing p {
-color:#666;
-}
-
-.event-listing p.details {
-color:#9b9b9b;
-}
-
-/* -- UI Tab Panels -- */
-.ui-tabs-hide {
-display:none;
-}
-
-#select-month {
-display:none;
-}
-
-#select-month {
-display:block;
-}
-
-/* Look good without JS */
-#events .content div.event-listing h3 {
-font-weight:400;
-margin:10px 0;
-}
-
-/* !Registration
---------------------- */
-.important {
-font-size:1.3em;
-padding:1em 1em 1.5em;
-}
-
-.registration {
-width:490px;
-}
-
-.registration #registrationresultssummary li {
-list-style:none;
-background:none;
-padding:0 0 3px;
-margin:0;
-}
-
-.registration #registrationresultssummary ul,.registration #registrationresultssummary td {
-padding:0;
-margin:0;
-}
-
-.payment-options .creditcard {
-border-bottom:1px solid #333;
-}
-
-/* layout amends for residency information */
-.residency .image {
-float:left;
-clear:both;
-margin:0 1.3em 0 0;
-}
-
-.residency {
-overflow:hidden;
-margin:.6em 0 1.6em;
-}
-
-.residency h3 {
-margin-top:.5em;
-}
-
-.residency p,.residency h3,.leaders-program-content h2,.leaders-program-content p {
-margin-left:135px!important;
-}
-
-.residency table td {
-width:49%;
-}
-
-/* leaders program */
-.leaders-program-content img {
-float:left;
-clear:both;
-margin:0 1.3em 0 0;
-}
-
-body.leaders-program p {
-/* margin-left: 60px; */
-text-align:left!important;
-}
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/ie6.css
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/inc/ie6.css	(.../ie6.css)	(revision 12579)
+++ branches/5.0.x/themes/simple/inc/ie6.css	(.../ie6.css)	(revision 12609)
@@ -1,11 +1,3 @@
-/*
-  Running MySource Matrix
-  Developed by Squiz - http://www.squiz.net
-  MySource, MySource Matrix and Squiz.net are registered Trademarks of Squiz Pty Ltd
-  Page generated: 18 September 2009 22:51:53
-*/
-
-
 /* Disable Border on Hover of Menu Elements */
 #wrapper #nav li a div,#wrapper ul#nav-sec li div,#wrapper #site-info li div {
 display:none;
Index: branches/5.0.x/themes/simple/elements/side_boxes/subscribe.elm.tpl
===================================================================
diff -u -r12589 -r12609
--- branches/5.0.x/themes/simple/elements/side_boxes/subscribe.elm.tpl	(.../subscribe.elm.tpl)	(revision 12589)
+++ branches/5.0.x/themes/simple/elements/side_boxes/subscribe.elm.tpl	(.../subscribe.elm.tpl)	(revision 12609)
@@ -11,14 +11,14 @@
 		<input type="hidden" name="subscribe_template" value="mailing_list/subscribe"/>
 		<input type="hidden" name="unsubscribe_template" value="mailing_list/unsubscribe"/>
 		<fieldset>
-			<label for="subscribe-email">Enter email adress below</label>
+			<label for="subscribe-email"><inp2:m_Phrase label="lu_EnterEmailToSubscribe"/></label>
 			<inp2:m_if check="u_HasError" field="any">
 				<span id="errormsg"><inp2:u_Error field="SubscribeEmail"/></span><br />
 			</inp2:m_if>
 			<span class="emailfield">
 				<input type="text" name="subscriber_email" class="required email" id="subscribe-email" />
 			</span>
-			<span class="submit"><input type="submit" name="events[u][OnSubscribeQuery]" value="Subscribe" /></span>
+			<span class="submit"><input type="submit" name="events[u][OnSubscribeQuery]" value="<inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/>" /></span>
 		</fieldset>
 	</div>
 	</form>
Index: branches/5.0.x/themes/simple/recommend.tpl
===================================================================
diff -u
--- branches/5.0.x/themes/simple/recommend.tpl	(revision 0)
+++ branches/5.0.x/themes/simple/recommend.tpl	(revision 12609)
@@ -0,0 +1,26 @@
+<!--##
+<NAME>Recommend to a Friend</NAME>
+<DESC>Recommend to a Friend</DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<div class="movable-element">
+		<div id="block-latest" class="block">
+			<div class="round-top"></div>
+			<div class="content">
+				<h1 class="movable-header"><inp2:m_Phrase label="lu_title_RecommendSite"/></h1>
+				<inp2:st_ContentBlock num="1"/>
+			</div>
+			<div class="round-bottom"></div>
+		</div>
+	</div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl
===================================================================
diff -u -r12589 -r12609
--- branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl	(.../navigation_menu.elm.tpl)	(revision 12589)
+++ branches/5.0.x/themes/simple/elements/navigation_menu.elm.tpl	(.../navigation_menu.elm.tpl)	(revision 12609)
@@ -18,7 +18,7 @@
 
 <ul id="nav">
 	<li>
-		<a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>" title="<inp2:m_RootCategoryName no_editing='1'/>"><inp2:m_RootCategoryName/></a>
+		<a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>" title="<inp2:m_RootCategoryName no_editing='1'/>"><inp2:m_RootCategoryName no_editing='1'/></a>
 	</li>
 	<inp2:st_CachedMenu render_as="menu_element" category_id="1"/>
 </ul>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl
===================================================================
diff -u -r12589 -r12609
--- branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl	(.../side_boxes.elm.tpl)	(revision 12589)
+++ branches/5.0.x/themes/simple/elements/side_boxes.elm.tpl	(.../side_boxes.elm.tpl)	(revision 12609)
@@ -1,3 +1,4 @@
+<!--## DESIGN FOR SIDE-BOX ELEMENTS ##-->
 <inp2:m_DefineElement name="side_box">
 	<div class="block" id="side-box">
 		<h3 class="movable-header"><inp2:m_param name="header"/></h3>
@@ -6,4 +7,13 @@
 		</div>
 		<div class="round-bottom"></div>
 	</div>
-</inp2:m_DefineElement>
\ No newline at end of file
+</inp2:m_DefineElement>
+<!--## /DESIGN FOR SIDE-BOX ELEMENTS ##-->
+
+<!--## DEFAULT SIDE-BOX ELEMENT ##-->
+<inp2:m_DefineElement name="default_left_sidebar" no_editing="1">
+	<div class="movable-element">
+		<inp2:m_RenderElement name="elements/side_boxes/subscribe.elm" design="side_box" />
+	</div>
+</inp2:m_DefineElement>
+<!--## /DEFAULT SIDE-BOX ELEMENT ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/layout.css
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/inc/layout.css	(.../layout.css)	(revision 12579)
+++ branches/5.0.x/themes/simple/inc/layout.css	(.../layout.css)	(revision 12609)
@@ -20,12 +20,16 @@
 position:relative;
 }
 
-
 #content-main {
 	background:#FFF;
 	float:left;
+	margin:0 13px;
+	width:531px;
+}
+
+#content-main.inner {
 	margin:0 0 20px 13px;
-	width:696px;
+	width:738px;
 }
 
 #content-main {
@@ -67,69 +71,11 @@
 	position:relative;
 }
 
-.home #masthead {
-background-image:url('../img/bg-masthead-home.png');
-}
-
 .inside #masthead {
 margin-top:-19px;
 padding-top:19px;
 }
 
-.events #masthead {
-background-image:url(../img/bg-masthead-events.png);
-margin-top:-11px;
-padding-top:11px;
-}
-
-.media-center #masthead {
-background-image:url(../img/bg-masthead-media-center.png);
-margin-top:-15px;
-padding-top:15px;
-}
-
-.about-asialink #masthead {
-background-image:url(../img/bg-masthead-about-asialink.png);
-margin-top:-19px;
-padding-top:19px;
-}
-
-.support-us #masthead {
-background-image:url(../img/bg-masthead-support-us.png);
-margin-top:-12px;
-padding-top:12px;
-}
-
-.arts #masthead {
-background-image:url(../img/bg-masthead-arts.png);
-margin-top:-19px;
-padding-top:19px;
-}
-
-.leaders-program #masthead {
-background-image:url(../img/bg-masthead-leaders-program.png);
-margin-top:-17px;
-padding-top:17px;
-}
-
-.corporate-programs #masthead {
-background-image:url(../img/bg-masthead-corporate-programs.png);
-margin-top:-1px;
-padding-top:1px;
-}
-
-.community-health #masthead {
-background-image:url(../img/bg-masthead-community-health.png);
-margin-top:-6px;
-padding-top:6px;
-}
-
-.school-education #masthead {
-background-image:url(../img/bg-masthead-school-education.png);
-margin-top:-17px;
-padding-top:17px;
-}
-
 /* -- !Branding -- */
 h1#branding {
 position:relative;
@@ -138,7 +84,7 @@
 }
 
 h1#branding a {
-background:url(../img/logo.png) no-repeat left top;
+background:url('../img/logo.png') no-repeat left top;
 display:block;
 height:105px;
 text-indent:-999em;
@@ -209,7 +155,7 @@
 
 /* -- !Navigation -- */
 ul#nav {
-background:#282828 url(../img/bg-nav.png) repeat-x left top;
+background:#282828 url('../img/bg-nav.png') repeat-x left top;
 border-top:1px solid #FFF;
 font-size:12px;
 margin:0;
@@ -241,16 +187,16 @@
 
 /* Rounded Corner */
 #nav li:first-child a,#nav li.first-child a {
-background:url(../img/bg-nav.png) no-repeat left -105px;
+background:url('../img/bg-nav.png') no-repeat left -105px;
 }
 
 #nav li:first-child:hover a,#nav li:first-child a.active,#nav li.first-child:hover a,#nav li.first-child-hover a,#nav li.first-child a.active {
-background:url(../img/bg-nav.png) no-repeat left -140px;
+background:url('../img/bg-nav.png') no-repeat left -140px;
 }
 
 /* Contact Us */
 #nav li.last-child a {
-background:url(../img/bg-nav.png) no-repeat left -315px;
+background:url('../img/bg-nav.png') no-repeat left -315px;
 }
 
 /* Red Border on Hover */
@@ -377,7 +323,7 @@
 }
 
 #content-tools a {
-background:url(../img/ir-content-tools.png) no-repeat 0 50%;
+background:url('../img/ir-content-tools.png') no-repeat 0 50%;
 display:block;
 float:left;
 height:11px;
@@ -500,26 +446,26 @@
 padding:0 20px;
 }
 
-#content-main .round-top {
-background:url(../img/bg-content-inside-top.png) no-repeat left top;
+#content-main.inner .round-top {
+background:url('../img/bg-content-inside-top.png') no-repeat left top;
 height:21px;
 margin:0 -21px;
 }
 
-#content-main .round-bottom {
-background:url(../img/bg-content-inside-bottom.png) no-repeat left bottom;
+#content-main.inner .round-bottom {
+background:url('../img/bg-content-inside-bottom.png') no-repeat left bottom;
 height:21px;
 margin:0 -21px;
 }
 
 /* !Sub Navigation
 --------------------- */
 #nav-sub {
-background:#46474b url(../img/bg-nav-sub-bottom.png) no-repeat left bottom;
+background:#46474b url('../img/bg-nav-sub-bottom.png') no-repeat left bottom;
 }
 
 #nav-sub ul {
-background:url(../img/bg-nav-sub-top.png) no-repeat left top;
+background:url('../img/bg-nav-sub-top.png') no-repeat left top;
 list-style:none;
 margin:0;
 padding:15px 0;
@@ -532,7 +478,7 @@
 }
 
 #nav-sub li a {
-background:url(../img/bg-nav-sub-li.png) no-repeat 12px .65em;
+background:url('../img/bg-nav-sub-li.png') no-repeat 12px .65em;
 border-bottom:1px solid #1c1d21;
 color:#FFF;
 display:block;
@@ -541,7 +487,7 @@
 }
 
 #nav-sub li.expanded a {
-background:#6a6b6d url(../img/bg-nav-sub-li-expanded.png) no-repeat 10px .65em;
+background:#6a6b6d url('../img/bg-nav-sub-li-expanded.png') no-repeat 10px .65em;
 text-decoration:none;
 }
 
Index: branches/5.0.x/themes/simple/inc/override.css
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/inc/override.css	(.../override.css)	(revision 12579)
+++ branches/5.0.x/themes/simple/inc/override.css	(.../override.css)	(revision 12609)
@@ -1,4 +1,4 @@
-#block-latest .feature { height: auto !important; padding: 10px 0 0 0; background: url(../img/bg-block-latest-featured.png) repeat-x -2px top; }
+#block-latest .feature { height: auto !important; padding: 10px 0 0 0; background: url('../img/bg-block-latest-featured.png') repeat-x -2px top; }
 #block-latest .feature div { padding-bottom: 4px; }
 #block-latest .feature div div { padding-bottom: 0; }
 #block-latest .feature-1 { padding: 0; background: none; }
Index: branches/5.0.x/themes/simple/elements/side_boxes/news.elm.tpl
===================================================================
diff -u
--- branches/5.0.x/themes/simple/elements/side_boxes/news.elm.tpl	(revision 0)
+++ branches/5.0.x/themes/simple/elements/side_boxes/news.elm.tpl	(revision 12609)
@@ -0,0 +1,17 @@
+<div class="movable-element">
+	<div class="block" id="side-box-plain">
+		<div class="round-top"></div>
+		<h3 class="movable-header">Latest <strong>News</strong></h3>
+		<div>
+			<ul>
+				<inp2:st_ContentBlock num="2"/>
+			</ul>
+		</div>
+		<!--##
+		<div class="content">
+			<p class="link"><a href="<inp2:m_Link t="subscribe" />">How to subscribe &gt;</a></p>
+		</div>
+		##-->
+		<div class="round-bottom"></div>
+	</div>
+</div>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/terms.tpl
===================================================================
diff -u
--- branches/5.0.x/themes/simple/terms.tpl	(revision 0)
+++ branches/5.0.x/themes/simple/terms.tpl	(revision 12609)
@@ -0,0 +1,26 @@
+<!--##
+<NAME>Terms and Conditions</NAME>
+<DESC></DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<div class="movable-element">
+		<div id="block-latest" class="block">
+			<div class="round-top"></div>
+			<div class="content">
+				<h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+				<inp2:st_ContentBlock num="1"/>
+			</div>
+			<div class="round-bottom"></div>
+		</div>
+	</div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/search-results.tpl
===================================================================
diff -u
--- branches/5.0.x/themes/simple/search-results.tpl	(revision 0)
+++ branches/5.0.x/themes/simple/search-results.tpl	(revision 12609)
@@ -0,0 +1,40 @@
+<!--##
+<NAME>Search Results</NAME>
+<DESC>Search Results</DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<div class="movable-element">
+		<div id="block-latest" class="block">
+			<div class="round-top"></div>
+			<div class="content">
+				<inp2:st_InitList list_name="search_results" types="search" parent_cat_id="any" recursive="1"/>
+
+				<h1 class="movable-header"><inp2:m_phrase name="lu_title_SearchResults"/> (<inp2:st_TotalRecords list_name="search_results"/>)</h1>
+				<inp2:m_if check="st_TotalRecords" list_name="search_results">
+					<inp2:m_DefineElement name="search_element">
+	 				<li>
+	 					<a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
+	   				</li>
+	 				</inp2:m_DefineElement>
+
+	 				<ul>
+						<inp2:st_PrintList list_name="search_results" render_as="search_element" per_page="-1"/>
+					</ul>
+				<inp2:m_else/>
+					<inp2:m_Phrase label="lu_text_NothingFound"/>!
+				</inp2:m_if>
+			</div>
+			<div class="round-bottom"></div>
+		</div>
+	</div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/designs/default_design_inner.des.tpl
===================================================================
diff -u
--- branches/5.0.x/themes/simple/designs/default_design_inner.des.tpl	(revision 0)
+++ branches/5.0.x/themes/simple/designs/default_design_inner.des.tpl	(revision 12609)
@@ -0,0 +1,91 @@
+<inp2:m_CheckSSL/>
+<inp2:m_Include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<title>
+		<inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
+	</title>
+
+
+	<inp2:m_Include template="elements/html_head.elm" />
+</head>
+
+<body>
+	<inp2:st_EditPage mode="start"/><!--## System tag please do not remove ##-->
+
+	<!-- Wrapper -->
+	<div id="wrapper">
+
+		<!-- Accessibility Navigation -->
+		<ol id="nav-accessibility">
+			<li><a href="#nav">Skip to navigation</a></li>
+			<li><a href="#content">Skip to content</a></li>
+		</ol>
+		<!-- /Accessibility Navigation -->
+
+		<!-- Masthead -->
+		<div id="masthead">
+
+			<!-- Branding -->
+			<h1 id="branding">
+				<a href="<inp2:m_Link t="index" />" title="<inp2:m_GetConfig name="Site_Name"/>"><inp2:m_GetConfig name="Site_Name"/></a>
+			</h1>
+			<!-- /Branding -->
+
+			<!-- Navigation -->
+			<inp2:m_include template="elements/navigation_menu.elm" />
+			<!-- /Navigation -->
+
+			<!-- Search -->
+			<inp2:m_include template="elements/search.elm" />
+			<!-- /Search -->
+
+		</div>
+		<!-- /Masthead -->
+
+		<!-- Breadcrumb -->
+		<inp2:m_Include template="elements/navigation_bar.elm" />
+		<!-- /Breadcrumb -->
+
+		<!-- Content Tools -->
+		<inp2:m_Include template="elements/content_tools.elm" />
+		<!-- /Content Tools -->
+
+		<!-- Content -->
+		<div id="content">
+
+			<div id="content-sec">
+
+				<div class="movable-area">
+					<inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar" /> <!--## defined in each data template or default one used ##-->
+				</div>
+
+			</div>
+
+			<!-- Main Content -->
+			<div id="content-main" class="inner">
+
+				<div class="movable-area">
+					<inp2:m_RenderElement name="content"/>
+				</div>
+
+			</div>
+			<!-- /Main Content -->
+
+		</div><!-- /Content -->
+
+		<inp2:m_Include template="elements/footer.elm" />
+
+	</div><!-- /Wrapper -->
+
+	<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
+
+	<inp2:m_Include template="elements/tracking.elm" />
+
+</body>
+</html>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/privacy.tpl
===================================================================
diff -u
--- branches/5.0.x/themes/simple/privacy.tpl	(revision 0)
+++ branches/5.0.x/themes/simple/privacy.tpl	(revision 12609)
@@ -0,0 +1,28 @@
+<!--##
+<NAME>Privacy Policy</NAME>
+<DESC></DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<div class="movable-element">
+
+		<div id="block-latest" class="block">
+			<div class="round-top"></div>
+			<div class="content">
+				<h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+				<inp2:st_ContentBlock num="1"/>
+			</div>
+			<div class="round-bottom"></div>
+		</div>
+
+	</div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/typography.css
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/inc/typography.css	(.../typography.css)	(revision 12579)
+++ branches/5.0.x/themes/simple/inc/typography.css	(.../typography.css)	(revision 12609)
@@ -1,11 +1,3 @@
-/*
-  Running MySource Matrix
-  Developed by Squiz - http://www.squiz.net
-  MySource, MySource Matrix and Squiz.net are registered Trademarks of Squiz Pty Ltd
-  Page generated: 18 September 2009 23:07:01
-*/
-
-
 /* -- TYPE DEFAULTS -- */
 body {
 color:#2f2d2d;
@@ -104,7 +96,7 @@
 }
 
 #content li {
-background:url(../img/li.png) no-repeat 0 .31em;
+background:url('../img/li.png') no-repeat 0 .31em;
 margin:6px 0;
 padding:0 0 0 12px;
 }
Index: branches/5.0.x/themes/simple/elements/html_head.elm.tpl
===================================================================
diff -u -r12589 -r12609
--- branches/5.0.x/themes/simple/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 12589)
+++ branches/5.0.x/themes/simple/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 12609)
@@ -1,4 +1,3 @@
-
 <meta http-equiv="content-type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
 
 <!-- CSS -->
@@ -12,12 +11,9 @@
 <!-- JS -->
 <inp2:st_EditingScripts/>
 
-<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
-	<!--<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.js"></script>-->
-	<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.1.3.2.js"></script>
-</inp2:m_ifnot>
+<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE"> <!--## EXCLUDE JS WHEN IN ADMIN ##-->
+	<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.pack.js"></script>
+</inp2:m_ifnot> <!--## EXCLUDE JS WHEN IN ADMIN ##-->
 
 <script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jcookie.js"></script>
-<!--<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jquery.validate.js"></script>-->
-
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/general.js"></script>
+<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/general.js"></script>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/content_tools.elm.tpl
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/elements/content_tools.elm.tpl	(.../content_tools.elm.tpl)	(revision 12579)
+++ branches/5.0.x/themes/simple/elements/content_tools.elm.tpl	(.../content_tools.elm.tpl)	(revision 12609)
@@ -1,3 +1,3 @@
 <ul id="content-tools">
-	<li id="send-to-friend"><a href="<inp2:m_Link t="send_to_friend" />" title="Send to a friend">Send to a friend</a></li>
+	<li id="send-to-friend"><a href="<inp2:m_Link template="recommend" m_cat_id="0"/>" title="<inp2:m_Phrase label="lu_title_RecommendSite" no_editing="1"/>"><inp2:m_Phrase label="lu_title_RecommendSite" no_editing="1"/></a></li>
 </ul>
Index: branches/5.0.x/themes/simple/elements/footer.elm.tpl
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/elements/footer.elm.tpl	(.../footer.elm.tpl)	(revision 12579)
+++ branches/5.0.x/themes/simple/elements/footer.elm.tpl	(.../footer.elm.tpl)	(revision 12609)
@@ -1,9 +1,9 @@
 <div id="site-info">
 	<ul>
-		<li class="first-child"><a href="<inp2:m_Link t="index" />"><inp2:m_Phrase name="lu_Home"/></a></li>
-		<li><a href="<inp2:m_Link t="sitemap" />"><inp2:m_Phrase name="lu_SiteMap"/></a></li>
-		<li><a href="<inp2:m_Link t="terms" />"><inp2:m_Phrase name="lu_title_TermsAndConditions"/></a></li>
-		<li><a href="<inp2:m_Link t="privacy" />"><inp2:m_Phrase name="lu_PrivacyPolicy"/></a></li>
-		<li class="last-child"><a href="#masthead">Back to top</a></li>
+		<li class="first-child"><a href="<inp2:m_Link template="index" m_cat_id="0"/>"><inp2:m_Phrase name="lu_Home"/></a></li>
+		<li><a href="<inp2:m_Link template="terms" m_cat_id="0"/>"><inp2:m_Phrase name="lu_title_TermsAndConditions"/></a></li>
+		<li><a href="<inp2:m_Link template="privacy" m_cat_id="0"/>"><inp2:m_Phrase name="lu_title_PrivacyPolicy"/></a></li>
+		<li><a href="<inp2:m_Link template="sitemap" m_cat_id="0"/>"><inp2:m_Phrase name="lu_title_Sitemap"/></a></li>
+		<li class="last-child"><a href="#masthead"><inp2:m_Phrase name="lu_title_BackToTop"/></a></li>
 	</ul>
 </div>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/designs/general.tpl
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/designs/general.tpl	(.../general.tpl)	(revision 12579)
+++ branches/5.0.x/themes/simple/designs/general.tpl	(.../general.tpl)	(revision 12609)
@@ -4,12 +4,33 @@
 <SECTION>Platform</SECTION>
 ##-->
 
+<!--## DEFINE LEFT SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="left_sidebar">
-<div class="movable-area">
+
 	<div class="movable-element">
-		<inp2:m_RenderElement name="elements/side_boxes/sub_navigation.elm"/>
+		<inp2:m_Include template="elements/side_boxes/sub_menu.elm"/>
 	</div>
-</div>
+
 </inp2:m_DefineElement>
+<!--## /DEFINE LEFT SIDE-BAR ELEMENT ##-->
 
-<inp2:m_include template="designs/default_design.des"/>
\ No newline at end of file
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<div class="movable-element">
+		<div id="block-latest" class="block">
+			<div class="round-top"></div>
+			<div class="content">
+				<h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+				<inp2:st_ContentBlock num="1"/>
+			</div>
+			<div class="round-bottom"></div>
+		</div>
+	</div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design_inner.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/inc/print.css
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/inc/print.css	(.../print.css)	(revision 12579)
+++ branches/5.0.x/themes/simple/inc/print.css	(.../print.css)	(revision 12609)
@@ -1,13 +1,5 @@
-/*
-  Running MySource Matrix
-  Developed by Squiz - http://www.squiz.net
-  MySource, MySource Matrix and Squiz.net are registered Trademarks of Squiz Pty Ltd
-  Page generated: 18 September 2009 22:45:54
-*/
-
-
 			@import url(typography.css);
-					
+
 #nav, #nav-sec, #nav-sub, #content-tools, #nav-accessibility, #masthead form, #site-info ul {
     display: none;
 }
Index: branches/5.0.x/themes/simple/designs/default_design.des.tpl
===================================================================
diff -u -r12589 -r12609
--- branches/5.0.x/themes/simple/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 12589)
+++ branches/5.0.x/themes/simple/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 12609)
@@ -1,5 +1,5 @@
 <inp2:m_CheckSSL/>
-<inp2:m_include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
+<inp2:m_Include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -12,7 +12,7 @@
 	</title>
 
 
-	<inp2:m_Include t="elements/html_head.elm" />
+	<inp2:m_Include template="elements/html_head.elm" />
 </head>
 
 <body>
@@ -25,7 +25,6 @@
 		<ol id="nav-accessibility">
 			<li><a href="#nav">Skip to navigation</a></li>
 			<li><a href="#content">Skip to content</a></li>
-			<li><a href="#content-sub">Skip to Secondary Content</a></li>
 		</ol>
 		<!-- /Accessibility Navigation -->
 
@@ -39,94 +38,62 @@
 			<!-- /Branding -->
 
 			<!-- Navigation -->
-			<inp2:m_include t="elements/navigation_menu.elm" />
+			<inp2:m_include template="elements/navigation_menu.elm" />
 			<!-- /Navigation -->
 
 			<!-- Search -->
-			<inp2:m_include t="elements/search.elm" />
+			<inp2:m_include template="elements/search.elm" />
 			<!-- /Search -->
 
 		</div>
 		<!-- /Masthead -->
 
 		<!-- Breadcrumb -->
-		<inp2:m_include t="elements/navigation_bar.elm" />
+		<inp2:m_Include template="elements/navigation_bar.elm" />
 		<!-- /Breadcrumb -->
 
 		<!-- Content Tools -->
-		<inp2:m_include t="elements/content_tools.elm" />
+		<inp2:m_Include template="elements/content_tools.elm" />
 		<!-- /Content Tools -->
 
 		<!-- Content -->
 		<div id="content">
 
-
 			<div id="content-sec">
-				<inp2:m_DefineElement name="default_left_sidebar" no_editing="1">
-					<div class="movable-area">
-						<div class="movable-element">
-							<inp2:m_RenderElement name="elements/side_boxes/subscribe.elm" design="side_box"/>
-						</div>
-					</div>
-				</inp2:m_DefineElement>
 
-				<inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar"/>
+				<div class="movable-area">
+					<inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar" /> <!--## defined in each data template or default one used ##-->
+				</div>
+
 			</div>
 
-
 			<!-- Main Content -->
 			<div id="content-main">
 
-				<div id="block-latest" class="block">
-					<div class="round-top"></div>
-					<div class="content">
-						<inp2:st_ContentBlock num="1"/>
-					</div>
-					<div class="round-bottom"></div>
+				<div class="movable-area">
+					<inp2:m_RenderElement name="content"/>
 				</div>
 
 			</div>
 			<!-- /Main Content -->
 
-
 			<div id="content-ter">
-				<div class="movable-area">
-					<div class="movable-element">
 
-						<div class="block" id="side-box-plain">
-
-							<div class="round-top"></div>
-
-							<h3>Latest <strong>Podcasts</strong></h3>
-							<div>
-								<ul>
-									<li><a href="<inp2:m_Link t="index" />">Young Entrepreneurs in China and Australia: Be inspired by stories of success</a></li>
-
-								</ul>
-							</div>
-
-							<div class="content">
-								<p class="link-rss"><a href="http://harangue.lecture.unimelb.edu.au/lectopia/podcast.lasso?ut=1633&amp;feed=1&amp;key=2f346fec58ee22a6d2662a6a3f6e8ded" title="Podcast RSS">Subscribe to RSS</a></p>
-								<p class="link"><a href="http://www.asialink.unimelb.edu.au/subscribe">How to subscribe &gt;</a></p>
-							</div>
-
-							<div class="round-bottom"></div>
-
-						</div>
-
-
-					</div>
+				<div class="movable-area">
+					<inp2:m_Include template="elements/side_boxes/news.elm" />
 				</div>
+
 			</div>
 
 		</div><!-- /Content -->
 
-		<inp2:m_include t="elements/footer.elm" />
+		<inp2:m_Include template="elements/footer.elm" />
 
 	</div><!-- /Wrapper -->
 
 	<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
 
-	<inp2:m_include t="elements/tracking.elm" />
+	<inp2:m_Include template="elements/tracking.elm" />
+
 </body>
 </html>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/.smsignore
===================================================================
diff -u
--- branches/5.0.x/themes/simple/.smsignore	(revision 0)
+++ branches/5.0.x/themes/simple/.smsignore	(revision 12609)
@@ -0,0 +1,2 @@
+search-results\.tpl
+recommend\.tpl
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/side_boxes/sub_menu.elm.tpl
===================================================================
diff -u -r12605 -r12609
--- branches/5.0.x/themes/simple/elements/side_boxes/sub_menu.elm.tpl	(.../sub_menu.elm.tpl)	(revision 12605)
+++ branches/5.0.x/themes/simple/elements/side_boxes/sub_menu.elm.tpl	(.../sub_menu.elm.tpl)	(revision 12609)
@@ -1,4 +1,4 @@
-<inp2:m_DefineElement name="nav_menu_element">
+<inp2:m_DefineElement name="nav_menu_element" no_editing="1">
 <li class="<inp2:m_if check='m_Param' name='active'>expanded current</inp2:m_if><inp2:m_if check='m_Param' name='is_first'> first-child<inp2:m_elseif check='m_Param' name='is_last'/> last-child</inp2:m_if>">
 	<a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
 </li>
@@ -8,4 +8,4 @@
 	<ul>
 		<inp2:st_CachedMenu render_as="nav_menu_element" category_id="parent" />
 	</ul>
-</div>
+</div>
\ No newline at end of file
Index: branches/5.0.x/themes/simple/index.tpl
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/index.tpl	(.../index.tpl)	(revision 12579)
+++ branches/5.0.x/themes/simple/index.tpl	(.../index.tpl)	(revision 12609)
@@ -4,27 +4,22 @@
 <SECTION></SECTION>
 ##-->
 
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
 <inp2:m_DefineElement name="content">
-	<div class="movable-area">
-		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm"/>
-		</div>
-		<div class="movable-element">
-			<inp2:m_RenderElement design="content_box">
-				<inp2:m_Capture to_var="header">
-					<inp2:m_phrase name="lu_title_WelcomeTitle"/>
-				</inp2:m_Capture>
 
+	<div class="movable-element">
+		<div id="block-latest" class="block">
+			<div class="round-top"></div>
+			<div class="content">
 				<inp2:st_ContentBlock num="1"/>
-			</inp2:m_RenderElement>
+			</div>
+			<div class="round-bottom"></div>
 		</div>
-		<div class="movable-element">
-			<!--## INCLUDE HOME PAGE ELEMENTS FOR EACH MODULE ##-->
-			<inp2:m_ModuleInclude template="elements/content_boxes/home_page_items.elm" data_exists="1"/>
-			<!--## /HOME PAGE ELEMENTS ##-->
-		</div>
 	</div>
+
 </inp2:m_DefineElement>
-<!--## /MAIN CONTENT ##-->
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
 
-<inp2:m_include template="designs/default_design.des"/>
\ No newline at end of file
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/sitemap.tpl
===================================================================
diff -u
--- branches/5.0.x/themes/simple/sitemap.tpl	(revision 0)
+++ branches/5.0.x/themes/simple/sitemap.tpl	(revision 12609)
@@ -0,0 +1,36 @@
+<!--##
+<NAME>Sitemap</NAME>
+<DESC>Sitemap of the website</DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## DEFINE MAIN CONTENT ELEMENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<div class="movable-element">
+		<div id="block-latest" class="block">
+			<div class="round-top"></div>
+			<div class="content">
+				<h1 class="movable-header"><inp2:st_PageInfo type="title"/></h1>
+				<inp2:st_ContentBlock num="1"/>
+
+				<inp2:m_DefineElement name="sitemap_element">
+ 				<li>
+ 					<a href="<inp2:m_if check='m_Param' name='external_url'><inp2:m_Param name='external_url'/><inp2:m_else/><inp2:m_Link template='$template' m_cat_id='$cat_id' m_cat_page='1'/></inp2:m_if>" title="<inp2:m_Param name="title"/>"><inp2:m_Param name="title"/></a>
+   				</li>
+ 				</inp2:m_DefineElement>
+
+ 				<ul>
+					<inp2:st_CachedMenu render_as="sitemap_element" category_id="1" per_page="-1"/>
+				</ul>
+			</div>
+			<div class="round-bottom"></div>
+		</div>
+	</div>
+
+</inp2:m_DefineElement>
+<!--## /DEFINE MAIN CONTENT ELEMENT ##-->
+
+<!--## INCLUDE MAIN DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des"/>
+<!--## /INCLUDE MAIN DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/5.0.x/themes/simple/elements/search.elm.tpl
===================================================================
diff -u -r12579 -r12609
--- branches/5.0.x/themes/simple/elements/search.elm.tpl	(.../search.elm.tpl)	(revision 12579)
+++ branches/5.0.x/themes/simple/elements/search.elm.tpl	(.../search.elm.tpl)	(revision 12609)
@@ -1,8 +1,8 @@
-<form method="post" action="<inp2:m_Link template="search-results" pass_category="1"/>">
+<form method="post" action="<inp2:m_Link template="search-results" m_cat_id="0"/>">
 	<fieldset id="site-search">
 		<inp2:m_GetFormHiddens template="search-results" />
 		<input type="hidden" name="mode" value="results" />
-		<input type="text" name="keywords" value="" size="5"  class="sq-form-field" id="queries_keywords_query" onfocus="if (this.value == '') { this.value = ''; }" onblur="if (this.value == '') { this.value=''; }" />				
-		<span class="submit"><input type="submit" value="Search" /></span>
+		<input type="text" name="keywords" value="" size="5"  class="sq-form-field" id="queries_keywords_query" onfocus="if (this.value == '') { this.value = ''; }" onblur="if (this.value == '') { this.value=''; }" />
+		<span class="submit"><input type="submit" value="<inp2:m_Phrase label="lu_search" no_editing="1"/>" /></span>
 	</fieldset>
 </form>
\ No newline at end of file