From 6476e7a1031a9229a2b74b32df6fce6d29d73699 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 1 Mar 2016 18:28:38 +0100
Subject: [PATCH] Overhauled ACP layout, menu and permissions

---
 com.woltlab.wcf/acpMenu.xml                   | 1311 +++++++++--------
 com.woltlab.wcf/templates/userNotice.tpl      |    2 +-
 com.woltlab.wcf/userGroupOption.xml           |  373 +++--
 .../files/acp/images/wcfLogo-small.png        |  Bin 0 -> 1751 bytes
 wcfsetup/install/files/acp/images/wcfLogo.png |  Bin 3555 -> 2928 bytes
 wcfsetup/install/files/acp/js/WCF.ACP.js      |   10 +-
 wcfsetup/install/files/acp/style/layout.scss  |  186 +++
 .../install/files/acp/style/mainMenu.scss     |   59 -
 .../install/files/acp/style/pageMenu.scss     |    0
 .../install/files/acp/templates/footer.tpl    |    5 +-
 .../install/files/acp/templates/header.tpl    |  123 +-
 .../install/files/acp/templates/index.tpl     |    2 +-
 .../files/acp/templates/packageList.tpl       |   10 +-
 .../files/acp/templates/pageHeader.tpl        |   14 -
 .../files/acp/templates/pageHeaderLogo.tpl    |    7 +-
 .../files/acp/templates/pageHeaderMenu.tpl    |   51 +-
 .../files/acp/templates/pageHeaderSearch.tpl  |   16 +-
 .../files/acp/templates/pageHeaderUser.tpl    |   20 +-
 .../install/files/acp/templates/pageMenu.tpl  |   53 +
 .../files/js/WoltLab/WCF/Acp/Bootstrap.js     |   13 +-
 .../files/js/WoltLab/WCF/Acp/Ui/Page/Menu.js  |   71 +
 .../lib/acp/action/CacheClearAction.class.php |    2 +-
 .../acp/form/ApplicationEditForm.class.php    |    2 +-
 .../lib/acp/form/CronjobAddForm.class.php     |    2 +-
 .../lib/acp/form/DataImportForm.class.php     |    2 +-
 .../files/lib/acp/form/OptionForm.class.php   |    2 +-
 .../form/PackageStartInstallForm.class.php    |    2 +-
 .../form/PackageUpdateServerAddForm.class.php |    2 +-
 .../lib/acp/form/RescueModeForm.class.php     |    2 +-
 .../acp/page/ACPSessionLogListPage.class.php  |    2 +-
 .../lib/acp/page/ACPSessionLogPage.class.php  |    2 +-
 .../page/ApplicationManagementPage.class.php  |    2 +-
 .../lib/acp/page/CacheListPage.class.php      |    2 +-
 .../lib/acp/page/CronjobListPage.class.php    |    2 +-
 .../lib/acp/page/CronjobLogListPage.class.php |    2 +-
 .../acp/page/ExceptionLogViewPage.class.php   |    2 +-
 .../files/lib/acp/page/PHPInfoPage.class.php  |    2 +-
 .../PackageInstallationConfirmPage.class.php  |    4 +-
 .../lib/acp/page/PackageListPage.class.php    |    2 +-
 .../files/lib/acp/page/PackagePage.class.php  |    2 +-
 .../lib/acp/page/PackageUpdatePage.class.php  |    2 +-
 .../PackageUpdateServerListPage.class.php     |    2 +-
 .../PluginStorePurchasedItemsPage.class.php   |    2 +-
 .../lib/acp/page/RebuildDataPage.class.php    |    2 +-
 .../files/lib/acp/page/StatPage.class.php     |    4 +-
 ...serAuthenticationFailureListPage.class.php |    2 +-
 .../lib/data/cronjob/CronjobAction.class.php  |    6 +-
 .../cronjob/log/CronjobLogAction.class.php    |    2 +-
 .../lib/data/option/OptionAction.class.php    |    6 +-
 .../category/OptionCategoryAction.class.php   |    6 +-
 .../files/lib/data/package/Package.class.php  |    2 +-
 .../lib/data/package/PackageAction.class.php  |    8 +-
 .../PackageInstallationQueueAction.class.php  |    2 +-
 .../update/PackageUpdateAction.class.php      |   10 +-
 .../PackageUpdateServerAction.class.php       |    6 +-
 .../data/stat/daily/StatDailyAction.class.php |    2 +-
 .../install/files/lib/system/CLIWCF.class.php |    2 +-
 .../cli/command/ImportCLICommand.class.php    |    2 +-
 .../cli/command/PackageCLICommand.class.php   |    6 +-
 .../system/importer/ImportHandler.class.php   |    2 +-
 .../PackageACPSearchResultProvider.class.php  |    2 +-
 .../lib/system/style/StyleCompiler.class.php  |    2 +-
 .../AbstractRebuildDataWorker.class.php       |    2 +-
 .../lib/system/worker/ImportWorker.class.php  |    2 +-
 .../files/style/layout/pageFooter.scss        |    4 +-
 wcfsetup/install/lang/de.xml                  |   58 +-
 wcfsetup/install/lang/en.xml                  |   46 +-
 wcfsetup/setup/db/install.sql                 |    2 +-
 68 files changed, 1308 insertions(+), 1252 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/images/wcfLogo-small.png
 create mode 100644 wcfsetup/install/files/acp/style/layout.scss
 delete mode 100644 wcfsetup/install/files/acp/style/mainMenu.scss
 create mode 100644 wcfsetup/install/files/acp/style/pageMenu.scss
 create mode 100644 wcfsetup/install/files/acp/templates/pageMenu.tpl
 create mode 100644 wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Page/Menu.js

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 29818e763c..3d3f75b860 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -1,669 +1,670 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/acpMenu.xsd">
 	<import>
-		<acpmenuitem name="wcf.acp.menu.link.system">
+		<!-- configuration -->
+		<acpmenuitem name="wcf.acp.menu.link.configuration">
 			<showorder>1</showorder>
-		</acpmenuitem>
-		
-		<!-- options -->
-		<acpmenuitem name="wcf.acp.menu.link.option">
-			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>1</showorder>
-			<permissions>admin.system.canEditOption</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.option.category">
-			<parent>wcf.acp.menu.link.option</parent>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.option.management">
-			<parent>wcf.acp.menu.link.option</parent>
-			<showorder>2</showorder>
-		</acpmenuitem>
-		<!-- /options -->
-		
-		<!-- packages -->
-		<acpmenuitem name="wcf.acp.menu.link.package">
-			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>2</showorder>
-			<permissions>admin.system.package.canInstallPackage,admin.system.package.canUpdatePackage,admin.system.package.canUninstallPackage,admin.system.package.canEditServer</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.application.management">
-			<controller><![CDATA[wcf\acp\page\ApplicationManagementPage]]></controller>
-			<parent>wcf.acp.menu.link.package</parent>
-			<permissions>admin.system.canManageApplication</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.package.list">
-			<controller><![CDATA[wcf\acp\page\PackageListPage]]></controller>
-			<parent>wcf.acp.menu.link.package</parent>
-			<permissions>admin.system.package.canUpdatePackage,admin.system.package.canUninstallPackage</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.package.install">
-			<controller><![CDATA[wcf\acp\form\PackageStartInstallForm]]></controller>
-			<parent>wcf.acp.menu.link.package.list</parent>
-			<permissions>admin.system.package.canInstallPackage</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.package.server.list">
-			<controller><![CDATA[wcf\acp\page\PackageUpdateServerListPage]]></controller>
-			<parent>wcf.acp.menu.link.package</parent>
-			<permissions>admin.system.package.canEditServer</permissions>
-		</acpmenuitem>
-		<!-- /packages -->
-		
-		<!-- cronjobs -->
-		<acpmenuitem name="wcf.acp.menu.link.cronjob">
-			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>3</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.cronjob.list">
-			<controller><![CDATA[wcf\acp\page\CronjobListPage]]></controller>
-			<parent>wcf.acp.menu.link.cronjob</parent>
-			<permissions>admin.system.canManageCronjob</permissions>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.cronjob.add">
-			<controller><![CDATA[wcf\acp\form\CronjobAddForm]]></controller>
-			<parent>wcf.acp.menu.link.cronjob.list</parent>
-			<permissions>admin.system.canManageCronjob</permissions>
-			<showorder>2</showorder>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		<!-- /cronjobs -->
-		
-		<acpmenuitem name="wcf.acp.menu.link.captcha">
-			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>4</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
-			<parent>wcf.acp.menu.link.captcha</parent>
-			<controller><![CDATA[wcf\acp\page\CaptchaQuestionListPage]]></controller>
-			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
-			<parent>wcf.acp.menu.link.captcha.question.list</parent>
-			<controller><![CDATA[wcf\acp\form\CaptchaQuestionAddForm]]></controller>
-			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<!-- maintenance -->
-		<acpmenuitem name="wcf.acp.menu.link.maintenance">
-			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>5</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.maintenance.cache">
-			<controller><![CDATA[wcf\acp\page\CacheListPage]]></controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.system.canManageApplication</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.maintenance.rebuildData">
-			<controller><![CDATA[wcf\acp\page\RebuildDataPage]]></controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.system.canRebuildData</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.maintenance.import">
-			<controller><![CDATA[wcf\acp\form\DataImportForm]]></controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.system.canImportData</permissions>
-		</acpmenuitem>
-		<!-- /maintenance -->
-		
-		<!-- log -->
-		<acpmenuitem name="wcf.acp.menu.link.log">
-			<parent>wcf.acp.menu.link.system</parent>
-			<showorder>6</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.log.session">
-			<controller><![CDATA[wcf\acp\page\ACPSessionLogListPage]]></controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<permissions>admin.system.canViewLog</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.log.cronjob">
-			<controller><![CDATA[wcf\acp\page\CronjobLogListPage]]></controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<permissions>admin.system.canManageCronjob</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.log.exception">
-			<controller><![CDATA[wcf\acp\page\ExceptionLogViewPage]]></controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<permissions>admin.system.canViewLog</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.log.stat">
-			<controller><![CDATA[wcf\acp\page\StatPage]]></controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<permissions>admin.system.canViewLog</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.log.authentication.failure">
-			<controller><![CDATA[wcf\acp\page\UserAuthenticationFailureListPage]]></controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<permissions>admin.system.canViewLog</permissions>
-			<options>enable_user_authentication_failure</options>
-		</acpmenuitem>
-		<!-- /log -->
-		
+			<icon>fa-wrench</icon>
+		</acpmenuitem>
+		
+			<!-- option -->
+			<acpmenuitem name="wcf.acp.menu.link.option">
+				<parent>wcf.acp.menu.link.configuration</parent>
+				<showorder>1</showorder>
+				<permissions>admin.configuration.canEditOption</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.option.category">
+				<parent>wcf.acp.menu.link.option</parent>
+				<showorder>1</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.option.management">
+				<parent>wcf.acp.menu.link.option</parent>
+				<showorder>2</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.activityPoint">
+				<parent>wcf.acp.menu.link.option</parent>
+				<controller><![CDATA[wcf\acp\form\UserActivityPointOptionForm]]></controller>
+				<permissions>admin.user.canEditActivityPoints</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings">
+				<parent>wcf.acp.menu.link.option</parent>
+				<controller><![CDATA[wcf\acp\form\NotificationPresetSettingsForm]]></controller>
+				<permissions>admin.user.canEditUser</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.userOptionDefaults">
+				<controller><![CDATA[wcf\acp\form\UserOptionSetDefaultsForm]]></controller>
+				<parent>wcf.acp.menu.link.option</parent>
+				<permissions>admin.user.canManageUserOption</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
+				<parent>wcf.acp.menu.link.option</parent>
+				<controller><![CDATA[wcf\acp\page\CaptchaQuestionListPage]]></controller>
+				<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
+				<parent>wcf.acp.menu.link.captcha.question.list</parent>
+				<controller><![CDATA[wcf\acp\form\CaptchaQuestionAddForm]]></controller>
+				<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /option -->
+			
+			<!-- package -->
+			<acpmenuitem name="wcf.acp.menu.link.package">
+				<parent>wcf.acp.menu.link.configuration</parent>
+				<showorder>2</showorder>
+				<permissions>admin.configuration.package.canInstallPackage,admin.configuration.package.canUpdatePackage,admin.configuration.package.canUninstallPackage,admin.configuration.package.canEditServer</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.application.management">
+				<controller><![CDATA[wcf\acp\page\ApplicationManagementPage]]></controller>
+				<parent>wcf.acp.menu.link.package</parent>
+				<permissions>admin.configuration.canManageApplication</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.package.list">
+				<controller><![CDATA[wcf\acp\page\PackageListPage]]></controller>
+				<parent>wcf.acp.menu.link.package</parent>
+				<permissions>admin.configuration.package.canUpdatePackage,admin.configuration.package.canUninstallPackage</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.package.install">
+				<controller><![CDATA[wcf\acp\form\PackageStartInstallForm]]></controller>
+				<parent>wcf.acp.menu.link.package.list</parent>
+				<permissions>admin.configuration.package.canInstallPackage</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.package.server.list">
+				<controller><![CDATA[wcf\acp\page\PackageUpdateServerListPage]]></controller>
+				<parent>wcf.acp.menu.link.package</parent>
+				<permissions>admin.configuration.package.canEditServer</permissions>
+			</acpmenuitem>
+			<!-- /package -->
+		
+		<!-- /configuration -->
+		
+		<!-- user -->
 		<acpmenuitem name="wcf.acp.menu.link.user">
 			<showorder>2</showorder>
