diff --git a/acptemplate/chatRoomAdd.tpl b/acptemplate/chatRoomAdd.tpl
index 2e86b46..88faf22 100644
--- a/acptemplate/chatRoomAdd.tpl
+++ b/acptemplate/chatRoomAdd.tpl
@@ -1,9 +1,5 @@
 {include file='header'}
 
-<!-- ToDo: DEBUG ONLY -->
-<link rel="stylesheet" type="text/css" href="{@$__wcf->getPath('wcf')}style/acl.css" />
-<!-- /DEBUG ONLY -->
-
 <script type="text/javascript" src="{@$__wcf->getPath('wcf')}js/WCF.ACL.js"></script>
 <script type="text/javascript">
 	//<![CDATA[
@@ -19,40 +15,40 @@
 	//]]>
 </script>
 
-<header class="wcf-mainHeading wcf-container">
-	<img src="{@$__wcf->getPath('wcf')}icon/{$action}1.svg" alt="" class="wcf-containerIcon" />
-	<hgroup class="wcf-containerContent">
+<header class="box48 boxHeadline">
+	<img src="{@$__wcf->getPath('wcf')}icon/{$action}1.svg" alt="" class="icon48" />
+	<hgroup>
 		<h1>{lang}wcf.acp.chat.room.{$action}{/lang}</h1>
 	</hgroup>
 </header>
 
 {if $errorField}
-	<p class="wcf-error">{lang}wcf.global.form.error{/lang}</p>
+	<p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
 {if $success|isset}
-	<p class="wcf-success">{lang}wcf.global.form.{$action}.success{/lang}</p>	
+	<p class="success">{lang}wcf.global.form.{$action}.success{/lang}</p>
 {/if}
 
-<div class="wcf-contentHeader">
+<div class="contentNavigation">
 	<nav>
-		<ul class="wcf-largeButtons">
-			<li><a href="{link controller='ChatRoomList'}{/link}" title="{lang}wcf.acp.menu.link.chat.room.list{/lang}" class="wcf-button"><img src="{@$__wcf->getPath('wcf')}icon/chat1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.chat.room.list{/lang}</span></a></li>
+		<ul>
+			<li><a href="{link controller='ChatRoomList'}{/link}" title="{lang}wcf.acp.menu.link.chat.room.list{/lang}" class="button"><img src="{@$__wcf->getPath('wcf')}icon/chat1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.menu.link.chat.room.list{/lang}</span></a></li>
 		</ul>
 	</nav>
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='ChatRoomAdd'}{/link}{else}{link controller='ChatRoomEdit'}{/link}{/if}">
-	<div class="wcf-box wcf-marginTop wcf-boxPadding wcf-shadow1">
+	<div class="container containerPadding sortableListContainer marginTop shadow">
 		<fieldset>
 			<legend>{lang}wcf.acp.chat.room.data{/lang}</legend>
 			
-			<dl{if $errorField == 'title'} class="wcf-formError"{/if}>
+			<dl{if $errorField == 'title'} class="formError"{/if}>
 				<dt><label for="title">{lang}wcf.acp.chat.room.title{/lang}</label></dt>
 				<dd>
 					<input type="text" id="title" name="title" value="{$title}" autofocus="autofocus" class="long" />
 					{if $errorField == 'title'}
-						<small class="wcf-innerError">
+						<small class="innerError">
 							{if $errorType == 'empty'}
 								{lang}wcf.global.form.error.empty{/lang}
 							{else}
@@ -65,12 +61,12 @@
 			
 			{include file='multipleLanguageInputJavascript' elementIdentifier='title'}
 			
-			<dl{if $errorField == 'topic'} class="wcf-formError"{/if}>
+			<dl{if $errorField == 'topic'} class="formError"{/if}>
 				<dt><label for="topic">{lang}wcf.acp.chat.room.topic{/lang}</label></dt>
 				<dd>
 					<input type="text" id="topic" name="topic" value="{$topic}" class="long" />
 					{if $errorField == 'topic'}
-						<small class="wcf-innerError">
+						<small class="innerError">
 							{if $errorType == 'empty'}
 								{lang}wcf.global.form.error.empty{/lang}
 							{else}
@@ -90,10 +86,8 @@
 		</fieldset>
 	</div>
 	
-	<div class="wcf-formSubmit">
-		<input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
+	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		{@SID_INPUT_TAG}
  		{if $roomID|isset}<input type="hidden" name="id" value="{@$roomID}" />{/if}
 	</div>
 </form>
diff --git a/acptemplate/chatRoomList.tpl b/acptemplate/chatRoomList.tpl
index 230e81e..7e5b17e 100644
--- a/acptemplate/chatRoomList.tpl
+++ b/acptemplate/chatRoomList.tpl
@@ -9,60 +9,58 @@
 	//]]>
 </script>
 	
-<header class="wcf-mainHeading wcf-container">
-	<img src="{@$__wcf->getPath('wcf')}icon/chat1.svg" alt="" class="wcf-containerIcon" />
-	<hgroup class="wcf-containerContent">
+<header class="box48 boxHeadline">
+	<img src="{@$__wcf->getPath('wcf')}icon/chat1.svg" alt="" class="icon48" />
+	<hgroup>
 		<h1>{lang}wcf.acp.chat.room.list{/lang}</h1>
 	</hgroup>
 </header>
 
