diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 5d6ecaf976a..761bf48b174 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -1,786 +1,143 @@
 <?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/6.0/acpMenu.xsd">
-	<import>
-		<!-- configuration -->
-		<acpmenuitem name="wcf.acp.menu.link.configuration">
-			<showorder>1</showorder>
-			<icon>wrench</icon>
-		</acpmenuitem>
-		<!-- option -->
-		<acpmenuitem name="wcf.acp.menu.link.option">
-			<parent>wcf.acp.menu.link.configuration</parent>
-			<permissions>admin.configuration.canEditOption</permissions>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.option.category">
-			<parent>wcf.acp.menu.link.option</parent>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		<!-- /option -->
-		<!-- package -->
-		<acpmenuitem name="wcf.acp.menu.link.package">
-			<parent>wcf.acp.menu.link.configuration</parent>
-			<showorder>2</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.application.management">
-			<controller>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>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.license">
-			<controller>wcf\acp\page\LicensePage</controller>
-			<parent>wcf.acp.menu.link.package.list</parent>
-			<permissions>admin.configuration.package.canInstallPackage</permissions>
-			<icon>cart-arrow-down</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.package.install">
-			<controller>wcf\acp\form\PackageStartInstallForm</controller>
-			<parent>wcf.acp.menu.link.package.list</parent>
-			<permissions>admin.configuration.package.canInstallPackage</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.package.server.list">
-			<controller>wcf\acp\page\PackageUpdateServerListPage</controller>
-			<parent>wcf.acp.menu.link.package</parent>
-			<permissions>admin.configuration.package.canEditServer</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.package.server.add">
-			<controller>wcf\acp\form\PackageUpdateServerAddForm</controller>
-			<parent>wcf.acp.menu.link.package.server.list</parent>
-			<permissions>admin.configuration.package.canEditServer</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /package -->
-		<!-- other -->
-		<acpmenuitem name="wcf.acp.menu.link.other">
-			<parent>wcf.acp.menu.link.configuration</parent>
-			<showorder>3</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.activityPoint">
-			<controller>wcf\acp\form\UserActivityPointOptionForm</controller>
-			<parent>wcf.acp.menu.link.other</parent>
-			<permissions>admin.user.canEditActivityPoints</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings">
-			<controller>wcf\acp\form\NotificationPresetSettingsForm</controller>
-			<parent>wcf.acp.menu.link.other</parent>
-			<permissions>admin.user.canManageNotificationSettings</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
-			<controller>wcf\acp\page\CaptchaQuestionListPage</controller>
-			<parent>wcf.acp.menu.link.other</parent>
-			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
-			<controller>wcf\acp\form\CaptchaQuestionAddForm</controller>
-			<parent>wcf.acp.menu.link.captcha.question.list</parent>
-			<permissions>admin.captcha.canManageCaptchaQuestion</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /other -->
-		<!-- devtools -->
-		<acpmenuitem name="wcf.acp.menu.link.devtools">
-			<parent>wcf.acp.menu.link.configuration</parent>
-			<options>enable_developer_tools</options>
-			<showorder>99</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.devtools.project.list">
-			<controller>wcf\acp\page\DevtoolsProjectListPage</controller>
-			<parent>wcf.acp.menu.link.devtools</parent>
-			<permissions>admin.configuration.package.canInstallPackage</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.devtools.project.add">
-			<controller>wcf\acp\form\DevtoolsProjectAddForm</controller>
-			<parent>wcf.acp.menu.link.devtools.project.list</parent>
-			<permissions>admin.configuration.package.canInstallPackage</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.devtools.missingLanguageItem.list">
-			<controller>wcf\acp\page\DevtoolsMissingLanguageItemListPage</controller>
-			<parent>wcf.acp.menu.link.devtools</parent>
-			<permissions>admin.configuration.package.canInstallPackage</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.devtools.notificationTest">
-			<controller>wcf\acp\page\DevtoolsNotificationTestPage</controller>
-			<parent>wcf.acp.menu.link.devtools</parent>
-			<permissions>admin.configuration.package.canInstallPackage</permissions>
-		</acpmenuitem>
-		<!-- /devtools -->
-		<!-- /configuration -->
-		<!-- user -->
-		<acpmenuitem name="wcf.acp.menu.link.user">
-			<showorder>2</showorder>
-			<icon>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>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>wcf\acp\form\UserSearchForm</controller>
-			<parent>wcf.acp.menu.link.user.list</parent>
-			<permissions>admin.user.canSearchUser</permissions>
-			<icon>magnifying-glass</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.add">
-			<controller>wcf\acp\form\UserAddForm</controller>
-			<parent>wcf.acp.menu.link.user.list</parent>
-			<permissions>admin.user.canAddUser</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.bulkProcessing">
-			<controller>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>wcf\acp\form\UserMailForm</controller>
-			<parent>wcf.acp.menu.link.user.management</parent>
-			<link>action=all</link>
-			<permissions>admin.user.canMailUser</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.profileMenu">
-			<controller>wcf\acp\page\UserProfileMenuPage</controller>
-			<parent>wcf.acp.menu.link.user.management</parent>
-			<permissions>admin.user.canManageUserOption</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>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>wcf\acp\form\UserGroupAddForm</controller>
-			<parent>wcf.acp.menu.link.group.list</parent>
-			<permissions>admin.user.canAddGroup</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.group.mail">
-			<controller>wcf\acp\form\UserMailForm</controller>
-			<parent>wcf.acp.menu.link.group</parent>
-			<link>action=group</link>
-			<permissions>admin.user.canMailUser</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.group.assignment">
-			<controller>wcf\acp\page\UserGroupAssignmentListPage</controller>
-			<parent>wcf.acp.menu.link.group</parent>
-			<permissions>admin.user.canManageGroupAssignment</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.group.assignment.add">
-			<controller>wcf\acp\form\UserGroupAssignmentAddForm</controller>
-			<parent>wcf.acp.menu.link.group.assignment</parent>
-			<permissions>admin.user.canManageGroupAssignment</permissions>
-			<icon>plus</icon>
-		</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">
-			<controller>wcf\acp\page\UserRankListPage</controller>
-			<parent>wcf.acp.menu.link.user.rank</parent>
-			<permissions>admin.user.rank.canManageRank</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.rank.add">
-			<controller>wcf\acp\form\UserRankAddForm</controller>
-			<parent>wcf.acp.menu.link.user.rank.list</parent>
-			<permissions>admin.user.rank.canManageRank</permissions>
-			<icon>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>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>wcf\acp\form\UserOptionAddForm</controller>
-			<parent>wcf.acp.menu.link.user.option.list</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.user.option.category.list">
-			<controller>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>wcf\acp\form\UserOptionCategoryAddForm</controller>
-			<parent>wcf.acp.menu.link.user.option.category.list</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.userOptionDefaults">
-			<controller>wcf\acp\form\UserOptionSetDefaultsForm</controller>
-			<parent>wcf.acp.menu.link.user.option</parent>
-			<permissions>admin.user.canManageUserOption</permissions>
-		</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>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>wcf\acp\form\NoticeAddForm</controller>
-			<parent>wcf.acp.menu.link.notice.list</parent>
-			<permissions>admin.notice.canManageNotice</permissions>
-			<icon>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>wcf\acp\page\PaidSubscriptionListPage</controller>
-			<parent>wcf.acp.menu.link.paidSubscription</parent>
-			<options>module_paid_subscription</options>
-			<permissions>admin.paidSubscription.canManageSubscription</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.add">
-			<controller>wcf\acp\form\PaidSubscriptionAddForm</controller>
-			<parent>wcf.acp.menu.link.paidSubscription.list</parent>
-			<options>module_paid_subscription</options>
-			<permissions>admin.paidSubscription.canManageSubscription</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.user.list">
-			<controller>wcf\acp\page\PaidSubscriptionUserListPage</controller>
-			<parent>wcf.acp.menu.link.paidSubscription</parent>
-			<options>module_paid_subscription</options>
-			<permissions>admin.paidSubscription.canManageSubscription</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.transactionLog.list">
-			<controller>wcf\acp\page\PaidSubscriptionTransactionLogListPage</controller>
-			<parent>wcf.acp.menu.link.paidSubscription</parent>
-			<options>module_paid_subscription</options>
-			<permissions>admin.paidSubscription.canManageSubscription</permissions>
-		</acpmenuitem>
-		<!-- /paid subscription -->
-		<!-- trophy -->
-		<acpmenuitem name="wcf.acp.menu.link.trophy">
-			<parent>wcf.acp.menu.link.user</parent>
-			<showorder>7</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.trophy.category.list">
-			<controller>wcf\acp\page\TrophyCategoryListPage</controller>
-			<parent>wcf.acp.menu.link.trophy</parent>
-			<options>module_trophy</options>
-			<permissions>admin.trophy.canManageTrophy</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.trophy.category.add">
-			<controller>wcf\acp\form\TrophyCategoryAddForm</controller>
-			<parent>wcf.acp.menu.link.trophy.category.list</parent>
-			<options>module_trophy</options>
-			<permissions>admin.trophy.canManageTrophy</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.trophy.list">
-			<controller>wcf\acp\page\TrophyListPage</controller>
-			<parent>wcf.acp.menu.link.trophy</parent>
-			<options>module_trophy</options>
-			<permissions>admin.trophy.canManageTrophy</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.trophy.add">
-			<controller>wcf\acp\form\TrophyAddForm</controller>
-			<parent>wcf.acp.menu.link.trophy.list</parent>
-			<options>module_trophy</options>
-			<permissions>admin.trophy.canManageTrophy</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.userTrophy.list">
-			<controller>wcf\acp\page\UserTrophyListPage</controller>
-			<parent>wcf.acp.menu.link.trophy</parent>
-			<options>module_trophy</options>
-			<permissions>admin.trophy.canAwardTrophy</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.userTrophy.add">
-			<controller>wcf\acp\form\UserTrophyAddForm</controller>
-			<parent>wcf.acp.menu.link.userTrophy.list</parent>
-			<options>module_trophy</options>
-			<permissions>admin.trophy.canAwardTrophy</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /trophy -->
-		<!-- /user -->
-		<!-- content -->
-		<acpmenuitem name="wcf.acp.menu.link.content">
-			<showorder>3</showorder>
-			<icon solid="true">file-lines</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>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.add">
-			<controller>wcf\acp\form\PageAddForm</controller>
-			<parent>wcf.acp.menu.link.cms.page.list</parent>
-			<permissions>admin.content.cms.canManagePage</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cms.menu.list">
-			<controller>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>wcf\acp\form\MenuAddForm</controller>
-			<parent>wcf.acp.menu.link.cms.menu.list</parent>
-			<permissions>admin.content.cms.canManageMenu</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cms.box.list">
-			<controller>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>wcf\acp\form\BoxAddForm</controller>
-			<parent>wcf.acp.menu.link.cms.box.list</parent>
-			<permissions>admin.content.cms.canManageBox</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /cms -->
-		<!-- media -->
-		<acpmenuitem name="wcf.acp.menu.link.media">
-			<parent>wcf.acp.menu.link.content</parent>
-			<showorder>2</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.media.list">
-			<controller>wcf\acp\page\MediaListPage</controller>
-			<parent>wcf.acp.menu.link.media</parent>
-			<permissions>admin.content.cms.canManageMedia</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.media.category.list">
-			<controller>wcf\acp\page\MediaCategoryListPage</controller>
-			<parent>wcf.acp.menu.link.media</parent>
-			<permissions>admin.content.cms.canManageMedia</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.media.category.add">
-			<controller>wcf\acp\form\MediaCategoryAddForm</controller>
-			<parent>wcf.acp.menu.link.media.category.list</parent>
-			<permissions>admin.content.cms.canManageMedia</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /media -->
-		<!-- article -->
-		<acpmenuitem name="wcf.acp.menu.link.article">
-			<parent>wcf.acp.menu.link.content</parent>
-			<options>module_article</options>
-			<showorder>3</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.article.list">
-			<controller>wcf\acp\page\ArticleListPage</controller>
-			<parent>wcf.acp.menu.link.article</parent>
-			<permissions>admin.content.article.canManageArticle,admin.content.article.canManageOwnArticles,admin.content.article.canContributeArticle</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.article.add">
-			<controller>wcf\acp\form\ArticleAddForm</controller>
-			<parent>wcf.acp.menu.link.article.list</parent>
-			<permissions>admin.content.article.canManageArticle,admin.content.article.canManageOwnArticles,admin.content.article.canContributeArticle</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.article.category.list">
-			<controller>wcf\acp\page\ArticleCategoryListPage</controller>
-			<parent>wcf.acp.menu.link.article</parent>
-			<permissions>admin.content.article.canManageCategory</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.article.category.add">
-			<controller>wcf\acp\form\ArticleCategoryAddForm</controller>
-			<parent>wcf.acp.menu.link.article.category.list</parent>
-			<permissions>admin.content.article.canManageCategory</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /article -->
-		<!-- label -->
-		<acpmenuitem name="wcf.acp.menu.link.label">
-			<parent>wcf.acp.menu.link.content</parent>
-			<showorder>4</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.label.list">
-			<controller>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>wcf\acp\form\LabelAddForm</controller>
-			<parent>wcf.acp.menu.link.label.list</parent>
-			<permissions>admin.content.label.canManageLabel</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.label.group.list">
-			<controller>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>wcf\acp\form\LabelGroupAddForm</controller>
-			<parent>wcf.acp.menu.link.label.group.list</parent>
-			<permissions>admin.content.label.canManageLabel</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /label -->
-		<!-- bbcode -->
-		<acpmenuitem name="wcf.acp.menu.link.bbcode">
-			<parent>wcf.acp.menu.link.content</parent>
-			<showorder>5</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.bbcode.list">
-			<controller>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>wcf\acp\form\BBCodeAddForm</controller>
-			<parent>wcf.acp.menu.link.bbcode.list</parent>
-			<permissions>admin.content.bbcode.canManageBBCode</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.bbcode.mediaProvider.list">
-			<controller>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>wcf\acp\form\BBCodeMediaProviderAddForm</controller>
-			<parent>wcf.acp.menu.link.bbcode.mediaProvider.list</parent>
-			<permissions>admin.content.bbcode.canManageBBCode</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /bbcode -->
-		<!-- tag -->
-		<acpmenuitem name="wcf.acp.menu.link.tag">
-			<parent>wcf.acp.menu.link.content</parent>
-			<options>module_tagging</options>
-			<showorder>6</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.tag.list">
-			<controller>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>wcf\acp\form\TagAddForm</controller>
-			<parent>wcf.acp.menu.link.tag.list</parent>
-			<permissions>admin.content.tag.canManageTag</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /tag -->
-		<!-- attachment -->
-		<acpmenuitem name="wcf.acp.menu.link.attachment">
-			<parent>wcf.acp.menu.link.content</parent>
-			<showorder>7</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.attachment.list">
-			<controller>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 solid="true">comments</icon>
-		</acpmenuitem>
-		<!-- /application -->
-		<!-- customization -->
-		<acpmenuitem name="wcf.acp.menu.link.customization">
-			<showorder>5</showorder>
-			<icon>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>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>wcf\acp\form\StyleImportForm</controller>
-			<parent>wcf.acp.menu.link.style.list</parent>
-			<permissions>admin.style.canManageStyle</permissions>
-			<icon>upload</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.style.add">
-			<controller>wcf\acp\form\StyleAddForm</controller>
-			<parent>wcf.acp.menu.link.style.list</parent>
-			<permissions>admin.style.canManageStyle</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.style.globalValues">
-			<controller>wcf\acp\form\StyleGlobalValuesForm</controller>
-			<parent>wcf.acp.menu.link.style</parent>
-			<permissions>admin.style.canManageStyle</permissions>
-		</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>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>wcf\acp\form\TemplateAddForm</controller>
-			<parent>wcf.acp.menu.link.template.list</parent>
-			<permissions>admin.template.canManageTemplate</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.template.group.list">
-			<controller>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>wcf\acp\form\TemplateGroupAddForm</controller>
-			<parent>wcf.acp.menu.link.template.group.list</parent>
-			<permissions>admin.template.canManageTemplate</permissions>
-			<icon>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">
-			<controller>wcf\acp\page\LanguageListPage</controller>
-			<parent>wcf.acp.menu.link.language</parent>
-			<permissions>admin.language.canManageLanguage</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.language.import">
-			<controller>wcf\acp\form\LanguageImportForm</controller>
-			<parent>wcf.acp.menu.link.language.list</parent>
-			<permissions>admin.language.canManageLanguage</permissions>
-			<icon>upload</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.language.item.list">
-			<controller>wcf\acp\page\LanguageItemListPage</controller>
-			<parent>wcf.acp.menu.link.language</parent>
-			<permissions>admin.language.canManageLanguage</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.language.item.add">
-			<controller>wcf\acp\form\LanguageItemAddForm</controller>
-			<parent>wcf.acp.menu.link.language.item.list</parent>
-			<permissions>admin.language.canManageLanguage</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.language.multilingualism">
-			<controller>wcf\acp\form\LanguageMultilingualismForm</controller>
-			<parent>wcf.acp.menu.link.language</parent>
-			<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>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>wcf\acp\form\SmileyAddForm</controller>
-			<parent>wcf.acp.menu.link.smiley.list</parent>
-			<permissions>admin.content.smiley.canManageSmiley</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.smiley.category.list">
-			<controller>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>wcf\acp\form\SmileyCategoryAddForm</controller>
-			<parent>wcf.acp.menu.link.smiley.category.list</parent>
-			<permissions>admin.content.smiley.canManageSmiley</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /smiley -->
-		<!-- ad -->
-		<acpmenuitem name="wcf.acp.menu.link.ad">
-			<parent>wcf.acp.menu.link.customization</parent>
-			<options>module_wcf_ad</options>
-			<showorder>5</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.ad.list">
-			<controller>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>wcf\acp\form\AdAddForm</controller>
-			<parent>wcf.acp.menu.link.ad.list</parent>
-			<permissions>admin.ad.canManageAd</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /ad -->
-		<!-- reactions -->
-		<acpmenuitem name="wcf.acp.menu.link.reactionType">
-			<parent>wcf.acp.menu.link.customization</parent>
-			<options>module_like</options>
-			<showorder>6</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.reactionType.list">
-			<controller>wcf\acp\page\ReactionTypeListPage</controller>
-			<parent>wcf.acp.menu.link.reactionType</parent>
-			<permissions>admin.content.reaction.canManageReactionType</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.reactionType.add">
-			<controller>wcf\acp\form\ReactionTypeAddForm</controller>
-			<parent>wcf.acp.menu.link.reactionType.list</parent>
-			<permissions>admin.content.reaction.canManageReactionType</permissions>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<!-- /reactions -->
-		<!-- /customization -->
-		<!-- management -->
-		<acpmenuitem name="wcf.acp.menu.link.management">
-			<showorder>6</showorder>
-			<icon>gear</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.systemCheck">
-			<controller>wcf\acp\page\SystemCheckPage</controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.configuration.package.canInstallPackage</permissions>
-			<showorder>1</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cronjob.list">
-			<controller>wcf\acp\page\CronjobListPage</controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.management.canManageCronjob</permissions>
-			<showorder>2</showorder>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.cronjob.add">
-			<controller>wcf\acp\form\CronjobAddForm</controller>
-			<parent>wcf.acp.menu.link.cronjob.list</parent>
-			<permissions>admin.management.canManageCronjob</permissions>
-			<showorder>3</showorder>
-			<icon>plus</icon>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.maintenance.cache">
-			<controller>wcf\acp\page\CacheListPage</controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.management.canRebuildData</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.maintenance.rebuildData">
-			<controller>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>wcf\acp\form\DataImportForm</controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.management.canImportData</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.maintenance.sitemap">
-			<controller>wcf\acp\page\SitemapListPage</controller>
-			<parent>wcf.acp.menu.link.maintenance</parent>
-			<permissions>admin.management.canRebuildData</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>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>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>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.email">
-			<controller>wcf\acp\page\EmailLogListPage</controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<permissions>admin.management.canViewLog</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.log.exception">
-			<controller>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>wcf\acp\page\UserAuthenticationFailureListPage</controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<options>enable_user_authentication_failure</options>
-			<permissions>admin.management.canViewLog</permissions>
-		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.log.modification">
-			<controller>wcf\acp\page\ModificationLogListPage</controller>
-			<parent>wcf.acp.menu.link.log</parent>
-			<permissions>admin.management.canViewLog</permissions>
-		</acpmenuitem>
-	</import>
 	<delete>
 		<acpmenuitem name="wcf.acp.menu.link.contact.settings"/>