-		</acpmenuitem>
-		
-		<!-- users -->
-		<acpmenuitem name="wcf.acp.menu.link.user.management">
-			<parent>wcf.acp.menu.link.user</parent>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.list">
-			<controller><![CDATA[wcf\acp\page\UserListPage]]></controller>
-			<parent>wcf.acp.menu.link.user.management</parent>
-			<permissions>admin.user.canSearchUser</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.search">
-			<controller><![CDATA[wcf\acp\form\UserSearchForm]]></controller>
-			<parent>wcf.acp.menu.link.user.list</parent>
-			<permissions>admin.user.canSearchUser</permissions>
-			<icon>fa-search</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.add">
-			<controller><![CDATA[wcf\acp\form\UserAddForm]]></controller>
-			<parent>wcf.acp.menu.link.user.list</parent>
-			<permissions>admin.user.canAddUser</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.bulkProcessing">
-			<controller><![CDATA[wcf\acp\form\UserBulkProcessingForm]]></controller>
-			<parent>wcf.acp.menu.link.user.management</parent>
-			<permissions>admin.user.canEditUser,admin.user.canDeleteUser,admin.user.canMailUser</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.mail">
-			<controller><![CDATA[wcf\acp\form\UserMailForm]]></controller>
-			<link><![CDATA[action=all]]></link>
-			<parent>wcf.acp.menu.link.user.management</parent>
-			<permissions>admin.user.canMailUser</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.activityPoint">
-			<parent>wcf.acp.menu.link.user.management</parent>
-			<controller><![CDATA[wcf\acp\form\UserActivityPointOptionForm]]></controller>
-			<permissions>admin.user.canEditActivityPoints</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings">
-			<parent>wcf.acp.menu.link.user.management</parent>
-			<controller><![CDATA[wcf\acp\form\NotificationPresetSettingsForm]]></controller>
-			<permissions>admin.user.canEditUser</permissions>
-		</acpmenuitem>
-		<!-- /users -->
-		
-		<!-- user groups -->
-		<acpmenuitem name="wcf.acp.menu.link.group">
-			<parent>wcf.acp.menu.link.user</parent>
-			<showorder>2</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.group.list">
-			<controller><![CDATA[wcf\acp\page\UserGroupListPage]]></controller>
-			<parent>wcf.acp.menu.link.group</parent>
-			<permissions>admin.user.canEditGroup,admin.user.canDeleteGroup</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.group.add">
-			<controller><![CDATA[wcf\acp\form\UserGroupAddForm]]></controller>
-			<parent>wcf.acp.menu.link.group.list</parent>
-			<permissions>admin.user.canAddGroup</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.group.mail">
-			<controller><![CDATA[wcf\acp\form\UserMailForm]]></controller>
-			<link><![CDATA[action=group]]></link>
-			<parent>wcf.acp.menu.link.group</parent>
-			<permissions>admin.user.canMailUser</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.group.assignment">
-			<controller><![CDATA[wcf\acp\page\UserGroupAssignmentListPage]]></controller>
-			<parent>wcf.acp.menu.link.group</parent>
-			<permissions>admin.user.canManageGroupAssignment</permissions>
-		</acpmenuitem>
-		<!-- user groups -->
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.rank">
-			<parent>wcf.acp.menu.link.user</parent>
-			<options>module_user_rank</options>
-			<showorder>3</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.rank.list">
-			<parent>wcf.acp.menu.link.user.rank</parent>
-			<controller><![CDATA[wcf\acp\page\UserRankListPage]]></controller>
-			<permissions>admin.user.rank.canManageRank</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.rank.add">
-			<parent>wcf.acp.menu.link.user.rank.list</parent>
-			<controller><![CDATA[wcf\acp\form\UserRankAddForm]]></controller>
-			<permissions>admin.user.rank.canManageRank</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<!-- user options -->
-		<acpmenuitem name="wcf.acp.menu.link.user.option">
-			<parent>wcf.acp.menu.link.user</parent>
-			<showorder>4</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.option.list">
-			<controller><![CDATA[wcf\acp\page\UserOptionListPage]]></controller>
-			<parent>wcf.acp.menu.link.user.option</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.option.add">
-			<controller><![CDATA[wcf\acp\form\UserOptionAddForm]]></controller>
-			<parent>wcf.acp.menu.link.user.option.list</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.option.category.list">
-			<controller><![CDATA[wcf\acp\page\UserOptionCategoryListPage]]></controller>
-			<parent>wcf.acp.menu.link.user.option</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.option.category.add">
-			<controller><![CDATA[wcf\acp\form\UserOptionCategoryAddForm]]></controller>
-			<parent>wcf.acp.menu.link.user.option.category.list</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.user.option.setDefaults">
-			<controller><![CDATA[wcf\acp\form\UserOptionSetDefaultsForm]]></controller>
-			<parent>wcf.acp.menu.link.user.option</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-		</acpmenuitem>
-		<!-- /user options -->
-		
-		<acpmenuitem name="wcf.acp.menu.link.notice">
-			<parent>wcf.acp.menu.link.user</parent>
-			<showorder>5</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.notice.list">
-			<controller><![CDATA[wcf\acp\page\NoticeListPage]]></controller>
-			<parent>wcf.acp.menu.link.notice</parent>
-			<permissions>admin.notice.canManageNotice</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.notice.add">
-			<controller><![CDATA[wcf\acp\form\NoticeAddForm]]></controller>
-			<parent>wcf.acp.menu.link.notice.list</parent>
-			<permissions>admin.notice.canManageNotice</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.paidSubscription">
-			<parent>wcf.acp.menu.link.user</parent>
-			<showorder>6</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.list">
-			<controller><![CDATA[wcf\acp\page\PaidSubscriptionListPage]]></controller>
-			<parent>wcf.acp.menu.link.paidSubscription</parent>
-			<permissions>admin.paidSubscription.canManageSubscription</permissions>
-			<options>module_paid_subscription</options>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.user.list">
-			<controller><![CDATA[wcf\acp\page\PaidSubscriptionUserListPage]]></controller>
-			<parent>wcf.acp.menu.link.paidSubscription</parent>
-			<permissions>admin.paidSubscription.canManageSubscription</permissions>
-			<options>module_paid_subscription</options>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.transactionLog.list">
-			<controller><![CDATA[wcf\acp\page\PaidSubscriptionTransactionLogListPage]]></controller>
-			<parent>wcf.acp.menu.link.paidSubscription</parent>
-			<permissions>admin.paidSubscription.canManageSubscription</permissions>
-			<options>module_paid_subscription</options>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.display">
-			<showorder>3</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.dashboard">
-			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.dashboard.list">
-			<parent>wcf.acp.menu.link.dashboard</parent>
-			<controller><![CDATA[wcf\acp\page\DashboardListPage]]></controller>
-			<permissions>admin.content.dashboard.canEditDashboard</permissions>
-		</acpmenuitem>
-		
-		<!-- style -->
-		<acpmenuitem name="wcf.acp.menu.link.style">
-			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>2</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.style.list">
-			<controller><![CDATA[wcf\acp\page\StyleListPage]]></controller>
-			<parent>wcf.acp.menu.link.style</parent>
-			<permissions>admin.style.canManageStyle</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.style.import">
-			<controller><![CDATA[wcf\acp\form\StyleImportForm]]></controller>
-			<parent>wcf.acp.menu.link.style.list</parent>
-			<permissions>admin.style.canManageStyle</permissions>
-			<icon>fa-upload</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.style.add">
-			<controller><![CDATA[wcf\acp\form\StyleAddForm]]></controller>
-			<parent>wcf.acp.menu.link.style.list</parent>
-			<permissions>admin.style.canManageStyle</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		<!-- /style -->
-		
-		<!-- page menu -->
-		<acpmenuitem name="wcf.acp.menu.link.pageMenu">
-			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>3</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.pageMenu.list">
-			<controller><![CDATA[wcf\acp\page\PageMenuItemListPage]]></controller>
-			<parent>wcf.acp.menu.link.pageMenu</parent>
-			<permissions>admin.display.canManagePageMenu</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.pageMenu.add">
-			<controller><![CDATA[wcf\acp\form\PageMenuItemAddForm]]></controller>
-			<parent>wcf.acp.menu.link.pageMenu.list</parent>
-			<permissions>admin.display.canManagePageMenu</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		<!-- /page menu -->
-		
-		<!-- template -->
-		<acpmenuitem name="wcf.acp.menu.link.template">
-			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>4</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.template.list">
-			<controller><![CDATA[wcf\acp\page\TemplateListPage]]></controller>
-			<parent>wcf.acp.menu.link.template</parent>
-			<permissions>admin.template.canManageTemplate</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.template.add">
-			<controller><![CDATA[wcf\acp\form\TemplateAddForm]]></controller>
-			<parent>wcf.acp.menu.link.template.list</parent>
-			<permissions>admin.template.canManageTemplate</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.template.group.list">
-			<controller><![CDATA[wcf\acp\page\TemplateGroupListPage]]></controller>
-			<parent>wcf.acp.menu.link.template</parent>
-			<permissions>admin.template.canManageTemplate</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.template.group.add">
-			<controller><![CDATA[wcf\acp\form\TemplateGroupAddForm]]></controller>
-			<parent>wcf.acp.menu.link.template.group.list</parent>
-			<permissions>admin.template.canManageTemplate</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		<!-- /template -->
-		
-		<!-- language -->
-		<acpmenuitem name="wcf.acp.menu.link.language">
-			<parent>wcf.acp.menu.link.display</parent>
-			<showorder>5</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.language.list">
-			<parent>wcf.acp.menu.link.language</parent>
-			<controller><![CDATA[wcf\acp\page\LanguageListPage]]></controller>
-			<permissions>admin.language.canManageLanguage</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.language.import">
-			<parent>wcf.acp.menu.link.language.list</parent>
-			<controller><![CDATA[wcf\acp\form\LanguageImportForm]]></controller>
-			<permissions>admin.language.canManageLanguage</permissions>
-			<icon>fa-upload</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.language.item.list">
-			<parent>wcf.acp.menu.link.language</parent>
-			<controller><![CDATA[wcf\acp\form\LanguageItemList]]></controller>
-			<permissions>admin.language.canManageLanguage</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.language.multilingualism">
-			<parent>wcf.acp.menu.link.language</parent>
-			<controller><![CDATA[wcf\acp\form\LanguageMultilingualismForm]]></controller>
-			<permissions>admin.language.canManageLanguage</permissions>
-		</acpmenuitem>
-		
-		<!-- <acpmenuitem name="wcf.acp.menu.link.language.server">
-			<parent>wcf.acp.menu.link.language</parent>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.language.server.list">
-			<controller><![CDATA[wcf\acp\page\LanguageServerListPage]]></controller>
-			<parent>wcf.acp.menu.link.language.server</parent>
-			<permissions>admin.language.canManageLanguage</permissions>
-		</acpmenuitem>-->
-		<!-- /language -->
-		
-		<acpmenuitem name="wcf.acp.menu.link.ad">
-			<parent>wcf.acp.menu.link.display</parent>
-			<!-- do NOT use 'module_ad', the ACP checkbox is incorrectly recognized by adblockers -->
-			<options>module_wcf_ad</options>
-			<showorder>6</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.ad.list">
-			<controller><![CDATA[wcf\acp\page\AdListPage]]></controller>
-			<parent>wcf.acp.menu.link.ad</parent>
-			<permissions>admin.ad.canManageAd</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.ad.add">
-			<controller><![CDATA[wcf\acp\form\AdAddForm]]></controller>
-			<parent>wcf.acp.menu.link.ad.list</parent>
-			<permissions>admin.ad.canManageAd</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
+			<icon>fa-users</icon>
+		</acpmenuitem>
+		
+			<!-- management -->
+			<acpmenuitem name="wcf.acp.menu.link.user.management">
+				<parent>wcf.acp.menu.link.user</parent>
+				<showorder>1</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.user.list">
+				<controller><![CDATA[wcf\acp\page\UserListPage]]></controller>
+				<parent>wcf.acp.menu.link.user.management</parent>
+				<permissions>admin.user.canSearchUser</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.user.search">
+				<controller><![CDATA[wcf\acp\form\UserSearchForm]]></controller>
+				<parent>wcf.acp.menu.link.user.list</parent>
+				<permissions>admin.user.canSearchUser</permissions>
+				<icon>fa-search</icon>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.user.add">
+				<controller><![CDATA[wcf\acp\form\UserAddForm]]></controller>
+				<parent>wcf.acp.menu.link.user.list</parent>
+				<permissions>admin.user.canAddUser</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.user.bulkProcessing">
+				<controller><![CDATA[wcf\acp\form\UserBulkProcessingForm]]></controller>
+				<parent>wcf.acp.menu.link.user.management</parent>
+				<permissions>admin.user.canEditUser,admin.user.canDeleteUser,admin.user.canMailUser</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.user.mail">
+				<controller><![CDATA[wcf\acp\form\UserMailForm]]></controller>
+				<link><![CDATA[action=all]]></link>
+				<parent>wcf.acp.menu.link.user.management</parent>
+				<permissions>admin.user.canMailUser</permissions>
+			</acpmenuitem>
+			<!-- /management -->
+			
+			<!-- group -->
+			<acpmenuitem name="wcf.acp.menu.link.group">
+				<parent>wcf.acp.menu.link.user</parent>
+				<showorder>2</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.group.list">
+				<controller><![CDATA[wcf\acp\page\UserGroupListPage]]></controller>
+				<parent>wcf.acp.menu.link.group</parent>
+				<permissions>admin.user.canEditGroup,admin.user.canDeleteGroup</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.group.add">
+				<controller><![CDATA[wcf\acp\form\UserGroupAddForm]]></controller>
+				<parent>wcf.acp.menu.link.group.list</parent>
+				<permissions>admin.user.canAddGroup</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.group.mail">
+				<controller><![CDATA[wcf\acp\form\UserMailForm]]></controller>
+				<link><![CDATA[action=group]]></link>
+				<parent>wcf.acp.menu.link.group</parent>
+				<permissions>admin.user.canMailUser</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.group.assignment">
+				<controller><![CDATA[wcf\acp\page\UserGroupAssignmentListPage]]></controller>
+				<parent>wcf.acp.menu.link.group</parent>
+				<permissions>admin.user.canManageGroupAssignment</permissions>
+			</acpmenuitem>
+			<!-- /group -->
+			
+			<!-- rank -->
+			<acpmenuitem name="wcf.acp.menu.link.user.rank">
+				<parent>wcf.acp.menu.link.user</parent>
+				<options>module_user_rank</options>
+				<showorder>3</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.user.rank.list">
+				<parent>wcf.acp.menu.link.user.rank</parent>
+				<controller><![CDATA[wcf\acp\page\UserRankListPage]]></controller>
+				<permissions>admin.user.rank.canManageRank</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.user.rank.add">
+				<parent>wcf.acp.menu.link.user.rank.list</parent>
+				<controller><![CDATA[wcf\acp\form\UserRankAddForm]]></controller>
+				<permissions>admin.user.rank.canManageRank</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /rank -->
+			
+			<!-- option -->
+			<acpmenuitem name="wcf.acp.menu.link.user.option">
+				<parent>wcf.acp.menu.link.user</parent>
+				<showorder>4</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.user.option.list">
+				<controller><![CDATA[wcf\acp\page\UserOptionListPage]]></controller>
+				<parent>wcf.acp.menu.link.user.option</parent>
+				<permissions>admin.user.canManageUserOption</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.user.option.add">
+				<controller><![CDATA[wcf\acp\form\UserOptionAddForm]]></controller>
+				<parent>wcf.acp.menu.link.user.option.list</parent>
+				<permissions>admin.user.canManageUserOption</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.user.option.category.list">
+				<controller><![CDATA[wcf\acp\page\UserOptionCategoryListPage]]></controller>
+				<parent>wcf.acp.menu.link.user.option</parent>
+				<permissions>admin.user.canManageUserOption</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.user.option.category.add">
+				<controller><![CDATA[wcf\acp\form\UserOptionCategoryAddForm]]></controller>
+				<parent>wcf.acp.menu.link.user.option.category.list</parent>
+				<permissions>admin.user.canManageUserOption</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /option -->
+			
+			<!-- notice -->
+			<acpmenuitem name="wcf.acp.menu.link.notice">
+				<parent>wcf.acp.menu.link.user</parent>
+				<showorder>5</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.notice.list">
+				<controller><![CDATA[wcf\acp\page\NoticeListPage]]></controller>
+				<parent>wcf.acp.menu.link.notice</parent>
+				<permissions>admin.notice.canManageNotice</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.notice.add">
+				<controller><![CDATA[wcf\acp\form\NoticeAddForm]]></controller>
+				<parent>wcf.acp.menu.link.notice.list</parent>
+				<permissions>admin.notice.canManageNotice</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /notice -->
+			
+			<!-- paid subscription -->
+			<acpmenuitem name="wcf.acp.menu.link.paidSubscription">
+				<parent>wcf.acp.menu.link.user</parent>
+				<showorder>6</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.paidSubscription.list">
+				<controller><![CDATA[wcf\acp\page\PaidSubscriptionListPage]]></controller>
+				<parent>wcf.acp.menu.link.paidSubscription</parent>
+				<permissions>admin.paidSubscription.canManageSubscription</permissions>
+				<options>module_paid_subscription</options>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.paidSubscription.user.list">
+				<controller><![CDATA[wcf\acp\page\PaidSubscriptionUserListPage]]></controller>
+				<parent>wcf.acp.menu.link.paidSubscription</parent>
+				<permissions>admin.paidSubscription.canManageSubscription</permissions>
+				<options>module_paid_subscription</options>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.paidSubscription.transactionLog.list">
+				<controller><![CDATA[wcf\acp\page\PaidSubscriptionTransactionLogListPage]]></controller>
+				<parent>wcf.acp.menu.link.paidSubscription</parent>
+				<permissions>admin.paidSubscription.canManageSubscription</permissions>
+				<options>module_paid_subscription</options>
+			</acpmenuitem>
+			<!-- /paid subscription -->
+		
+		<!-- /user -->
+		
+		<!-- content -->
 		<acpmenuitem name="wcf.acp.menu.link.content">
-			<showorder>4</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.smiley">
-			<parent>wcf.acp.menu.link.content</parent>
-			<options>module_smiley</options>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.smiley.list">
-			<controller><![CDATA[wcf\acp\page\SmileyListPage]]></controller>
-			<parent>wcf.acp.menu.link.smiley</parent>
-			<permissions>admin.content.smiley.canManageSmiley</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.smiley.add">
-			<controller><![CDATA[wcf\acp\form\SmileyAddForm]]></controller>
-			<parent>wcf.acp.menu.link.smiley.list</parent>
-			<permissions>admin.content.smiley.canManageSmiley</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.smiley.category.list">
-			<controller><![CDATA[wcf\acp\page\SmileyCategoryListPage]]></controller>
-			<parent>wcf.acp.menu.link.smiley</parent>
-			<permissions>admin.content.smiley.canManageSmiley</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.smiley.category.add">
-			<controller><![CDATA[wcf\acp\form\SmileyCategoryAddForm]]></controller>
-			<parent>wcf.acp.menu.link.smiley.category.list</parent>
-			<permissions>admin.content.smiley.canManageSmiley</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.label">
-			<parent>wcf.acp.menu.link.content</parent>
-			<showorder>2</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.label.list">
-			<controller><![CDATA[wcf\acp\page\LabelListPage]]></controller>
-			<parent>wcf.acp.menu.link.label</parent>
-			<permissions>admin.content.label.canManageLabel</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.label.add">
-			<controller><![CDATA[wcf\acp\form\LabelAddForm]]></controller>
-			<parent>wcf.acp.menu.link.label.list</parent>
-			<permissions>admin.content.label.canManageLabel</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.label.group.list">
-			<controller><![CDATA[wcf\acp\page\LabelGroupListPage]]></controller>
-			<parent>wcf.acp.menu.link.label</parent>
-			<permissions>admin.content.label.canManageLabel</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.label.group.add">
-			<controller><![CDATA[wcf\acp\form\LabelGroupAddForm]]></controller>
-			<parent>wcf.acp.menu.link.label.group.list</parent>
-			<permissions>admin.content.label.canManageLabel</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.bbcode">
-			<parent>wcf.acp.menu.link.content</parent>
 			<showorder>3</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.bbcode.list">
-			<controller><![CDATA[wcf\acp\page\BBCodeListPage]]></controller>
-			<parent>wcf.acp.menu.link.bbcode</parent>
-			<permissions>admin.content.bbcode.canManageBBCode</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.bbcode.add">
-			<controller><![CDATA[wcf\acp\form\BBCodeAddForm]]></controller>
-			<parent>wcf.acp.menu.link.bbcode.list</parent>
-			<permissions>admin.content.bbcode.canManageBBCode</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.bbcode.mediaProvider.list">
-			<controller><![CDATA[wcf\acp\page\BBCodeMediaProviderListPage]]></controller>
-			<parent>wcf.acp.menu.link.bbcode</parent>
-			<permissions>admin.content.bbcode.canManageBBCode</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.bbcode.mediaProvider.add">
-			<controller><![CDATA[wcf\acp\form\BBCodeMediaProviderAddForm]]></controller>
-			<parent>wcf.acp.menu.link.bbcode.mediaProvider.list</parent>
-			<permissions>admin.content.bbcode.canManageBBCode</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.tag">
-			<parent>wcf.acp.menu.link.content</parent>
-			<options>module_tagging</options>
+			<icon>fa-file-text</icon>
+		</acpmenuitem>
+		
+			<!-- cms -->
+			<acpmenuitem name="wcf.acp.menu.link.cms">
+				<parent>wcf.acp.menu.link.content</parent>
+				<showorder>1</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.cms.page.list">
+				<controller><![CDATA[wcf\acp\page\PageListPage]]></controller>
+				<parent>wcf.acp.menu.link.cms</parent>
+				<permissions>admin.content.cms.canManagePage</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.cms.page.landing">
+				<controller><![CDATA[wcf\acp\form\PageLandingForm]]></controller>
+				<parent>wcf.acp.menu.link.cms.page.list</parent>
+				<permissions>admin.content.cms.canManagePage</permissions>
+				<icon>fa-home</icon>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.cms.page.add">
+				<controller><![CDATA[wcf\acp\form\PageAddForm]]></controller>
+				<parent>wcf.acp.menu.link.cms.page.list</parent>
+				<permissions>admin.content.cms.canManagePage</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.cms.menu.list">
+				<controller><![CDATA[wcf\acp\page\MenuListPage]]></controller>
+				<parent>wcf.acp.menu.link.cms</parent>
+				<permissions>admin.content.cms.canManageMenu</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.cms.menu.add">
+				<controller><![CDATA[wcf\acp\form\MenuAddForm]]></controller>
+				<parent>wcf.acp.menu.link.cms.menu.list</parent>
+				<permissions>admin.content.cms.canManageMenu</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.cms.box.list">
+				<controller><![CDATA[wcf\acp\page\BoxListPage]]></controller>
+				<parent>wcf.acp.menu.link.cms</parent>
+				<permissions>admin.content.cms.canManageBox</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.cms.box.add">
+				<controller><![CDATA[wcf\acp\form\BoxAddForm]]></controller>
+				<parent>wcf.acp.menu.link.cms.box.list</parent>
+				<permissions>admin.content.cms.canManageBox</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.cms.media.list">
+				<controller><![CDATA[wcf\acp\page\MediaListPage]]></controller>
+				<parent>wcf.acp.menu.link.cms</parent>
+				<permissions>admin.content.cms.canManageMedia</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.cms.media.add">
+				<controller><![CDATA[wcf\acp\form\MediaAddForm]]></controller>
+				<parent>wcf.acp.menu.link.cms.media.list</parent>
+				<permissions>admin.content.cms.canManageMedia</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /cms -->
+			
+			<!-- label -->
+			<acpmenuitem name="wcf.acp.menu.link.label">
+				<parent>wcf.acp.menu.link.content</parent>
+				<showorder>2</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.label.list">
+				<controller><![CDATA[wcf\acp\page\LabelListPage]]></controller>
+				<parent>wcf.acp.menu.link.label</parent>
+				<permissions>admin.content.label.canManageLabel</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.label.add">
+				<controller><![CDATA[wcf\acp\form\LabelAddForm]]></controller>
+				<parent>wcf.acp.menu.link.label.list</parent>
+				<permissions>admin.content.label.canManageLabel</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.label.group.list">
+				<controller><![CDATA[wcf\acp\page\LabelGroupListPage]]></controller>
+				<parent>wcf.acp.menu.link.label</parent>
+				<permissions>admin.content.label.canManageLabel</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.label.group.add">
+				<controller><![CDATA[wcf\acp\form\LabelGroupAddForm]]></controller>
+				<parent>wcf.acp.menu.link.label.group.list</parent>
+				<permissions>admin.content.label.canManageLabel</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /label -->
+			
+			<!-- bbcode -->
+			<acpmenuitem name="wcf.acp.menu.link.bbcode">
+				<parent>wcf.acp.menu.link.content</parent>
+				<showorder>3</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.bbcode.list">
+				<controller><![CDATA[wcf\acp\page\BBCodeListPage]]></controller>
+				<parent>wcf.acp.menu.link.bbcode</parent>
+				<permissions>admin.content.bbcode.canManageBBCode</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.bbcode.add">
+				<controller><![CDATA[wcf\acp\form\BBCodeAddForm]]></controller>
+				<parent>wcf.acp.menu.link.bbcode.list</parent>
+				<permissions>admin.content.bbcode.canManageBBCode</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.bbcode.mediaProvider.list">
+				<controller><![CDATA[wcf\acp\page\BBCodeMediaProviderListPage]]></controller>
+				<parent>wcf.acp.menu.link.bbcode</parent>
+				<permissions>admin.content.bbcode.canManageBBCode</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.bbcode.mediaProvider.add">
+				<controller><![CDATA[wcf\acp\form\BBCodeMediaProviderAddForm]]></controller>
+				<parent>wcf.acp.menu.link.bbcode.mediaProvider.list</parent>
+				<permissions>admin.content.bbcode.canManageBBCode</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /bbcode -->
+			
+			<!-- tag -->
+			<acpmenuitem name="wcf.acp.menu.link.tag">
+				<parent>wcf.acp.menu.link.content</parent>
+				<options>module_tagging</options>
+				<showorder>4</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.tag.list">
+				<controller><![CDATA[wcf\acp\page\TagListPage]]></controller>
+				<parent>wcf.acp.menu.link.tag</parent>
+				<permissions>admin.content.tag.canManageTag</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.tag.add">
+				<controller><![CDATA[wcf\acp\form\TagAddForm]]></controller>
+				<parent>wcf.acp.menu.link.tag.list</parent>
+				<permissions>admin.content.tag.canManageTag</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /tag -->
+			
+			<!-- attachment -->
+			<acpmenuitem name="wcf.acp.menu.link.attachment">
+				<parent>wcf.acp.menu.link.content</parent>
+				<showorder>5</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.attachment.list">
+				<controller><![CDATA[wcf\acp\page\AttachmentListPage]]></controller>
+				<parent>wcf.acp.menu.link.attachment</parent>
+				<permissions>admin.attachment.canManageAttachment</permissions>
+			</acpmenuitem>
+			<!-- /attachment -->
+		
+		<!-- /content -->
+		
+		<!-- application -->
+		<acpmenuitem name="wcf.acp.menu.link.application">
 			<showorder>4</showorder>
