diff --git a/styles/subsilver2/template/events/overall_header_head_append_listener.html b/styles/subsilver2/template/event/overall_header_head_append.html
similarity index 100%
rename from styles/subsilver2/template/events/overall_header_head_append_listener.html
rename to styles/subsilver2/template/event/overall_header_head_append.html
diff --git a/styles/subsilver2/template/portal/modules/clock_side.html b/styles/subsilver2/template/portal/modules/clock_side.html
index fbdf3182..5c0b67ec 100644
--- a/styles/subsilver2/template/portal/modules/clock_side.html
+++ b/styles/subsilver2/template/portal/modules/clock_side.html
@@ -5,12 +5,12 @@
 			<div id="portal-clock" style="margin-top: -20px;">
 				<div id="portal-clock-back">
 					<div id="portal-clock-back-upper">
-						<img src="{T_EXT_THEME_PATH}/images/portal/spacer_up.png" style="float: left;" /><div id="portal-clock-back-hours-up"></div>
+						<img src="{T_EXT_THEME_PATH}images/portal/spacer_up.png" style="float: left;" /><div id="portal-clock-back-hours-up"></div>
 						<div id="portal-clock-back-minutes-up-left" ></div><div id="portal-clock-back-minutes-up-right"></div>
 						<div id="portal-clock-back-seconds-up-left"></div><div id="portal-clock-back-seconds-up-right"></div>
 					</div>
 					<div id="portal-clock-back-lower">
-						<img src="{T_EXT_THEME_PATH}/images/portal/spacer_down.png" style="float: left;" /><div id="portal-clock-back-hours-down"></div>
+						<img src="{T_EXT_THEME_PATH}images/portal/spacer_down.png" style="float: left;" /><div id="portal-clock-back-hours-down"></div>
 						<div id="portal-clock-back-minutes-down-left"></div><div id="portal-clock-back-minutes-down-right"></div>
 						<div id="portal-clock-back-seconds-down-left"></div><div id="portal-clock-back-seconds-down-right"></div>
 					</div>
@@ -22,7 +22,7 @@
 						<div id="portal-clock-front-seconds-up-left"></div><div id="portal-clock-front-seconds-up-right"></div>
 					</div>
 					<div id="portal-clock-front-lower">
-						<img src="{T_EXT_THEME_PATH}/images/portal/spacer_down.png" style="float: left;" /><div id="portal-clock-front-hours-down"></div>
+						<img src="{T_EXT_THEME_PATH}images/portal/spacer_down.png" style="float: left;" /><div id="portal-clock-front-hours-down"></div>
 						<div id="portal-clock-front-minutes-down-left"></div><div id="portal-clock-front-minutes-down-right"></div>
 						<div id="portal-clock-front-seconds-down-left"></div><div id="portal-clock-front-seconds-down-right"></div>
 					</div>
@@ -31,6 +31,6 @@
 		</td>
 	</tr>
 </table>
-<!-- INCLUDEJS template/portal/modules/jquery.easing.1.3.js -->
-<!-- INCLUDEJS template/portal/modules/portal_clock.js -->
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
+<!-- INCLUDEJS portal/modules/jquery.easing.1.3.js -->
+<!-- INCLUDEJS portal/modules/portal_clock.js -->
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
diff --git a/styles/subsilver2/template/portal/modules/leaders_side.html b/styles/subsilver2/template/portal/modules/leaders_side.html
index e617eb77..c83a034c 100644
--- a/styles/subsilver2/template/portal/modules/leaders_side.html
+++ b/styles/subsilver2/template/portal/modules/leaders_side.html
@@ -5,13 +5,13 @@
 			<strong>{L_ADMINISTRATORS}</strong>
 		</td>
 	</tr>
-	<!-- BEGIN admin -->
+	<!-- BEGIN b3p_admins -->
 	<tr  class="row1">
 		<td>
 			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-			<span style="float:right;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:right; padding-right:5px; padding-top:2px;"><strong>{admin.USERNAME_FULL}</strong></span><br style="clear:both" />
+			<span style="float:right;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:right; padding-right:5px; padding-top:2px;"><strong>{b3p_admins.USERNAME_FULL}</strong></span><br style="clear:both" />
 			<!-- ELSE -->
