diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html
index 222e1265bf..b0364f04f1 100644
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -71,24 +71,24 @@
 	<fieldset class="perm nolegend">
 
 		<div id="advanced00">
-			<div class="perm_cat">
+			<div class="permissions-category">
 				<ul>
 				<!-- BEGIN auth -->
 					<!-- IF auth.S_YES -->
-						<li class="perm_preset_yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-yes<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ELSEIF auth.S_NEVER -->
-						<li class="perm_preset_never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-never<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ELSEIF auth.S_NO -->
-						<li class="perm_preset_no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-no<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ELSE -->
-						<li class="perm_preset_custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
+						<li class="permissions-preset-custom<!-- IF auth.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab00{auth.S_ROW_COUNT}">
 					<!-- ENDIF -->
 						<a href="#" onclick="swap_options('0','0','{auth.S_ROW_COUNT}'); return false;"><span class="tabbg"><span class="colour"></span>{auth.CAT_NAME}</span></a></li>	
 				<!-- END auth -->
 				</ul>
 			</div>
 			<!-- BEGIN auth -->
-			<div class="perm_panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 				<span class="corners-top"><span></span></span>
 				<div class="tablewrap">
 					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
@@ -109,7 +109,7 @@
 					<tbody>
 					<!-- BEGIN mask -->
 						<!-- IF auth.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-						<th class="permission_name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
+						<th class="permission-name<!-- IF auth.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->">{auth.mask.PERMISSION}</th>
 							
 						<td><label for="{auth.mask.FIELD_NAME}_y"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_y" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_YES --> checked="checked"<!-- ENDIF --> value="1" /></label></td>
 						<td><label for="{auth.mask.FIELD_NAME}_u"><input onchange="set_colours('00{auth.S_ROW_COUNT}', false)" id="setting[{auth.mask.FIELD_NAME}]_u" name="setting[{auth.mask.FIELD_NAME}]" class="radio" type="radio"<!-- IF auth.mask.S_NO --> checked="checked"<!-- ENDIF --> value="-1" /></label></td>
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index f5a5f78c6b..22bc012377 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -325,11 +325,11 @@
 	<script type="text/javascript" src="style/tooltip.js"></script>
 	<script type="text/javascript">
 	<!--