+			<icon>fa-comments</icon>
 		</acpmenuitem>
+		<!-- /application -->
 		
-		<acpmenuitem name="wcf.acp.menu.link.tag.list">
-			<controller><![CDATA[wcf\acp\page\TagListPage]]></controller>
-			<parent>wcf.acp.menu.link.tag</parent>
-			<permissions>admin.content.tag.canManageTag</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.tag.add">
-			<controller><![CDATA[wcf\acp\form\TagAddForm]]></controller>
-			<parent>wcf.acp.menu.link.tag.list</parent>
-			<permissions>admin.content.tag.canManageTag</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.attachment">
-			<parent>wcf.acp.menu.link.content</parent>
+		<!-- customization -->
+		<acpmenuitem name="wcf.acp.menu.link.customization">
 			<showorder>5</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.attachment.list">
-			<controller><![CDATA[wcf\acp\page\AttachmentListPage]]></controller>
-			<parent>wcf.acp.menu.link.attachment</parent>
-			<permissions>admin.attachment.canManageAttachment</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.community">
-			<showorder>5</showorder>
-		</acpmenuitem>
-		
-		<!-- lantia -->
-		<acpmenuitem name="wcf.acp.menu.link.cms">
-			<parent>wcf.acp.menu.link.content</parent>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.cms.page.list">
-			<controller><![CDATA[wcf\acp\page\PageListPage]]></controller>
-			<parent>wcf.acp.menu.link.cms</parent>
-			<permissions>admin.content.cms.canManagePage</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cms.page.landing">
-			<controller><![CDATA[wcf\acp\form\PageLandingForm]]></controller>
-			<parent>wcf.acp.menu.link.cms.page.list</parent>
-			<permissions>admin.content.cms.canManagePage</permissions>
-			<icon>fa-home</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cms.page.add">
-			<controller><![CDATA[wcf\acp\form\PageAddForm]]></controller>
-			<parent>wcf.acp.menu.link.cms.page.list</parent>
-			<permissions>admin.content.cms.canManagePage</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.cms.menu.list">
-			<controller><![CDATA[wcf\acp\page\MenuListPage]]></controller>
-			<parent>wcf.acp.menu.link.cms</parent>
-			<permissions>admin.content.cms.canManageMenu</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cms.menu.add">
-			<controller><![CDATA[wcf\acp\form\MenuAddForm]]></controller>
-			<parent>wcf.acp.menu.link.cms.menu.list</parent>
-			<permissions>admin.content.cms.canManageMenu</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.cms.box.list">
-			<controller><![CDATA[wcf\acp\page\BoxListPage]]></controller>
-			<parent>wcf.acp.menu.link.cms</parent>
-			<permissions>admin.content.cms.canManageBox</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cms.box.add">
-			<controller><![CDATA[wcf\acp\form\BoxAddForm]]></controller>
-			<parent>wcf.acp.menu.link.cms.box.list</parent>
-			<permissions>admin.content.cms.canManageBox</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.cms.media.list">
-			<controller><![CDATA[wcf\acp\page\MediaListPage]]></controller>
-			<parent>wcf.acp.menu.link.cms</parent>
-			<permissions>admin.content.cms.canManageMedia</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cms.media.add">
-			<controller><![CDATA[wcf\acp\form\MediaAddForm]]></controller>
-			<parent>wcf.acp.menu.link.cms.media.list</parent>
-			<permissions>admin.content.cms.canManageMedia</permissions>
-			<icon>fa-plus</icon>
-		</acpmenuitem>
+			<icon>fa-desktop</icon>
+		</acpmenuitem>
+		
+			<!-- style -->
+			<acpmenuitem name="wcf.acp.menu.link.style">
+				<parent>wcf.acp.menu.link.customization</parent>
+				<showorder>1</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.style.list">
+				<controller><![CDATA[wcf\acp\page\StyleListPage]]></controller>
+				<parent>wcf.acp.menu.link.style</parent>
+				<permissions>admin.style.canManageStyle</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.style.import">
+				<controller><![CDATA[wcf\acp\form\StyleImportForm]]></controller>
+				<parent>wcf.acp.menu.link.style.list</parent>
+				<permissions>admin.style.canManageStyle</permissions>
+				<icon>fa-upload</icon>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.style.add">
+				<controller><![CDATA[wcf\acp\form\StyleAddForm]]></controller>
+				<parent>wcf.acp.menu.link.style.list</parent>
+				<permissions>admin.style.canManageStyle</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /style -->
+			
+			<!-- template -->
+			<acpmenuitem name="wcf.acp.menu.link.template">
+				<parent>wcf.acp.menu.link.customization</parent>
+				<showorder>2</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.template.list">
+				<controller><![CDATA[wcf\acp\page\TemplateListPage]]></controller>
+				<parent>wcf.acp.menu.link.template</parent>
+				<permissions>admin.template.canManageTemplate</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.template.add">
+				<controller><![CDATA[wcf\acp\form\TemplateAddForm]]></controller>
+				<parent>wcf.acp.menu.link.template.list</parent>
+				<permissions>admin.template.canManageTemplate</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.template.group.list">
+				<controller><![CDATA[wcf\acp\page\TemplateGroupListPage]]></controller>
+				<parent>wcf.acp.menu.link.template</parent>
+				<permissions>admin.template.canManageTemplate</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.template.group.add">
+				<controller><![CDATA[wcf\acp\form\TemplateGroupAddForm]]></controller>
+				<parent>wcf.acp.menu.link.template.group.list</parent>
+				<permissions>admin.template.canManageTemplate</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /template -->
+			
+			<!-- language -->
+			<acpmenuitem name="wcf.acp.menu.link.language">
+				<parent>wcf.acp.menu.link.customization</parent>
+				<showorder>3</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.language.list">
+				<parent>wcf.acp.menu.link.language</parent>
+				<controller><![CDATA[wcf\acp\page\LanguageListPage]]></controller>
+				<permissions>admin.language.canManageLanguage</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.language.import">
+				<parent>wcf.acp.menu.link.language.list</parent>
+				<controller><![CDATA[wcf\acp\form\LanguageImportForm]]></controller>
+				<permissions>admin.language.canManageLanguage</permissions>
+				<icon>fa-upload</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.language.item.list">
+				<parent>wcf.acp.menu.link.language</parent>
+				<controller><![CDATA[wcf\acp\form\LanguageItemList]]></controller>
+				<permissions>admin.language.canManageLanguage</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.language.multilingualism">
+				<parent>wcf.acp.menu.link.language</parent>
+				<controller><![CDATA[wcf\acp\form\LanguageMultilingualismForm]]></controller>
+				<permissions>admin.language.canManageLanguage</permissions>
+			</acpmenuitem>
+			<!-- /language -->
+			
+			<!-- smiley -->
+			<acpmenuitem name="wcf.acp.menu.link.smiley">
+				<parent>wcf.acp.menu.link.customization</parent>
+				<options>module_smiley</options>
+				<showorder>4</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.smiley.list">
+				<controller><![CDATA[wcf\acp\page\SmileyListPage]]></controller>
+				<parent>wcf.acp.menu.link.smiley</parent>
+				<permissions>admin.content.smiley.canManageSmiley</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.smiley.add">
+				<controller><![CDATA[wcf\acp\form\SmileyAddForm]]></controller>
+				<parent>wcf.acp.menu.link.smiley.list</parent>
+				<permissions>admin.content.smiley.canManageSmiley</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.smiley.category.list">
+				<controller><![CDATA[wcf\acp\page\SmileyCategoryListPage]]></controller>
+				<parent>wcf.acp.menu.link.smiley</parent>
+				<permissions>admin.content.smiley.canManageSmiley</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.smiley.category.add">
+				<controller><![CDATA[wcf\acp\form\SmileyCategoryAddForm]]></controller>
+				<parent>wcf.acp.menu.link.smiley.category.list</parent>
+				<permissions>admin.content.smiley.canManageSmiley</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /smiley -->
+			
+			<!-- ad -->
+			<acpmenuitem name="wcf.acp.menu.link.ad">
+				<parent>wcf.acp.menu.link.customization</parent>
+				<!-- do NOT use 'module_ad', the ACP checkbox is incorrectly recognized by adblockers -->
+				<options>module_wcf_ad</options>
+				<showorder>5</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.ad.list">
+				<controller><![CDATA[wcf\acp\page\AdListPage]]></controller>
+				<parent>wcf.acp.menu.link.ad</parent>
+				<permissions>admin.ad.canManageAd</permissions>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.ad.add">
+				<controller><![CDATA[wcf\acp\form\AdAddForm]]></controller>
+				<parent>wcf.acp.menu.link.ad.list</parent>
+				<permissions>admin.ad.canManageAd</permissions>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			<!-- /ad -->
+		
+		<!-- /customization -->
+		
+		<!-- management -->
+		<acpmenuitem name="wcf.acp.menu.link.management">
+			<showorder>6</showorder>
+			<icon>fa-cog</icon>
+		</acpmenuitem>
+		
+			<!-- maintenance -->
+			<acpmenuitem name="wcf.acp.menu.link.maintenance">
+				<parent>wcf.acp.menu.link.management</parent>
+				<showorder>1</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.cronjob.list">
+				<controller><![CDATA[wcf\acp\page\CronjobListPage]]></controller>
+				<parent>wcf.acp.menu.link.maintenance</parent>
+				<permissions>admin.management.canManageCronjob</permissions>
+				<showorder>1</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.cronjob.add">
+				<controller><![CDATA[wcf\acp\form\CronjobAddForm]]></controller>
+				<parent>wcf.acp.menu.link.cronjob.list</parent>
+				<permissions>admin.management.canManageCronjob</permissions>
+				<showorder>2</showorder>
+				<icon>fa-plus</icon>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.maintenance.cache">
+				<controller><![CDATA[wcf\acp\page\CacheListPage]]></controller>
+				<parent>wcf.acp.menu.link.maintenance</parent>
+				<permissions>admin.configuration.canManageApplication</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.maintenance.rebuildData">
+				<controller><![CDATA[wcf\acp\page\RebuildDataPage]]></controller>
+				<parent>wcf.acp.menu.link.maintenance</parent>
+				<permissions>admin.management.canRebuildData</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.maintenance.import">
+				<controller><![CDATA[wcf\acp\form\DataImportForm]]></controller>
+				<parent>wcf.acp.menu.link.maintenance</parent>
+				<permissions>admin.management.canImportData</permissions>
+			</acpmenuitem>
+			<!-- /maintenance -->
+		
+			<!-- stat -->
+			<acpmenuitem name="wcf.acp.menu.link.stat">
+				<parent>wcf.acp.menu.link.management</parent>
+				<showorder>2</showorder>
+			</acpmenuitem>
+			<acpmenuitem name="wcf.acp.menu.link.stat.list">
+				<controller><![CDATA[wcf\acp\page\StatPage]]></controller>
+				<parent>wcf.acp.menu.link.stat</parent>
+				<permissions>admin.management.canViewLog</permissions>
+			</acpmenuitem>
+			<!-- /stat -->
+			
+			<!-- log -->
+			<acpmenuitem name="wcf.acp.menu.link.log">
+				<parent>wcf.acp.menu.link.management</parent>
+				<showorder>3</showorder>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.log.session">
+				<controller><![CDATA[wcf\acp\page\ACPSessionLogListPage]]></controller>
+				<parent>wcf.acp.menu.link.log</parent>
+				<permissions>admin.management.canViewLog</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.log.cronjob">
+				<controller><![CDATA[wcf\acp\page\CronjobLogListPage]]></controller>
+				<parent>wcf.acp.menu.link.log</parent>
+				<permissions>admin.management.canManageCronjob</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.log.exception">
+				<controller><![CDATA[wcf\acp\page\ExceptionLogViewPage]]></controller>
+				<parent>wcf.acp.menu.link.log</parent>
+				<permissions>admin.management.canViewLog</permissions>
+			</acpmenuitem>
+			
+			<acpmenuitem name="wcf.acp.menu.link.log.authentication.failure">
+				<controller><![CDATA[wcf\acp\page\UserAuthenticationFailureListPage]]></controller>
+				<parent>wcf.acp.menu.link.log</parent>
+				<permissions>admin.management.canViewLog</permissions>
+				<options>enable_user_authentication_failure</options>
+			</acpmenuitem>
+			<!-- /log -->
+		
+		<!-- /management -->
 	</import>
 </data>
diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl
index 34c7e7d06f..34f8e2fc63 100644
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -10,7 +10,7 @@
 		<p class="info">{lang}wcf.page.cookiePolicy.info{/lang}</p>
 	{/if}
 	
