diff --git a/file/lib/data/room/RoomAction.class.php b/file/lib/data/room/RoomAction.class.php
index 8350c59..fc9ee46 100644
--- a/file/lib/data/room/RoomAction.class.php
+++ b/file/lib/data/room/RoomAction.class.php
@@ -124,7 +124,7 @@ public function updatePosition() {
 	 * Validates parameters and permissions.
 	 */
 	public function validateGetRoomList() {
-		if (!CHAT_ACTIVE) throw new \wcf\system\exception\IllegalLinkException();
+		if (!MODULE_CHAT) throw new \wcf\system\exception\IllegalLinkException();
 		
 		$rooms = Room::getCache();
 		$roomID = ChatUtil::readUserData('roomID');
@@ -161,7 +161,7 @@ public function getRoomList() {
 	 * Validates parameters and permissions.
 	 */
 	public function validateLeave() {
-		if (!CHAT_ACTIVE) throw new \wcf\system\exception\IllegalLinkException();
+		if (!MODULE_CHAT) throw new \wcf\system\exception\IllegalLinkException();
 		
 		unset($this->parameters['user']);
 		
@@ -228,7 +228,7 @@ public function removeDeadUsers() {
 	 * Validates permissions.
 	 */
 	public function validateGetDashboardRoomList() {
-		if (!CHAT_ACTIVE) throw new \wcf\system\exception\IllegalLinkException();
+		if (!MODULE_CHAT) throw new \wcf\system\exception\IllegalLinkException();
 	}
 	
 	/**
diff --git a/file/lib/page/ChatPage.class.php b/file/lib/page/ChatPage.class.php
index 87c4322..5942834 100644
--- a/file/lib/page/ChatPage.class.php
+++ b/file/lib/page/ChatPage.class.php
@@ -21,7 +21,7 @@ class ChatPage extends \wcf\page\AbstractPage {
 	/**
 	 * @see \wcf\page\AbstractPage::$neededModules
 	 */
-	public $neededModules = array('CHAT_ACTIVE');
+	public $neededModules = array('MODULE_CHAT');
 	
 	/**
 	 * @see \wcf\page\AbstractPage::$neededPermissions
diff --git a/file/lib/page/CopyrightPage.class.php b/file/lib/page/CopyrightPage.class.php
index 6741e5f..4b853f0 100644
--- a/file/lib/page/CopyrightPage.class.php
+++ b/file/lib/page/CopyrightPage.class.php
@@ -19,7 +19,7 @@ class CopyrightPage extends \wcf\page\AbstractPage {
 	/**
 	 * @see \wcf\page\AbstractPage::$neededModules
 	 */
-	public $neededModules = array('CHAT_ACTIVE');
+	public $neededModules = array('MODULE_CHAT');
 	
 	/**
 	 * @see \wcf\page\AbstractPage::$neededPermissions
diff --git a/file/lib/page/LogPage.class.php b/file/lib/page/LogPage.class.php
index 5b6b9ad..5a9fa50 100644
--- a/file/lib/page/LogPage.class.php
+++ b/file/lib/page/LogPage.class.php
@@ -30,7 +30,7 @@ class LogPage extends \wcf\page\AbstractPage {
 	/**
 	 * @see \wcf\page\AbstractPage::$neededModules
 	 */
-	public $neededModules = array('CHAT_ACTIVE');
+	public $neededModules = array('MODULE_CHAT');
 	
 	/**
 	 * @see \wcf\page\AbstractPage::$neededPermissions
diff --git a/file/lib/page/NewMessagesPage.class.php b/file/lib/page/NewMessagesPage.class.php
index e8a48c8..066eb3b 100644
--- a/file/lib/page/NewMessagesPage.class.php
+++ b/file/lib/page/NewMessagesPage.class.php
@@ -29,7 +29,7 @@ class NewMessagesPage extends \wcf\page\AbstractPage {
 	/**
 	 * @see \wcf\page\AbstractPage::$neededModules
 	 */
-	public $neededModules = array('CHAT_ACTIVE');
+	public $neededModules = array('MODULE_CHAT');
 	
 	/**
 	 * @see \wcf\page\AbstractPage::$neededPermissions
diff --git a/file/lib/system/dashboard/box/OnlineListDashboardBox.class.php b/file/lib/system/dashboard/box/OnlineListDashboardBox.class.php
index bdfde1c..4f87ffc 100644
--- a/file/lib/system/dashboard/box/OnlineListDashboardBox.class.php
+++ b/file/lib/system/dashboard/box/OnlineListDashboardBox.class.php
@@ -24,7 +24,7 @@ class OnlineListDashboardBox extends \wcf\system\dashboard\box\AbstractContentDa
 	public function init(\wcf\data\dashboard\box\DashboardBox $box, \wcf\page\IPage $page) {
 		parent::init($box, $page);
 		
-		if (!CHAT_ACTIVE) return;
+		if (!MODULE_CHAT) return;
 		if (!\wcf\system\WCF::getUser()->userID) return;
 		
 		$this->rooms = data\room\Room::getCache();
diff --git a/language/de.xml b/language/de.xml
index 13414bd..dd6e1d5 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -35,7 +35,7 @@
 	<category name="wcf.acp.option">
 		<item name="wcf.acp.option.category.chat"><![CDATA[Chat]]></item>
 		<item name="wcf.acp.option.category.chat.general"><![CDATA[Allgemein]]></item>
-		<item name="wcf.acp.option.chat_active"><![CDATA[Chat aktivieren]]></item>
+		<item name="wcf.acp.option.module_chat"><![CDATA[Tims Chat]]></item>
 		<item name="wcf.acp.option.chat_reloadtime"><![CDATA[Nachladezeit]]></item>
 		<item name="wcf.acp.option.chat_reloadtime.description"><![CDATA[Wartezeit zwischen zwei Anfragen zum Server. [Zeit in Sekunden]]]></item>
 		<item name="wcf.acp.option.chat_lastmessages"><![CDATA[Anzahl der letzten Nachrichten]]></item>
diff --git a/option.xml b/option.xml
index 05c8e8b..24bd39d 100644
--- a/option.xml
+++ b/option.xml
@@ -14,10 +14,9 @@
 		<options>
 			<!-- general chat options -->
 			<option name="chat_active">
-				<categoryname>chat.general</categoryname>
+				<categoryname>module.community</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
-				<showorder>1</showorder>
 			</option>
 			<option name="chat_reloadtime">
 				<categoryname>chat.general</categoryname>
@@ -25,7 +24,6 @@
 				<defaultvalue>5</defaultvalue>
 				<minvalue>1</minvalue>
 				<maxvalue>15</maxvalue>
-				<showorder>2</showorder>
 			</option>
 			<option name="chat_lastmessages">
 				<categoryname>chat.general</categoryname>
@@ -33,13 +31,11 @@
 				<defaultvalue>5</defaultvalue>
 				<minvalue>0</minvalue>
 				<maxvalue>50</maxvalue>
-				<showorder>4</showorder>
 			</option>
 			<option name="chat_display_join_leave">
 				<categoryname>chat.general</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
-				<showorder>5</showorder>
 			</option>
 			<option name="chat_max_length">
 				<categoryname>chat.general</categoryname>
@@ -47,13 +43,11 @@
 				<defaultvalue>500</defaultvalue>
 				<minvalue>1</minvalue>
 				<maxvalue>5000</maxvalue>
-				<showorder>8</showorder>
 			</option>
 			<option name="chat_show_version">
 				<categoryname>chat.general</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
-				<showorder>9</showorder>
 			</option>
 			<!-- general chat options end -->
 			
@@ -62,14 +56,12 @@
 				<categoryname>chat.log</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue><![CDATA[1]]></defaultvalue>
-				<showorder>1</showorder>
 			</option>
 			<option name="chat_log_archivetime">
 				<categoryname>chat.log</categoryname>
 				<optiontype>integer</optiontype>
 				<defaultvalue>10080</defaultvalue>
 				<minvalue>-1</minvalue>
-				<showorder>2</showorder>
 			</option>
 			<!--log options end-->
 		</options>
diff --git a/package.xml b/package.xml
index 99b57d9..2ff79af 100644
--- a/package.xml
+++ b/package.xml
@@ -5,7 +5,7 @@
 		<packagedescription><![CDATA[Chat for WoltLab Community Framework™.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Chat für WoltLab Community Framework™.]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>3.0.0 Alpha 22</version><!-- Codename: Codenames are overrated -->
+		<version>3.0.0 Alpha 23</version><!-- Codename: Codenames are overrated -->
 		<date>2011-11-26</date>
 	</packageinformation>