-			<span style="float:left;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:left; padding-left:5px; padding-top:2px;"><strong>{admin.USERNAME_FULL}</strong></span><br style="clear:both" />
+			<span style="float:left;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:left; padding-left:5px; padding-top:2px;"><strong>{b3p_admins.USERNAME_FULL}</strong></span><br style="clear:both" />
 			<!-- ENDIF -->
 		</td>
 	</tr>
@@ -21,19 +21,19 @@
 			{L_NO_ADMINISTRATORS_P}
 		</td>
 	</tr>
-	<!-- END admin -->
+	<!-- END b3p_admins -->
 	<tr  class="row3">
 		<td>
 			<strong>{L_MODERATORS}</strong>
 		</td>
 	</tr>
-	<!-- BEGIN mod -->
+	<!-- BEGIN b3p_moderator -->
 	<tr  class="row1">
 		<td>
 			<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-			<span style="float:right;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:right; padding-right:5px; padding-top:2px;"><strong>{mod.USERNAME_FULL}</strong></span><br style="clear:both" />
+			<span style="float:right;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:right; padding-right:5px; padding-top:2px;"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br style="clear:both" />
 			<!-- ELSE -->
-			<span style="float:left;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:left; padding-left:5px; padding-top:2px;"><strong>{mod.USERNAME_FULL}</strong></span><br style="clear:both" />
+			<span style="float:left;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="float:left; padding-left:5px; padding-top:2px;"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br style="clear:both" />
 			<!-- ENDIF -->
 		</td>
 	</tr>
@@ -43,6 +43,6 @@
 			{L_NO_MODERATORS_P}
 		</td>
 	</tr>
-	<!-- END mod -->
+	<!-- END b3p_moderator -->
 </table>
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
diff --git a/styles/subsilver2/template/portal/modules/recent_center.html b/styles/subsilver2/template/portal/modules/recent_center.html
index a8bd39e8..d6897537 100644
--- a/styles/subsilver2/template/portal/modules/recent_center.html
+++ b/styles/subsilver2/template/portal/modules/recent_center.html
@@ -10,25 +10,25 @@
 		<!-- IF .latest_announcements -->
 		<td class="row1" width="33%" valign="top">
 			<!-- BEGIN latest_announcements -->
-						<a href="{latest_announcements.U_VIEW_TOPIC}" title="{latest_announcements.FULL_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_announcements.TITLE}</a><br />
+						<a href="{latest_announcements.U_VIEW_TOPIC}" title="{latest_announcements.FULL_TITLE}"><img src="{T_EXT_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_announcements.TITLE}</a><br />
 			<!-- END latest_announcements -->
 		</td>
 		<!-- ENDIF -->
 		<!-- IF .latest_hot_topics -->
 		<td class="row1" width="33%" valign="top">
 			<!-- BEGIN latest_hot_topics -->
-				<a href="{latest_hot_topics.U_VIEW_TOPIC}" title="{latest_hot_topics.FULL_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_hot_topics.TITLE}</a><br />
+				<a href="{latest_hot_topics.U_VIEW_TOPIC}" title="{latest_hot_topics.FULL_TITLE}"><img src="{T_EXT_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_hot_topics.TITLE}</a><br />
 			<!-- END latest_hot_topics -->
 		</td>
 		<!-- ENDIF -->
 		<!-- IF .latest_topics -->
 		<td class="row1" width="33%" valign="top">
 			<!-- BEGIN latest_topics -->
-				<a href="{latest_topics.U_VIEW_TOPIC}" title="{latest_topics.FULL_TITLE}"><img src="{T_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_topics.TITLE}</a><br />
+				<a href="{latest_topics.U_VIEW_TOPIC}" title="{latest_topics.FULL_TITLE}"><img src="{T_EXT_THEME_PATH}/images/portal/arrowbullet<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->_rtl<!-- ENDIF -->.gif" width="12" height="11" alt="" />&nbsp;{latest_topics.TITLE}</a><br />
 			<!-- END latest_topics -->
 		</td>
 		<!-- ENDIF -->
 	</tr>
 </table>
 {$C_BLOCK_F_L}{$C_BLOCK_F_R}
-<!-- ENDIF -->
\ No newline at end of file
+<!-- ENDIF -->