-	{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
+	{if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
 		<p class="info">{lang}wcf.global.availableUpdates{/lang}</p>
 	{/if}
 	
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 0209520d25..eb6cc9cecc 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -2,7 +2,7 @@
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/userGroupOption.xsd">
 	<import>
 		<categories>
-			<category name="user"></category>
+			<category name="user" />
 			<category name="user.profile">
 				<parent>user</parent>
 			</category>
@@ -29,7 +29,7 @@
 				<parent>user.message</parent>
 			</category>
 			
-			<category name="mod"></category>
+			<category name="mod" />
 			<category name="mod.general">
 				<parent>mod</parent>
 			</category>
@@ -37,19 +37,22 @@
 				<parent>mod.general</parent>
 			</category>
 			
-			<category name="admin"></category>
+			<category name="admin" />
+			
 			<category name="admin.general">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.system">
+			
+			<!-- admin.configuration -->
+			<category name="admin.configuration">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.system.package">
-				<parent>admin.system</parent>
-			</category>
-			<category name="admin.maintenance">
-				<parent>admin.system</parent>
+			<category name="admin.configuration.package">
+				<parent>admin.configuration</parent>
 			</category>
+			<!-- /admin.configuration -->
+			
+			<!-- admin.user -->
 			<category name="admin.user">
 				<parent>admin</parent>
 			</category>
@@ -59,57 +62,35 @@
 			<category name="admin.user.group">
 				<parent>admin.user</parent>
 			</category>
-			<category name="admin.user.option"><!-- @deprecated -->
-				<parent>admin.user</parent>
-			</category>
-			<category name="admin.user.rank"><!-- @deprecated -->
-				<parent>admin.user</parent>
-			</category>
+			<!-- /admin.user -->
 			
-			<category name="admin.display">
+			<!-- admin.content -->
+			<category name="admin.content">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.style"><!-- @deprecated -->
-				<parent>admin.display</parent>
-			</category>
-			<category name="admin.display.pageMenu"><!-- @deprecated -->
-				<parent>admin.display</parent>
-			</category>
-			<category name="admin.template"><!-- @deprecated -->
-				<parent>admin.display</parent>
-			</category>
+			<!-- /admin.content -->
 			
-			<category name="admin.content">
+			<!-- admin.application -->
+			<category name="admin.application">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.attachment"><!-- @deprecated -->
-				<parent>admin.content</parent>
-			</category>
-			<category name="admin.content.bbcode"><!-- @deprecated -->
-				<parent>admin.content</parent>
-			</category>
-			<category name="admin.content.smiley"><!-- @deprecated -->
-				<parent>admin.content</parent>
-			</category>
-			<category name="admin.content.dashboard"><!-- @deprecated -->
-				<parent>admin.content</parent>
-			</category>
-			<category name="admin.content.label"><!-- @deprecated -->
-				<parent>admin.content</parent>
-			</category>
-			<category name="admin.content.tag"><!-- @deprecated -->
-				<parent>admin.content</parent>
-			</category>
+			<!-- /admin.application -->
 			
-			<category name="admin.community">
+			<!-- admin.customization -->
+			<category name="admin.customization">
 				<parent>admin</parent>
 			</category>
-			<category name="admin.language"><!-- @deprecated -->
-				<parent>admin.display</parent>
+			<!-- /admin.customization -->
+			
+			<!-- admin.management -->
+			<category name="admin.management">
+				<parent>admin</parent>
 			</category>
+			<!-- /admin.management -->
 		</categories>
 		
 		<options>
+			<!-- admin.general -->
 			<option name="admin.general.canViewPrivateUserOptions">
 				<categoryname>admin.general</categoryname>
 				<optiontype>boolean</optiontype>
@@ -124,73 +105,79 @@
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.canEditOption">
-				<categoryname>admin.system</categoryname>
+			<option name="admin.user.canViewInvisible">
+				<categoryname>admin.general</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.canViewLog">
-				<categoryname>admin.system</categoryname>
+			<option name="admin.user.canViewIpAddress">
+				<categoryname>admin.general</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.canManageApplication">
-				<categoryname>admin.system.package</categoryname>
+			<!-- /admin.general -->
+			
+			<!-- admin.configuration -->
+			<option name="admin.configuration.canEditOption">
+				<categoryname>admin.configuration</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.canImportData">
-				<categoryname>admin.system</categoryname>
+			<option name="admin.user.canEditActivityPoints">
+				<categoryname>admin.configuration</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.canRebuildData">
-				<categoryname>admin.system</categoryname>
+			<option name="admin.captcha.canManageCaptchaQuestion">
+				<categoryname>admin.configuration</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.canManageCronjob">
-				<categoryname>admin.system</categoryname>
+			<option name="admin.configuration.canManageApplication">
+				<categoryname>admin.configuration.package</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.package.canUpdatePackage">
-				<categoryname>admin.system.package</categoryname>
+			<option name="admin.configuration.package.canUpdatePackage">
+				<categoryname>admin.configuration.package</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.package.canUninstallPackage">
-				<categoryname>admin.system.package</categoryname>
+			<option name="admin.configuration.package.canUninstallPackage">
+				<categoryname>admin.configuration.package</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.system.package.canEditServer">
-				<categoryname>admin.system.package</categoryname>
+			<option name="admin.configuration.package.canEditServer">
+				<categoryname>admin.configuration.package</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
+			<!-- /admin.configuration -->
+			
+			<!-- admin.user -->
 			<option name="admin.user.accessibleGroups">
 				<categoryname>admin.user.group</categoryname>
 				<optiontype>userGroups</optiontype>
-				<defaultvalue></defaultvalue>
+				<defaultvalue />
 				<admindefaultvalue>1,2,3,4,5</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
@@ -236,6 +223,13 @@
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
+			<option name="admin.user.canEnableUser">
+				<categoryname>admin.user.user</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
 			<option name="admin.user.canBanUser">
 				<categoryname>admin.user.user</categoryname>
 				<optiontype>boolean</optiontype>
@@ -296,7 +290,7 @@
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.paidSubscription.canManageSubscription">
+			<option name="admin.notice.canManageNotice">
 				<categoryname>admin.user.user</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
@@ -304,89 +298,94 @@
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.content.dashboard.canEditDashboard">
-				<categoryname>admin.display</categoryname>
+			<option name="admin.user.rank.canManageRank">
+				<categoryname>admin.user.user</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.style.canManageStyle">
-				<categoryname>admin.display</categoryname>
+			<option name="admin.paidSubscription.canManageSubscription">
+				<categoryname>admin.user.user</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.style.canUseDisabledStyle">
-				<categoryname>admin.display</categoryname>
+			<!-- /admin.user -->
+			
+			<!-- admin.content -->
+			<option name="admin.content.cms.canManagePage">
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.display.canManagePageMenu">
-				<categoryname>admin.display</categoryname>
+			<option name="admin.content.cms.canManageMenu">
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.template.canManageTemplate">
-				<categoryname>admin.display</categoryname>
+			<option name="admin.content.cms.canManageBox">
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.language.canManageLanguage">
-				<categoryname>admin.display</categoryname>
+			<option name="admin.content.cms.canManageMedia">
+				<categoryname>admin.content</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			<option name="admin.content.cms.canUseMedia">
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.ad.canManageAd">
-				<categoryname>admin.display</categoryname>
+			<option name="admin.content.canBulkRevertContentChanges">
+				<categoryname>admin.content</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
+				<options>module_edit_history</options>
 			</option>
 			
-			<option name="user.attachment.maxSize">
-				<categoryname>user.message.attachment</categoryname>
-				<optiontype>fileSize</optiontype>
-				<defaultvalue>1000000</defaultvalue>
-				<minvalue>10000</minvalue>
-				<options>module_attachment</options>
+			<option name="admin.content.label.canManageLabel">
+				<categoryname>admin.content</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
 			</option>
-			<option name="user.attachment.allowedExtensions">
-				<categoryname>user.message.attachment</categoryname>
-				<optiontype>textarea</optiontype>
-				<defaultvalue><![CDATA[gif
-jpg
-jpeg
-png
-bmp
-zip
-txt
-pdf]]></defaultvalue>
-				<wildcard><![CDATA[*]]></wildcard>
-				<options>module_attachment</options>
+			
+			<option name="admin.content.bbcode.canManageBBCode">
+				<categoryname>admin.content</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
 			</option>
-			<option name="user.attachment.maxCount">
-				<categoryname>user.message.attachment</categoryname>
-				<optiontype>integer</optiontype>
-				<defaultvalue>10</defaultvalue>
-				<minvalue>1</minvalue>
-				<options>module_attachment</options>
-				<maxvalue>100</maxvalue>
+			
+			<option name="admin.content.tag.canManageTag">
+				<categoryname>admin.content</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
 			</option>
 			
 			<option name="admin.attachment.canManageAttachment">
@@ -397,9 +396,34 @@ pdf]]></defaultvalue>
 				<options>module_attachment</options>
 				<usersonly>1</usersonly>
 			</option>
+			<!-- /admin.content -->
 			
-			<option name="admin.content.bbcode.canManageBBCode">
-				<categoryname>admin.content</categoryname>
+			<!-- admin.customization -->
+			<option name="admin.style.canManageStyle">
+				<categoryname>admin.customization</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			<option name="admin.style.canUseDisabledStyle">
+				<categoryname>admin.customization</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			
+			<option name="admin.template.canManageTemplate">
+				<categoryname>admin.customization</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<admindefaultvalue>1</admindefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			
+			<option name="admin.language.canManageLanguage">
+				<categoryname>admin.customization</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
@@ -414,45 +438,78 @@ pdf]]></defaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.content.cms.canManagePage">
-				<categoryname>admin.content</categoryname>
+			<option name="admin.ad.canManageAd">
+				<categoryname>admin.customization</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
+			<!-- /admin.customization -->
 			
-			<option name="admin.content.cms.canManageMenu">
-				<categoryname>admin.content</categoryname>
+			<!-- admin.management -->
+			<option name="admin.management.canManageCronjob">
+				<categoryname>admin.management</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.content.cms.canManageBox">
-				<categoryname>admin.content</categoryname>
+			<option name="admin.management.canRebuildData">
+				<categoryname>admin.management</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.content.cms.canManageMedia">
-				<categoryname>admin.content</categoryname>
+			<option name="admin.management.canImportData">
+				<categoryname>admin.management</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			
-			<option name="admin.content.cms.canUseMedia">
-				<categoryname>admin.content</categoryname>
+			<option name="admin.management.canViewLog">
+				<categoryname>admin.management</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
+			<!-- /admin.management -->
+			
+			<option name="user.attachment.maxSize">
+				<categoryname>user.message.attachment</categoryname>
+				<optiontype>fileSize</optiontype>
+				<defaultvalue>1000000</defaultvalue>
+				<minvalue>10000</minvalue>
+				<options>module_attachment</options>
+			</option>
+			<option name="user.attachment.allowedExtensions">
+				<categoryname>user.message.attachment</categoryname>
+				<optiontype>textarea</optiontype>
+				<defaultvalue><![CDATA[gif
+jpg
+jpeg
+png
+bmp
+zip
+txt
+pdf]]></defaultvalue>
+				<wildcard><![CDATA[*]]></wildcard>
+				<options>module_attachment</options>
+			</option>
+			<option name="user.attachment.maxCount">
+				<categoryname>user.message.attachment</categoryname>
+				<optiontype>integer</optiontype>
+				<defaultvalue>10</defaultvalue>
+				<minvalue>1</minvalue>
+				<options>module_attachment</options>
+				<maxvalue>100</maxvalue>
+			</option>
 			
 			<!-- user.message -->
 			<option name="user.message.canUseSmilies">
@@ -488,43 +545,6 @@ pdf]]></defaultvalue>
 			</option>
 			<!-- /user.message.comment -->
 			
-			<option name="admin.user.canViewInvisible">
-				<categoryname>admin.general</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			<option name="admin.user.canViewIpAddress">
-				<categoryname>admin.general</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			<option name="admin.user.canEnableUser">
-				<categoryname>admin.user.user</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			<option name="admin.user.canEditActivityPoints">
-				<categoryname>admin.user.user</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			
-			<option name="admin.user.rank.canManageRank">
-				<categoryname>admin.user.user</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			
 			<!-- user.signature -->
 			<option name="user.signature.canUseSmilies">
 				<categoryname>user.signature</categoryname>
@@ -746,47 +766,6 @@ png]]></defaultvalue>
 			</option>
 			<!-- /user.profileComment -->
 			
-			<option name="admin.content.canBulkRevertContentChanges">
-				<categoryname>admin.content</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-				<options>module_edit_history</options>
-			</option>
-			
-			<option name="admin.content.label.canManageLabel">
-				<categoryname>admin.content</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			
-			<option name="admin.content.tag.canManageTag">
-				<categoryname>admin.content</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			
-			<option name="admin.notice.canManageNotice">
-				<categoryname>admin.user.user</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			
-			<option name="admin.captcha.canManageCaptchaQuestion">
-				<categoryname>admin.system</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
-			
 			<!-- todo: find better category -->
 			<option name="user.tag.canViewTag">
 				<categoryname>user.message</categoryname>
