diff --git a/root/portal/modules/portal_leaders.php b/root/portal/modules/portal_leaders.php
index 207b3128..0e618393 100644
--- a/root/portal/modules/portal_leaders.php
+++ b/root/portal/modules/portal_leaders.php
@@ -169,11 +169,11 @@ class portal_leaders_module
 			{
 				if ($row['group_name'] == 'ADMINISTRATORS')
 				{
-					$which_row = 'admin';
+					$which_row = 'b3p_admins';
 				}
 				elseif ($row['group_name'] == 'GLOBAL_MODERATORS')
 				{
-					$which_row = 'mod';
+					$which_row = 'b3p_moderators';
 				}
 
 				if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id'])
diff --git a/root/styles/prosilver/template/events/overall_header_head_append_listener.html b/root/styles/prosilver/template/event/overall_header_head_append.html
old mode 100644
new mode 100755
similarity index 100%
rename from root/styles/prosilver/template/events/overall_header_head_append_listener.html
rename to root/styles/prosilver/template/event/overall_header_head_append.html
diff --git a/root/styles/prosilver/template/portal/_block_config.html b/root/styles/prosilver/template/portal/_block_config.html
index ea75bc1a..c14b14ba 100644
--- a/root/styles/prosilver/template/portal/_block_config.html
+++ b/root/styles/prosilver/template/portal/_block_config.html
@@ -7,7 +7,7 @@
 <!-- Config for the center blocks //-->
 <!-- DEFINE $C_BLOCK_H_L = '<div class="forabg"><div class="inner"><span class="corners-top"><span></span></span><ul class="topiclist"><li class="header"><dl class="icon"><dt>' -->
 <!-- DEFINE $C_BLOCK_H_R = '</dt><dd></dd></dl></li></ul>' -->
-<!-- DEFINE $C_BLOCK_F_L = '' -->
+<!-- DEFINE $C_BLOCK_F_L = ' ' -->
 <!-- DEFINE $C_BLOCK_F_R = '<span class="corners-bottom"><span></span></span></div></div><br style="clear:both" />' -->
 
 <!-- Config for compact blocks //-->
diff --git a/root/styles/prosilver/template/portal/modules/clock_side.html b/root/styles/prosilver/template/portal/modules/clock_side.html
index d01c9889..0f0e9478 100644
--- a/root/styles/prosilver/template/portal/modules/clock_side.html
+++ b/root/styles/prosilver/template/portal/modules/clock_side.html
@@ -27,6 +27,6 @@
 				</div>
 			</div>
 			</div>
-<!-- INCLUDEJS template/portal/modules/jquery.easing.1.3.js -->
-<!-- INCLUDEJS template/portal/modules/portal_clock.js -->
+<!-- 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/root/styles/prosilver/template/portal/modules/leaders_side.html b/root/styles/prosilver/template/portal/modules/leaders_side.html
index 2a943dd5..92205423 100644
--- a/root/styles/prosilver/template/portal/modules/leaders_side.html
+++ b/root/styles/prosilver/template/portal/modules/leaders_side.html
@@ -1,15 +1,15 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->>{L_ADMINISTRATORS}</strong><br />
-	<!-- BEGIN admin -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{admin.USERNAME_FULL}</strong></span><br style="clear:both" />
+	<!-- BEGIN b3p_admins -->
+		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{b3p_admins.USERNAME_FULL}</strong></span><br style="clear:both" />
 	<!-- BEGINELSE -->
 		{L_NO_ADMINISTRATORS_P}<br /><br />
-	<!-- END admin -->
+	<!-- END b3p_admins -->
 	<br style="clear:both" />
 	<strong<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> style="float: right;"<!-- ENDIF -->>{L_MODERATORS}</strong><br />
-	<!-- BEGIN mod -->
-		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{mod.USERNAME_FULL}</strong></span><br style="clear:both" />
+	<!-- BEGIN b3p_moderator -->
+		<span style="float:<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->;"><img src="{T_EXT_THEME_PATH}/images/portal/portal_user.png" width="16" height="16" alt="" /></span><span style="<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->float:right; padding-right:5px;<!-- ELSE -->float:left; padding-left:5px;<!-- ENDIF --> padding-top:2px;"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br style="clear:both" />
 	<!-- BEGINELSE -->
 		{L_NO_MODERATORS_P}
-	<!-- END mod -->
+	<!-- END b3p_moderator -->
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
diff --git a/root/styles/prosilver/template/portal/modules/main_menu_side.html b/root/styles/prosilver/template/portal/modules/main_menu_side.html
index b659eaf6..f149eb37 100644
--- a/root/styles/prosilver/template/portal/modules/main_menu_side.html
+++ b/root/styles/prosilver/template/portal/modules/main_menu_side.html
@@ -14,6 +14,6 @@
 		<ul>
 			<span style="float:left;" class="gensmall"><strong>{L_MENU_NO_LINKS}</strong></span><br />
 		</ul>
-	<!-- END portal_menu -->
+	<!-- END portalmenu -->
 	</div>
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
\ No newline at end of file
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}