+		<acpmenuitem name="wcf.acp.menu.link.configuration"/>
+		<acpmenuitem name="wcf.acp.menu.link.option"/>
+		<acpmenuitem name="wcf.acp.menu.link.option.category"/>
+		<acpmenuitem name="wcf.acp.menu.link.package"/>
+		<acpmenuitem name="wcf.acp.menu.link.application.management"/>
+		<acpmenuitem name="wcf.acp.menu.link.package.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.package.license"/>
+		<acpmenuitem name="wcf.acp.menu.link.package.install"/>
+		<acpmenuitem name="wcf.acp.menu.link.package.server.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.package.server.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.other"/>
+		<acpmenuitem name="wcf.acp.menu.link.activityPoint"/>
+		<acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings"/>
+		<acpmenuitem name="wcf.acp.menu.link.captcha.question.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.captcha.question.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.devtools"/>
+		<acpmenuitem name="wcf.acp.menu.link.devtools.project.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.devtools.project.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.devtools.missingLanguageItem.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.devtools.notificationTest"/>
+		<acpmenuitem name="wcf.acp.menu.link.user"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.management"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.search"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.bulkProcessing"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.mail"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.profileMenu"/>
+		<acpmenuitem name="wcf.acp.menu.link.group"/>
+		<acpmenuitem name="wcf.acp.menu.link.group.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.group.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.group.mail"/>
+		<acpmenuitem name="wcf.acp.menu.link.group.assignment"/>
+		<acpmenuitem name="wcf.acp.menu.link.group.assignment.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.rank"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.rank.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.rank.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.option"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.option.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.option.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.option.category.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.user.option.category.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.userOptionDefaults"/>
+		<acpmenuitem name="wcf.acp.menu.link.notice"/>
+		<acpmenuitem name="wcf.acp.menu.link.notice.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.notice.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.paidSubscription"/>
+		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.user.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.paidSubscription.transactionLog.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.trophy"/>
+		<acpmenuitem name="wcf.acp.menu.link.trophy.category.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.trophy.category.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.trophy.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.trophy.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.userTrophy.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.userTrophy.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms.page.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms.page.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms.menu.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms.menu.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms.box.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms.box.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.media"/>
+		<acpmenuitem name="wcf.acp.menu.link.media.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.media.category.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.media.category.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.article"/>
+		<acpmenuitem name="wcf.acp.menu.link.article.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.article.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.article.category.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.article.category.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.label"/>
+		<acpmenuitem name="wcf.acp.menu.link.label.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.label.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.label.group.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.label.group.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.bbcode"/>
+		<acpmenuitem name="wcf.acp.menu.link.bbcode.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.bbcode.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.bbcode.mediaProvider.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.bbcode.mediaProvider.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.tag"/>
+		<acpmenuitem name="wcf.acp.menu.link.tag.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.tag.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.attachment"/>
+		<acpmenuitem name="wcf.acp.menu.link.attachment.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.application"/>
+		<acpmenuitem name="wcf.acp.menu.link.customization"/>
+		<acpmenuitem name="wcf.acp.menu.link.style"/>
+		<acpmenuitem name="wcf.acp.menu.link.style.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.style.import"/>
+		<acpmenuitem name="wcf.acp.menu.link.style.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.style.globalValues"/>
+		<acpmenuitem name="wcf.acp.menu.link.template"/>
+		<acpmenuitem name="wcf.acp.menu.link.template.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.template.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.template.group.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.template.group.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.language"/>
+		<acpmenuitem name="wcf.acp.menu.link.language.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.language.import"/>
+		<acpmenuitem name="wcf.acp.menu.link.language.item.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.language.item.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.language.multilingualism"/>
+		<acpmenuitem name="wcf.acp.menu.link.smiley"/>
+		<acpmenuitem name="wcf.acp.menu.link.smiley.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.smiley.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.smiley.category.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.smiley.category.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.ad"/>
+		<acpmenuitem name="wcf.acp.menu.link.ad.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.ad.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.reactionType"/>
+		<acpmenuitem name="wcf.acp.menu.link.reactionType.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.reactionType.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.management"/>
+		<acpmenuitem name="wcf.acp.menu.link.maintenance"/>
+		<acpmenuitem name="wcf.acp.menu.link.systemCheck"/>
+		<acpmenuitem name="wcf.acp.menu.link.cronjob.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.cronjob.add"/>
+		<acpmenuitem name="wcf.acp.menu.link.maintenance.cache"/>
+		<acpmenuitem name="wcf.acp.menu.link.maintenance.rebuildData"/>
+		<acpmenuitem name="wcf.acp.menu.link.maintenance.import"/>
+		<acpmenuitem name="wcf.acp.menu.link.maintenance.sitemap"/>
+		<acpmenuitem name="wcf.acp.menu.link.stat"/>
+		<acpmenuitem name="wcf.acp.menu.link.stat.list"/>
+		<acpmenuitem name="wcf.acp.menu.link.log"/>
+		<acpmenuitem name="wcf.acp.menu.link.log.session"/>
+		<acpmenuitem name="wcf.acp.menu.link.log.cronjob"/>
+		<acpmenuitem name="wcf.acp.menu.link.log.email"/>
+		<acpmenuitem name="wcf.acp.menu.link.log.exception"/>
+		<acpmenuitem name="wcf.acp.menu.link.log.authentication.failure"/>
+		<acpmenuitem name="wcf.acp.menu.link.log.modification"/>
+		<acpmenuitem name="wcf.acp.menu.link.content"/>
+		<acpmenuitem name="wcf.acp.menu.link.cms"/>
 	</delete>
 </data>
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index a89a60614c8..02af1d9b7b5 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -185,13 +185,6 @@
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<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.configuration.package.canEditServer">
 				<categoryname>admin.configuration.package</categoryname>
 				<optiontype>boolean</optiontype>