diff --git a/wcfsetup/install/files/acp/images/wcfLogo-small.png b/wcfsetup/install/files/acp/images/wcfLogo-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0fec150dae7c2e047e73cca575ab6d5356eab24
GIT binary patch
literal 1751
zcmXX_30PCd7EZV*Ap{b_&5FSU5>`bhwjve@J1Ec?qGeM<+2o-tWofKM0)hfX10w4S
zpa^P}O++CiF(4qIR(2yM5FjW>saOTXR!c8^@Be1b{BzDfXU@!glf&}!)J2k!Fc?hN
z+slm&jk}<3ga9BbyOxp*gK7N6^5M8cQwVUl#@HboMC5@WWFZcR!zm~0zQ1P$Xuu(>
zh0rMPW<Y+3L+#y5(z9=Ir1%<$%caz{c>?~sQVQ?Z+8hyDuAU@7O7|)u6kUBq92+v~
z8pc2z3Z;q6rYG<lnh7ERXzq1I5EE+sOZWuFZh_c%X@(5xe;oxM4r3`)U|Z&OJ&&}>
zXwZP2tc8FRIeB_^9<QfJALj`i6P+xn`OF02MJQOsGp1+WJKN6a=`n#kDkUDu3~ezz
zu~7!rC-e3bV>F&REXVbZVAUcMM;C;7o)oI*<s=aj2prI6x#IsF?RC2eM4pY~o{Slg
zg9=gts8F8u_4TV)uR?k#6crWqW`;aEI;v8s&Ye3qJ4v9^>2KBKce5lYo0F5%!W0>*
zaQPK+Wo1PokrWpfgRJbuY4V3T;>dH{<S~%P<8e3~=pKF&nO&67W+w3y3jB)~xMu-4
zWf-X7f}KOy-VyzUg#|pfm~`ko+ABS|)gr5%k<)IHCpIpVQsz`d)dXHXj%(@14az~N
z)JLOOTWcN7O+ZsqlVS1=Fs2HO6q17S6Yp7`Y_mX-%`!x$0txMsgjyoqD!gxaSw@ft
z<HiqzeSLj|xElTanL7iLuzTb5nMd)vjuO9MBdt9%T9}Hy9Y3^LoE6gxI%&c-T8(6D
zSr-LO-cr{|n2HCdPJp!?2K-X&W|V&SFeceqhh?UPBWjv~04=r2fuCm(oJR}E)(^-e
z9mznup29fueylzcdp(3;?M1Y5zZAX~Z@lxMi`DQ$i^lt=mzqq^UN;Tonm+DfNGll1
z)AY(7+Jz2k-6Klpkl~qXl01Pl6izx2PWm~Y(AbHeJB5o5#my#xeQZ!NsDIm6Up9ok
z8H9HE8tvh(8yJdmW}&i~sN>sFM`Co`DcW2c1kZ6M2zpL#65G!omi}PL6|-uy9kVp2
z8j#5v`TTer3<k3_AiK)vb6G4V(}qr^f*8!lrT=3ddUECSfepxHvew3`4HOCl{0+oM
zayPKCj%i~<rFPwY;|qfUd%WG8Irfi>h9WqHp<u@!QD<o8x%`QLkx;csQEHQETieZK
z+A?c2f#`e>rh}#!!sq$a)i0F%9e-5;QHt@n50mGKZ1k<aQ!W5?<pzMEv_JAph5D84
z<_8S89=TOi6xwk9^F!Y)i`>#Xy77ZdKr7|WUDZ6d>vGs(0{MM<T!@+Qm#h@Z0=Hwh
zBk~qL>9|Kyd2W7vd*{u2>hyeMx@X^?Ip{mhu}-DcR=tUXkr(d2eyRrI8<K$z7gd(V
z&Yg^Iuw-sJC-}tg0PCyauxpD_p&gv%rA*JtPqKxhrdt4VzwmN>R@Pm<ZwxG!oqGik
z?dYl5x2bktfITqFLH^|85bJs@M$k}MK(uR)ED;^JiAC1VD}NcG<%H~uxcneW>cP)@
zG%hhxv|dp<TtMXCPVvFKb>8<<S-CccD&29g-T&wf*s7{VhZdvJY8UMtSx?=6zErXM
ziKfup=t=^6VOwW7C!<ga)0>W||D*V%b-H;~;Ki}b`bR=5*jPe{A5!A8X)Oo2`rif$
zadu_~yVmAtxjBLBd+xmrBh$8Pamuga6&k6n=kj`}C_eD#9_@yrwu{XRdvVs+E!M5X
zU+RBIEeehw+(W0^+s{X*R{!d<Wht4=S?ft`wf8UEqvh)CU2y|t`DVf~c~H^YYewho
zSO4c*H2RY^k~Bt-60{M0!W%zjKaF@QuG{9>Qp%AZ67m6O<8CE2?^LGqY$^*;L0c3>
zU2<w4*qZ28eQmv>!+i4bN*v>ur8K_)eNflwFWn|=+Q8>iciz9N6oNTqgNou*ueX+#
zpV&uETbZncxUtuIMh|@b<ayo8BDpH9r28T7jY1qD$R4Yl{|cY>p!!4H)(TZ>xO}?i
ztz99aWITUQT(0`Nu<BLHoN)Kh<7Gl@(3){zy$3;mayXAOR`ZQ>f-r6Q@8g0n&$3|e
zW%cKe%kMmzRoW}DNz#Jo;M2I?>61o0LvcgoNSASA?cr5_b@ldgOa(sTPtO>6ovNky
zxACUs$RCl0**=XaW%hb<w`U@}Yo9<;nbQA_<M$NWmt3b<;qK=4a>Xvki237eaYJE(
eP*j`JpC;Q@c;d|cn~Bhug?YRCxiz?OGyVZ|<Q)qD

literal 0
HcmV?d00001

diff --git a/wcfsetup/install/files/acp/images/wcfLogo.png b/wcfsetup/install/files/acp/images/wcfLogo.png
index 23004724989e5ccd8678de770d92cb7b0c506eba..aeb620fa1a5da8e5ffea66bdbb788df4d272a7e8 100644
GIT binary patch
literal 2928
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

literal 3555
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
ZUpV*Kv3{wh>i>Q!W>+mutBswa{sjsF3(o)m

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 5b74819e95..1397b08981 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -1880,10 +1880,10 @@ WCF.ACP.Search = WCF.Search.Base.extend({
 	 */
 	init: function() {
 		this._className = 'wcf\\data\\acp\\search\\provider\\ACPSearchProviderAction';
-		this._super('#search input[name=q]');
+		this._super('#pageHeaderSearch input[name=q]');
 		
 		// disable form submitting
-		$('#search > form').on('submit', function(event) {
+		$('#pageHeaderSearch > form').on('submit', function(event) {
 			event.preventDefault();
 		});
 	},
@@ -1936,6 +1936,12 @@ WCF.ACP.Search = WCF.Search.Base.extend({
 		}
 		
 		window.location = this._list.find('li.dropdownNavigationItem > a').attr('href');
+	},
+	
+	_success: function(data) {
+		this._super(data);
+		
+		this._list.addClass('acpSearchDropdown');
 	}
 });
 
diff --git a/wcfsetup/install/files/acp/style/layout.scss b/wcfsetup/install/files/acp/style/layout.scss
new file mode 100644
index 0000000000..3511f2c29c
--- /dev/null
+++ b/wcfsetup/install/files/acp/style/layout.scss
@@ -0,0 +1,186 @@
+.layoutBoundary {
+	margin: 0;
+	max-width: none;
+	min-width: 0;
+}
+
+.pageContainer {
+	/* required for sticky page header */
+	padding-top: 50px;
+}
+
+/* page header */
+.pageHeaderContainer {
+	left: 0;
+	position: fixed;
+	right: 0;
+	top: 0;
+	
+	.pageHeader > div > div {
+		height: 50px;
+		padding: 10px 10px 10px 0;
+	}
+	
+	.pageHeaderLogo {
+		flex: 0 0 120px;
+		margin: 0;
+		order: 1;
+		text-align: center;
+		
+		.pageHeaderLogoLarge {
+			display: none;
+		}
+		
+		.pageHeaderLogoSmall {
+			display: inline;
+		}
+	}
+	
+	.mainMenu {
+		flex: 0 0 auto;
+		order: 2;
+	}
+	
+	.pageHeaderSearch {
+		flex: 0 0 auto;
+		order: 3;
+		
+		.pageHeaderSearchInput {
+			border-width: 0 !important;
+			height: 50px;
+			width: 300px;
+		}
+	}
+	
+	.userPanel {
+		flex: 1 1 auto;
+		order: 4;
+	}
+}
+
+.acpSearchDropdown {
+	border-width: 0;
+	top: 50px !important;
+	width: 300px;
+	
+	&::before,
+	&::after {
+		display: none;
+	}
+}
+
+
+.acpPageContentContainer {
+	display: flex;
+	flex: 1 0 auto;
+}
+
+.acpPageMenu .icon, .acpPageSubMenu .icon {
+	color: inherit;
+}
+
+.acpPageMenu {
+	background-color: rgb(52, 73, 94);
+	flex: 0 0 120px;
+	text-align: center;
+	overflow: hidden;
+	
+	.acpPageMenuLink {
+		color: rgb(192, 192, 192);
+		display: block;
+		padding: 20px 10px;
+		
+		&.active {
+			background-color: rgb(65, 86, 107);
+			color: rgb(255, 255, 255);
+			
+			> .icon {
+				transform: scale(1);
+			}
+		}
+		
+		> .icon {
+			transform: scale(.8);
+			transition: transform .12s linear;
+		}
+	}
+	
+	.acpPageMenuItemLabel {
+		display: block;
+		margin-top: 5px;
+	}
+}
+
+
+.acpPageSubMenu {
+	background-color: rgb(65, 86, 107);
+	flex: 0 0 auto;
+}
+
+.acpPageSubMenuCategoryList{
+	flex: 0 0 300px;
+	overflow: hidden;
+	width: 300px;
+	
+	&:not(.active) {
+		display: none;
+	}
+	
+	> .acpPageSubMenuCategory {
+		margin-top: 20px;
+		padding-left: 20px;
+		
+		> span {
+			color: rgb(169, 169, 169);
+			display: block;
+			padding: 5px 20px;
+			text-transform: uppercase;
+		}
+	}
+	
+	.acpPageSubMenuLink,
+	.acpPageSubMenuIcon {
+		color: rgb(255, 255, 255);
+		display: block;
+		overflow: hidden;
+		padding: 5px 20px;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	
+	.acpPageSubMenuLink:hover,
+	.acpPageSubMenuLink:hover ~ .acpPageSubMenuIcon:not(.active),
+	.acpPageSubMenuIcon:hover {
+		background-color: rgb(52, 73, 94);
+	}
+	
+	.acpPageSubMenuLinkWrapper {
+		display: flex;
+		
+		> .acpPageSubMenuLink {
+			flex: 1 1 auto;
+		}
+		
+		> .acpPageSubMenuIcon {
+			flex: 0 0 auto;
+		}
+	}
+	
+	.acpPageSubMenuItemList > .active > a,
+	.acpPageSubMenuLink.active,
+	.acpPageSubMenuLink.active ~ .acpPageSubMenuIcon,
+	.acpPageSubMenuIcon.active {
+		background-color: rgb(255, 255, 255) !important;
+		color: rgb(44, 62, 80) !important;
+	}
+}
+
+.main {
+	flex: 1 1 auto;
+	padding: 40px 0 40px 20px;
+}
+
+.pageFooter {
+	padding: 20px 0;
+	text-align: center;
+}
diff --git a/wcfsetup/install/files/acp/style/mainMenu.scss b/wcfsetup/install/files/acp/style/mainMenu.scss
deleted file mode 100644
index 9d3237b625..0000000000
--- a/wcfsetup/install/files/acp/style/mainMenu.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-.wcfAcpMenu {
-	&.doubleColumned {
-		-webkit-columns: 2;
-		-moz-columns: 2;
-		columns: 2;
-		
-		-webkit-column-gap: 1px;
-		-moz-column-gap: 1px;
-		column-gap: 1px;
-		
-		-webkit-column-rule: 1px solid $wcfContentBorderInner;
-		-moz-column-rule: 1px solid $wcfContentBorderInner;
-		column-rule: 1px solid $wcfContentBorderInner;
-		
-		> li {
-			-webkit-column-break-inside: avoid;
-			page-break-inside: avoid;
-			break-inside: avoid;
-		}
-	}
-	
-	> li {
-		min-width: 250px;
-	}
-}
-
-.boxMenuDepth1 > li > span {
-	color: $wcfTabularBoxHeadline;
-	cursor: default;
-	
-	@extend .wcfFontBold;
-}
-
-.menuItemWrapper {
-	display: flex;
-	
-	&:hover > a,
-	> .active {
-		background-color: $wcfDropdownBackgroundActive;
-		color: $wcfDropdownLinkActive;
-		
-		> .icon {
-			color: $wcfDropdownLinkActive;
-		}
-	}
-	
-	> a {
-		color: $wcfDropdownLink;
-		display: block;
-		flex: 0 0 auto;
-		padding: 5px 10px;
-		white-space: nowrap;
-		
-		&:first-child {
-			flex: 1 1 auto;
-			padding: 5px 20px 5px 40px;
-		}
-	}
-}
diff --git a/wcfsetup/install/files/acp/style/pageMenu.scss b/wcfsetup/install/files/acp/style/pageMenu.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl
index bfedf7fd73..af0a6a5370 100644
--- a/wcfsetup/install/files/acp/templates/footer.tpl
+++ b/wcfsetup/install/files/acp/templates/footer.tpl
@@ -1,6 +1,7 @@
+				</div>
 			</div>
-		</div>
-	</section>
+		</section>
+	</div>
 			
 	{include file='pageFooter'}		
 </div>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 679b63f051..7781aba195 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -120,20 +120,13 @@
 	</script>
 	<script>
 		$(function() {
-			{* work-around for unknown core-object during WCFSetup *}
-			{if PACKAGE_ID}
-				{assign var=activeMenuItems value=$__wcf->getACPMenu()->getActiveMenuItems()|array_reverse}
-				var $activeMenuItems = [{implode from=$activeMenuItems item=_menuItem}'{$_menuItem}'{/implode}];
-				//new WCF.ACP.Menu($activeMenuItems);
-			{/if}
-			
 			if (jQuery.browser.touch) $('html').addClass('touch');
 			
 			new WCF.Effect.SmoothScroll();
 			WCF.System.PageNavigation.init('.pagination');
 			
 			{if $__wcf->user->userID}
-				//new WCF.ACP.Search();
+				new WCF.ACP.Search();
 			{/if}
 			
 			{event name='javascriptInit'}
@@ -154,112 +147,10 @@
 		
 		{event name='afterPageHeader'}
 		
-		{*include file='pageNavbarTop'*}
-		
-		<section id="main" class="main" role="main">
-	
-	{*
-	<header id="pageHeader" class="layoutBoundary">
-		<div>
-			{if $__wcf->user->userID}
-				<nav id="topMenu" class="userPanel">
-					<div class="layoutBoundary">
-						<ul class="userPanelItems">
-							<li id="userMenu" class="dropdown">
-								<a class="dropdownToggle framed" data-toggle="userMenu">{if PACKAGE_ID}{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(24)} {/if}{lang}wcf.user.userNote{/lang}</a>
-								<ul class="dropdownMenu">
-									{if PACKAGE_ID > 1}
-										<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}{/link}" class="box32">
-											<div class="framed">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</div>
-											
-											<div class="containerHeadline">
-												<h3>{$__wcf->user->username}</h3>
-												<small>{lang}wcf.user.myProfile{/lang}</small>
-											</div>
-										</a></li>
-										{if $__wcf->getUserProfileHandler()->canEditOwnProfile()}<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}editOnInit=true#about{/link}">{lang}wcf.user.editProfile{/lang}</a></li>{/if}
-										<li><a href="{link controller='Settings' forceFrontend=true}{/link}">{lang}wcf.user.menu.settings{/lang}</a></li>
-										
-										{event name='userMenuItems'}
-										
-										<li class="dropdownDivider"></li>
-									{/if}
-									<li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
-								</ul>
-							</li>
-							
-							{if PACKAGE_ID > 1}
-								<li id="jumpToPage" class="dropdown">
-									<a href="{link forceFrontend=true}{/link}" class="dropdownToggle" data-toggle="jumpToPage"><span class="icon icon16 icon-home"></span> <span>{lang}wcf.global.jumpToPage{/lang}</span></a>
-									<ul class="dropdownMenu">
-										{foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=_menuItem}
-											<li><a href="{$_menuItem->getProcessor()->getLink()}">{lang}{$_menuItem->menuItem}{/lang}</a></li>
-										{/foreach}
-									</ul>
-								</li>
-								
-								{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
-									<li>
-										<a href="{link controller='PackageUpdate'}{/link}"><span class="icon icon16 icon-refresh"></span> <span>{lang}wcf.acp.package.updates{/lang}</span> <span class="badge badgeInverse">{#$__wcf->getAvailableUpdates()}</span></a>
-									</li>
-								{/if}
-							{/if}
-														
-							<li id="woltlab" class="dropdown">
-								<a class="dropdownToggle" data-toggle="woltlab"><span class="icon icon16 icon-info-sign"></span> <span>WoltLab&reg;</span></a>
-								
-								<ul class="dropdownMenu">
-									<li><a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://www.woltlab.com"|rawurlencode}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{lang}wcf.acp.index.woltlab.website{/lang}</a></li>
-									<li><a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://community.woltlab.com"|rawurlencode}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{lang}wcf.acp.index.woltlab.forums{/lang}</a></li>
-									<li><a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://www.woltlab.com/ticket-add/"|rawurlencode}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{lang}wcf.acp.index.woltlab.tickets{/lang}</a></li>
-									<li><a class="externalURL" href="{@$__wcf->getPath()}acp/dereferrer.php?url={"https://pluginstore.woltlab.com"|rawurlencode}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{lang}wcf.acp.index.woltlab.pluginStore{/lang}</a></li>
-								</ul>
-							</li>
-							
-							{event name='topMenu'}
-						</ul>
-						
-						{if $__wcf->getSession()->getPermission('admin.general.canUseAcp')}
-							<aside id="search" class="searchBar">
-								<form>
-									<input type="search" name="q" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" value="" />
-								</form>
-							</aside>
-						{/if}
-					</div>
-				</nav>
-			{/if}
-			
-			<div id="logo" class="logo">
-				<a href="{link}{/link}">
-					<h1>{lang}wcf.global.acp{/lang}</h1>
-					{if PACKAGE_ID > 1}
-						{event name='headerLogo'}
-					{else}
-						<img src="{@$__wcf->getPath()}acp/images/wcfLogo.png" alt="" style="height: 80px; width: 502px;" />
-					{/if}
-				</a>
-			</div>
+		<div id="acpPageContentContainer" class="acpPageContentContainer">
+			{include file='pageMenu'}
 			
-			*}{* work-around for unknown core-object during WCFSetup *}{*
-			{if PACKAGE_ID && $__wcf->user->userID}
-				{hascontent}
-					<nav id="mainMenu" class="mainMenu">
-						<ul>{content}{foreach from=$__wcf->getACPMenu()->getMenuItems('') item=_menuItem}<li data-menu-item="{$_menuItem->menuItem}"><a>{lang}{@$_menuItem->menuItem}{/lang}</a></li>{/foreach}{/content}</ul>
-					</nav>
-				{/hascontent}
-			{/if}
-			
-			<nav class="navigation navigationHeader">
-				<ul class="navigationIcons">
-					<li id="toBottomLink" class="toBottomLink"><a href="{@$__wcf->getAnchor('bottom')}" title="{lang}wcf.global.scrollDown{/lang}" class="jsTooltip"><span class="icon icon16 icon-arrow-down"></span> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
-					{event name='navigationIcons'}
-				</ul>
-			</nav>
-		</div>
-	</header>
-	*}
-	
-	<div class="layoutBoundary">
-		<div id="content" class="content">
-				
+			<section id="main" class="main" role="main">
+				<div class="layoutBoundary">
+					<div id="content" class="content">
+					
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index a2b398f67f..365df56dbe 100644
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -94,7 +94,7 @@
 			<dl>
 				<dt>{lang}wcf.acp.index.system.php{/lang}</dt>
 				<dd>
-					{if $__wcf->session->getPermission('admin.system.package.canInstallPackage') && $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
+					{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage') && $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')}
 						<a href="{link controller='PHPInfo'}{/link}">{PHP_VERSION}</a>
 					{else}
 						{PHP_VERSION}
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index ad6ae67c3e..9db8b15a88 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -13,7 +13,7 @@
 			'wcf.acp.pluginStore.purchasedItems.noResults': '{lang}wcf.acp.pluginStore.purchasedItems.noResults{/lang}'
 		});
 		
-		{if $__wcf->session->getPermission('admin.system.package.canUninstallPackage')}
+		{if $__wcf->session->getPermission('admin.configuration.package.canUninstallPackage')}
 			new WCF.ACP.Package.Uninstallation($('.jsPackageRow .jsUninstallButton'), {if PACKAGE_ID > 1}'{link controller='PackageList' forceWCF=true encode=false}packageID={literal}{packageID}{/literal}{/link}'{else}null{/if});
 			{if $packageID}
 				new WCF.PeriodicalExecuter(function(pe) {
@@ -23,11 +23,11 @@
 			{/if}
 		{/if}
 		
-		{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
+		{if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')}
 			new WCF.ACP.Package.Update.Search();
 		{/if}
 		
-		{if $__wcf->session->getPermission('admin.system.package.canInstallPackage') && $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
+		{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage') && $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')}
 			new WCF.ACP.PluginStore.PurchasedItems.Search();
 		{/if}
 	});
@@ -45,7 +45,7 @@
 		<nav>
 			<ul>
 				{content}
-					{if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
+					{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
 						<li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
 					{/if}
 					
@@ -114,7 +114,7 @@
 			<nav>
 				<ul>
 					{content}
-						{if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}
+						{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
 							<li><a href="{link controller='PackageStartInstall'}action=install{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>
 						{/if}
 						
diff --git a/wcfsetup/install/files/acp/templates/pageHeader.tpl b/wcfsetup/install/files/acp/templates/pageHeader.tpl
index 11e9226aa6..6ded76cc79 100644
--- a/wcfsetup/install/files/acp/templates/pageHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeader.tpl
@@ -14,19 +14,5 @@
 				{/if}
 			</div>
 		</div>
-		
-		<script data-relocate="true">
-			var header = elById('pageHeader');
-			var pageHeaderContainer = elBySel('.pageHeaderContainer');
-			header.style.setProperty('min-height', header.clientHeight + 'px');
-			
-			function stickyHeader() {
-				header.classList[(document.body.scrollTop > 50) ? 'add' : 'remove']('sticky');
-				pageHeaderContainer.classList[(document.body.scrollTop > 50) ? 'add' : 'remove']('stickyPageHeader');
-			}
-			
-			stickyHeader();
-			window.addEventListener('scroll', stickyHeader);
-		</script>
 	</header>
 </div>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl b/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
index 3267d0dab3..a2e0807c3c 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
@@ -1,9 +1,6 @@
 <div id="pageHeaderLogo" class="pageHeaderLogo">
 	<a href="{link}{/link}">
-		{* @TODO *}
-		<img src="{@$__wcf->getPath()}images/default-logo.png" alt="" class="pageHeaderLogoLarge">
-		<img src="{@$__wcf->getPath()}images/default-logo-small.png" alt="" class="pageHeaderLogoSmall">
-		
-		{event name='headerLogo'}
+		<img src="{@$__wcf->getPath()}acp/images/wcfLogo.png" alt="" class="pageHeaderLogoLarge">
+		<img src="{@$__wcf->getPath()}acp/images/wcfLogo-small.png" alt="" class="pageHeaderLogoSmall">
 	</a>
 </div>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderMenu.tpl b/wcfsetup/install/files/acp/templates/pageHeaderMenu.tpl
index f4d455611c..79c0382945 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderMenu.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderMenu.tpl
@@ -1,48 +1,3 @@
-{if PACKAGE_ID}{assign var=_activeMenuItems value=$__wcf->getACPMenu()->getActiveMenuItems()}{/if}
-<nav id="mainMenu" class="mainMenu">
-	{if PACKAGE_ID}
-		<ol class="boxMenu">
-			{foreach from=$__wcf->getACPMenu()->getMenuItems('') item=_sectionMenuItem}
-				<li class="boxMenuHasChildren{if $_sectionMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" data-menu-item="{$_sectionMenuItem->menuItem}">
-					<span>{@$_sectionMenuItem}</span>
-					
-					{assign var=_menuItemCategories value=$__wcf->getACPMenu()->getMenuItems($_sectionMenuItem->menuItem)}
-					<ol class="wcfAcpMenu boxMenuDepth1 subMenu{if $_menuItemCategories|count > 3} doubleColumned{/if}">
-						{foreach from=$_menuItemCategories item=_menuItemCategory}
-							<li>
-								<span>{@$_menuItemCategory}</span>
-								
-								<ol class="boxMenuDepth2 menuItemList">
-									{foreach from=$__wcf->getACPMenu()->getMenuItems($_menuItemCategory->menuItem) item=_menuItem}
-										{assign var=_subMenuItems value=$__wcf->getACPMenu()->getMenuItems($_menuItem->menuItem)}
-										
-										{if $_subMenuItems|empty}
-											<li{if $_menuItem->menuItem|in_array:$_activeMenuItems} class="active"{/if}><a href="{$_menuItem->getLink()}">{@$_menuItem}</a></li>
-										{else}
-											{if $_menuItemCategory->menuItem === 'wcf.acp.menu.link.option'}
-											{* handle special option categories *}
-												{foreach from=$_subMenuItems item=_subMenuItem}
-													<li{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} class="active"{/if}><a href="{$_subMenuItem->getLink()}">{@$_subMenuItem}</a></li>
-												{/foreach}
-											{else}
-												<li>
-													<div class="menuItemWrapper">
-														<a href="{$_menuItem->getLink()}"{if $_menuItem->menuItem|in_array:$_activeMenuItems && $_activeMenuItems[0] === $_menuItem->menuItem} class="active"{/if}>{@$_menuItem}</a>
-														
-														{foreach from=$_subMenuItems item=_subMenuItem}
-															<a href="{$_subMenuItem->getLink()}" class="jsTooltip{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" title="{@$_subMenuItem}"><span class="icon icon16 {$_subMenuItem->icon}"></span></a>
-														{/foreach}
-													</div>
-												</li>
-											{/if}
-										{/if}
-									{/foreach}
-								</ol>
-							</li>
-						{/foreach}
-					</ol>
-				</li>
-			{/foreach}
-		</ol>
-	{/if}
-</nav>
+<div id="mainMenu" class="mainMenu">
+	<!-- placeholder for mobile UI -->
+</div>
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
index d7ad15758f..fe8c605c6e 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderSearch.tpl
@@ -7,20 +7,8 @@
 
 <div id="pageHeaderSearch" class="pageHeaderSearch" data-disable-auto-focus="true">
 	<form method="post" action="{@$__searchFormLink}">
-		<div class="pageHeaderSearchInputContainer dropdown">
-			<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput dropdownToggle" placeholder="{@$__searchInputPlaceholder}" autocomplete="off" required="required" value="{if $query|isset}{$query}{/if}" data-toggle="search" />
-			
-			<ul class="dropdownMenu">
-				{hascontent}
-					<li class="dropdownText">
-						{content}
-							{@$__searchDropdownOptions}
-						{/content}
-					</li>
-					<li class="dropdownDivider"></li>
-				{/hascontent}
-				<li><a href="{@$__searchFormLink}">{lang}wcf.search.extended{/lang}</a></li>
-			</ul>
+		<div class="pageHeaderSearchInputContainer">
+			<input type="search" name="q" id="pageHeaderSearchInput" class="pageHeaderSearchInput" placeholder="{@$__searchInputPlaceholder}" autocomplete="off" required="required" value="{if $query|isset}{$query}{/if}" data-toggle="search" />
 			
 			<button class="pageHeaderSearchInputButton" type="submit">
 				<span class="icon icon16 pointer fa-search" title="{lang}wcf.global.search{/lang}"></span>
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index 0aa3e49dea..c6658b3525 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@ -1,11 +1,11 @@
 <nav id="topMenu" class="userPanel">
 	<ul class="userPanelItems">
 		{if $__wcf->user->userID}
-			<!-- user menu -->
-			<li id="userMenu" class="dropdown">
-				<a class="dropdownToggle" data-toggle="userMenu">{if PACKAGE_ID}{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)} {/if}{lang}wcf.user.userNote{/lang}</a>
-				<ul class="dropdownMenu">
-					{if PACKAGE_ID > 1}
+			{if PACKAGE_ID}
+				<li id="userMenu" class="dropdown">
+					<a class="dropdownToggle" data-toggle="userMenu">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</a>
+					<ul class="dropdownMenu">
+						{* TODO: this was copied straight from the frontend *}
 						<li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}{/link}" class="box32">
 								<div>{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</div>
 								
@@ -20,12 +20,10 @@
 						{event name='userMenuItems'}
 						
 						<li class="dropdownDivider"></li>
-					{/if}
-					<li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
-				</ul>
-			</li>
+						<li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
+					</ul>
+				</li>
 			
-			{if PACKAGE_ID}
 				<li id="jumpToPage" class="dropdown">
 					<a href="{link forceFrontend=true}{/link}" class="dropdownToggle" data-toggle="jumpToPage"><span class="icon icon32 fa-home"></span> <span>{lang}wcf.global.jumpToPage{/lang}</span></a>
 					<ul class="dropdownMenu">
@@ -35,7 +33,7 @@
 					</ul>
 				</li>
 				
-				{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
+				{if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
 					<li>
 						<a href="{link controller='PackageUpdate'}{/link}"><span class="icon icon32 fa-refresh"></span> <span>{lang}wcf.acp.package.updates{/lang}</span> <span class="badge badgeInverse">{#$__wcf->getAvailableUpdates()}</span></a>
 					</li>
diff --git a/wcfsetup/install/files/acp/templates/pageMenu.tpl b/wcfsetup/install/files/acp/templates/pageMenu.tpl
new file mode 100644
index 0000000000..f201ce261f
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/pageMenu.tpl
@@ -0,0 +1,53 @@
+{if PACKAGE_ID && $__wcf->user->userID}
+	{assign var=_activeMenuItems value=$__wcf->getACPMenu()->getActiveMenuItems()}
+	
+	<nav id="acpPageMenu" class="acpPageMenu">
+		<ol class="acpPageMenuList">
+			{foreach from=$__wcf->getACPMenu()->getMenuItems('') item=_sectionMenuItem}
+				<li>
+					<a href="#" class="acpPageMenuLink{if $_sectionMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" data-menu-item="{$_sectionMenuItem->menuItem}">
+						<span class="icon icon48 {$_sectionMenuItem->icon}"></span>
+						<span class="acpPageMenuItemLabel">{@$_sectionMenuItem}</span>
+					</a>
+				</li>
+			{/foreach}
+		</ol>
+	</nav>
+	
+	<nav id="acpPageSubMenu" class="acpPageSubMenu">
+		{foreach from=$__wcf->getACPMenu()->getMenuItems('') item=_sectionMenuItem}
+			<ol class="acpPageSubMenuCategoryList{if $_sectionMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" data-menu-item="{$_sectionMenuItem->menuItem}">
+				{foreach from=$__wcf->getACPMenu()->getMenuItems($_sectionMenuItem->menuItem) item=_menuItemCategory}
+					<li class="acpPageSubMenuCategory">
+						<span>{@$_menuItemCategory}</span>
+						
+						<ol class="acpPageSubMenuItemList">
+							{foreach from=$__wcf->getACPMenu()->getMenuItems($_menuItemCategory->menuItem) item=_menuItem}
+								{assign var=_subMenuItems value=$__wcf->getACPMenu()->getMenuItems($_menuItem->menuItem)}
+								
+								{if $_subMenuItems|empty}
+									<li{if $_menuItem->menuItem|in_array:$_activeMenuItems} class="active"{/if}><a href="{$_menuItem->getLink()}" class="acpPageSubMenuLink">{@$_menuItem}</a></li>
+								{else}
+									{if $_menuItem->menuItem === 'wcf.acp.menu.link.option.category'}
+										{* handle special option categories *}
+										{foreach from=$_subMenuItems item=_subMenuItem}
+											<li{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} class="active"{/if}><a href="{$_subMenuItem->getLink()}" class="acpPageSubMenuLink">{@$_subMenuItem}</a></li>
+										{/foreach}
+									{else}
+										<li class="acpPageSubMenuLinkWrapper">
+											<a href="{$_menuItem->getLink()}" class="acpPageSubMenuLink{if $_menuItem->menuItem|in_array:$_activeMenuItems && $_activeMenuItems[0] === $_menuItem->menuItem} active{/if}">{@$_menuItem}</a>
+											
+											{foreach from=$_subMenuItems item=_subMenuItem}
+												<a href="{$_subMenuItem->getLink()}" class="acpPageSubMenuIcon jsTooltip{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" title="{@$_subMenuItem}"><span class="icon icon16 {$_subMenuItem->icon}"></span></a>
+											{/foreach}
+										</li>
+									{/if}
+								{/if}
+							{/foreach}
+						</ol>
+					</li>
+				{/foreach}
+			</ol>
+		{/foreach}
+	</nav>
+{/if}
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Acp/Bootstrap.js b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Bootstrap.js
index 17460a4c9e..eb788acfed 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Acp/Bootstrap.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Bootstrap.js
@@ -2,28 +2,25 @@
  * Bootstraps WCF's JavaScript with additions for the ACP usage.
  * 
  * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
+ * @copyright	2001-2016 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @module	WoltLab/WCF/Acp/Bootstrap
  */
-define(['WoltLab/WCF/Bootstrap'], function(Bootstrap) {
+define(['WoltLab/WCF/Bootstrap', './Ui/Page/Menu'], function(Bootstrap, UiPageMenu) {
 	"use strict";
 	
 	/**
-	 * ACP Boostrapper.
-	 * 
 	 * @exports	WoltLab/WCF/Acp/Bootstrap
 	 */
-	var AcpBootstrap = {
+	return {
 		/**
 		 * Bootstraps general modules and frontend exclusive ones.
 		 * 
-		 * @param	{object<string, *>}	options		bootstrap options
+		 * @param	{Object}	options		bootstrap options
 		 */
 		setup: function(options) {
 			Bootstrap.setup();
+			UiPageMenu.init();
 		}
 	};
-	
-	return AcpBootstrap;
 });
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Page/Menu.js b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Page/Menu.js
new file mode 100644
index 0000000000..9811aebf3f
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Page/Menu.js
@@ -0,0 +1,71 @@
+/**
+ * Provides the ACP menu navigation.
+ * 
+ * @author	Alexander Ebert
+ * @copyright	2001-2016 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module	WoltLab/WCF/Acp/Ui/Page/Menu
+ */
+define(['Dictionary'], function(Dictionary) {
+	"use strict";
+	
+	var _activeMenuItem = '';
+	var _menuItems = new Dictionary();
+	var _menuItemContainers = new Dictionary();
+	
+	/**
+	 * @exports     WoltLab/WCF/Acp/Ui/Page/Menu
+	 */
+	return {
+		/**
+		 * Initializes the ACP menu navigation.
+		 */
+		init: function() {
+			elBySelAll('.acpPageMenuLink', null, (function(link) {
+				var menuItem = elData(link, 'menu-item');
+				if (link.classList.contains('active')) {
+					_activeMenuItem = menuItem;
+				}
+				
+				link.addEventListener(WCF_CLICK_EVENT, this._toggle.bind(this));
+				
+				_menuItems.set(menuItem, link);
+			}).bind(this));
+			
+			elBySelAll('.acpPageSubMenuCategoryList', null, function(container) {
+				_menuItemContainers.set(elData(container, 'menu-item'), container);
+			});
+		},
+		
+		/**
+		 * Toggles a menu item.
+		 * 
+		 * @param       {Event}         event           event object
+		 * @protected
+		 */
+		_toggle: function(event) {
+			event.preventDefault();
+			event.stopPropagation();
+			
+			var link = event.currentTarget;
+			var menuItem = elData(link, 'menu-item');
+			
+			// remove active marking from currently active menu
+			if (_activeMenuItem) {
+				_menuItems.get(_activeMenuItem).classList.remove('active');
+				_menuItemContainers.get(_activeMenuItem).classList.remove('active');
+			}
+			
+			if (_activeMenuItem === menuItem) {
+				// current item was active before
+				_activeMenuItem = '';
+			}
+			else {
+				link.classList.add('active');
+				_menuItemContainers.get(menuItem).classList.add('active');
+				
+				_activeMenuItem = menuItem;
+			}
+		}
+	};
+});
diff --git a/wcfsetup/install/files/lib/acp/action/CacheClearAction.class.php b/wcfsetup/install/files/lib/acp/action/CacheClearAction.class.php
index 8cdf518df7..4358363adb 100644
--- a/wcfsetup/install/files/lib/acp/action/CacheClearAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/CacheClearAction.class.php
@@ -21,7 +21,7 @@ class CacheClearAction extends AbstractAction {
 	/**
 	 * @see	\wcf\action\AbstractAction::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canViewLog');
+	public $neededPermissions = array('admin.management.canViewLog');
 	
 	/**
 	 * @see	\wcf\action\IAction::execute()
diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
index e005ae0063..7f949879be 100644
--- a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
@@ -56,7 +56,7 @@ class ApplicationEditForm extends AbstractForm {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canManageApplication');
+	public $neededPermissions = array('admin.configuration.canManageApplication');
 	
 	/**
 	 * application package id
diff --git a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
index 0666f86302..d724baffe3 100755
--- a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
@@ -29,7 +29,7 @@ class CronjobAddForm extends AbstractForm {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canManageCronjob');
+	public $neededPermissions = array('admin.management.canManageCronjob');
 	
 	/**
 	 * cronjob class name
diff --git a/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php b/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
index 3b11b41af9..9f20400428 100644
--- a/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
@@ -35,7 +35,7 @@ class DataImportForm extends AbstractForm {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canImportData');
+	public $neededPermissions = array('admin.management.canImportData');
 	
 	/**
 	 * list of available exporters
diff --git a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php
index b627af88c8..92e4ee75c9 100644
--- a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php
@@ -122,7 +122,7 @@ class OptionForm extends AbstractOptionListForm {
 		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.option.category.'.$this->category->categoryName);
 		
 		// check permission
-		WCF::getSession()->checkPermissions(array('admin.system.canEditOption'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.canEditOption'));
 		
 		if ($this->category->categoryName == 'module') {
 			// check master password
diff --git a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
index b7b8f2e546..00b03b085a 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
@@ -200,7 +200,7 @@ class PackageStartInstallForm extends AbstractForm {
 	 * @see	\wcf\page\IPage::show()
 	 */
 	public function show() {
-		if (!WCF::getSession()->getPermission('admin.system.package.canInstallPackage') && !WCF::getSession()->getPermission('admin.system.package.canUpdatePackage')) {
+		if (!WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage') && !WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage')) {
 			throw new PermissionDeniedException();
 		}
 		
diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php
index 6a2a1453fa..ff25a166f1 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php
@@ -27,7 +27,7 @@ class PackageUpdateServerAddForm extends AbstractForm {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.package.canEditServer');
+	public $neededPermissions = array('admin.configuration.package.canEditServer');
 	
 	/**
 	 * server url
diff --git a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
index d45286a1a4..f4b14feca8 100644
--- a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
@@ -181,7 +181,7 @@ class RescueModeForm extends AbstractCaptchaForm {
 		WCF::getSession()->disableUpdate();
 		WCF::getSession()->changeUser($this->user, true);
 		
-		if (!WCF::getSession()->getPermission('admin.system.canManageApplication')) {
+		if (!WCF::getSession()->getPermission('admin.configuration.canManageApplication')) {
 			throw new UserInputException('username', 'notAuthorized');
 		}
 	}
diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php
index c746701b99..b46b3d9522 100755
--- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php
@@ -26,7 +26,7 @@ class ACPSessionLogListPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canViewLog');
+	public $neededPermissions = array('admin.management.canViewLog');
 	
 	/**
 	 * @see	\wcf\page\SortablePage::$defaultSortField
diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php
index f21caca4d7..e94bd44523 100755
--- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php
@@ -29,7 +29,7 @@ class ACPSessionLogPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canViewLog');
+	public $neededPermissions = array('admin.management.canViewLog');
 	
 	/**
 	 * @see	\wcf\page\SortablePage::$defaultSortField
diff --git a/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php b/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php
index ed470bb0ad..f809e1e1ee 100644
--- a/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php
@@ -29,7 +29,7 @@ class ApplicationManagementPage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canManageApplication');
+	public $neededPermissions = array('admin.configuration.canManageApplication');
 	
 	/**
 	 * @see	\wcf\page\IPage::readData()
diff --git a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
index ea7a7f5a62..a09c624538 100755
--- a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
@@ -27,7 +27,7 @@ class CacheListPage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canManageApplication');
+	public $neededPermissions = array('admin.configuration.canManageApplication');
 	
 	/**
 	 * indicates if cache was cleared
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
index 47788405bf..197c8ca4da 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
@@ -21,7 +21,7 @@ class CronjobListPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canManageCronjob');
+	public $neededPermissions = array('admin.management.canManageCronjob');
 	
 	/**
 	 * @see	\wcf\page\SortablePage::$defaultSortField
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
index 74509ffcc3..aee3b8efe4 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
@@ -21,7 +21,7 @@ class CronjobLogListPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canManageCronjob');
+	public $neededPermissions = array('admin.management.canManageCronjob');
 	
 	/**
 	 * @see	\wcf\page\MultipleLinkPage::$itemsPerPage
diff --git a/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php b/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php
index e1edef30cf..4a59fa2d57 100644
--- a/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php
@@ -29,7 +29,7 @@ class ExceptionLogViewPage extends MultipleLinkPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canViewLog');
+	public $neededPermissions = array('admin.management.canViewLog');
 	
 	/**
 	 * @see	\wcf\page\MultipleLinkPage::$itemsPerPage
diff --git a/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php b/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php
index 21bba7a7cd..4bc394d97c 100644
--- a/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php
@@ -22,7 +22,7 @@ class PHPInfoPage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.package.canInstallPackage', 'admin.system.package.canUpdatePackage');
+	public $neededPermissions = array('admin.configuration.package.canInstallPackage', 'admin.configuration.package.canUpdatePackage');
 	
 	/**
 	 * @see	\wcf\page\IPage::assignVariables()
diff --git a/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php
index 0ce7f5492a..4016ad56da 100644
--- a/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageInstallationConfirmPage.class.php
@@ -68,10 +68,10 @@ class PackageInstallationConfirmPage extends AbstractPage {
 		}
 		
 		if ($this->queue->action == 'install') {
-			WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
+			WCF::getSession()->checkPermissions(array('admin.configuration.package.canInstallPackage'));
 		}
 		else {
-			WCF::getSession()->checkPermissions(array('admin.system.package.canUpdatePackage'));
+			WCF::getSession()->checkPermissions(array('admin.configuration.package.canUpdatePackage'));
 		}
 		
 		$this->installingImportedStyle = WCF::getSession()->getVar('stylePackageImportLocation') !== null;
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
index 59ca831a18..bf0bd55b34 100644
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -22,7 +22,7 @@ class PackageListPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canUninstallPackage');
+	public $neededPermissions = array('admin.configuration.package.canUpdatePackage', 'admin.configuration.package.canUninstallPackage');
 	
 	/**
 	 * @see	\wcf\page\MultipleLinkPage::$itemsPerPage
diff --git a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
index bb74aefbda..01cdbe2736 100755
--- a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
@@ -24,7 +24,7 @@ class PackagePage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canUninstallPackage');
+	public $neededPermissions = array('admin.configuration.package.canUpdatePackage', 'admin.configuration.package.canUninstallPackage');
 	
 	/**
 	 * id of the package
diff --git a/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php b/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php
index 643e2e8c0b..2c9694a15a 100644
--- a/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageUpdatePage.class.php
@@ -30,7 +30,7 @@ class PackageUpdatePage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.package.canUpdatePackage');
+	public $neededPermissions = array('admin.configuration.package.canUpdatePackage');
 	
 	/**
 	 * @see	\wcf\page\IPage::readData()
diff --git a/wcfsetup/install/files/lib/acp/page/PackageUpdateServerListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageUpdateServerListPage.class.php
index e19d822cb0..e3aa3b80f4 100755
--- a/wcfsetup/install/files/lib/acp/page/PackageUpdateServerListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageUpdateServerListPage.class.php
@@ -21,7 +21,7 @@ class PackageUpdateServerListPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.package.canEditServer');
+	public $neededPermissions = array('admin.configuration.package.canEditServer');
 	
 	/**
 	 * @see	\wcf\page\SortablePage::$defaultSortField
diff --git a/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php b/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php
index 759964e1f1..e6075d1584 100644
--- a/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PluginStorePurchasedItemsPage.class.php
@@ -26,7 +26,7 @@ class PluginStorePurchasedItemsPage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.package.canUpdatePackage', 'admin.system.package.canUninstallPackage');
+	public $neededPermissions = array('admin.configuration.package.canUpdatePackage', 'admin.configuration.package.canUninstallPackage');
 	
 	/**
 	 * list of purchased products grouped by WCF major release
diff --git a/wcfsetup/install/files/lib/acp/page/RebuildDataPage.class.php b/wcfsetup/install/files/lib/acp/page/RebuildDataPage.class.php
index 848d9c5365..1808466230 100644
--- a/wcfsetup/install/files/lib/acp/page/RebuildDataPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/RebuildDataPage.class.php
@@ -23,7 +23,7 @@ class RebuildDataPage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canRebuildData');
+	public $neededPermissions = array('admin.management.canRebuildData');
 	
 	/**
 	 * object types
diff --git a/wcfsetup/install/files/lib/acp/page/StatPage.class.php b/wcfsetup/install/files/lib/acp/page/StatPage.class.php
index e33bdf2d33..11b8a1f763 100644
--- a/wcfsetup/install/files/lib/acp/page/StatPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/StatPage.class.php
@@ -19,12 +19,12 @@ class StatPage extends AbstractPage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$activeMenuItem
 	 */
-	public $activeMenuItem = 'wcf.acp.menu.link.log.stat';
+	public $activeMenuItem = 'wcf.acp.menu.link.stat.list';
 	
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canViewLog');
+	public $neededPermissions = array('admin.management.canViewLog');
 	
 	/**
 	 * start date (yyyy-mm-dd)
diff --git a/wcfsetup/install/files/lib/acp/page/UserAuthenticationFailureListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserAuthenticationFailureListPage.class.php
index 41e56512d4..a91ce91ddc 100644
--- a/wcfsetup/install/files/lib/acp/page/UserAuthenticationFailureListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UserAuthenticationFailureListPage.class.php
@@ -21,7 +21,7 @@ class UserAuthenticationFailureListPage extends SortablePage {
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.system.canViewLog');
+	public $neededPermissions = array('admin.management.canViewLog');
 	
 	/**
 	 * @see	\wcf\page\AbstractPage::$neededModules
diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
index 205d17486d..27a0aee63d 100644
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
@@ -28,17 +28,17 @@ class CronjobAction extends AbstractDatabaseObjectAction implements IToggleActio
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.system.canManageCronjob');
+	protected $permissionsCreate = array('admin.management.canManageCronjob');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.system.canManageCronjob');
+	protected $permissionsDelete = array('admin.management.canManageCronjob');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.system.canManageCronjob');
+	protected $permissionsUpdate = array('admin.management.canManageCronjob');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$allowGuestAccess
diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php
index e1d1c3af59..35649e3cdc 100644
--- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLogAction.class.php
@@ -28,7 +28,7 @@ class CronjobLogAction extends AbstractDatabaseObjectAction {
 	 * Validates the clear all action.
 	 */
 	public function validateClearAll() {
-		WCF::getSession()->checkPermissions(array('admin.system.canManageCronjob'));
+		WCF::getSession()->checkPermissions(array('admin.management.canManageCronjob'));
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/data/option/OptionAction.class.php b/wcfsetup/install/files/lib/data/option/OptionAction.class.php
index e5a46f10b8..375678816c 100644
--- a/wcfsetup/install/files/lib/data/option/OptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/option/OptionAction.class.php
@@ -21,17 +21,17 @@ class OptionAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.system.canEditOption');
+	protected $permissionsCreate = array('admin.configuration.canEditOption');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.system.canEditOption');
+	protected $permissionsDelete = array('admin.configuration.canEditOption');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.system.canEditOption');
+	protected $permissionsUpdate = array('admin.configuration.canEditOption');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
diff --git a/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php b/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php
index b508460124..fdad3caf74 100644
--- a/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php
@@ -21,17 +21,17 @@ class OptionCategoryAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.system.canEditOption');
+	protected $permissionsCreate = array('admin.configuration.canEditOption');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.system.canEditOption');
+	protected $permissionsDelete = array('admin.configuration.canEditOption');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.system.canEditOption');
+	protected $permissionsUpdate = array('admin.configuration.canEditOption');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php
index 68b191a2bd..587f63909a 100644
--- a/wcfsetup/install/files/lib/data/package/Package.class.php
+++ b/wcfsetup/install/files/lib/data/package/Package.class.php
@@ -141,7 +141,7 @@ class Package extends DatabaseObject {
 	 * @return	boolean
 	 */
 	public function canUninstall() {
-		if (!WCF::getSession()->getPermission('admin.system.package.canUninstallPackage')) {
+		if (!WCF::getSession()->getPermission('admin.configuration.package.canUninstallPackage')) {
 			return false;
 		}
 		
diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
index ee7f30f33c..2bcfbb524e 100644
--- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
@@ -28,17 +28,17 @@ class PackageAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.system.package.canInstallPackage');
+	protected $permissionsCreate = array('admin.configuration.package.canInstallPackage');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.system.package.canUninstallPackage');
+	protected $permissionsDelete = array('admin.configuration.package.canUninstallPackage');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.system.package.canUpdatePackage');
+	protected $permissionsUpdate = array('admin.configuration.package.canUpdatePackage');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
@@ -49,7 +49,7 @@ class PackageAction extends AbstractDatabaseObjectAction {
 	 * Validates parameters to search for purchased items in the WoltLab Plugin-Store.
 	 */
 	public function validateSearchForPurchasedItems() {
-		WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage', 'admin.system.package.canUpdatePackage'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.package.canInstallPackage', 'admin.configuration.package.canUpdatePackage'));
 		
 		$this->readString('password', true);
 		$this->readString('username', true);
diff --git a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php
index c9d3fe7c06..8e8e0326e6 100644
--- a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php
@@ -84,7 +84,7 @@ class PackageInstallationQueueAction extends AbstractDatabaseObjectAction {
 	 */
 	public function validateCancelInstallation() {
 		// check permissions
-		WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.package.canInstallPackage'));
 		
 		// validate queue
 		$this->queue = $this->getSingleObject();
diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
index b78e09e7fb..cb15636cb7 100644
--- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
@@ -47,7 +47,7 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 	 * Validates parameters to search for installable packages.
 	 */
 	public function validateSearch() {
-		WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.package.canInstallPackage'));
 		
 		$this->readString('package', true);
 		$this->readString('packageDescription', true);
@@ -295,7 +295,7 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 	 * Validates parameters to return a result list for a previous search.
 	 */
 	public function validateGetResultList() {
-		WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.package.canInstallPackage'));
 		
 		$this->readInteger('pageNo');
 		$this->readInteger('searchID');
@@ -374,7 +374,7 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 	 * Validates permissions to search for updates.
 	 */
 	public function validateSearchForUpdates() {
-		WCF::getSession()->checkPermissions(array('admin.system.package.canUpdatePackage'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.package.canUpdatePackage'));
 		
 		$this->readBoolean('ignoreCache', true);
 	}
@@ -402,7 +402,7 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 	 * Validates parameters to perform a system update.
 	 */
 	public function validatePrepareUpdate() {
-		WCF::getSession()->checkPermissions(array('admin.system.package.canUpdatePackage'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.package.canUpdatePackage'));
 		
 		if (!isset($this->parameters['packages']) || !is_array($this->parameters['packages'])) {
 			throw new UserInputException('packages');
@@ -453,7 +453,7 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 	 * Validates parameters to prepare a package installation.
 	 */
 	public function validatePrepareInstallation() {
-		WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
+		WCF::getSession()->checkPermissions(array('admin.configuration.package.canInstallPackage'));
 		
 		if (!isset($this->parameters['packages']) || !is_array($this->parameters['packages']) || count($this->parameters['packages']) != 1) {
 			throw new UserInputException('packages');
diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php
index da20ef4db2..12dc7677a7 100644
--- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php
@@ -22,17 +22,17 @@ class PackageUpdateServerAction extends AbstractDatabaseObjectAction implements
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.system.package.canEditServer');
+	protected $permissionsCreate = array('admin.configuration.package.canEditServer');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.system.package.canEditServer');
+	protected $permissionsDelete = array('admin.configuration.package.canEditServer');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.system.package.canEditServer');
+	protected $permissionsUpdate = array('admin.configuration.package.canEditServer');
 	
 	/**
 	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
diff --git a/wcfsetup/install/files/lib/data/stat/daily/StatDailyAction.class.php b/wcfsetup/install/files/lib/data/stat/daily/StatDailyAction.class.php
index 5cd1f6457b..8eb8a73acb 100644
--- a/wcfsetup/install/files/lib/data/stat/daily/StatDailyAction.class.php
+++ b/wcfsetup/install/files/lib/data/stat/daily/StatDailyAction.class.php
@@ -26,7 +26,7 @@ class StatDailyAction extends AbstractDatabaseObjectAction {
 	 * Validates the getData action.
 	 */
 	public function validateGetData() {
-		WCF::getSession()->checkPermissions(array('admin.system.canViewLog'));
+		WCF::getSession()->checkPermissions(array('admin.management.canViewLog'));
 		
 		// validate start date
 		if (empty($this->parameters['startDate']) || !preg_match('/^\d{4}\-\d{2}\-\d{2}$/', $this->parameters['startDate'])) {
diff --git a/wcfsetup/install/files/lib/system/CLIWCF.class.php b/wcfsetup/install/files/lib/system/CLIWCF.class.php
index 0595362518..f48f4a41d0 100644
--- a/wcfsetup/install/files/lib/system/CLIWCF.class.php
+++ b/wcfsetup/install/files/lib/system/CLIWCF.class.php
@@ -325,7 +325,7 @@ class CLIWCF extends WCF {
 	 * @return	string
 	 */
 	public function checkForUpdates() {
-		if (WCF::getSession()->getPermission('admin.system.package.canUpdatePackage') && VERBOSITY >= -1 && !self::getArgvParser()->disableUpdateCheck) {
+		if (WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage') && VERBOSITY >= -1 && !self::getArgvParser()->disableUpdateCheck) {
 			$updates = PackageUpdateDispatcher::getInstance()->getAvailableUpdates();
 			if (!empty($updates)) {
 				$return = self::getReader()->println(count($updates) . ' update' . (count($updates) > 1 ? 's are' : ' is') . ' available');
diff --git a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
index a4471032da..ecbd52f27d 100644
--- a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
@@ -107,7 +107,7 @@ class ImportCLICommand implements ICLICommand {
 	 * @see	\wcf\system\cli\command\ICLICommand::canAccess()
 	 */
 	public function canAccess() {
-		return WCF::getSession()->getPermission('admin.system.canImportData');
+		return WCF::getSession()->getPermission('admin.management.canImportData');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php
index fd7cabf2e0..e67def8a89 100644
--- a/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php
@@ -130,7 +130,7 @@ class PackageCLICommand implements IArgumentedCLICommand {
 		
 		// check update or install support
 		if ($package !== null) {
-			CLIWCF::getSession()->checkPermissions(array('admin.system.package.canUpdatePackage'));
+			CLIWCF::getSession()->checkPermissions(array('admin.configuration.package.canUpdatePackage'));
 			
 			$archive->setPackage($package);
 			if (!$archive->isValidUpdate()) {
@@ -138,7 +138,7 @@ class PackageCLICommand implements IArgumentedCLICommand {
 			}
 		}
 		else {
-			CLIWCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
+			CLIWCF::getSession()->checkPermissions(array('admin.configuration.package.canInstallPackage'));
 			
 			if (!$archive->isValidInstall()) {
 				$this->error('noValidInstall');
@@ -471,6 +471,6 @@ class PackageCLICommand implements IArgumentedCLICommand {
 	 * @see	\wcf\system\cli\command\ICLICommand::canAccess()
 	 */
 	public function canAccess() {
-		return CLIWCF::getSession()->getPermission('admin.system.package.canInstallPackage') || CLIWCF::getSession()->getPermission('admin.system.package.canUpdatePackage');
+		return CLIWCF::getSession()->getPermission('admin.configuration.package.canInstallPackage') || CLIWCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage');
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php b/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
index febc1195bc..4b78ad1933 100644
--- a/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
+++ b/wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
@@ -139,7 +139,7 @@ class ImportHandler extends SingletonFactory implements IAJAXInvokeAction {
 	 * Validates accessibility of resetMapping().
 	 */
 	public function validateResetMapping() {
-		WCF::getSession()->checkPermissions(array('admin.system.canImportData'));
+		WCF::getSession()->checkPermissions(array('admin.management.canImportData'));
 		
 		// reset caches
 		CacheHandler::getInstance()->flushAll();
diff --git a/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php b/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
index 97e7bbd76f..9d36e2b68e 100644
--- a/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
@@ -19,7 +19,7 @@ class PackageACPSearchResultProvider implements IACPSearchResultProvider {
 	 * @see	\wcf\system\search\acp\IACPSearchResultProvider::search()
 	 */
 	public function search($query) {
-		if (!WCF::getSession()->getPermission('admin.system.package.canUpdatePackage') && !WCF::getSession()->getPermission('admin.system.package.canUninstallPackage')) {
+		if (!WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage') && !WCF::getSession()->getPermission('admin.configuration.package.canUninstallPackage')) {
 			return array();
 		}
 		
diff --git a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
index bfa32e053a..4c7723849a 100644
--- a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
@@ -178,7 +178,7 @@ class StyleCompiler extends SingletonFactory {
 			closedir($handle);
 		}
 		
-		$additional = ['mainMenu'];
+		$additional = ['layout'];
 		for ($i = 0, $length = count($additional); $i < $length; $i++) {
 			$files[] = WCF_DIR . 'acp/style/' . $additional[$i] . '.scss';
 		}
diff --git a/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php b/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
index 3c88eb2268..5cf882a94a 100644
--- a/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/AbstractRebuildDataWorker.class.php
@@ -49,7 +49,7 @@ abstract class AbstractRebuildDataWorker extends AbstractWorker implements IRebu
 	 * @see	\wcf\system\worker\IWorker::validate()
 	 */
 	public function validate() {
-		WCF::getSession()->checkPermissions(array('admin.system.canRebuildData'));
+		WCF::getSession()->checkPermissions(array('admin.management.canRebuildData'));
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php b/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php
index 8b87e15039..4d77245995 100644
--- a/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/ImportWorker.class.php
@@ -33,7 +33,7 @@ class ImportWorker extends AbstractWorker {
 	 * @see	\wcf\system\worker\IWorker::validate()
 	 */
 	public function validate() {
-		WCF::getSession()->checkPermissions(array('admin.system.canImportData'));
+		WCF::getSession()->checkPermissions(array('admin.management.canImportData'));
 		
 		if (!isset($this->parameters['objectType'])) {
 			throw new SystemException("parameter 'objectType' missing");
diff --git a/wcfsetup/install/files/style/layout/pageFooter.scss b/wcfsetup/install/files/style/layout/pageFooter.scss
index 6c73738ecd..889b04beab 100644
--- a/wcfsetup/install/files/style/layout/pageFooter.scss
+++ b/wcfsetup/install/files/style/layout/pageFooter.scss
@@ -18,7 +18,9 @@
 	// benchmark link styling
 	.benchmark,
 	.copyright {
-		margin-top: 20px;
+		&:not(:first-child) {
+			margin-top: 20px;
+		}
 		
 		a {
 			// use text color instead
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 18921e6a11..5bbfe390bf 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -279,15 +279,15 @@
 		<item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Mitglieder dieser Benutzergruppe können die Administrationsoberfläche betreten und dort abhängig von den weiteren Zugriffsrechten verschiedene Aktionen durchführen. Diese Option muss aktiviert sein, wenn diesen Benutzern andere administrative Funktionen erlaubt werden sollen.]]></item>
 		<item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Kann versteckte Profilinformationen sehen]]></item>
 		<item name="wcf.acp.group.option.admin.language.canManageLanguage"><![CDATA[Kann Sprachen verwalten]]></item>
-		<item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Kann allgemeine Einstellungen vornehmen]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.canEditOption"><![CDATA[Kann allgemeine Einstellungen vornehmen]]></item>
 		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Kann deaktivierte Stile benutzen]]></item>
-		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Kann Protokolle abrufen]]></item>
-		<item name="wcf.acp.group.option.admin.system.canManageApplication"><![CDATA[Kann Anwendungen verwalten]]></item>
-		<item name="wcf.acp.group.option.admin.system.canManageCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben verwalten]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canEditServer"><![CDATA[Kann Update-Server bearbeiten]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canInstallPackage"><![CDATA[Kann Pakete installieren]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canUninstallPackage"><![CDATA[Kann Pakete deinstallieren]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canUpdatePackage"><![CDATA[Kann Pakete aktualisieren]]></item>
+		<item name="wcf.acp.group.option.admin.management.canViewLog"><![CDATA[Kann Protokolle abrufen]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.canManageApplication"><![CDATA[Kann Anwendungen verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.management.canManageCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canEditServer"><![CDATA[Kann Update-Server bearbeiten]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canInstallPackage"><![CDATA[Kann Pakete installieren]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canUninstallPackage"><![CDATA[Kann Pakete deinstallieren]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canUpdatePackage"><![CDATA[Kann Pakete aktualisieren]]></item>
 		<item name="wcf.acp.group.option.admin.user.accessibleGroups"><![CDATA[Zugängliche Benutzergruppen]]></item>
 		<item name="wcf.acp.group.option.admin.user.accessibleGroups.description"><![CDATA[Mitglieder dieser Benutzergruppe haben auf diese Gruppen Zugriff. Zusätzlich muss angegeben werden, ob z.B. die Benutzergruppe bearbeitet werden darf.]]></item>
 		<item name="wcf.acp.group.option.admin.user.canAddGroup"><![CDATA[Kann neue Benutzergruppen erstellen]]></item>
@@ -301,13 +301,13 @@
 		<item name="wcf.acp.group.option.admin.user.canMailUser"><![CDATA[Kann E-Mails an Benutzer senden]]></item>
 		<item name="wcf.acp.group.option.admin.user.canSearchUser"><![CDATA[Kann Benutzer suchen]]></item>
 		<item name="wcf.acp.group.option.category.admin"><![CDATA[Administrative Rechte]]></item>
-		<item name="wcf.acp.group.option.category.admin.display"><![CDATA[Darstellung]]></item>
-		<item name="wcf.acp.group.option.category.admin.display.pageMenu"><![CDATA[Seitenmenü]]></item>
+		<item name="wcf.acp.group.option.category.admin.customization"><![CDATA[Anpassung]]></item>
+		<item name="wcf.acp.group.option.category.admin.management"><![CDATA[Verwaltung]]></item>
 		<item name="wcf.acp.group.option.category.admin.general"><![CDATA[Allgemeine Rechte]]></item>
 		<item name="wcf.acp.group.option.category.admin.language"><![CDATA[Sprachen]]></item>
 		<item name="wcf.acp.group.option.category.admin.style"><![CDATA[Stile]]></item>
-		<item name="wcf.acp.group.option.category.admin.system"><![CDATA[System]]></item>
-		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Pakete]]></item>
+		<item name="wcf.acp.group.option.category.admin.configuration"><![CDATA[Konfiguration]]></item>
+		<item name="wcf.acp.group.option.category.admin.configuration.package"><![CDATA[Pakete]]></item>
 		<item name="wcf.acp.group.option.category.admin.user"><![CDATA[Benutzer]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.group"><![CDATA[Benutzergruppen]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.user"><![CDATA[Benutzer]]></item>
@@ -325,9 +325,9 @@
 		<item name="wcf.acp.group.option.category.admin.template"><![CDATA[Templates]]></item>
 		<item name="wcf.acp.group.option.admin.template.canManageTemplate"><![CDATA[Kann Templates verwalten]]></item>
 		<item name="wcf.acp.group.option.admin.style.canManageStyle"><![CDATA[Kann Stile verwalten]]></item>
-		<item name="wcf.acp.group.option.category.admin.content"><![CDATA[Inhalte]]></item>
+		<item name="wcf.acp.group.option.category.admin.content"><![CDATA[Inhalt]]></item>
 		<item name="wcf.acp.group.option.admin.content.canBulkRevertContentChanges"><![CDATA[Kann Änderungen der letzten Tage zurücksetzen]]></item>
-		<item name="wcf.acp.group.option.category.admin.community"><![CDATA[Community]]></item>
+		<item name="wcf.acp.group.option.category.admin.application"><![CDATA[Anwendungen]]></item>
 		<item name="wcf.acp.group.option.category.mod.general"><![CDATA[Allgemeine Rechte]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.option"><![CDATA[Benutzerprofilfelder]]></item>
 		<item name="wcf.acp.group.option.admin.user.canManageUserOption"><![CDATA[Kann Benutzerprofilfelder verwalten]]></item>
@@ -404,8 +404,8 @@
 		<item name="wcf.acp.group.option.category.admin.content.tag"><![CDATA[Tags]]></item>
 		<item name="wcf.acp.group.option.admin.content.tag.canManageTag"><![CDATA[Kann Tags verwalten]]></item>
 		<item name="wcf.acp.group.option.user.signature.maxLength"><![CDATA[Maximale Signaturlänge]]></item>
-		<item name="wcf.acp.group.option.admin.system.canImportData"><![CDATA[Kann Daten importieren]]></item>
-		<item name="wcf.acp.group.option.admin.system.canRebuildData"><![CDATA[Kann Anzeigen aktualisieren]]></item>
+		<item name="wcf.acp.group.option.admin.management.canImportData"><![CDATA[Kann Daten importieren]]></item>
+		<item name="wcf.acp.group.option.admin.management.canRebuildData"><![CDATA[Kann Anzeigen aktualisieren]]></item>
 		<item name="wcf.acp.group.description"><![CDATA[Beschreibung der Benutzergruppe]]></item>
 		<item name="wcf.acp.group.button.choose"><![CDATA[Benutzergruppe wählen]]></item>
 		<item name="wcf.acp.group.option.error.validationFailed"><![CDATA[Sie haben einen ungültigen Inhalt eingegeben.]]></item>
@@ -548,10 +548,11 @@
 	</category>
 	
 	<category name="wcf.acp.menu">
+		<item name="wcf.acp.menu.link.management"><![CDATA[Verwaltung]]></item>
 		<item name="wcf.acp.menu.link.maintenance"><![CDATA[Wartung]]></item>
 		<item name="wcf.acp.menu.link.maintenance.cache"><![CDATA[Cache]]></item>
 		<item name="wcf.acp.menu.link.application.management"><![CDATA[Anwendungen verwalten]]></item>
-		<item name="wcf.acp.menu.link.community"><![CDATA[Community]]></item>
+		<item name="wcf.acp.menu.link.application"><![CDATA[Anwendungen]]></item>
 		<item name="wcf.acp.menu.link.content"><![CDATA[Inhalt]]></item>
 		<item name="wcf.acp.menu.link.cronjob"><![CDATA[Cronjobs]]></item>
 		<item name="wcf.acp.menu.link.cronjob.add"><![CDATA[Cronjob hinzufügen]]></item>
@@ -570,7 +571,7 @@
 		<item name="wcf.acp.menu.link.group.add"><![CDATA[Benutzergruppe hinzufügen]]></item>
 		<item name="wcf.acp.menu.link.group.mail"><![CDATA[E-Mail an Gruppenmitglieder]]></item>
 		<item name="wcf.acp.menu.link.group.list"><![CDATA[Benutzergruppen]]></item>
-		<item name="wcf.acp.menu.link.display"><![CDATA[Darstellung]]></item>
+		<item name="wcf.acp.menu.link.customization"><![CDATA[Anpassung]]></item>
 		<item name="wcf.acp.menu.link.option"><![CDATA[Optionen]]></item>
 		<item name="wcf.acp.menu.link.package"><![CDATA[Pakete]]></item>
 		<item name="wcf.acp.menu.link.package.install"><![CDATA[Paket installieren]]></item>
@@ -583,7 +584,7 @@
 		<item name="wcf.acp.menu.link.style.add"><![CDATA[Stil hinzufügen]]></item>
 		<item name="wcf.acp.menu.link.style.import"><![CDATA[Stil importieren]]></item>
 		<item name="wcf.acp.menu.link.style.list"><![CDATA[Stile]]></item>
-		<item name="wcf.acp.menu.link.system"><![CDATA[System]]></item>
+		<item name="wcf.acp.menu.link.configuration"><![CDATA[Konfiguration]]></item>
 		<item name="wcf.acp.menu.link.user"><![CDATA[Benutzer]]></item>
 		<item name="wcf.acp.menu.link.user.add"><![CDATA[Benutzer hinzufügen]]></item>
 		<item name="wcf.acp.menu.link.user.list"><![CDATA[Benutzer]]></item>
@@ -591,12 +592,12 @@
 		<item name="wcf.acp.menu.link.user.management"><![CDATA[Benutzer]]></item>
 		<item name="wcf.acp.menu.link.user.bulkProcessing"><![CDATA[Benutzer-Massenbearbeitung]]></item>
 		<item name="wcf.acp.menu.link.user.search"><![CDATA[Benutzer suchen]]></item>
-		<item name="wcf.acp.menu.link.user.option"><![CDATA[Benutzerprofilfelder]]></item>
-		<item name="wcf.acp.menu.link.user.option.list"><![CDATA[Benutzerprofilfelder]]></item>
-		<item name="wcf.acp.menu.link.user.option.add"><![CDATA[Benutzerprofilfeld hinzufügen]]></item>
-		<item name="wcf.acp.menu.link.user.option.category.list"><![CDATA[Benutzerprofilfeld-Kategorien]]></item>
-		<item name="wcf.acp.menu.link.user.option.category.add"><![CDATA[Benutzerprofilfeld-Kategorie hinzufügen]]></item>
-		<item name="wcf.acp.menu.link.user.option.setDefaults"><![CDATA[Benutzerprofil-Einstellungen verwalten]]></item>
+		<item name="wcf.acp.menu.link.user.option"><![CDATA[Profilfelder]]></item>
+		<item name="wcf.acp.menu.link.user.option.list"><![CDATA[Profilfelder]]></item>
+		<item name="wcf.acp.menu.link.user.option.add"><![CDATA[Profilfeld hinzufügen]]></item>
+		<item name="wcf.acp.menu.link.user.option.category.list"><![CDATA[Profilfeld-Kategorien]]></item>
+		<item name="wcf.acp.menu.link.user.option.category.add"><![CDATA[Profilfeld-Kategorie hinzufügen]]></item>
+		<item name="wcf.acp.menu.link.userOptionDefaults"><![CDATA[Benutzerprofil-Einstellungen]]></item>
 		<item name="wcf.acp.menu.link.template"><![CDATA[Templates]]></item>
 		<item name="wcf.acp.menu.link.template.list"><![CDATA[Templates]]></item>
 		<item name="wcf.acp.menu.link.template.add"><![CDATA[Template hinzufügen]]></item>
@@ -630,7 +631,8 @@
 		<item name="wcf.acp.menu.link.tag.list"><![CDATA[Tags]]></item>
 		<item name="wcf.acp.menu.link.maintenance.import"><![CDATA[Datenimport]]></item>
 		<item name="wcf.acp.menu.link.maintenance.rebuildData"><![CDATA[Anzeigen aktualisieren]]></item>
-		<item name="wcf.acp.menu.link.log.stat"><![CDATA[Statistiken]]></item>
+		<item name="wcf.acp.menu.link.stat"><![CDATA[Statistiken]]></item>
+		<item name="wcf.acp.menu.link.stat.list"><![CDATA[Statistiken]]></item>
 		<item name="wcf.acp.menu.link.group.assignment"><![CDATA[Automatische Zuordnungen]]></item>
 		<item name="wcf.acp.menu.link.notice"><![CDATA[Hinweise]]></item>
 		<item name="wcf.acp.menu.link.notice.add"><![CDATA[Hinweis hinzufügen]]></item>
@@ -640,13 +642,13 @@
 		<item name="wcf.acp.menu.link.ad.list"><![CDATA[Werbung]]></item>
 		<item name="wcf.acp.menu.link.captcha"><![CDATA[Captchas]]></item>
 		<item name="wcf.acp.menu.link.captcha.question.add"><![CDATA[Frage hinzufügen]]></item>
-		<item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[Fragen]]></item>
+		<item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[Captcha-Fragen]]></item>
 		<item name="wcf.acp.menu.link.log.authentication.failure"><![CDATA[Fehlgeschlagene Anmeldungen]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription"><![CDATA[Bezahlte Mitgliedschaften]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription.list"><![CDATA[Mitgliedschaften auflisten]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription.user.list"><![CDATA[Aktive Mitgliedschaften auflisten]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription.transactionLog.list"><![CDATA[Transaktionen auflisten]]></item>
-		<item name="wcf.acp.menu.link.notificationPresetSettings"><![CDATA[Vorgabewerte für Benachrichtigungen bearbeiten]]></item>
+		<item name="wcf.acp.menu.link.notificationPresetSettings"><![CDATA[Benachrichtigungen]]></item>
 	</category>
 	
 	<category name="wcf.acp.notice">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 726b5ebaf4..0794bfc211 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -278,15 +278,15 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Users of this group may access the Administration Control Panel based upon their granted permissions. This option must be enabled if you wish to grant access to any administrative option.]]></item>
 		<item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Can view private user options]]></item>
 		<item name="wcf.acp.group.option.admin.language.canManageLanguage"><![CDATA[Can manage languages]]></item>
-		<item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Can edit system options]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.canEditOption"><![CDATA[Can edit system options]]></item>
 		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Can view disabled styles]]></item>
-		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Can view log files]]></item>
-		<item name="wcf.acp.group.option.admin.system.canManageApplication"><![CDATA[Can manage applications]]></item>
-		<item name="wcf.acp.group.option.admin.system.canManageCronjob"><![CDATA[Can manage cronjobs]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canEditServer"><![CDATA[Can edit update servers]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canInstallPackage"><![CDATA[Can install packages]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canUninstallPackage"><![CDATA[Can uninstall packages]]></item>
-		<item name="wcf.acp.group.option.admin.system.package.canUpdatePackage"><![CDATA[Can update packages]]></item>
+		<item name="wcf.acp.group.option.admin.management.canViewLog"><![CDATA[Can view log files]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.canManageApplication"><![CDATA[Can manage applications]]></item>
+		<item name="wcf.acp.group.option.admin.management.canManageCronjob"><![CDATA[Can manage cronjobs]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canEditServer"><![CDATA[Can edit update servers]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canInstallPackage"><![CDATA[Can install packages]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canUninstallPackage"><![CDATA[Can uninstall packages]]></item>
+		<item name="wcf.acp.group.option.admin.configuration.package.canUpdatePackage"><![CDATA[Can update packages]]></item>
 		<item name="wcf.acp.group.option.admin.user.accessibleGroups"><![CDATA[Accessible User Groups]]></item>
 		<item name="wcf.acp.group.option.admin.user.accessibleGroups.description"><![CDATA[Users of this group have access to these groups, furthermore you need to specify if these users are allowed to edit these groups.]]></item>
 		<item name="wcf.acp.group.option.admin.user.canAddGroup"><![CDATA[Can add user groups]]></item>
@@ -300,13 +300,14 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.admin.user.canMailUser"><![CDATA[Can send emails to users]]></item>
 		<item name="wcf.acp.group.option.admin.user.canSearchUser"><![CDATA[Can search users]]></item>
 		<item name="wcf.acp.group.option.category.admin"><![CDATA[Administrative Permissions]]></item>
-		<item name="wcf.acp.group.option.category.admin.display"><![CDATA[Appearance]]></item>
+		<item name="wcf.acp.group.option.category.admin.configuration"><![CDATA[Configuration]]></item>
+		<item name="wcf.acp.group.option.category.admin.customization"><![CDATA[Customization]]></item>
+		<item name="wcf.acp.group.option.category.admin.management"><![CDATA[Management]]></item>
 		<item name="wcf.acp.group.option.category.admin.display.pageMenu"><![CDATA[Page Menu]]></item>
 		<item name="wcf.acp.group.option.category.admin.general"><![CDATA[General Permissions]]></item>
 		<item name="wcf.acp.group.option.category.admin.language"><![CDATA[Languages]]></item>
 		<item name="wcf.acp.group.option.category.admin.style"><![CDATA[Styles]]></item>
-		<item name="wcf.acp.group.option.category.admin.system"><![CDATA[System]]></item>
-		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Packages]]></item>
+		<item name="wcf.acp.group.option.category.admin.configuration.package"><![CDATA[Packages]]></item>
 		<item name="wcf.acp.group.option.category.admin.user"><![CDATA[Users]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.group"><![CDATA[User Groups]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.user"><![CDATA[Users]]></item>
@@ -326,7 +327,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.admin.style.canManageStyle"><![CDATA[Can manage styles]]></item>
 		<item name="wcf.acp.group.option.category.admin.content"><![CDATA[Content]]></item>
 		<item name="wcf.acp.group.option.admin.content.canBulkRevertContentChanges"><![CDATA[Can bulk revert content changes]]></item>
-		<item name="wcf.acp.group.option.category.admin.community"><![CDATA[Community]]></item>
+		<item name="wcf.acp.group.option.category.admin.application"><![CDATA[Applications]]></item>
 		<item name="wcf.acp.group.option.category.mod.general"><![CDATA[General]]></item>
 		<item name="wcf.acp.group.option.category.admin.user.option"><![CDATA[User Profile Fields]]></item>
 		<item name="wcf.acp.group.option.admin.user.canManageUserOption"><![CDATA[Can manage user profile fields]]></item>
@@ -403,8 +404,8 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.option.category.admin.content.tag"><![CDATA[Tags]]></item>
 		<item name="wcf.acp.group.option.admin.content.tag.canManageTag"><![CDATA[Can manage tags]]></item>
 		<item name="wcf.acp.group.option.user.signature.maxLength"><![CDATA[Maximum Signature Length]]></item>
-		<item name="wcf.acp.group.option.admin.system.canImportData"><![CDATA[Can import data]]></item>
-		<item name="wcf.acp.group.option.admin.system.canRebuildData"><![CDATA[Can rebuild data]]></item>
+		<item name="wcf.acp.group.option.admin.management.canImportData"><![CDATA[Can import data]]></item>
+		<item name="wcf.acp.group.option.admin.management.canRebuildData"><![CDATA[Can rebuild data]]></item>
 		<item name="wcf.acp.group.description"><![CDATA[Description]]></item>
 		<item name="wcf.acp.group.button.choose"><![CDATA[Choose User Group]]></item>
 		<item name="wcf.acp.group.option.error.validationFailed"><![CDATA[You have entered an invalid value.]]></item>
@@ -547,10 +548,11 @@ Examples for medium ID detection:
 	</category>
 	
 	<category name="wcf.acp.menu">
+		<item name="wcf.acp.menu.link.management"><![CDATA[Management]]></item>
 		<item name="wcf.acp.menu.link.maintenance"><![CDATA[Maintenance]]></item>
 		<item name="wcf.acp.menu.link.maintenance.cache"><![CDATA[Cache]]></item>
 		<item name="wcf.acp.menu.link.application.management"><![CDATA[Manage Applications]]></item>
-		<item name="wcf.acp.menu.link.community"><![CDATA[Community]]></item>
+		<item name="wcf.acp.menu.link.application"><![CDATA[Applications]]></item>
 		<item name="wcf.acp.menu.link.content"><![CDATA[Content]]></item>
 		<item name="wcf.acp.menu.link.cronjob"><![CDATA[Cronjobs]]></item>
 		<item name="wcf.acp.menu.link.cronjob.add"><![CDATA[Add Cronjob]]></item>
@@ -568,9 +570,8 @@ Examples for medium ID detection:
 		<item name="wcf.acp.menu.link.group.add"><![CDATA[Add User Group]]></item>
 		<item name="wcf.acp.menu.link.group.mail"><![CDATA[Email Users]]></item>
 		<item name="wcf.acp.menu.link.group.list"><![CDATA[User Groups]]></item>
-		<item name="wcf.acp.menu.link.display"><![CDATA[Appearance]]></item>
+		<item name="wcf.acp.menu.link.customization"><![CDATA[Customization]]></item>
 		<item name="wcf.acp.menu.link.option"><![CDATA[Options]]></item>
-		<item name="wcf.acp.menu.link.option.importAndExport"><![CDATA[Import &amp; Export]]></item>
 		<item name="wcf.acp.menu.link.package"><![CDATA[Packages]]></item>
 		<item name="wcf.acp.menu.link.package.install"><![CDATA[Install Package]]></item>
 		<item name="wcf.acp.menu.link.package.server.list"><![CDATA[Package Servers]]></item>
@@ -582,7 +583,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.menu.link.style.add"><![CDATA[Add Style]]></item>
 		<item name="wcf.acp.menu.link.style.import"><![CDATA[Import Style]]></item>
 		<item name="wcf.acp.menu.link.style.list"><![CDATA[Styles]]></item>
-		<item name="wcf.acp.menu.link.system"><![CDATA[System]]></item>
+		<item name="wcf.acp.menu.link.configuration"><![CDATA[Configuration]]></item>
 		<item name="wcf.acp.menu.link.user"><![CDATA[Users]]></item>
 		<item name="wcf.acp.menu.link.user.add"><![CDATA[Add User]]></item>
 		<item name="wcf.acp.menu.link.user.list"><![CDATA[Users]]></item>
@@ -595,7 +596,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.menu.link.user.option.add"><![CDATA[Add Custom User Field]]></item>
 		<item name="wcf.acp.menu.link.user.option.category.list"><![CDATA[Field Categories]]></item>
 		<item name="wcf.acp.menu.link.user.option.category.add"><![CDATA[Add Field Category]]></item>
-		<item name="wcf.acp.menu.link.user.option.setDefaults"><![CDATA[Manage User Field Settings]]></item>
+		<item name="wcf.acp.menu.link.userOptionDefaults"><![CDATA[User Field Settings]]></item>
 		<item name="wcf.acp.menu.link.template"><![CDATA[Templates]]></item>
 		<item name="wcf.acp.menu.link.template.list"><![CDATA[Templates]]></item>
 		<item name="wcf.acp.menu.link.template.add"><![CDATA[Add Template]]></item>
@@ -629,7 +630,8 @@ Examples for medium ID detection:
 		<item name="wcf.acp.menu.link.tag.list"><![CDATA[Tags]]></item>
 		<item name="wcf.acp.menu.link.maintenance.import"><![CDATA[Data Import]]></item>
 		<item name="wcf.acp.menu.link.maintenance.rebuildData"><![CDATA[Rebuild Data]]></item>
-		<item name="wcf.acp.menu.link.log.stat"><![CDATA[Statistics]]></item>
+		<item name="wcf.acp.menu.link.stat"><![CDATA[Statistics]]></item>
+		<item name="wcf.acp.menu.link.stat.list"><![CDATA[Statistics]]></item>
 		<item name="wcf.acp.menu.link.group.assignment"><![CDATA[Automatic Assignments]]></item>
 		<item name="wcf.acp.menu.link.notice"><![CDATA[Notices]]></item>
 		<item name="wcf.acp.menu.link.notice.add"><![CDATA[Add Notice]]></item>
@@ -639,13 +641,13 @@ Examples for medium ID detection:
 		<item name="wcf.acp.menu.link.ad.list"><![CDATA[Ads]]></item>
 		<item name="wcf.acp.menu.link.captcha"><![CDATA[Captchas]]></item>
 		<item name="wcf.acp.menu.link.captcha.question.add"><![CDATA[Add Question]]></item>
-		<item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[Questions]]></item>
+		<item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[Captcha Questions]]></item>
 		<item name="wcf.acp.menu.link.log.authentication.failure"><![CDATA[Failed Login Attempts]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription"><![CDATA[Paid Subscriptions]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription.list"><![CDATA[List Paid Subscriptions]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription.user.list"><![CDATA[List Active Subscriptions]]></item>
 		<item name="wcf.acp.menu.link.paidSubscription.transactionLog.list"><![CDATA[List Transactions]]></item>
-		<item name="wcf.acp.menu.link.notificationPresetSettings"><![CDATA[Default Notification Settings]]></item>
+		<item name="wcf.acp.menu.link.notificationPresetSettings"><![CDATA[Notifications]]></item>
 	</category>
 	
 	<category name="wcf.acp.notice">
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 78138ab7df..f329284f48 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1941,7 +1941,7 @@ INSERT INTO wcf1_user_group (groupID, groupName, groupType) VALUES (5, 'wcf.acp.
 
 -- default user group options
 INSERT INTO wcf1_user_group_option (optionID, optionName, categoryName, optionType, defaultValue, showOrder, usersOnly) VALUES (1, 'admin.general.canUseAcp', 'admin.general', 'boolean', '0', 1, 1);
-INSERT INTO wcf1_user_group_option (optionID, optionName, categoryName, optionType, defaultValue, showOrder, usersOnly) VALUES (2, 'admin.system.package.canInstallPackage', 'admin.system.package', 'boolean', '0', 1, 1);
+INSERT INTO wcf1_user_group_option (optionID, optionName, categoryName, optionType, defaultValue, showOrder, usersOnly) VALUES (2, 'admin.configuration.package.canInstallPackage', 'admin.configuration.package', 'boolean', '0', 1, 1);
 INSERT INTO wcf1_user_group_option (optionID, optionName, categoryName, optionType, defaultValue, showOrder, usersOnly) VALUES (3, 'admin.user.canEditGroup', 'admin.user.group', 'boolean', '0', 1, 1);
 
 -- default user group option values
-- 
2.20.1