-		window.onload = function(){enable_tooltips_select('set_permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
+		window.onload = function(){enable_tooltips_select('set-permissions', '{LA_ROLE_DESCRIPTION}', 'role')};
 	//-->
 	</script>
 
-	<form id="set_permissions" method="post" action="{U_ACTION}">
+	<form id="set-permissions" method="post" action="{U_ACTION}">
 
 	{S_HIDDEN_FIELDS}
 
@@ -339,7 +339,7 @@
 
 	<fieldset class="quick" style="float: right;">
 		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
-		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set_permissions'].reset(); init_colours(active_pmask + active_fmask);" />
+		<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
 	</fieldset>
 
 	<br /><br />
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 226402c403..4ed89e645a 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -659,7 +659,7 @@ dd textarea {
 	width: 100%;
 }
 
-input.radio, input.perm_cb {
+input.radio, input.permissions-checkbox {
 	width: auto !important;
 	background-color: transparent;
 	border: none;
@@ -1051,66 +1051,66 @@ input.disabled {
 /* Permission interface
 ---------------------------------------- */
 
-fieldset.perm legend {
+fieldset.permissions legend {
 	text-transform: none;
 }
-fieldset.perm legend input{
+fieldset.permissions legend input{
 	height: 1.1em;
 }
 
 /* Permission sections */ 
-fieldset.perm .perm_simple {
+fieldset.permissions .permissions-simple {
 	text-align: left;
 	padding-top: 3px;
 }
 
-.rtl fieldset.perm .perm_simple {
+.rtl fieldset.permissions .permissions-simple {
 	text-align: right;
 }
 
-fieldset.perm .perm_advanced {
+fieldset.permissions .permissions-advanced {
 	padding: 10px 0 0 5px;
 	vertical-align: top;
 	clear: right;
 }
 
-.rtl fieldset.perm .perm_advanced {
+.rtl fieldset.permissions .permissions-advanced {
 	padding: 10px 5px 0 0;
 	clear: left;
 }
 
-fieldset.perm .perm_switch {
+fieldset.permissions .permissions-switch {
 	float: right;
 	font-size: 1.1em;
 }
 
-.rtl fieldset.perm .perm_switch {
+.rtl fieldset.permissions .permissions-switch {
 	float: left;
 }
 
-.perm_switch a {
+.permissions-switch a {
 	text-decoration: underline;
 }
 
 /* Tabbed menu */
-.perm_cat {
+.permissions-category {
 	line-height: normal;
 	margin: 0 0 0 7px;
 	min-width: 570px;
 	font-size: 1em;
 }
 
-.rtl .perm_cat {
+.rtl .permissions-category {
 	margin: 0 7px 0 0;
 }
 
-.perm_cat ul {
+.permissions-category ul {
 	margin: 0;
 	padding: 0;
 	list-style: none;
 }
 
-.perm_cat li {
+.permissions-category li {
 	display: inline;
 	margin: 0;
 	padding: 0;
@@ -1118,7 +1118,7 @@ fieldset.perm .perm_switch {
 	font-weight: bold;
 }
 
-.perm_cat a {
+.permissions-category a {
 	float: left;
 	background: url("../images/bg_tabs1.gif") no-repeat 0% -35px;
 	margin: 0 1px 0 0;
@@ -1127,11 +1127,11 @@ fieldset.perm .perm_switch {
 	position: relative;
 }
 
-.rtl .perm_cat a {
+.rtl .permissions-category a {
 	float: right;
 }
 
-.perm_cat a span.tabbg {
+.permissions-category a span.tabbg {
 	float: left;
 	display: block;
 	background: url("../images/bg_tabs2.gif") no-repeat 100% -35px;
@@ -1140,46 +1140,46 @@ fieldset.perm .perm_switch {
 	white-space: nowrap;
 }
 
-.rtl .perm_cat a span.tabbg {
+.rtl .permissions-category a span.tabbg {
 	float: right;
 }
 
 /* Commented Backslash Hack hides rule from IE5-Mac \*/
-.perm_cat a span.tabbg, .rtl .perm_cat a span.tabbg { float: none;}
+.permissions-category a span.tabbg, .rtl .permissions-category a span.tabbg { float: none;}
 /* End hack */
 
-.perm_cat a:hover span.tabbg {
+.permissions-category a:hover span.tabbg {
 	color: #DD6900;
 }
 
-.perm_cat .activetab a {
+.permissions-category .activetab a {
 	background-position: 0 0px;
 }
 
-.perm_cat .activetab a span.tabbg {
+.permissions-category .activetab a span.tabbg {
 	background-position: 100% 0px;
 	padding-bottom: 7px;
 	color: #333333;
 }
 
-.perm_cat a:hover {
+.permissions-category a:hover {
 	background-position: 0 -70px;
 }
 
-.perm_cat a:hover span.tabbg {
+.permissions-category a:hover span.tabbg {
 	background-position: 100% -70px;
 }
 
-.perm_cat .activetab a:hover span.tabbg {
+.permissions-category .activetab a:hover span.tabbg {
 	color: #333333;
 	background-position: 100% 0px;
 }
 
-.perm_cat .activetab a:hover {
+.permissions-category .activetab a:hover {
 	background-position: 0 0px;
 }
 
-.perm_cat a span.colour {
+.permissions-category a span.colour {
 	border: 1px solid #536482;
 	display: block;
 	float: left;
@@ -1189,46 +1189,46 @@ fieldset.perm .perm_switch {
 }
 
 /* Most browsers will have to live with a left aligned icon in RTL mode, as (currently) only Firefox 3.0 Alpha 3 renders it correctly without destroying it
-.rtl .perm_cat a span.colour {
+.rtl .permissions-category a span.colour {
 	float: right;
 	margin: 0 0 0 5px;
 }
 */
 
-.perm_cat .activetab span.colour {
+.permissions-category .activetab span.colour {
 	border-color: #333333;
 }
 
-.perm_cat a:hover span.colour {
+.permissions-category a:hover span.colour {
 	border-color: #DD6900;
 }
 
-.perm_cat .activetab a:hover span.colour {
+.permissions-category .activetab a:hover span.colour {
 	border-color: #333333;
 }
 
 /* Permission preset colours */
-.perm_preset_yes span.colour,
+.permissions-preset-yes span.colour,
 .yes {
 	background-color: #86F786;
 }
 
-.perm_preset_custom span.colour {
+.permissions-preset-custom span.colour {
 	background-color: #B2BBDD;
 }
 
-.perm_preset_never span.colour {
+.permissions-preset-never span.colour {
 	background-color: #DD0000;
 }
 
-.perm_preset_no span.colour,
+.permissions-preset-no span.colour,
 .never {
 	background-color: #EFB0B2;
 }
 
 /* Permission panel
 ---------------------------------------- */
-.perm_panel {
+.permissions-panel {
 	float: left;
 	background-color: #FFF;
 	width: 100%;
@@ -1236,28 +1236,28 @@ fieldset.perm .perm_switch {
 	margin-top: -1px;
 }
 
-.rtl .perm_panel {
+.rtl .permissions-panel {
 	float: right;
 }
 
-.perm_panel span.corners-top {
+.permissions-panel span.corners-top {
 	background-image: url("../images/corners_left2.gif");
 }
 
-.perm_panel span.corners-top span {
+.permissions-panel span.corners-top span {
 	background-image: url("../images/corners_right2.gif");
 }
 
-.perm_panel span.corners-bottom {
+.permissions-panel span.corners-bottom {
 	background-image: url("../images/corners_left2.gif");
 }
 
-.perm_panel span.corners-bottom span {
+.permissions-panel span.corners-bottom span {
 	background-image: url("../images/corners_right2.gif");
 }
 
-.perm_panel span.corners-top, .perm_panel span.corners-bottom, 
-.perm_panel span.corners-top span, .perm_panel span.corners-bottom span {
+.permissions-panel span.corners-top, .permissions-panel span.corners-bottom, 
+.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span {
 	font-size: 1px;
 	line-height: 1px;
 	display: block;
@@ -1265,88 +1265,88 @@ fieldset.perm .perm_switch {
 	background-repeat: no-repeat;
 }
 
-.perm_panel span.corners-top {
+.permissions-panel span.corners-top {
 	background-image: url("../images/corners_left2.gif");
 	background-position: 0 0;
 	margin: 0 0;
 }
 
-.perm_panel span.corners-top span {
+.permissions-panel span.corners-top span {
 	background-image: url("../images/corners_right2.gif");
 	background-position: 100% 0;
 }
 
-.perm_panel span.corners-bottom {
+.permissions-panel span.corners-bottom {
 	background-image: url("../images/corners_left2.gif");
 	background-position: 0 100%;
 	margin: 0 0;
 	clear: both;
 }
 
-.perm_panel span.corners-bottom span {
+.permissions-panel span.corners-bottom span {
 	background-image: url("../images/corners_right2.gif");
 	background-position: 100% 100%;
 }
 
 /* Permission table
 ---------------------------------------- */
-.perm_panel .tablewrap {
+.permissions-panel .tablewrap {
 	margin: 0 10px;
 }
 
-.perm_panel table {
+.permissions-panel table {
 	width: 100%;
 }
 
-.perm_panel th {
+.permissions-panel th {
 	text-transform: none;
 }
 
-.perm_panel th.value {
+.permissions-panel th.value {
 	text-align: center;
 }
 
-.perm_panel th.name {
+.permissions-panel th.name {
 	text-align: left;
 	width: auto;
 	text-transform: none;
 }
 
-.rtl .perm_panel th.name {
+.rtl .permissions-panel th.name {
 	text-align: right;
 }
 
-.perm_panel th.permission_name {
+.permissions-panel th.permission-name {
 	border: none;
 	color: #536482;
 	font-weight: normal;
 }
 
-.perm_panel th.permission_name a.trace {
+.permissions-panel th.permission-name a.trace {
 	display: inline;
 }
 
-.perm_panel th.row3 {
+.permissions-panel th.row3 {
 	background-image: none;
 	background-color: #D1D7DC; 
 }
 
-.perm_panel th.row4 {
+.permissions-panel th.row4 {
 	background-image: none;	
 	background-color: #E4E8EB; 
 }
 
-.perm_panel th a:link, .perm_panel th a:hover, .perm_panel th a:visited {
+.permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited {
 	display: block;
 	color: #FFA34F; 
 	text-decoration: underline; 
 }
 
-.perm_panel td {
+.permissions-panel td {
 	padding: 0;
 	text-align: center;
 }
 
-.perm_panel td label {
+.permissions-panel td label {
 	display: block;
 }
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index 7ef2bc1848..6e9954312f 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -24,20 +24,20 @@
 
 <!-- BEGIN f_mask -->
 <div class="clearfix"></div>
-<fieldset class="perm" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
+<fieldset class="permissions" id="perm{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
 	<legend id="legend{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">
 		<!-- IF not p_mask.S_VIEW -->
-			<input type="checkbox" style="display: none;" class="perm_cb" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
+			<input type="checkbox" style="display: none;" class="permissions-checkbox" name="inherit[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" id="checkbox{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" value="1" onclick="toggle_opacity('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')" /> 
 		<!-- ELSE -->
 		<!-- ENDIF -->
 		
 		{p_mask.f_mask.NAME}
 	</legend>
 	<!-- IF not p_mask.S_VIEW -->
-		<div class="perm_switch">
+		<div class="permissions-switch">
 			<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '0', true); return false;">{L_ADVANCED_PERMISSIONS}</a>
 		</div>
-		<dl class="perm_simple">
+		<dl class="permissions-simple">
 			<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}:</label></dt>
 			<!-- IF p_mask.f_mask.S_ROLE_OPTIONS -->
 				<dd style="margin-left: 20%"><select id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" name="role[{p_mask.f_mask.UG_ID}][{p_mask.f_mask.FORUM_ID}]" onchange="set_role_settings(this.options[selectedIndex].value, 'advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}'); init_colours('{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}')">{p_mask.f_mask.S_ROLE_OPTIONS}</select></dd>
@@ -49,20 +49,20 @@
 
 	<!-- BEGIN category -->
 		<!-- IF p_mask.f_mask.category.S_FIRST_ROW -->
-			<div class="perm_advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}"<!-- IF not p_mask.S_VIEW --> style="display: none;"<!-- ENDIF -->>
+			<div class="permissions-advanced" id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}"<!-- IF not p_mask.S_VIEW --> style="display: none;"<!-- ENDIF -->>
 
-			<div class="perm_cat">
+			<div class="permissions-category">
 				<ul>
 		<!-- ENDIF -->
  		
 		<!-- IF p_mask.f_mask.category.S_YES -->
-			<li class="perm_preset_yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+			<li class="permissions-preset-yes<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ELSEIF p_mask.f_mask.category.S_NEVER -->
-			<li class="perm_preset_never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+			<li class="permissions-preset-never<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ELSEIF p_mask.f_mask.category.S_NO -->
-			<li class="perm_preset_no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+			<li class="permissions-preset-no<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ELSE -->
-			<li class="perm_preset_custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
+			<li class="permissions-preset-custom<!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --> activetab<!-- ENDIF -->" id="tab{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}">
 		<!-- ENDIF -->
 		<a href="#" onclick="swap_options('{p_mask.S_ROW_COUNT}', '{p_mask.f_mask.S_ROW_COUNT}', '{p_mask.f_mask.category.S_ROW_COUNT}', false<!-- IF p_mask.S_VIEW -->, true<!-- ENDIF -->); return false;"><span class="tabbg"><span class="colour"></span>{category.CAT_NAME}</span></a></li>
 	<!-- END category -->
@@ -70,7 +70,7 @@
 			</div>
 
 	<!-- BEGIN category -->
-		<div class="perm_panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+		<div class="permissions-panel" id="options{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" <!-- IF p_mask.S_FIRST_ROW and p_mask.f_mask.S_FIRST_ROW and p_mask.f_mask.category.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
 			<span class="corners-top"><span></span></span>
 			<div class="tablewrap">
 				<table id="table{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}{p_mask.f_mask.category.S_ROW_COUNT}" cellspacing="1">
@@ -98,7 +98,7 @@
 				<tbody>
 				<!-- BEGIN mask -->
 					<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --><tr class="row4"><!-- ELSE --><tr class="row3"><!-- ENDIF -->
-					<th class="permission_name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" class="trace" onclick="trace('{p_mask.f_mask.category.mask.U_TRACE}'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
+					<th class="permission-name<!-- IF p_mask.f_mask.category.mask.S_ROW_COUNT is even --> row4<!-- ELSE --> row3<!-- ENDIF -->"><!-- IF p_mask.f_mask.category.mask.U_TRACE --><a href="#" class="trace" onclick="trace('{p_mask.f_mask.category.mask.U_TRACE}'); return false;" title="{L_TRACE_SETTING}"><img src="images/icon_trace.gif" alt="{L_TRACE_SETTING}" /></a> <!-- ENDIF -->{p_mask.f_mask.category.mask.PERMISSION}</th>
 					<!-- IF p_mask.S_VIEW -->
 						<td<!-- IF p_mask.f_mask.category.mask.S_YES --> class="yes"<!-- ENDIF -->>&nbsp;</td>
 						<td<!-- IF p_mask.f_mask.category.mask.S_NEVER --> class="never"<!-- ENDIF -->></td>
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index eb84e40435..adc8995c23 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -4,7 +4,7 @@
 */
 function display_checkboxes(status) 
 {
-	var form = document.getElementById('set_permissions');
+	var form = document.getElementById('set-permissions');
 	var cb = document.getElementsByTagName('input');
 	var display;
 
@@ -21,7 +21,7 @@ function display_checkboxes(status)
 	
 	for (var i = 0; i < cb.length; i++ )
 	{
-		if (cb[i].className == 'perm_cb')
+		if (cb[i].className == 'permissions-checkbox')
 		{
 			cb[i].style.display = display;
 		}
@@ -67,7 +67,7 @@ function toggle_opacity(block_id) {
 * except_id = id of the element not to hide
 */
 function reset_opacity(status, except_id) {
-	var perm = document.getElementById('set_permissions');
+	var perm = document.getElementById('set-permissions');
 	var fs = perm.getElementsByTagName('fieldset');
 	var opacity = 5;
 
@@ -90,7 +90,7 @@ function reset_opacity(status, except_id) {
 	}
 
 	//reset checkboxes too
-	marklist('set_permissions', 'inherit', !status);
+	marklist('set-permissions', 'inherit', !status);
 }
 
 
@@ -132,7 +132,7 @@ function set_colours(id, init, quick)
 
 	if (typeof(quick) != 'undefined') 
 	{
-		tab.className = 'perm_preset_' + quick + ' activetab';
+		tab.className = 'permissions-preset-' + quick + ' activetab';
 		return;
 	}
 
@@ -168,11 +168,11 @@ function set_colours(id, init, quick)
 
 	if (init)
 	{
-		tab.className = 'perm_preset_' + colour;
+		tab.className = 'permissions-preset-' + colour;
 	}
 	else
 	{
-		tab.className = 'perm_preset_' + colour + ' activetab';
+		tab.className = 'permissions-preset-' + colour + ' activetab';
 	}
 }
 
@@ -188,7 +188,7 @@ function init_colours(block_id)
 
 	for (var i = 0; i < panels.length; i++)
 	{
-		if(panels[i].className == 'perm_panel')
+		if(panels[i].className == 'permissions-panel')
 		{
 			set_colours(panels[i].id.replace(/options/, ''), true);
 		}