@@ -1081,5 +1074,6 @@ webp</defaultvalue>
 	</import>
 	<delete>
 		<option name="user.profile.avatar.maxSize"/>
+		<option name="admin.configuration.package.canUninstallPackage"/>
 	</delete>
 </data>
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 09d6e108da5..4fc7f214528 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -8,7 +8,7 @@
 			'wcf.acp.package.uninstallation.title': '{jslang}wcf.acp.package.uninstallation.title{/jslang}',
 		});
 		
-		{if $__wcf->session->getPermission('admin.configuration.package.canUninstallPackage')}
+		{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
 			new WCF.ACP.Package.Uninstallation($('.jsPackageRow .jsUninstallButton'));
 		{/if}
 		
diff --git a/wcfsetup/install/files/acp/templates/pageMenu.tpl b/wcfsetup/install/files/acp/templates/pageMenu.tpl
index 68775fa07fc..54bd40cbcb4 100644
--- a/wcfsetup/install/files/acp/templates/pageMenu.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenu.tpl
@@ -28,22 +28,15 @@
 								{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 *}
+									<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}
-											<li{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} class="active"{/if}><a href="{$_subMenuItem->getLink()}" class="acpPageSubMenuLink">{$_subMenuItem}</a></li>
+											<a href="{$_subMenuItem->getLink()}" class="acpPageSubMenuIcon jsTooltip{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" title="{$_subMenuItem}">
+												{unsafe:$_subMenuItem->getIcon()->toHtml()}
+											</a>
 										{/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}">
