Index: branches/RC/themes/default2007/platform/inc/lbox/lightbox.css
===================================================================
diff -u -r9058 -r9113
--- branches/RC/themes/default2007/platform/inc/lbox/lightbox.css	(.../lightbox.css)	(revision 9058)
+++ branches/RC/themes/default2007/platform/inc/lbox/lightbox.css	(.../lightbox.css)	(revision 9113)
@@ -47,8 +47,8 @@
 	background: transparent url(../../img/s.gif) no-repeat; /* Trick IE into showing hover */
 	display: block;
 	}
-#prevLink { background: url(../../img/lbox/prevlabel.gif); left: 0; float: left;}
-#nextLink { background: url(../../img/lbox/prevlabel.gif); right: 0; float: right;}
+#prevLink { left: 0; float: left;}
+#nextLink { right: 0; float: right;}
 #prevLink:hover, #prevLink:visited:hover { background: url(../../img/lbox/prevlabel.gif) left 15% no-repeat; }
 #nextLink:hover, #nextLink:visited:hover { background: url(../../img/lbox/nextlabel.gif) right 15% no-repeat; }
 
Index: branches/RC/themes/default2007/error_notfound.tpl
===================================================================
diff -u -r8929 -r9113
--- branches/RC/themes/default2007/error_notfound.tpl	(.../error_notfound.tpl)	(revision 8929)
+++ branches/RC/themes/default2007/error_notfound.tpl	(.../error_notfound.tpl)	(revision 9113)
@@ -1,3 +1,4 @@
+<!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 		<inp2:m_RenderElements
 			elements="
@@ -6,8 +7,11 @@
 			"
 			design="blue_box"/>
 </inp2:m_DefineElement>
+<!--## /SIDE-BAR ELEMENT ##-->
 
+<!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
+
 	<!-- page not found -->
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
@@ -18,6 +22,10 @@
 		<br /><br />
 	</inp2:m_RenderElement>
 	<!-- // page not found -->
+	
 </inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
 
-<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/RC/themes/default2007/platform/elements/side_boxes/login.tpl
===================================================================
diff -u -r9067 -r9113
--- branches/RC/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 9067)
+++ branches/RC/themes/default2007/platform/elements/side_boxes/login.tpl	(.../login.tpl)	(revision 9113)
@@ -58,7 +58,7 @@
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
 			</td>
 			<td>
-				<a href="<inp2:u_LogoutLink template="index" />"><inp2:m_Phrase label="lu_comm_Logout"/></a>
+				<a href="<inp2:u_LogoutLink template="index" />"><inp2:m_Phrase label="lu_logout"/></a>
 			</td>
 		</tr>
 		
@@ -100,10 +100,10 @@
 		<table>
 			<tr>
 				<td width="10">
-					<input class="button" name="events[u][OnLogin]" type="submit" value="<inp2:m_Phrase label="lu_comm_Login"/>" /><br />
+					<input class="button" name="events[u][OnLogin]" type="submit" value="<inp2:m_Phrase label="lu_Login"/>" /><br />
 				</td>
 				<td align="left">
-					<input type="checkbox" /> <span class="remember-login">Remember login</span>
+					<input type="checkbox" /> <span class="remember-login"><inp2:m_Phrase label="lu_remember_login"/></span>
 				</td>
 			</tr>
 		</table>
Index: branches/RC/themes/default2007/index.tpl
===================================================================
diff -u -r9079 -r9113
--- branches/RC/themes/default2007/index.tpl	(.../index.tpl)	(revision 9079)
+++ branches/RC/themes/default2007/index.tpl	(.../index.tpl)	(revision 9113)
@@ -1,3 +1,4 @@
+<!--## SIDE-BAR ELEMENT ##-->
 <inp2:m_DefineElement name="sidebar">
 	<inp2:m_RenderElements
 		elements="
@@ -8,7 +9,9 @@
 		"
 		design="blue_box"/>
 </inp2:m_DefineElement>
+<!--## /SIDE-BAR ELEMENT ##-->
 
+<!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar"/>
 
@@ -33,7 +36,13 @@
 		
 	</inp2:m_RenderElement>
 
+	<!--## HOME PAGE ELEMENTS ##-->
 	<inp2:m_ModuleInclude template="elements/content_boxes/home_page_items" data_exists="1"/>
+	<!--## /HOME PAGE ELEMENTS ##-->
+	
 </inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
 
-<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="platform/designs/default_design" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file