-<div class="wcf-contentHeader">
+<div class="contentNavigation">
 	{pages print=true assign=pagesLinks controller="ChatRoomList" link="pageNo=%d"}
 	
 	{if $__wcf->session->getPermission('admin.content.chat.canAddRoom')}
 		<nav>
-			<ul class="wcf-largeButtons">
-				<li><a href="{link controller='ChatRoomAdd'}{/link}" title="{lang}wcf.acp.chat.room.add{/lang}" class="wcf-button"><img src="{@$__wcf->getPath('wcf')}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.chat.room.add{/lang}</span></a></li>
+			<ul>
+				<li><a href="{link controller='ChatRoomAdd'}{/link}" title="{lang}wcf.acp.chat.room.add{/lang}" class="button"><img src="{@$__wcf->getPath('wcf')}icon/add1.svg" alt="" class="icon24" /> <span>{lang}wcf.acp.chat.room.add{/lang}</span></a></li>
 			</ul>
 		</nav>
 	{/if}
 </div>
-
-<section id="chatRoomList" class="wcf-box wcf-marginTop wcf-boxPadding wcf-shadow1 wcf-sortableListContainer">
-	{hascontent}
-	<ol class="wcf-sortableList" data-object-id="0" start="{$startIndex}">
-		{content}
-			{foreach from=$objects item=chatRoom}
-				<li class="wcf-sortableNode wcf-sortableNoNesting chatRoomRow" data-object-id="{@$chatRoom->roomID}">
-					<span class="wcf-sortableNodeLabel">
-						{if $__wcf->session->getPermission('admin.content.chat.canEditRoom')}
-							<a href="{link controller='ChatRoomEdit' id=$chatRoom->roomID}{/link}">{$chatRoom->title|language}</a>
-						{else}
-							{$chatRoom->title|language}
-						{/if}
-						
-						<span class="wcf-statusDisplay wcf-sortableButtonContainer">
+{hascontent}
+	<section id="chatRoomList" class="container containerPadding sortableListContainer marginTop shadow">
+		<ol class="sortableList" data-object-id="0" start="{$startIndex}">
+			{content}
+				{foreach from=$objects item=chatRoom}
+					<li class="sortableNode sortableNoNesting chatRoomRow" data-object-id="{@$chatRoom->roomID}">
+						<span class="sortableNodeLabel">
 							{if $__wcf->session->getPermission('admin.content.chat.canEditRoom')}
-								<a href="{link controller='ChatRoomEdit' id=$chatRoom->roomID}{/link}"><img src="{@$__wcf->getPath('wcf')}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip" /></a>
-							{/if}
-							{if $__wcf->session->getPermission('admin.content.chat.canDeleteRoom')}
-								<img src="{@$__wcf->getPath('wcf')}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip" data-object-id="{@$chatRoom->roomID}" data-confirm-message="{lang}wcf.acp.chat.delete.sure{/lang}" />
+								<a href="{link controller='ChatRoomEdit' id=$chatRoom->roomID}{/link}">{$chatRoom->title|language}</a>
+							{else}
+								{$chatRoom->title|language}
 							{/if}
+							
+							<span class="statusDisplay sortableButtonContainer">
+								{if $__wcf->session->getPermission('admin.content.chat.canEditRoom')}
+									<a href="{link controller='ChatRoomEdit' id=$chatRoom->roomID}{/link}"><img src="{@$__wcf->getPath('wcf')}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon16" /></a>
+								{/if}
+								{if $__wcf->session->getPermission('admin.content.chat.canDeleteRoom')}
+									<img src="{@$__wcf->getPath('wcf')}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip icon16" data-object-id="{@$chatRoom->roomID}" data-confirm-message="{lang}wcf.acp.chat.delete.sure{/lang}" />
+								{/if}
+							</span>
 						</span>
-					</span>
-					<ol class="wcf-sortableList" data-object-id="{@$chatRoom->roomID}"></ol></li>
-				</li>
-			{/foreach}
-		{/content}
-	</ol>
-	<div class="wcf-formSubmit">
-		<button class="wcf-button" data-type="reset">{lang}wcf.global.button.reset{/lang}</button>
-		<button class="wcf-button default" data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
-	</div>
-	{hascontentelse}
-		<p class="wcf-warning">{lang}wcf.acp.chat.room.noneAvailable{/lang}</p>
-	{/hascontent}
-</section>
+						<ol class="sortableList" data-object-id="{@$chatRoom->roomID}"></ol></li>
+					</li>
+				{/foreach}
+			{/content}
+		</ol>
+		<div class="formSubmit">
+			<button class="button" data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
+		</div>
+	</section>
+{hascontentelse}
+	<p class="warning">{lang}wcf.acp.chat.room.noneAvailable{/lang}</p>
+{/hascontent}
 
 
 {include file='footer'}