-													{unsafe:$_subMenuItem->getIcon()->toHtml()}
-												</a>
-											{/foreach}
-										</li>
-									{/if}
+									</li>
 								{/if}
 							{/foreach}
 						</ol>
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
index f2729959a94..be9610a3be7 100644
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -30,7 +30,7 @@ final class PackageListPage extends AbstractGridViewPage
      */
     public $neededPermissions = [
         'admin.configuration.package.canUpdatePackage',
-        'admin.configuration.package.canUninstallPackage',
+        'admin.configuration.package.canInstallPackage',
     ];
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
index 81fce23618f..c9275dcb91b 100755
--- a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
@@ -31,7 +31,7 @@ class PackagePage extends AbstractPage
      */
     public $neededPermissions = [
         'admin.configuration.package.canUpdatePackage',
-        'admin.configuration.package.canUninstallPackage',
+        'admin.configuration.package.canInstallPackage',
     ];
 
     /**
diff --git a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
index 54078369929..81ac762a183 100644
--- a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
+++ b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
@@ -1,336 +1,308 @@
 <?php
 
-use wcf\event\acp\menu\item\ItemCollecting;
 use wcf\system\cronjob\CronjobScheduler;
 use wcf\system\event\EventHandler;
 use wcf\system\language\LanguageFactory;
 use wcf\system\language\preload\command\ResetPreloadCache;
 use wcf\system\language\preload\PhrasePreloader;
-use wcf\system\menu\acp\AcpMenuItem;
 use wcf\system\package\license\LicenseApi;
-use wcf\system\request\LinkHandler;
-use wcf\system\style\FontAwesomeIcon;
 use wcf\system\user\authentication\LoginRedirect;
 use wcf\system\WCF;
 
-return static function (): void {
-    $eventHandler = EventHandler::getInstance();
-
-    $cronjobNextExec = CronjobScheduler::getInstance()->getNextExec();
-    if ($cronjobNextExec !== null) {
-        WCF::getTPL()->assign(
-            'executeCronjobs',
-            $cronjobNextExec < TIME_NOW && \defined('OFFLINE') && !OFFLINE
-        );
+return new class {
+    public function __invoke(): void
+    {
+        $this->initEventListeners();
+        $this->initEndpoints();
+        $this->initACPMenuItems();
+        $this->initLicenseData();
     }
 
-    $eventHandler->register(
-        \wcf\event\user\authentication\UserLoggedIn::class,
-        \wcf\system\event\listener\UserLoginCancelLostPasswordListener::class
-    );
-    $eventHandler->register(
-        \wcf\event\session\PreserveVariablesCollecting::class,
-        static function (\wcf\event\session\PreserveVariablesCollecting $event) {
-            $event->keys[] = LoginRedirect::SESSION_VAR_KEY;
+    private function initEventListeners(): void
+    {
+        $eventHandler = EventHandler::getInstance();
+
+        $cronjobNextExec = CronjobScheduler::getInstance()->getNextExec();
+        if ($cronjobNextExec !== null) {
+            WCF::getTPL()->assign(
+                'executeCronjobs',
+                $cronjobNextExec < TIME_NOW && \defined('OFFLINE') && !OFFLINE
+            );
         }
-    );
 
-    $eventHandler->register(
-        \wcf\event\user\UsernameValidating::class,
-        \wcf\system\event\listener\UsernameValidatingCheckCharactersListener::class
-    );
+        $eventHandler->register(
+            \wcf\event\user\authentication\UserLoggedIn::class,
+            \wcf\system\event\listener\UserLoginCancelLostPasswordListener::class
+        );
+        $eventHandler->register(
+            \wcf\event\session\PreserveVariablesCollecting::class,
+            static function (\wcf\event\session\PreserveVariablesCollecting $event) {
+                $event->keys[] = LoginRedirect::SESSION_VAR_KEY;
+            }
+        );
 
-    $eventHandler->register(
-        \wcf\event\user\RegistrationSpamChecking::class,
-        \wcf\system\event\listener\RegistrationSpamCheckingSfsListener::class
-    );
-    $eventHandler->register(
-        \wcf\event\page\ContactFormSpamChecking::class,
-        \wcf\system\event\listener\ContactFormSpamCheckingSfsListener::class
-    );
-    $eventHandler->register(
-        \wcf\event\message\MessageSpamChecking::class,
-        \wcf\system\event\listener\MessageSpamCheckingSfsListener::class
-    );
+        $eventHandler->register(
+            \wcf\event\user\UsernameValidating::class,
+            \wcf\system\event\listener\UsernameValidatingCheckCharactersListener::class
+        );
 
-    $eventHandler->register(
-        \wcf\event\package\PackageListChanged::class,
-        static function () {
-            foreach (LanguageFactory::getInstance()->getLanguages() as $language) {
-                $command = new ResetPreloadCache($language);
+        $eventHandler->register(
+            \wcf\event\user\RegistrationSpamChecking::class,
+            \wcf\system\event\listener\RegistrationSpamCheckingSfsListener::class
+        );
+        $eventHandler->register(
+            \wcf\event\page\ContactFormSpamChecking::class,
+            \wcf\system\event\listener\ContactFormSpamCheckingSfsListener::class
+        );
+        $eventHandler->register(
+            \wcf\event\message\MessageSpamChecking::class,
+            \wcf\system\event\listener\MessageSpamCheckingSfsListener::class
+        );
+
+        $eventHandler->register(
+            \wcf\event\package\PackageListChanged::class,
+            static function () {
+                foreach (LanguageFactory::getInstance()->getLanguages() as $language) {
+                    $command = new ResetPreloadCache($language);
+                    $command();
+                }
+            }
+        );
+        $eventHandler->register(
+            \wcf\event\language\LanguageImported::class,
+            static function (\wcf\event\language\LanguageImported $event) {
+                $command = new ResetPreloadCache($event->language);
                 $command();
             }
-        }
-    );
-    $eventHandler->register(
-        \wcf\event\language\LanguageImported::class,
-        static function (\wcf\event\language\LanguageImported $event) {
-            $command = new ResetPreloadCache($event->language);
-            $command();
-        }
-    );
-    $eventHandler->register(
-        \wcf\event\language\PhraseChanged::class,
-        \wcf\system\event\listener\PhraseChangedPreloadListener::class
-    );
-    $eventHandler->register(
-        \wcf\event\package\PackageInstallationPluginSynced::class,
-        \wcf\system\event\listener\PipSyncedPhrasePreloadListener::class
-    );
-    WCF::getTPL()->assign('phrasePreloader', new PhrasePreloader());
-    $eventHandler->register(
-        \wcf\event\language\PreloadPhrasesCollecting::class,
-        \wcf\system\event\listener\PreloadPhrasesCollectingListener::class
-    );
-
-    $eventHandler->register(
-        \wcf\event\worker\RebuildWorkerCollecting::class,
-        static function (\wcf\event\worker\RebuildWorkerCollecting $event) {
-            $event->register(\wcf\system\worker\LikeRebuildDataWorker::class, -100);
-            $event->register(\wcf\system\worker\ArticleRebuildDataWorker::class, 50);
-            $event->register(\wcf\system\worker\PageRebuildDataWorker::class, 50);
-            $event->register(\wcf\system\worker\PollRebuildDataWorker::class, 60);
-            $event->register(\wcf\system\worker\UserActivityPointUpdateEventsWorker::class, 65);
-            $event->register(\wcf\system\worker\UserRebuildDataWorker::class, 70);
-            $event->register(\wcf\system\worker\UserActivityPointItemsRebuildDataWorker::class, 75);
-            $event->register(\wcf\system\worker\CommentRebuildDataWorker::class, 120);
-            $event->register(\wcf\system\worker\CommentResponseRebuildDataWorker::class, 121);
-            $event->register(\wcf\system\worker\AttachmentRebuildDataWorker::class, 450);
-            $event->register(\wcf\system\worker\MediaRebuildDataWorker::class, 450);
-            $event->register(\wcf\system\worker\UnfurlUrlRebuildDataWorker::class, 450);
-            $event->register(\wcf\system\worker\FileRebuildDataWorker::class, 475);
-            $event->register(\wcf\system\worker\SitemapRebuildWorker::class, 500);
-            $event->register(\wcf\system\worker\StatDailyRebuildDataWorker::class, 800);
-        }
-    );
-
-    $eventHandler->register(
-        \wcf\event\package\PackageUpdateListChanged::class,
-        \wcf\system\event\listener\PackageUpdateListChangedLicenseListener::class
-    );
+        );
+        $eventHandler->register(
+            \wcf\event\language\PhraseChanged::class,
+            \wcf\system\event\listener\PhraseChangedPreloadListener::class
+        );
+        $eventHandler->register(
+            \wcf\event\package\PackageInstallationPluginSynced::class,
+            \wcf\system\event\listener\PipSyncedPhrasePreloadListener::class
+        );
+        WCF::getTPL()->assign('phrasePreloader', new PhrasePreloader());
+        $eventHandler->register(
+            \wcf\event\language\PreloadPhrasesCollecting::class,
+            \wcf\system\event\listener\PreloadPhrasesCollectingListener::class
+        );
 
-    $eventHandler->register(
-        \wcf\event\acp\dashboard\box\BoxCollecting::class,
-        static function (\wcf\event\acp\dashboard\box\BoxCollecting $event) {
-            $event->register(new \wcf\system\acp\dashboard\box\NewsAcpDashboardBox());
-            $event->register(new \wcf\system\acp\dashboard\box\StatusMessageAcpDashboardBox());
-            $event->register(new \wcf\system\acp\dashboard\box\ExpiringLicensesAcpDashboardBox());
-            $event->register(new \wcf\system\acp\dashboard\box\UsersAwaitingApprovalAcpDashboardBox());
-            $event->register(new \wcf\system\acp\dashboard\box\SystemInfoAcpDashboardBox());
-            $event->register(new \wcf\system\acp\dashboard\box\CreditsAcpDashboardBox());
-        }
-    );
+        $eventHandler->register(
+            \wcf\event\worker\RebuildWorkerCollecting::class,
+            static function (\wcf\event\worker\RebuildWorkerCollecting $event) {
+                $event->register(\wcf\system\worker\LikeRebuildDataWorker::class, -100);
+                $event->register(\wcf\system\worker\ArticleRebuildDataWorker::class, 50);
+                $event->register(\wcf\system\worker\PageRebuildDataWorker::class, 50);
+                $event->register(\wcf\system\worker\PollRebuildDataWorker::class, 60);
+                $event->register(\wcf\system\worker\UserActivityPointUpdateEventsWorker::class, 65);
+                $event->register(\wcf\system\worker\UserRebuildDataWorker::class, 70);
+                $event->register(\wcf\system\worker\UserActivityPointItemsRebuildDataWorker::class, 75);
+                $event->register(\wcf\system\worker\CommentRebuildDataWorker::class, 120);
+                $event->register(\wcf\system\worker\CommentResponseRebuildDataWorker::class, 121);
+                $event->register(\wcf\system\worker\AttachmentRebuildDataWorker::class, 450);
+                $event->register(\wcf\system\worker\MediaRebuildDataWorker::class, 450);
+                $event->register(\wcf\system\worker\UnfurlUrlRebuildDataWorker::class, 450);
+                $event->register(\wcf\system\worker\FileRebuildDataWorker::class, 475);
+                $event->register(\wcf\system\worker\SitemapRebuildWorker::class, 500);
+                $event->register(\wcf\system\worker\StatDailyRebuildDataWorker::class, 800);
+            }
+        );
 
-    $eventHandler->register(
-        \wcf\event\endpoint\ControllerCollecting::class,
-        static function (\wcf\event\endpoint\ControllerCollecting $event) {
-            $event->register(new \wcf\system\endpoint\controller\core\articles\GetArticlePopover());
-            $event->register(new \wcf\system\endpoint\controller\core\files\DeleteFile());
-            $event->register(new \wcf\system\endpoint\controller\core\files\GenerateThumbnails());
-            $event->register(new \wcf\system\endpoint\controller\core\files\PrepareUpload());
-            $event->register(new \wcf\system\endpoint\controller\core\files\upload\SaveChunk());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\CreateComment());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\DeleteComment());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\EditComment());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\EnableComment());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\RenderComments());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\RenderComment());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\UpdateComment());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\responses\CreateResponse());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\responses\DeleteResponse());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\responses\EditResponse());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\responses\EnableResponse());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\responses\RenderResponse());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\responses\RenderResponses());
-            $event->register(new \wcf\system\endpoint\controller\core\comments\responses\UpdateResponse());
-            $event->register(new \wcf\system\endpoint\controller\core\exceptions\RenderException());
-            $event->register(new \wcf\system\endpoint\controller\core\gridViews\GetRows());
-            $event->register(new \wcf\system\endpoint\controller\core\gridViews\GetGridView());
-            $event->register(new \wcf\system\endpoint\controller\core\gridViews\GetRow());
-            $event->register(new \wcf\system\endpoint\controller\core\cronjobs\logs\ClearLogs());
-            $event->register(new \wcf\system\endpoint\controller\core\listViews\GetItems());
-            $event->register(new \wcf\system\endpoint\controller\core\listViews\GetItem());
-            $event->register(new \wcf\system\endpoint\controller\core\messages\GetMentionSuggestions());
-            $event->register(new \wcf\system\endpoint\controller\core\messages\RenderQuote());
-            $event->register(new \wcf\system\endpoint\controller\core\messages\ResetRemovalQuotes());
-            $event->register(new \wcf\system\endpoint\controller\core\sessions\DeleteSession());
-            $event->register(new \wcf\system\endpoint\controller\core\versionTrackers\RevertVersion());
-            $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\ChangeJustifiedStatus());
-            $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\CloseReport());
-            $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\DeleteContent());
-            $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\EnableContent());
-            $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\MarkAsRead());
-            $event->register(new \wcf\system\endpoint\controller\core\styles\AddDarkMode());
-            $event->register(new \wcf\system\endpoint\controller\core\styles\CopyStyle());
-            $event->register(new \wcf\system\endpoint\controller\core\styles\DeleteStyle());
-            $event->register(new \wcf\system\endpoint\controller\core\styles\DisableStyle());
-            $event->register(new \wcf\system\endpoint\controller\core\styles\EnableStyle());
-            $event->register(new \wcf\system\endpoint\controller\core\styles\SetStyleAsDefault());
-            $event->register(new \wcf\system\endpoint\controller\core\users\options\DeleteOption());
-            $event->register(new \wcf\system\endpoint\controller\core\users\options\DisableOption());
-            $event->register(new \wcf\system\endpoint\controller\core\users\options\EnableOption());
-            $event->register(new \wcf\system\endpoint\controller\core\users\ranks\DeleteUserRank());
-            $event->register(new \wcf\system\endpoint\controller\core\users\trophies\DeleteUserTrophy());
-            $event->register(new \wcf\system\endpoint\controller\core\interactions\GetBulkContextMenuOptions());
-            $event->register(new \wcf\system\endpoint\controller\core\interactions\GetContextMenuOptions());
-            $event->register(new \wcf\system\endpoint\controller\core\articles\DeleteArticle());
-            $event->register(new \wcf\system\endpoint\controller\core\articles\SoftDeleteArticle());
-            $event->register(new \wcf\system\endpoint\controller\core\articles\RestoreArticle());
-            $event->register(new \wcf\system\endpoint\controller\core\articles\PublishArticle());
-            $event->register(new \wcf\system\endpoint\controller\core\articles\UnpublishArticle());
-            $event->register(new \wcf\system\endpoint\controller\core\articles\contents\GetArticleContentHeaderTitle());
-            $event->register(new \wcf\system\endpoint\controller\core\attachments\DeleteAttachment());
-            $event->register(new \wcf\system\endpoint\controller\core\cronjobs\EnableCronjob());
-            $event->register(new \wcf\system\endpoint\controller\core\cronjobs\DisableCronjob());
-            $event->register(new \wcf\system\endpoint\controller\core\cronjobs\DeleteCronjob());
-            $event->register(new \wcf\system\endpoint\controller\core\cronjobs\ExecuteCronjob());
-            $event->register(new \wcf\system\endpoint\controller\core\captchas\questions\EnableQuestion());
-            $event->register(new \wcf\system\endpoint\controller\core\captchas\questions\DisableQuestion());
-            $event->register(new \wcf\system\endpoint\controller\core\captchas\questions\DeleteQuestion());
-            $event->register(new \wcf\system\endpoint\controller\core\boxes\DisableBox());
-            $event->register(new \wcf\system\endpoint\controller\core\boxes\EnableBox());
-            $event->register(new \wcf\system\endpoint\controller\core\boxes\DeleteBox());
-            $event->register(new \wcf\system\endpoint\controller\core\bbcodes\media\providers\DeleteProvider());
-            $event->register(new \wcf\system\endpoint\controller\core\bbcodes\media\providers\DisableProvider());
-            $event->register(new \wcf\system\endpoint\controller\core\bbcodes\media\providers\EnableProvider());
-            $event->register(new \wcf\system\endpoint\controller\core\bbcodes\DeleteBBCode());
-            $event->register(new \wcf\system\endpoint\controller\core\languages\DisableLanguage());
-            $event->register(new \wcf\system\endpoint\controller\core\languages\DeleteLanguage());
-            $event->register(new \wcf\system\endpoint\controller\core\languages\EnableLanguage());
-            $event->register(new \wcf\system\endpoint\controller\core\languages\SetAsDefaultLanguage());
-            $event->register(new \wcf\system\endpoint\controller\core\languages\items\DeleteItem());
-            $event->register(new \wcf\system\endpoint\controller\core\labels\DeleteLabel());
-            $event->register(new \wcf\system\endpoint\controller\core\labels\groups\ChangeLabelShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\labels\groups\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\labels\groups\DeleteGroup());
-            $event->register(new \wcf\system\endpoint\controller\core\labels\groups\GetLabelShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\labels\groups\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\pages\DeletePage());
-            $event->register(new \wcf\system\endpoint\controller\core\pages\DisablePage());
-            $event->register(new \wcf\system\endpoint\controller\core\pages\EnablePage());
-            $event->register(new \wcf\system\endpoint\controller\core\templates\groups\DeleteTemplateGroup());
-            $event->register(new \wcf\system\endpoint\controller\core\packages\updates\servers\DisableServer());
-            $event->register(new \wcf\system\endpoint\controller\core\packages\updates\servers\DeleteServer());
-            $event->register(new \wcf\system\endpoint\controller\core\packages\updates\servers\EnableServer());
-            $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\DeleteSubscription());
-            $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\DisableSubscription());
-            $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\EnableSubscription());
-            $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\users\DeleteSubscriptionUser());
-            $event->register(new \wcf\system\endpoint\controller\core\templates\DeleteTemplate());
-            $event->register(new \wcf\system\endpoint\controller\core\tags\DeleteTag());
-            $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignment\DeleteAssignment());
-            $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignment\EnableAssignment());
-            $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignment\DisableAssignment());
-            $event->register(new \wcf\system\endpoint\controller\core\users\groups\DeleteGroup());
-            $event->register(new \wcf\system\endpoint\controller\core\menus\DeleteMenu());
-            $event->register(new \wcf\system\endpoint\controller\core\trophies\EnableTrophy());
-            $event->register(new \wcf\system\endpoint\controller\core\trophies\DisableTrophy());
-            $event->register(new \wcf\system\endpoint\controller\core\trophies\DeleteTrophy());
-            $event->register(new \wcf\system\endpoint\controller\core\trophies\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\trophies\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\ads\EnableAd());
-            $event->register(new \wcf\system\endpoint\controller\core\ads\DisableAd());
-            $event->register(new \wcf\system\endpoint\controller\core\ads\DeleteAd());
-            $event->register(new \wcf\system\endpoint\controller\core\ads\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\ads\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\notices\EnableNotice());
-            $event->register(new \wcf\system\endpoint\controller\core\notices\DisableNotice());
-            $event->register(new \wcf\system\endpoint\controller\core\notices\DeleteNotice());
-            $event->register(new \wcf\system\endpoint\controller\core\notices\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\notices\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\reactions\types\EnableType());
-            $event->register(new \wcf\system\endpoint\controller\core\reactions\types\DisableType());
-            $event->register(new \wcf\system\endpoint\controller\core\reactions\types\DeleteType());
-            $event->register(new \wcf\system\endpoint\controller\core\reactions\types\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\reactions\types\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\smilies\DeleteSmiley());
-            $event->register(new \wcf\system\endpoint\controller\core\smilies\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\smilies\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\smilies\categories\GetSmileyShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\smilies\categories\ChangeSmileyShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\attachments\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\options\DeleteOption());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\options\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\options\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\options\DisableOption());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\options\EnableOption());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\DeleteRecipient());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\ChangeShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\GetShowOrder());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\DisableRecipient());
-            $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\EnableRecipient());
-        }
-    );
+        $eventHandler->register(
+            \wcf\event\package\PackageUpdateListChanged::class,
+            \wcf\system\event\listener\PackageUpdateListChangedLicenseListener::class
+        );
 
-    // The options are not available while the WCFSetup process has not yet completed.
-    if (defined('MODULE_CONTACT_FORM') && MODULE_CONTACT_FORM) {
-        $eventHandler->register(ItemCollecting::class, static function (ItemCollecting $event) {
-            if (!WCF::getSession()->getPermission("admin.contact.canManageContactForm")) {
-                return;
+        $eventHandler->register(
+            \wcf\event\acp\dashboard\box\BoxCollecting::class,
+            static function (\wcf\event\acp\dashboard\box\BoxCollecting $event) {
+                $event->register(new \wcf\system\acp\dashboard\box\NewsAcpDashboardBox());
+                $event->register(new \wcf\system\acp\dashboard\box\StatusMessageAcpDashboardBox());
+                $event->register(new \wcf\system\acp\dashboard\box\ExpiringLicensesAcpDashboardBox());
+                $event->register(new \wcf\system\acp\dashboard\box\UsersAwaitingApprovalAcpDashboardBox());
+                $event->register(new \wcf\system\acp\dashboard\box\SystemInfoAcpDashboardBox());
+                $event->register(new \wcf\system\acp\dashboard\box\CreditsAcpDashboardBox());
             }
+        );
+    }
 
-            $event->register(
-                new AcpMenuItem(
-                    "wcf.acp.menu.link.contact",
-                    parentMenuItem: 'wcf.acp.menu.link.configuration'
-                )
-            );
+    private function initEndpoints(): void
+    {
+        EventHandler::getInstance()->register(
+            \wcf\event\endpoint\ControllerCollecting::class,
+            static function (\wcf\event\endpoint\ControllerCollecting $event) {
+                $event->register(new \wcf\system\endpoint\controller\core\articles\GetArticlePopover());
+                $event->register(new \wcf\system\endpoint\controller\core\files\DeleteFile());
+                $event->register(new \wcf\system\endpoint\controller\core\files\GenerateThumbnails());
+                $event->register(new \wcf\system\endpoint\controller\core\files\PrepareUpload());
+                $event->register(new \wcf\system\endpoint\controller\core\files\upload\SaveChunk());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\CreateComment());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\DeleteComment());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\EditComment());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\EnableComment());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\RenderComments());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\RenderComment());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\UpdateComment());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\responses\CreateResponse());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\responses\DeleteResponse());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\responses\EditResponse());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\responses\EnableResponse());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\responses\RenderResponse());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\responses\RenderResponses());
+                $event->register(new \wcf\system\endpoint\controller\core\comments\responses\UpdateResponse());
+                $event->register(new \wcf\system\endpoint\controller\core\exceptions\RenderException());
+                $event->register(new \wcf\system\endpoint\controller\core\gridViews\GetRows());
+                $event->register(new \wcf\system\endpoint\controller\core\gridViews\GetGridView());
+                $event->register(new \wcf\system\endpoint\controller\core\gridViews\GetRow());
+                $event->register(new \wcf\system\endpoint\controller\core\cronjobs\logs\ClearLogs());
+                $event->register(new \wcf\system\endpoint\controller\core\listViews\GetItems());
+                $event->register(new \wcf\system\endpoint\controller\core\listViews\GetItem());
+                $event->register(new \wcf\system\endpoint\controller\core\messages\GetMentionSuggestions());
+                $event->register(new \wcf\system\endpoint\controller\core\messages\RenderQuote());
+                $event->register(new \wcf\system\endpoint\controller\core\messages\ResetRemovalQuotes());
+                $event->register(new \wcf\system\endpoint\controller\core\sessions\DeleteSession());
+                $event->register(new \wcf\system\endpoint\controller\core\versionTrackers\RevertVersion());
+                $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\ChangeJustifiedStatus());
+                $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\CloseReport());
+                $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\DeleteContent());
+                $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\EnableContent());
+                $event->register(new \wcf\system\endpoint\controller\core\moderationQueues\MarkAsRead());
+                $event->register(new \wcf\system\endpoint\controller\core\styles\AddDarkMode());
+                $event->register(new \wcf\system\endpoint\controller\core\styles\CopyStyle());
+                $event->register(new \wcf\system\endpoint\controller\core\styles\DeleteStyle());
+                $event->register(new \wcf\system\endpoint\controller\core\styles\DisableStyle());
+                $event->register(new \wcf\system\endpoint\controller\core\styles\EnableStyle());
+                $event->register(new \wcf\system\endpoint\controller\core\styles\SetStyleAsDefault());
+                $event->register(new \wcf\system\endpoint\controller\core\users\options\DeleteOption());
+                $event->register(new \wcf\system\endpoint\controller\core\users\options\DisableOption());
+                $event->register(new \wcf\system\endpoint\controller\core\users\options\EnableOption());
+                $event->register(new \wcf\system\endpoint\controller\core\users\ranks\DeleteUserRank());
+                $event->register(new \wcf\system\endpoint\controller\core\users\trophies\DeleteUserTrophy());
+                $event->register(new \wcf\system\endpoint\controller\core\interactions\GetBulkContextMenuOptions());
+                $event->register(new \wcf\system\endpoint\controller\core\interactions\GetContextMenuOptions());
+                $event->register(new \wcf\system\endpoint\controller\core\articles\DeleteArticle());
+                $event->register(new \wcf\system\endpoint\controller\core\articles\SoftDeleteArticle());
+                $event->register(new \wcf\system\endpoint\controller\core\articles\RestoreArticle());
+                $event->register(new \wcf\system\endpoint\controller\core\articles\PublishArticle());
+                $event->register(new \wcf\system\endpoint\controller\core\articles\UnpublishArticle());
+                $event->register(new \wcf\system\endpoint\controller\core\articles\contents\GetArticleContentHeaderTitle());
+                $event->register(new \wcf\system\endpoint\controller\core\attachments\DeleteAttachment());
+                $event->register(new \wcf\system\endpoint\controller\core\cronjobs\EnableCronjob());
+                $event->register(new \wcf\system\endpoint\controller\core\cronjobs\DisableCronjob());
+                $event->register(new \wcf\system\endpoint\controller\core\cronjobs\DeleteCronjob());
+                $event->register(new \wcf\system\endpoint\controller\core\cronjobs\ExecuteCronjob());
+                $event->register(new \wcf\system\endpoint\controller\core\captchas\questions\EnableQuestion());
+                $event->register(new \wcf\system\endpoint\controller\core\captchas\questions\DisableQuestion());
+                $event->register(new \wcf\system\endpoint\controller\core\captchas\questions\DeleteQuestion());
+                $event->register(new \wcf\system\endpoint\controller\core\boxes\DisableBox());
+                $event->register(new \wcf\system\endpoint\controller\core\boxes\EnableBox());
+                $event->register(new \wcf\system\endpoint\controller\core\boxes\DeleteBox());
+                $event->register(new \wcf\system\endpoint\controller\core\bbcodes\media\providers\DeleteProvider());
+                $event->register(new \wcf\system\endpoint\controller\core\bbcodes\media\providers\DisableProvider());
+                $event->register(new \wcf\system\endpoint\controller\core\bbcodes\media\providers\EnableProvider());
+                $event->register(new \wcf\system\endpoint\controller\core\bbcodes\DeleteBBCode());
+                $event->register(new \wcf\system\endpoint\controller\core\languages\DisableLanguage());
+                $event->register(new \wcf\system\endpoint\controller\core\languages\DeleteLanguage());
+                $event->register(new \wcf\system\endpoint\controller\core\languages\EnableLanguage());
+                $event->register(new \wcf\system\endpoint\controller\core\languages\SetAsDefaultLanguage());
+                $event->register(new \wcf\system\endpoint\controller\core\languages\items\DeleteItem());
+                $event->register(new \wcf\system\endpoint\controller\core\labels\DeleteLabel());
+                $event->register(new \wcf\system\endpoint\controller\core\labels\groups\ChangeLabelShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\labels\groups\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\labels\groups\DeleteGroup());
+                $event->register(new \wcf\system\endpoint\controller\core\labels\groups\GetLabelShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\labels\groups\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\pages\DeletePage());
+                $event->register(new \wcf\system\endpoint\controller\core\pages\DisablePage());
+                $event->register(new \wcf\system\endpoint\controller\core\pages\EnablePage());
+                $event->register(new \wcf\system\endpoint\controller\core\templates\groups\DeleteTemplateGroup());
+                $event->register(new \wcf\system\endpoint\controller\core\packages\updates\servers\DisableServer());
+                $event->register(new \wcf\system\endpoint\controller\core\packages\updates\servers\DeleteServer());
+                $event->register(new \wcf\system\endpoint\controller\core\packages\updates\servers\EnableServer());
+                $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\DeleteSubscription());
+                $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\DisableSubscription());
+                $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\EnableSubscription());
+                $event->register(new \wcf\system\endpoint\controller\core\paid\subscriptions\users\DeleteSubscriptionUser());
+                $event->register(new \wcf\system\endpoint\controller\core\templates\DeleteTemplate());
+                $event->register(new \wcf\system\endpoint\controller\core\tags\DeleteTag());
+                $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignment\DeleteAssignment());
+                $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignment\EnableAssignment());
+                $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignment\DisableAssignment());
+                $event->register(new \wcf\system\endpoint\controller\core\users\groups\DeleteGroup());
+                $event->register(new \wcf\system\endpoint\controller\core\menus\DeleteMenu());
+                $event->register(new \wcf\system\endpoint\controller\core\trophies\EnableTrophy());
+                $event->register(new \wcf\system\endpoint\controller\core\trophies\DisableTrophy());
+                $event->register(new \wcf\system\endpoint\controller\core\trophies\DeleteTrophy());
+                $event->register(new \wcf\system\endpoint\controller\core\trophies\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\trophies\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\ads\EnableAd());
+                $event->register(new \wcf\system\endpoint\controller\core\ads\DisableAd());
+                $event->register(new \wcf\system\endpoint\controller\core\ads\DeleteAd());
+                $event->register(new \wcf\system\endpoint\controller\core\ads\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\ads\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\notices\EnableNotice());
+                $event->register(new \wcf\system\endpoint\controller\core\notices\DisableNotice());
+                $event->register(new \wcf\system\endpoint\controller\core\notices\DeleteNotice());
+                $event->register(new \wcf\system\endpoint\controller\core\notices\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\notices\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\reactions\types\EnableType());
+                $event->register(new \wcf\system\endpoint\controller\core\reactions\types\DisableType());
+                $event->register(new \wcf\system\endpoint\controller\core\reactions\types\DeleteType());
+                $event->register(new \wcf\system\endpoint\controller\core\reactions\types\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\reactions\types\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\smilies\DeleteSmiley());
+                $event->register(new \wcf\system\endpoint\controller\core\smilies\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\smilies\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\smilies\categories\GetSmileyShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\smilies\categories\ChangeSmileyShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\attachments\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\options\DeleteOption());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\options\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\options\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\options\DisableOption());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\options\EnableOption());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\DeleteRecipient());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\ChangeShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\GetShowOrder());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\DisableRecipient());
+                $event->register(new \wcf\system\endpoint\controller\core\contact\recipients\EnableRecipient());
+            }
+        );
+    }
 
-            $event->register(
-                new AcpMenuItem(
-                    "wcf.acp.menu.link.contact.options",
-                    parentMenuItem: "wcf.acp.menu.link.contact",
-                    link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ContactOptionListPage::class),
-                )
-            );
-            $event->register(
-                new AcpMenuItem(
-                    "wcf.acp.menu.link.contact.options.add",
-                    WCF::getLanguage()->get("wcf.acp.contact.option.add"),
-                    "wcf.acp.menu.link.contact.options",
-                    LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ContactOptionAddForm::class),
-                    FontAwesomeIcon::fromValues("plus"),
-                )
-            );
-            $event->register(
-                new AcpMenuItem(
-                    "wcf.acp.menu.link.contact.recipients",
-                    parentMenuItem: "wcf.acp.menu.link.contact",
-                    link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ContactRecipientListPage::class),
-                )
-            );
-            $event->register(
-                new AcpMenuItem(
-                    "wcf.acp.menu.link.contact.recipients.add",
-                    WCF::getLanguage()->get("wcf.acp.contact.recipient.add"),
-                    "wcf.acp.menu.link.contact.recipients",
-                    LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ContactRecipientAddForm::class),
-                    FontAwesomeIcon::fromValues("plus"),
-                )
-            );
-        });
+    private function initACPMenuItems(): void
+    {
+        EventHandler::getInstance()->register(
+            \wcf\event\acp\menu\item\ItemCollecting::class,
+            \wcf\system\event\listener\AcpMenuItemCollectingListener::class
+        );
     }
 
-    try {
-        $licenseApi = new LicenseApi();
-        $licenseData = $licenseApi->readFromFile();
-        if ($licenseData !== null) {
-            $brandingFree = $licenseData->woltlab['com.woltlab.brandingFree'] ?? '0.0';
-            $expiresAt = $licenseData->license['expiryDates']['com.woltlab.brandingFree'] ?? \TIME_NOW;
-            if ($brandingFree !== '0.0' && ($expiresAt === -1 || $expiresAt >= \TIME_NOW)) {
-                define('WOLTLAB_BRANDING', false);
-            }
+    private function initLicenseData(): void
+    {
+        try {
+            $licenseApi = new LicenseApi();
+            $licenseData = $licenseApi->readFromFile();
+            if ($licenseData !== null) {
+                $brandingFree = $licenseData->woltlab['com.woltlab.brandingFree'] ?? '0.0';
+                $expiresAt = $licenseData->license['expiryDates']['com.woltlab.brandingFree'] ?? \TIME_NOW;
+                if ($brandingFree !== '0.0' && ($expiresAt === -1 || $expiresAt >= \TIME_NOW)) {
+                    define('WOLTLAB_BRANDING', false);
+                }
 
-            // Expire the cached license data after 60 days.
-            if ($licenseData->creationDate->getTimestamp() < \TIME_NOW - 86400 * 60) {
-                $licenseApi->clearLicenseFile();
+                // Expire the cached license data after 60 days.
+                if ($licenseData->creationDate->getTimestamp() < \TIME_NOW - 86400 * 60) {
+                    $licenseApi->clearLicenseFile();
+                }
             }
+        } catch (\Throwable) {
+            // Reading the license file must never cause any errors.
         }
-    } catch (\Throwable) {
-        // Reading the license file must never cause any errors.
-    }
 
-    if (!defined('WOLTLAB_BRANDING')) {
-        define('WOLTLAB_BRANDING', true);
+        if (!defined('WOLTLAB_BRANDING')) {
+            define('WOLTLAB_BRANDING', true);
+        }
     }
 };
diff --git a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php
index 0270c8d2a0c..bc28fd1df04 100644
--- a/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php
@@ -67,12 +67,6 @@ public function getLink(): string
             'application' => $this->application,
         ];
 
-        // links of top option category menu items need the id of the option
-        // category
-        if ($this->parentMenuItem == 'wcf.acp.menu.link.option.category') {
-            $linkParameters['id'] = $this->optionCategoryID;
-        }
-
         return LinkHandler::getInstance()->getLink(
             $this->controller,
             $linkParameters,
@@ -119,14 +113,6 @@ protected function parseController()
      */
     public function __toString(): string
     {
-        // This is a placeholder category that represents the dynamic menu items
-        // generated by categories in the `options.xml`. It has no title and
-        // trying to access its name causes a false-positive for missing phrases
-        // with every ACP request.
-        if ($this->menuItem === 'wcf.acp.menu.link.option.category') {
-            return 'wcf.acp.menu.link.option.category';
-        }
-
         return WCF::getLanguage()->get($this->menuItem);
     }
 
diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php
index b5d991559fc..7b41028ccde 100644
--- a/wcfsetup/install/files/lib/data/package/Package.class.php
+++ b/wcfsetup/install/files/lib/data/package/Package.class.php
@@ -220,7 +220,7 @@ public function getAllRequiredPackages()
      */
     public function canUninstall()
     {
-        if (!WCF::getSession()->getPermission('admin.configuration.package.canUninstallPackage')) {
+        if (!WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage')) {
             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 a17ec72f3d2..8548f16c00d 100644
--- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
@@ -28,7 +28,7 @@ class PackageAction extends AbstractDatabaseObjectAction
     /**
      * @inheritDoc
      */
-    protected $permissionsDelete = ['admin.configuration.package.canUninstallPackage'];
+    protected $permissionsDelete = ['admin.configuration.package.canInstallPackage'];
 
     /**
      * @inheritDoc
diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
index 4caa133409d..1f66fc96b1b 100644
--- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
@@ -608,7 +608,6 @@ public static function getOwnerPermissions()
             'admin.configuration.canEditOption',
             'admin.configuration.canManageApplication',
             'admin.configuration.package.canInstallPackage',
-            'admin.configuration.package.canUninstallPackage',
             'admin.configuration.package.canUpdatePackage',
             'admin.general.canUseAcp',
             'admin.general.canViewPageDuringOfflineMode',
diff --git a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php
index 38341e3ffbe..93e857e1f55 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php
@@ -2,12 +2,7 @@
 
 namespace wcf\system\cache\builder;
 
-use wcf\acp\form\OptionForm;
-use wcf\data\acp\menu\item\ACPMenuItem;
 use wcf\data\acp\menu\item\ACPMenuItemList;
-use wcf\data\option\category\OptionCategory;
-use wcf\data\option\category\OptionCategoryList;
-use wcf\data\option\OptionList;
 
 /**
  * Caches the ACP menu items.
@@ -18,18 +13,6 @@
  */
 class ACPMenuCacheBuilder extends AbstractCacheBuilder
 {
-    /**
-     * list of option categories which directly contain options
-     * @var string[]
-     */
-    protected $categoriesWithOptions = [];
-
-    /**
-     * list of option categories grouped by the name of their parent category
-     * @var array<string, OptionCategory[]>
-     */
-    protected $categoryStructure = [];
-
     /**
      * @inheritDoc
      */
@@ -37,7 +20,6 @@ public function rebuild(array $parameters)
     {
         $data = [];
 
-        // get "real" menu items
         $menuItemList = new ACPMenuItemList();
         $menuItemList->sqlOrderBy = "acp_menu_item.showOrder";
         $menuItemList->readObjects();
@@ -45,91 +27,6 @@ public function rebuild(array $parameters)
             $data[$menuItem->parentMenuItem][] = $menuItem;
         }
 
-        // get menu items for top option categories
-        $data['wcf.acp.menu.link.option.category'] = [];
-        foreach ($this->getTopOptionCategories() as $optionCategory) {
-            $data['wcf.acp.menu.link.option.category'][] = new ACPMenuItem(null, [
-                'menuItem' => 'wcf.acp.option.category.' . $optionCategory->categoryName,
-                'parentMenuItem' => 'wcf.acp.menu.link.option.category',
-                'menuItemController' => OptionForm::class,
-                'permissions' => $optionCategory->permissions,
-                'optionCategoryID' => $optionCategory->categoryID,
-                'options' => $optionCategory->options,
-            ]);
-        }
-
         return $data;
     }
-
-    /**
-     * Returns the list with top option categories which contain options.
-     *
-     * @return  OptionCategory[]
-     */
-    protected function getTopOptionCategories()
-    {
-        $optionCategoryList = new OptionCategoryList();
-        $optionCategoryList->readObjects();
-        $optionCategories = $optionCategoryList->getObjects();
-
-        // build category structure
-        $this->categoryStructure = [];
-        foreach ($optionCategories as $optionCategory) {
-            if (!isset($this->categoryStructure[$optionCategory->parentCategoryName])) {
-                $this->categoryStructure[$optionCategory->parentCategoryName] = [];
-            }
-
-            $this->categoryStructure[$optionCategory->parentCategoryName][] = $optionCategory;
-        }
-
-        $optionList = new OptionList();
-        $optionList->readObjects();
-
-        // collect names of categories which contain options
-        foreach ($optionList as $option) {
-            if (!isset($this->categoriesWithOptions[$option->categoryName])) {
-                $this->categoriesWithOptions[$option->categoryName] = $option->categoryName;
-            }
-        }
-
-        // collect top categories which contain options
-        $topCategories = [];
-        foreach ($this->categoryStructure[""] as $topCategory) {
-            if ($this->containsOptions($topCategory)) {
-                $topCategories[$topCategory->categoryID] = $topCategory;
-            }
-        }
-
-        return $topCategories;
-    }
-
-    /**
-     * Returns true if the given category or one of its child categories contains
-     * options.
-     *
-     * @param OptionCategory $topCategory
-     * @return  bool
-     */
-    protected function containsOptions(OptionCategory $topCategory)
-    {
-        // check if category directly contains options
-        if (isset($this->categoriesWithOptions[$topCategory->categoryName])) {
-            return true;
-        }
-
-        if (!isset($this->categoryStructure[$topCategory->categoryName])) {
-            // if category directly contains no options and has no child
-            // categories, it contains no options at all
-            return false;
-        }
-
-        // check child categories
-        foreach ($this->categoryStructure[$topCategory->categoryName] as $category) {
-            if ($this->containsOptions($category)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
diff --git a/wcfsetup/install/files/lib/system/cache/eager/TopOptionCategoryCache.class.php b/wcfsetup/install/files/lib/system/cache/eager/TopOptionCategoryCache.class.php
new file mode 100644
index 00000000000..6273d902463
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/cache/eager/TopOptionCategoryCache.class.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace wcf\system\cache\eager;
+
+use wcf\data\option\category\OptionCategory;
+use wcf\data\option\category\OptionCategoryList;
+use wcf\data\option\OptionList;
+
+/**
+ * Returns the list with top option categories which contain options.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2025 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.2
+ *
+ * @extends AbstractEagerCache<array<int, OptionCategory>>
+ */
+final class TopOptionCategoryCache extends AbstractEagerCache
+{
+    /**
+     * list of option categories which directly contain options
+     * @var string[]
+     */
+    private array $categoriesWithOptions = [];
+
+    /**
+     * list of option categories grouped by the name of their parent category
+     * @var array<string, OptionCategory[]>
+     */
+    private array $categoryStructure = [];
+
+    /**
+     * @return array<int, OptionCategory>
+     */
+    #[\Override]
+    protected function getCacheData(): array
+    {
+        $optionCategoryList = new OptionCategoryList();
+        $optionCategoryList->readObjects();
+        $optionCategories = $optionCategoryList->getObjects();
+
+        // build category structure
+        $this->categoryStructure = [];
+        foreach ($optionCategories as $optionCategory) {
+            if (!isset($this->categoryStructure[$optionCategory->parentCategoryName])) {
+                $this->categoryStructure[$optionCategory->parentCategoryName] = [];
+            }
+
+            $this->categoryStructure[$optionCategory->parentCategoryName][] = $optionCategory;
+        }
+
+        $optionList = new OptionList();
+        $optionList->readObjects();
+
+        // collect names of categories which contain options
+        foreach ($optionList as $option) {
+            if (!isset($this->categoriesWithOptions[$option->categoryName])) {
+                $this->categoriesWithOptions[$option->categoryName] = $option->categoryName;
+            }
+        }
+
+        // collect top categories which contain options
+        $topCategories = [];
+        foreach ($this->categoryStructure[""] as $topCategory) {
+            if ($this->containsOptions($topCategory)) {
+                $topCategories[$topCategory->categoryID] = $topCategory;
+            }
+        }
+
+        return $topCategories;
+    }
+
+    /**
+     * Returns true if the given category or one of its child categories contains
+     * options.
+     */
+    private function containsOptions(OptionCategory $topCategory): bool
+    {
+        // check if category directly contains options
+        if (isset($this->categoriesWithOptions[$topCategory->categoryName])) {
+            return true;
+        }
+
+        if (!isset($this->categoryStructure[$topCategory->categoryName])) {
+            // if category directly contains no options and has no child
+            // categories, it contains no options at all
+            return false;
+        }
+
+        // check child categories
+        foreach ($this->categoryStructure[$topCategory->categoryName] as $category) {
+            if ($this->containsOptions($category)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/event/listener/AcpMenuItemCollectingListener.class.php b/wcfsetup/install/files/lib/system/event/listener/AcpMenuItemCollectingListener.class.php
new file mode 100644
index 00000000000..5a7728266a0
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/event/listener/AcpMenuItemCollectingListener.class.php
@@ -0,0 +1,1133 @@
+<?php
+
+namespace wcf\system\event\listener;
+
+use wcf\event\acp\menu\item\ItemCollecting;
+use wcf\system\cache\eager\TopOptionCategoryCache;
+use wcf\system\menu\acp\AcpMenuItem;
+use wcf\system\request\LinkHandler;
+use wcf\system\style\FontAwesomeIcon;
+use wcf\system\WCF;
+
+/**
+ * Adds the ACP menu entries of the core.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2025 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.2
+ */
+final class AcpMenuItemCollectingListener
+{
+    public function __invoke(ItemCollecting $event): void
+    {
+        $this->addTopLevelItems($event);
+
+        $this->addOptionItems($event);
+        $this->addPackageItems($event);
+        $this->addOtherItems($event);
+        $this->addContactFormItems($event);
+        $this->addDevtoolsItems($event);
+
+        $this->addUserItems($event);
+        $this->addUserGroupItems($event);
+        $this->addUserRankItems($event);
+        $this->addUserOptionItems($event);
+        $this->addUserNoticeItems($event);
+        $this->addPaidSubscriptionItems($event);
+        $this->addTrophyItems($event);
+
+        $this->addCmsItems($event);
+        $this->addMediaItems($event);
+        $this->addArticleItems($event);
+        $this->addLabelItems($event);
+        $this->addBbcodeItems($event);
+        $this->addTagItems($event);
+        $this->addAttachmentItems($event);
+
+        $this->addStyleItems($event);
+        $this->addTemplateItems($event);
+        $this->addLanguageItems($event);
+        $this->addSmileyItems($event);
+        $this->addAdItems($event);
+        $this->addReactionItems($event);
+
+        $this->addMaintenanceItems($event);
+        $this->addStatItems($event);
+        $this->addLogItems($event);
+    }
+
+    private function addTopLevelItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.configuration',
+            icon: FontAwesomeIcon::fromValues('wrench'),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user',
+            icon: FontAwesomeIcon::fromValues('users'),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.content',
+            icon: FontAwesomeIcon::fromValues('file-lines', true),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.application',
+            icon: FontAwesomeIcon::fromValues('comments', true),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.customization',
+            icon: FontAwesomeIcon::fromValues('desktop'),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.management',
+            icon: FontAwesomeIcon::fromValues('gear'),
+        ));
+    }
+
+    private function addOptionItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.configuration.canEditOption')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.option',
+            parentMenuItem: 'wcf.acp.menu.link.configuration'
+        ));
+
+        foreach ((new TopOptionCategoryCache())->getCache() as $optionCategory) {
+            if (!$optionCategory->validateOptions() || !$optionCategory->validatePermissions()) {
+                continue;
+            }
+
+            $event->register(
+                new AcpMenuItem(
+                    'wcf.acp.option.category.' . $optionCategory->categoryName,
+                    parentMenuItem: 'wcf.acp.menu.link.option',
+                    link: LinkHandler::getInstance()->getControllerLink(
+                        \wcf\acp\form\OptionForm::class,
+                        ['id' => $optionCategory->categoryID]
+                    ),
+                )
+            );
+        }
+    }
+
+    private function addOtherItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.other',
+            parentMenuItem: 'wcf.acp.menu.link.configuration'
+        ));
+
+        if (WCF::getSession()->getPermission('admin.user.canEditActivityPoints')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.activityPoint',
+                parentMenuItem: 'wcf.acp.menu.link.other',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserActivityPointOptionForm::class)
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.user.canManageNotificationSettings')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.notificationPresetSettings',
+                parentMenuItem: 'wcf.acp.menu.link.other',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\NotificationPresetSettingsForm::class)
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.captcha.canManageCaptchaQuestion')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.captcha.question.list',
+                parentMenuItem: 'wcf.acp.menu.link.other',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\CaptchaQuestionListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.captcha.question.add',
+                parentMenuItem: 'wcf.acp.menu.link.captcha.question.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\CaptchaQuestionAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+    }
+
+    private function addPackageItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.package',
+            parentMenuItem: 'wcf.acp.menu.link.configuration'
+        ));
+
+        if (WCF::getSession()->getPermission('admin.configuration.canManageApplication')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.application.management',
+                parentMenuItem: 'wcf.acp.menu.link.package',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ApplicationManagementForm::class)
+            ));
+        }
+
+        if (
+            WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage')
+            || WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage')
+        ) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.package.list',
+                parentMenuItem: 'wcf.acp.menu.link.package',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\PackageListPage::class)
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.package.license',
+                parentMenuItem: 'wcf.acp.menu.link.package.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\LicensePage::class),
+                icon: FontAwesomeIcon::fromValues('cart-arrow-down')
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.package.install',
+                parentMenuItem: 'wcf.acp.menu.link.package.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\PackageStartInstallForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.configuration.package.canEditServer')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.package.server.list',
+                parentMenuItem: 'wcf.acp.menu.link.package',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\PackageUpdateServerListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.package.server.add',
+                parentMenuItem: 'wcf.acp.menu.link.package.server.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\PackageUpdateServerAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+    }
+
+    private function addDevtoolsItems(ItemCollecting $event): void
+    {
+        if (!\ENABLE_DEVELOPER_TOOLS) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.devtools',
+            parentMenuItem: 'wcf.acp.menu.link.configuration'
+        ));
+
+        if (!WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.devtools.project.list',
+            parentMenuItem: 'wcf.acp.menu.link.devtools',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\DevtoolsProjectListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.devtools.project.add',
+            parentMenuItem: 'wcf.acp.menu.link.devtools.project.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\DevtoolsProjectAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.devtools.missingLanguageItem.list',
+            parentMenuItem: 'wcf.acp.menu.link.devtools',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\DevtoolsMissingLanguageItemListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.devtools.notificationTest',
+            parentMenuItem: 'wcf.acp.menu.link.devtools',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\DevtoolsNotificationTestPage::class),
+        ));
+    }
+
+    private function addContactFormItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_CONTACT_FORM) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.contact.canManageContactForm')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.contact',
+            parentMenuItem: 'wcf.acp.menu.link.configuration'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.contact.options',
+            parentMenuItem: 'wcf.acp.menu.link.contact',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ContactOptionListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.contact.options.add',
+            WCF::getLanguage()->get('wcf.acp.contact.option.add'),
+            'wcf.acp.menu.link.contact.options',
+            LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ContactOptionAddForm::class),
+            FontAwesomeIcon::fromValues('plus'),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.contact.recipients',
+            parentMenuItem: 'wcf.acp.menu.link.contact',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ContactRecipientListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.contact.recipients.add',
+            WCF::getLanguage()->get('wcf.acp.contact.recipient.add'),
+            'wcf.acp.menu.link.contact.recipients',
+            LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ContactRecipientAddForm::class),
+            FontAwesomeIcon::fromValues('plus'),
+        ));
+    }
+
+    private function addUserItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.management',
+            parentMenuItem: 'wcf.acp.menu.link.user'
+        ));
+
+        if (WCF::getSession()->getPermission('admin.user.canSearchUser')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.user.list',
+                parentMenuItem: 'wcf.acp.menu.link.user.management',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.user.search',
+                parentMenuItem: 'wcf.acp.menu.link.user.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserSearchForm::class),
+                icon: FontAwesomeIcon::fromValues('magnifying-glass')
+            ));
+            if (WCF::getSession()->getPermission('admin.user.canAddUser')) {
+                $event->register(new AcpMenuItem(
+                    'wcf.acp.menu.link.user.add',
+                    parentMenuItem: 'wcf.acp.menu.link.user.list',
+                    link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserAddForm::class),
+                    icon: FontAwesomeIcon::fromValues('plus')
+                ));
+            }
+        }
+
+        if (
+            WCF::getSession()->getPermission('admin.user.canEditUser')
+            || WCF::getSession()->getPermission('admin.user.canDeleteUser')
+            || WCF::getSession()->getPermission('admin.user.canMailUser')
+        ) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.user.bulkProcessing',
+                parentMenuItem: 'wcf.acp.menu.link.user.management',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserBulkProcessingForm::class)
+            ));
+        }
+        if (WCF::getSession()->getPermission('admin.user.canMailUser')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.user.mail',
+                parentMenuItem: 'wcf.acp.menu.link.user.management',
+                link: LinkHandler::getInstance()->getControllerLink(
+                    \wcf\acp\form\UserMailForm::class,
+                    ['action' => 'all']
+                )
+            ));
+        }
+        if (WCF::getSession()->getPermission('admin.user.canManageUserOption')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.user.profileMenu',
+                parentMenuItem: 'wcf.acp.menu.link.user.management',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserProfileMenuPage::class)
+            ));
+        }
+    }
+
+    private function addUserGroupItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.group',
+            parentMenuItem: 'wcf.acp.menu.link.user'
+        ));
+
+        if (
+            WCF::getSession()->getPermission('admin.user.canEditGroup')
+            || WCF::getSession()->getPermission('admin.user.canDeleteGroup')
+        ) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.group.list',
+                parentMenuItem: 'wcf.acp.menu.link.group',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserGroupListPage::class)
+            ));
+
+            if (WCF::getSession()->getPermission('admin.user.canAddGroup')) {
+                $event->register(new AcpMenuItem(
+                    'wcf.acp.menu.link.group.add',
+                    parentMenuItem: 'wcf.acp.menu.link.group.list',
+                    link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserGroupAddForm::class),
+                    icon: FontAwesomeIcon::fromValues('plus')
+                ));
+            }
+        }
+
+        if (WCF::getSession()->getPermission('admin.user.canMailUser')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.group.mail',
+                parentMenuItem: 'wcf.acp.menu.link.group',
+                link: LinkHandler::getInstance()->getControllerLink(
+                    \wcf\acp\form\UserMailForm::class,
+                    ['action' => 'group']
+                ),
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.user.canManageGroupAssignment')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.group.assignment',
+                parentMenuItem: 'wcf.acp.menu.link.group',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserGroupAssignmentListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.group.assignment.add',
+                parentMenuItem: 'wcf.acp.menu.link.group.assignment',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserGroupAssignmentAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+    }
+
+    private function addUserRankItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_USER_RANK) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.user.rank.canManageRank')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.rank',
+            parentMenuItem: 'wcf.acp.menu.link.user'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.rank.list',
+            parentMenuItem: 'wcf.acp.menu.link.user.rank',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserRankListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.rank.add',
+            parentMenuItem: 'wcf.acp.menu.link.user.rank.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserRankAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addUserOptionItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.user.canManageUserOption')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.option',
+            parentMenuItem: 'wcf.acp.menu.link.user'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.option.list',
+            parentMenuItem: 'wcf.acp.menu.link.user.option',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserOptionListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.option.add',
+            parentMenuItem: 'wcf.acp.menu.link.user.option.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserOptionAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.option.category.list',
+            parentMenuItem: 'wcf.acp.menu.link.user.option',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserOptionCategoryListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.user.option.category.add',
+            parentMenuItem: 'wcf.acp.menu.link.user.option.category.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserOptionCategoryAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.userOptionDefaults',
+            parentMenuItem: 'wcf.acp.menu.link.user.option',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserOptionSetDefaultsForm::class),
+        ));
+    }
+
+    private function addUserNoticeItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.notice.canManageNotice')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.notice',
+            parentMenuItem: 'wcf.acp.menu.link.user'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.notice.list',
+            parentMenuItem: 'wcf.acp.menu.link.notice',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\NoticeListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.notice.add',
+            parentMenuItem: 'wcf.acp.menu.link.notice.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\NoticeAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addPaidSubscriptionItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_PAID_SUBSCRIPTION) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.paidSubscription.canManageSubscription')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.paidSubscription',
+            parentMenuItem: 'wcf.acp.menu.link.user'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.paidSubscription.list',
+            parentMenuItem: 'wcf.acp.menu.link.paidSubscription',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\PaidSubscriptionListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.paidSubscription.add',
+            parentMenuItem: 'wcf.acp.menu.link.paidSubscription.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\PaidSubscriptionAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.paidSubscription.user.list',
+            parentMenuItem: 'wcf.acp.menu.link.paidSubscription',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\PaidSubscriptionUserListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.paidSubscription.transactionLog.list',
+            parentMenuItem: 'wcf.acp.menu.link.paidSubscription',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\PaidSubscriptionTransactionLogListPage::class),
+        ));
+    }
+
+    private function addTrophyItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_TROPHY) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.trophy.canManageTrophy')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.trophy',
+            parentMenuItem: 'wcf.acp.menu.link.user'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.trophy.category.list',
+            parentMenuItem: 'wcf.acp.menu.link.trophy',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\TrophyCategoryListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.trophy.category.add',
+            parentMenuItem: 'wcf.acp.menu.link.trophy.category.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\TrophyCategoryAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.trophy.list',
+            parentMenuItem: 'wcf.acp.menu.link.trophy',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\TrophyListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.trophy.add',
+            parentMenuItem: 'wcf.acp.menu.link.trophy.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\TrophyAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.userTrophy.list',
+            parentMenuItem: 'wcf.acp.menu.link.trophy',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserTrophyListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.userTrophy.add',
+            parentMenuItem: 'wcf.acp.menu.link.userTrophy.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\UserTrophyAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addCmsItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.cms',
+            parentMenuItem: 'wcf.acp.menu.link.content'
+        ));
+
+        if (WCF::getSession()->getPermission('admin.content.cms.canManagePage')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cms.page.list',
+                parentMenuItem: 'wcf.acp.menu.link.cms',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\PageListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cms.page.add',
+                parentMenuItem: 'wcf.acp.menu.link.cms.page.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\PageAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.content.cms.canManageMenu')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cms.menu.list',
+                parentMenuItem: 'wcf.acp.menu.link.cms',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\MenuListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cms.menu.add',
+                parentMenuItem: 'wcf.acp.menu.link.cms.menu.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\MenuAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.content.cms.canManageBox')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cms.box.list',
+                parentMenuItem: 'wcf.acp.menu.link.cms',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\BoxListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cms.box.add',
+                parentMenuItem: 'wcf.acp.menu.link.cms.box.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\BoxAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+    }
+
+    private function addMediaItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.content.cms.canManageMedia')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.media',
+            parentMenuItem: 'wcf.acp.menu.link.content'
+        ));
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.media.list',
+            parentMenuItem: 'wcf.acp.menu.link.media',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\MediaListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.media.category.list',
+            parentMenuItem: 'wcf.acp.menu.link.media',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\MediaCategoryListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.media.category.add',
+            parentMenuItem: 'wcf.acp.menu.link.media.category.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\MediaCategoryAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addArticleItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_ARTICLE) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.article',
+            parentMenuItem: 'wcf.acp.menu.link.content'
+        ));
+
+        if (
+            WCF::getSession()->getPermission('admin.content.article.canManageArticle')
+            || WCF::getSession()->getPermission('admin.content.article.canManageOwnArticles')
+            || WCF::getSession()->getPermission('admin.content.article.canContributeArticle')
+        ) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.article.list',
+                parentMenuItem: 'wcf.acp.menu.link.article',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ArticleListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.article.add',
+                parentMenuItem: 'wcf.acp.menu.link.article.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ArticleAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.content.article.canManageCategory')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.article.category.list',
+                parentMenuItem: 'wcf.acp.menu.link.article',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ArticleCategoryListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.article.category.add',
+                parentMenuItem: 'wcf.acp.menu.link.article.category.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ArticleCategoryAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+    }
+
+    private function addLabelItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.content.label.canManageLabel')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.label',
+            parentMenuItem: 'wcf.acp.menu.link.content'
+        ));
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.label.list',
+            parentMenuItem: 'wcf.acp.menu.link.label',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\LabelListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.label.add',
+            parentMenuItem: 'wcf.acp.menu.link.label.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\LabelAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.label.group.list',
+            parentMenuItem: 'wcf.acp.menu.link.label',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\LabelGroupListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.label.group.add',
+            parentMenuItem: 'wcf.acp.menu.link.label.group.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\LabelGroupAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addBbcodeItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.content.bbcode.canManageBBCode')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.bbcode',
+            parentMenuItem: 'wcf.acp.menu.link.content'
+        ));
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.bbcode.list',
+            parentMenuItem: 'wcf.acp.menu.link.bbcode',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\BBCodeListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.bbcode.add',
+            parentMenuItem: 'wcf.acp.menu.link.bbcode.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\BBCodeAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.bbcode.mediaProvider.list',
+            parentMenuItem: 'wcf.acp.menu.link.bbcode',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\BBCodeMediaProviderListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.bbcode.mediaProvider.add',
+            parentMenuItem: 'wcf.acp.menu.link.bbcode.mediaProvider.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\BBCodeMediaProviderAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addTagItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_TAGGING) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.content.tag.canManageTag')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.tag',
+            parentMenuItem: 'wcf.acp.menu.link.content'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.tag.list',
+            parentMenuItem: 'wcf.acp.menu.link.tag',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\TagListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.tag.add',
+            parentMenuItem: 'wcf.acp.menu.link.tag.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\TagAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addAttachmentItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.attachment.canManageAttachment')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.attachment',
+            parentMenuItem: 'wcf.acp.menu.link.content'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.attachment.list',
+            parentMenuItem: 'wcf.acp.menu.link.attachment',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\AttachmentListPage::class),
+        ));
+    }
+
+    private function addStyleItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.style.canManageStyle')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.style',
+            parentMenuItem: 'wcf.acp.menu.link.customization'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.style.list',
+            parentMenuItem: 'wcf.acp.menu.link.style',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\StyleListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.style.import',
+            parentMenuItem: 'wcf.acp.menu.link.style.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\StyleImportForm::class),
+            icon: FontAwesomeIcon::fromValues('upload')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.style.add',
+            parentMenuItem: 'wcf.acp.menu.link.style.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\StyleAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.style.globalValues',
+            parentMenuItem: 'wcf.acp.menu.link.style',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\StyleGlobalValuesForm::class),
+        ));
+    }
+
+    private function addTemplateItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.template.canManageTemplate')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.template',
+            parentMenuItem: 'wcf.acp.menu.link.customization'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.template.list',
+            parentMenuItem: 'wcf.acp.menu.link.template',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\TemplateListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.template.add',
+            parentMenuItem: 'wcf.acp.menu.link.template.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\TemplateAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.template.group.list',
+            parentMenuItem: 'wcf.acp.menu.link.template',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\TemplateGroupListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.template.group.add',
+            parentMenuItem: 'wcf.acp.menu.link.template.group.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\TemplateGroupAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addLanguageItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.language.canManageLanguage')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.language',
+            parentMenuItem: 'wcf.acp.menu.link.customization'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.language.list',
+            parentMenuItem: 'wcf.acp.menu.link.language',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\LanguageListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.language.import',
+            parentMenuItem: 'wcf.acp.menu.link.language.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\LanguageImportForm::class),
+            icon: FontAwesomeIcon::fromValues('upload')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.language.item.list',
+            parentMenuItem: 'wcf.acp.menu.link.language',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\LanguageItemListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.language.item.add',
+            parentMenuItem: 'wcf.acp.menu.link.language.item.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\LanguageItemAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.language.multilingualism',
+            parentMenuItem: 'wcf.acp.menu.link.language',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\LanguageMultilingualismForm::class),
+        ));
+    }
+
+    private function addSmileyItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_SMILEY) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.content.smiley.canManageSmiley')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.smiley',
+            parentMenuItem: 'wcf.acp.menu.link.customization'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.smiley.list',
+            parentMenuItem: 'wcf.acp.menu.link.smiley',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\SmileyListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.smiley.add',
+            parentMenuItem: 'wcf.acp.menu.link.smiley.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\SmileyAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.smiley.category.list',
+            parentMenuItem: 'wcf.acp.menu.link.smiley',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\SmileyCategoryListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.smiley.category.add',
+            parentMenuItem: 'wcf.acp.menu.link.smiley.category.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\SmileyCategoryAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addAdItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_WCF_AD) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.ad.canManageAd')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.ad',
+            parentMenuItem: 'wcf.acp.menu.link.customization'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.ad.list',
+            parentMenuItem: 'wcf.acp.menu.link.ad',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\AdListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.ad.add',
+            parentMenuItem: 'wcf.acp.menu.link.ad.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\AdAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addReactionItems(ItemCollecting $event): void
+    {
+        if (!\MODULE_LIKE) {
+            return;
+        }
+
+        if (!WCF::getSession()->getPermission('admin.content.reaction.canManageReactionType')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.reactionType',
+            parentMenuItem: 'wcf.acp.menu.link.customization'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.reactionType.list',
+            parentMenuItem: 'wcf.acp.menu.link.reactionType',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ReactionTypeListPage::class),
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.reactionType.add',
+            parentMenuItem: 'wcf.acp.menu.link.reactionType.list',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\ReactionTypeAddForm::class),
+            icon: FontAwesomeIcon::fromValues('plus')
+        ));
+    }
+
+    private function addMaintenanceItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.maintenance',
+            parentMenuItem: 'wcf.acp.menu.link.management'
+        ));
+
+        if (WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.systemCheck',
+                parentMenuItem: 'wcf.acp.menu.link.maintenance',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\SystemCheckPage::class),
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.management.canManageCronjob')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cronjob.list',
+                parentMenuItem: 'wcf.acp.menu.link.maintenance',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\CronjobListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.cronjob.add',
+                parentMenuItem: 'wcf.acp.menu.link.cronjob.list',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\CronjobAddForm::class),
+                icon: FontAwesomeIcon::fromValues('plus')
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.management.canRebuildData')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.maintenance.cache',
+                parentMenuItem: 'wcf.acp.menu.link.maintenance',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\CacheListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.maintenance.rebuildData',
+                parentMenuItem: 'wcf.acp.menu.link.maintenance',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\RebuildDataPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.maintenance.sitemap',
+                parentMenuItem: 'wcf.acp.menu.link.maintenance',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\SitemapListPage::class),
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.management.canImportData')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.maintenance.import',
+                parentMenuItem: 'wcf.acp.menu.link.maintenance',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\form\DataImportForm::class),
+            ));
+        }
+    }
+
+    private function addStatItems(ItemCollecting $event): void
+    {
+        if (!WCF::getSession()->getPermission('admin.management.canViewLog')) {
+            return;
+        }
+
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.stat',
+            parentMenuItem: 'wcf.acp.menu.link.management'
+        ));
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.stat.list',
+            parentMenuItem: 'wcf.acp.menu.link.stat',
+            link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\StatPage::class),
+        ));
+    }
+
+    private function addLogItems(ItemCollecting $event): void
+    {
+        $event->register(new AcpMenuItem(
+            'wcf.acp.menu.link.log',
+            parentMenuItem: 'wcf.acp.menu.link.management'
+        ));
+
+        if (WCF::getSession()->getPermission('admin.management.canViewLog')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.log.session',
+                parentMenuItem: 'wcf.acp.menu.link.log',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ACPSessionLogListPage::class),
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.management.canManageCronjob')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.log.cronjob',
+                parentMenuItem: 'wcf.acp.menu.link.log',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\CronjobLogListPage::class),
+            ));
+        }
+
+        if (WCF::getSession()->getPermission('admin.management.canViewLog')) {
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.log.email',
+                parentMenuItem: 'wcf.acp.menu.link.log',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\EmailLogListPage::class),
+            ));
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.log.exception',
+                parentMenuItem: 'wcf.acp.menu.link.log',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ExceptionLogViewPage::class),
+            ));
+            if (\ENABLE_USER_AUTHENTICATION_FAILURE) {
+                $event->register(new AcpMenuItem(
+                    'wcf.acp.menu.link.log.authentication.failure',
+                    parentMenuItem: 'wcf.acp.menu.link.log',
+                    link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\UserAuthenticationFailureListPage::class),
+                ));
+            }
+            $event->register(new AcpMenuItem(
+                'wcf.acp.menu.link.log.modification',
+                parentMenuItem: 'wcf.acp.menu.link.log',
+                link: LinkHandler::getInstance()->getControllerLink(\wcf\acp\page\ModificationLogListPage::class),
+            ));
+        }
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/gridView/admin/PackageGridView.class.php b/wcfsetup/install/files/lib/system/gridView/admin/PackageGridView.class.php
index 7e07d65a4a2..4e6ff48fd4d 100644
--- a/wcfsetup/install/files/lib/system/gridView/admin/PackageGridView.class.php
+++ b/wcfsetup/install/files/lib/system/gridView/admin/PackageGridView.class.php
@@ -124,7 +124,7 @@ public function render(mixed $value, DatabaseObject $row): string
     public function isAccessible(): bool
     {
         return WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage')
-            || WCF::getSession()->getPermission('admin.configuration.package.canUninstallPackage');
+            || WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage');
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php
index d3d039be2a5..0db6ffa778c 100644
--- a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php
@@ -57,13 +57,13 @@ protected function loadCache()
             return;
         }
 
-        $this->loadLegacyMenuItems();
-
         $event = new ItemCollecting();
         EventHandler::getInstance()->fire($event);
         foreach ($event->getItems() as $item) {
             $this->menuItems[$item->parentMenuItem][] = $item;
         }
+
+        $this->loadLegacyMenuItems();
     }
 
     /**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
index d7ce92f572a..e24363340c0 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
@@ -7,7 +7,6 @@
 use wcf\system\form\builder\container\IFormContainer;
 use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 use wcf\system\form\builder\field\IconFormField;
-use wcf\system\form\builder\field\SingleSelectionFormField;
 use wcf\system\form\builder\field\TextFormField;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
 use wcf\system\form\builder\field\validation\FormFieldValidator;
@@ -41,6 +40,13 @@ protected function prepareImport(array $data)
         return $returnValue;
     }
 
+    #[\Override]
+    protected function validateImport(array $data)
+    {
+        // The parent method checks whether the parent menu item exists.
+        // Since menu items can now also be added at runtime, this check is no longer reliable.
+    }
+
     /**
      * @inheritDoc
      */
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 6242a4e279b..7c7c7a4b5b2 100644
--- a/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
+++ b/wcfsetup/install/files/lib/system/search/acp/PackageACPSearchResultProvider.class.php
@@ -22,7 +22,7 @@ public function search($query)
     {
         if (
             !WCF::getSession()->getPermission('admin.configuration.package.canUpdatePackage')
-            && !WCF::getSession()->getPermission('admin.configuration.package.canUninstallPackage')
+            && !WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage')
         ) {
             return [];
         }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 2ed721af8ae..82cb360a31a 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -736,7 +736,6 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<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 Paket-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>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 1a9c6d7bf0f..d3915fabac9 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -712,7 +712,6 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<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 package 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 user group have access to these user groups. Furthermore, you need to specify if these users are allowed to edit these user groups.]]></item>