diff --git a/phpBB/phpbb/install/helper/database.php b/phpBB/phpbb/install/helper/database.php
index 27cb2dc828..627e9ea9b0 100644
--- a/phpBB/phpbb/install/helper/database.php
+++ b/phpBB/phpbb/install/helper/database.php
@@ -33,7 +33,91 @@ class database
 	/**
 	 * @var array
 	 */
-	protected $supported_dbms;
+	protected $supported_dbms = array(
+		// Note: php 5.5 alpha 2 deprecated mysql.
+		// Keep mysqli before mysql in this list.
+		'mysqli'	=> array(
+			'LABEL'			=> 'MySQL with MySQLi Extension',
+			'SCHEMA'		=> 'mysql_41',
+			'MODULE'		=> 'mysqli',
+			'DELIM'			=> ';',
+			'DRIVER'		=> 'phpbb\db\driver\mysqli',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> true,
+		),
+		'mysql'		=> array(
+			'LABEL'			=> 'MySQL',
+			'SCHEMA'		=> 'mysql',
+			'MODULE'		=> 'mysql',
+			'DELIM'			=> ';',
+			'DRIVER'		=> 'phpbb\db\driver\mysql',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> true,
+		),
+		'mssql'		=> array(
+			'LABEL'			=> 'MS SQL Server 2000+',
+			'SCHEMA'		=> 'mssql',
+			'MODULE'		=> 'mssql',
+			'DELIM'			=> 'GO',
+			'DRIVER'		=> 'phpbb\db\driver\mssql',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> true,
+		),
+		'mssql_odbc'=>	array(
+			'LABEL'			=> 'MS SQL Server [ ODBC ]',
+			'SCHEMA'		=> 'mssql',
+			'MODULE'		=> 'odbc',
+			'DELIM'			=> 'GO',
+			'DRIVER'		=> 'phpbb\db\driver\mssql_odbc',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> true,
+		),
+		'mssqlnative'		=> array(
+			'LABEL'			=> 'MS SQL Server 2005+ [ Native ]',
+			'SCHEMA'		=> 'mssql',
+			'MODULE'		=> 'sqlsrv',
+			'DELIM'			=> 'GO',
+			'DRIVER'		=> 'phpbb\db\driver\mssqlnative',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> false,
+		),
+		'oracle'	=>	array(
+			'LABEL'			=> 'Oracle',
+			'SCHEMA'		=> 'oracle',
+			'MODULE'		=> 'oci8',
+			'DELIM'			=> '/',
+			'DRIVER'		=> 'phpbb\db\driver\oracle',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> false,
+		),
+		'postgres' => array(
+			'LABEL'			=> 'PostgreSQL 8.3+',
+			'SCHEMA'		=> 'postgres',
+			'MODULE'		=> 'pgsql',
+			'DELIM'			=> ';',
+			'DRIVER'		=> 'phpbb\db\driver\postgres',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> true,
+		),
+		'sqlite'		=> array(
+			'LABEL'			=> 'SQLite',
+			'SCHEMA'		=> 'sqlite',
+			'MODULE'		=> 'sqlite',
+			'DELIM'			=> ';',
+			'DRIVER'		=> 'phpbb\db\driver\sqlite',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> false,
+		),
+		'sqlite3'		=> array(
+			'LABEL'			=> 'SQLite3',
+			'SCHEMA'		=> 'sqlite',
+			'MODULE'		=> 'sqlite3',
+			'DELIM'			=> ';',
+			'DRIVER'		=> 'phpbb\db\driver\sqlite3',
+			'AVAILABLE'		=> true,
+			'2.0.x'			=> false,
+		),
+	);
 
 	/**
 	 * Constructor
@@ -45,93 +129,6 @@ class database
 	{
 		$this->filesystem		= $filesystem;
 		$this->phpbb_root_path	= $phpbb_root_path;
-
-		// DBMS supported by phpBB
-		$this->supported_dbms = array(
-			// Note: php 5.5 alpha 2 deprecated mysql.
-			// Keep mysqli before mysql in this list.
-			'mysqli'	=> array(
-				'LABEL'			=> 'MySQL with MySQLi Extension',
-				'SCHEMA'		=> 'mysql_41',
-				'MODULE'		=> 'mysqli',
-				'DELIM'			=> ';',
-				'DRIVER'		=> 'phpbb\db\driver\mysqli',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> true,
-			),
-			'mysql'		=> array(
-				'LABEL'			=> 'MySQL',
-				'SCHEMA'		=> 'mysql',
-				'MODULE'		=> 'mysql',
-				'DELIM'			=> ';',
-				'DRIVER'		=> 'phpbb\db\driver\mysql',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> true,
-			),
-			'mssql'		=> array(
-				'LABEL'			=> 'MS SQL Server 2000+',
-				'SCHEMA'		=> 'mssql',
-				'MODULE'		=> 'mssql',
-				'DELIM'			=> 'GO',
-				'DRIVER'		=> 'phpbb\db\driver\mssql',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> true,
-			),
-			'mssql_odbc'=>	array(
-				'LABEL'			=> 'MS SQL Server [ ODBC ]',
-				'SCHEMA'		=> 'mssql',
-				'MODULE'		=> 'odbc',
-				'DELIM'			=> 'GO',
-				'DRIVER'		=> 'phpbb\db\driver\mssql_odbc',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> true,
-			),
-			'mssqlnative'		=> array(
-				'LABEL'			=> 'MS SQL Server 2005+ [ Native ]',
-				'SCHEMA'		=> 'mssql',
-				'MODULE'		=> 'sqlsrv',
-				'DELIM'			=> 'GO',
-				'DRIVER'		=> 'phpbb\db\driver\mssqlnative',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> false,
-			),
-			'oracle'	=>	array(
-				'LABEL'			=> 'Oracle',
-				'SCHEMA'		=> 'oracle',
-				'MODULE'		=> 'oci8',
-				'DELIM'			=> '/',
-				'DRIVER'		=> 'phpbb\db\driver\oracle',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> false,
-			),
-			'postgres' => array(
-				'LABEL'			=> 'PostgreSQL 8.3+',
-				'SCHEMA'		=> 'postgres',
-				'MODULE'		=> 'pgsql',
-				'DELIM'			=> ';',
-				'DRIVER'		=> 'phpbb\db\driver\postgres',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> true,
-			),
-			'sqlite'		=> array(
-				'LABEL'			=> 'SQLite',
-				'SCHEMA'		=> 'sqlite',
-				'MODULE'		=> 'sqlite',
-				'DELIM'			=> ';',
-				'DRIVER'		=> 'phpbb\db\driver\sqlite',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> false,
-			),
-			'sqlite3'		=> array(
-				'LABEL'			=> 'SQLite3',
-				'SCHEMA'		=> 'sqlite',
-				'MODULE'		=> 'sqlite3',
-				'DELIM'			=> ';',
-				'DRIVER'		=> 'phpbb\db\driver\sqlite3',
-				'AVAILABLE'		=> true,
-				'2.0.x'			=> false,
-			),
-		);
 	}
 
 	/**
diff --git a/phpBB/phpbb/install/module/install_data/task/add_bots.php b/phpBB/phpbb/install/module/install_data/task/add_bots.php
index c31700e97f..b45d3808db 100644
--- a/phpBB/phpbb/install/module/install_data/task/add_bots.php
+++ b/phpBB/phpbb/install/module/install_data/task/add_bots.php
@@ -16,9 +16,91 @@ namespace phpbb\install\module\install_data\task;
 class add_bots extends \phpbb\install\task_base
 {
 	/**
+	 * A list of the web-crawlers/bots we recognise by default
+	 *
+	 * Candidates but not included:
+	 * 'Accoona [Bot]'				'Accoona-AI-Agent/'
+	 * 'ASPseek [Crawler]'			'ASPseek/'
+	 * 'Boitho [Crawler]'			'boitho.com-dc/'
+	 * 'Bunnybot [Bot]'				'powered by www.buncat.de'
+	 * 'Cosmix [Bot]'				'cfetch/'
+	 * 'Crawler Search [Crawler]'	'.Crawler-Search.de'
+	 * 'Findexa [Crawler]'			'Findexa Crawler ('
+	 * 'GBSpider [Spider]'			'GBSpider v'
+	 * 'genie [Bot]'				'genieBot ('
+	 * 'Hogsearch [Bot]'			'oegp v. 1.3.0'
+	 * 'Insuranco [Bot]'			'InsurancoBot'
+	 * 'IRLbot [Bot]'				'http://irl.cs.tamu.edu/crawler'
+	 * 'ISC Systems [Bot]'			'ISC Systems iRc Search'
+	 * 'Jyxobot [Bot]'				'Jyxobot/'
+	 * 'Kraehe [Metasuche]'			'-DIE-KRAEHE- META-SEARCH-ENGINE/'
+	 * 'LinkWalker'					'LinkWalker'
+	 * 'MMSBot [Bot]'				'http://www.mmsweb.at/bot.html'
+	 * 'Naver [Bot]'				'nhnbot@naver.com)'
+	 * 'NetResearchServer'			'NetResearchServer/'
+	 * 'Nimble [Crawler]'			'NimbleCrawler'
+	 * 'Ocelli [Bot]'				'Ocelli/'
+	 * 'Onsearch [Bot]'				'onCHECK-Robot'
+	 * 'Orange [Spider]'			'OrangeSpider'
+	 * 'Sproose [Bot]'				'http://www.sproose.com/bot'
+	 * 'Susie [Sync]'				'!Susie (http://www.sync2it.com/susie)'
+	 * 'Tbot [Bot]'					'Tbot/'
+	 * 'Thumbshots [Capture]'		'thumbshots-de-Bot'
+	 * 'Vagabondo [Crawler]'		'http://webagent.wise-guys.nl/'
+	 * 'Walhello [Bot]'				'appie 1.1 (www.walhello.com)'
+	 * 'WissenOnline [Bot]'			'WissenOnline-Bot'
+	 * 'WWWeasel [Bot]'				'WWWeasel Robot v'
+	 * 'Xaldon [Spider]'			'Xaldon WebSpider'
+	 *
 	 * @var array
 	 */
-	protected $bot_list;
+	protected $bot_list = array(
+		'AdsBot [Google]'			=> array('AdsBot-Google', ''),
+		'Alexa [Bot]'				=> array('ia_archiver', ''),
+		'Alta Vista [Bot]'			=> array('Scooter/', ''),
+		'Ask Jeeves [Bot]'			=> array('Ask Jeeves', ''),
+		'Baidu [Spider]'			=> array('Baiduspider', ''),
+		'Bing [Bot]'				=> array('bingbot/', ''),
+		'Exabot [Bot]'				=> array('Exabot', ''),
+		'FAST Enterprise [Crawler]'	=> array('FAST Enterprise Crawler', ''),
+		'FAST WebCrawler [Crawler]'	=> array('FAST-WebCrawler/', ''),
+		'Francis [Bot]'				=> array('http://www.neomo.de/', ''),
+		'Gigabot [Bot]'				=> array('Gigabot/', ''),
+		'Google Adsense [Bot]'		=> array('Mediapartners-Google', ''),
+		'Google Desktop'			=> array('Google Desktop', ''),
+		'Google Feedfetcher'		=> array('Feedfetcher-Google', ''),
+		'Google [Bot]'				=> array('Googlebot', ''),
+		'Heise IT-Markt [Crawler]'	=> array('heise-IT-Markt-Crawler', ''),
+		'Heritrix [Crawler]'		=> array('heritrix/1.', ''),
+		'IBM Research [Bot]'		=> array('ibm.com/cs/crawler', ''),
+		'ICCrawler - ICjobs'		=> array('ICCrawler - ICjobs', ''),
+		'ichiro [Crawler]'			=> array('ichiro/', ''),
+		'Majestic-12 [Bot]'			=> array('MJ12bot/', ''),
+		'Metager [Bot]'				=> array('MetagerBot/', ''),
+		'MSN NewsBlogs'				=> array('msnbot-NewsBlogs/', ''),
+		'MSN [Bot]'					=> array('msnbot/', ''),
+		'MSNbot Media'				=> array('msnbot-media/', ''),
+		'Nutch [Bot]'				=> array('http://lucene.apache.org/nutch/', ''),
+		'Online link [Validator]'	=> array('online link validator', ''),
+		'psbot [Picsearch]'			=> array('psbot/0', ''),
+		'Sensis [Crawler]'			=> array('Sensis Web Crawler', ''),
+		'SEO Crawler'				=> array('SEO search Crawler/', ''),
+		'Seoma [Crawler]'			=> array('Seoma [SEO Crawler]', ''),
+		'SEOSearch [Crawler]'		=> array('SEOsearch/', ''),
+		'Snappy [Bot]'				=> array('Snappy/1.1 ( http://www.urltrends.com/ )', ''),
+		'Steeler [Crawler]'			=> array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''),
+		'Telekom [Bot]'				=> array('crawleradmin.t-info@telekom.de', ''),
+		'TurnitinBot [Bot]'			=> array('TurnitinBot/', ''),
+		'Voyager [Bot]'				=> array('voyager/', ''),
+		'W3 [Sitesearch]'			=> array('W3 SiteSearch Crawler', ''),
+		'W3C [Linkcheck]'			=> array('W3C-checklink/', ''),
+		'W3C [Validator]'			=> array('W3C_Validator', ''),
+		'YaCy [Bot]'				=> array('yacybot', ''),
+		'Yahoo MMCrawler [Bot]'		=> array('Yahoo-MMCrawler/', ''),
+		'Yahoo Slurp [Bot]'			=> array('Yahoo! DE Slurp', ''),
+		'Yahoo [Bot]'				=> array('Yahoo! Slurp', ''),
+		'YahooSeeker [Bot]'			=> array('YahooSeeker/', ''),
+	);
 
 	/**
 	 * @var \phpbb\db\driver\driver_interface
@@ -75,91 +157,6 @@ class add_bots extends \phpbb\install\task_base
 		$this->language			= $language;
 		$this->phpbb_root_path	= $phpbb_root_path;
 		$this->php_ext			= $php_ext;
-
-		/**
-		 * A list of the web-crawlers/bots we recognise by default
-		 *
-		 * Candidates but not included:
-		 * 'Accoona [Bot]'				'Accoona-AI-Agent/'
-		 * 'ASPseek [Crawler]'			'ASPseek/'
-		 * 'Boitho [Crawler]'			'boitho.com-dc/'
-		 * 'Bunnybot [Bot]'				'powered by www.buncat.de'
-		 * 'Cosmix [Bot]'				'cfetch/'
-		 * 'Crawler Search [Crawler]'	'.Crawler-Search.de'
-		 * 'Findexa [Crawler]'			'Findexa Crawler ('
-		 * 'GBSpider [Spider]'			'GBSpider v'
-		 * 'genie [Bot]'				'genieBot ('
-		 * 'Hogsearch [Bot]'			'oegp v. 1.3.0'
-		 * 'Insuranco [Bot]'			'InsurancoBot'
-		 * 'IRLbot [Bot]'				'http://irl.cs.tamu.edu/crawler'
-		 * 'ISC Systems [Bot]'			'ISC Systems iRc Search'
-		 * 'Jyxobot [Bot]'				'Jyxobot/'
-		 * 'Kraehe [Metasuche]'			'-DIE-KRAEHE- META-SEARCH-ENGINE/'
-		 * 'LinkWalker'					'LinkWalker'
-		 * 'MMSBot [Bot]'				'http://www.mmsweb.at/bot.html'
-		 * 'Naver [Bot]'				'nhnbot@naver.com)'
-		 * 'NetResearchServer'			'NetResearchServer/'
-		 * 'Nimble [Crawler]'			'NimbleCrawler'
-		 * 'Ocelli [Bot]'				'Ocelli/'
-		 * 'Onsearch [Bot]'				'onCHECK-Robot'
-		 * 'Orange [Spider]'			'OrangeSpider'
-		 * 'Sproose [Bot]'				'http://www.sproose.com/bot'
-		 * 'Susie [Sync]'				'!Susie (http://www.sync2it.com/susie)'
-		 * 'Tbot [Bot]'					'Tbot/'
-		 * 'Thumbshots [Capture]'		'thumbshots-de-Bot'
-		 * 'Vagabondo [Crawler]'		'http://webagent.wise-guys.nl/'
-		 * 'Walhello [Bot]'				'appie 1.1 (www.walhello.com)'
-		 * 'WissenOnline [Bot]'			'WissenOnline-Bot'
-		 * 'WWWeasel [Bot]'				'WWWeasel Robot v'
-		 * 'Xaldon [Spider]'			'Xaldon WebSpider'
-		 */
-		$this->bot_list = array(
-			'AdsBot [Google]'			=> array('AdsBot-Google', ''),
-			'Alexa [Bot]'				=> array('ia_archiver', ''),
-			'Alta Vista [Bot]'			=> array('Scooter/', ''),
-			'Ask Jeeves [Bot]'			=> array('Ask Jeeves', ''),
-			'Baidu [Spider]'			=> array('Baiduspider', ''),
-			'Bing [Bot]'				=> array('bingbot/', ''),
-			'Exabot [Bot]'				=> array('Exabot', ''),
-			'FAST Enterprise [Crawler]'	=> array('FAST Enterprise Crawler', ''),
-			'FAST WebCrawler [Crawler]'	=> array('FAST-WebCrawler/', ''),
-			'Francis [Bot]'				=> array('http://www.neomo.de/', ''),
-			'Gigabot [Bot]'				=> array('Gigabot/', ''),
-			'Google Adsense [Bot]'		=> array('Mediapartners-Google', ''),
-			'Google Desktop'			=> array('Google Desktop', ''),
-			'Google Feedfetcher'		=> array('Feedfetcher-Google', ''),
-			'Google [Bot]'				=> array('Googlebot', ''),
-			'Heise IT-Markt [Crawler]'	=> array('heise-IT-Markt-Crawler', ''),
-			'Heritrix [Crawler]'		=> array('heritrix/1.', ''),
-			'IBM Research [Bot]'		=> array('ibm.com/cs/crawler', ''),
-			'ICCrawler - ICjobs'		=> array('ICCrawler - ICjobs', ''),
-			'ichiro [Crawler]'			=> array('ichiro/', ''),
-			'Majestic-12 [Bot]'			=> array('MJ12bot/', ''),
-			'Metager [Bot]'				=> array('MetagerBot/', ''),
-			'MSN NewsBlogs'				=> array('msnbot-NewsBlogs/', ''),
-			'MSN [Bot]'					=> array('msnbot/', ''),
-			'MSNbot Media'				=> array('msnbot-media/', ''),
-			'Nutch [Bot]'				=> array('http://lucene.apache.org/nutch/', ''),
-			'Online link [Validator]'	=> array('online link validator', ''),
-			'psbot [Picsearch]'			=> array('psbot/0', ''),
-			'Sensis [Crawler]'			=> array('Sensis Web Crawler', ''),
-			'SEO Crawler'				=> array('SEO search Crawler/', ''),
-			'Seoma [Crawler]'			=> array('Seoma [SEO Crawler]', ''),
-			'SEOSearch [Crawler]'		=> array('SEOsearch/', ''),
-			'Snappy [Bot]'				=> array('Snappy/1.1 ( http://www.urltrends.com/ )', ''),
-			'Steeler [Crawler]'			=> array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''),
-			'Telekom [Bot]'				=> array('crawleradmin.t-info@telekom.de', ''),
-			'TurnitinBot [Bot]'			=> array('TurnitinBot/', ''),
-			'Voyager [Bot]'				=> array('voyager/', ''),
-			'W3 [Sitesearch]'			=> array('W3 SiteSearch Crawler', ''),
-			'W3C [Linkcheck]'			=> array('W3C-checklink/', ''),
-			'W3C [Validator]'			=> array('W3C_Validator', ''),
-			'YaCy [Bot]'				=> array('yacybot', ''),
-			'Yahoo MMCrawler [Bot]'		=> array('Yahoo-MMCrawler/', ''),
-			'Yahoo Slurp [Bot]'			=> array('Yahoo! DE Slurp', ''),
-			'Yahoo [Bot]'				=> array('Yahoo! Slurp', ''),
-			'YahooSeeker [Bot]'			=> array('YahooSeeker/', ''),
-		);
 	}
 
 	/**
diff --git a/phpBB/phpbb/install/module/install_data/task/add_modules.php b/phpBB/phpbb/install/module/install_data/task/add_modules.php
index 8ca2b6b215..bfbe6282bc 100644
--- a/phpBB/phpbb/install/module/install_data/task/add_modules.php
+++ b/phpBB/phpbb/install/module/install_data/task/add_modules.php
@@ -41,17 +41,97 @@ class add_modules extends \phpbb\install\task_base
 	 *
 	 * @var array
 	 */
-	protected $module_categories;
+	protected $module_categories = array(
+		'acp' => array(
+			'ACP_CAT_GENERAL' => array(
+				'ACP_QUICK_ACCESS',
+				'ACP_BOARD_CONFIGURATION',
+				'ACP_CLIENT_COMMUNICATION',
+				'ACP_SERVER_CONFIGURATION',
+			),
+			'ACP_CAT_FORUMS' => array(
+				'ACP_MANAGE_FORUMS',
+				'ACP_FORUM_BASED_PERMISSIONS',
+			),
+			'ACP_CAT_POSTING' => array(
+				'ACP_MESSAGES',
+				'ACP_ATTACHMENTS',
+			),
+			'ACP_CAT_USERGROUP' => array(
+				'ACP_CAT_USERS',
+				'ACP_GROUPS',
+				'ACP_USER_SECURITY',
+			),
+			'ACP_CAT_PERMISSIONS' => array(
+				'ACP_GLOBAL_PERMISSIONS',
+				'ACP_FORUM_BASED_PERMISSIONS',
+				'ACP_PERMISSION_ROLES',
+				'ACP_PERMISSION_MASKS',
+			),
+			'ACP_CAT_CUSTOMISE' => array(
+				'ACP_STYLE_MANAGEMENT',
+				'ACP_EXTENSION_MANAGEMENT',
+				'ACP_LANGUAGE',
+			),
+			'ACP_CAT_MAINTENANCE' => array(
+				'ACP_FORUM_LOGS',
+				'ACP_CAT_DATABASE',
+			),
+			'ACP_CAT_SYSTEM' => array(
+				'ACP_AUTOMATION',
+				'ACP_GENERAL_TASKS',
+				'ACP_MODULE_MANAGEMENT',
+			),
+			'ACP_CAT_DOT_MODS' => null,
+		),
+		'mcp' => array(
+			'MCP_MAIN'		=> null,
+			'MCP_QUEUE'		=> null,
+			'MCP_REPORTS'	=> null,
+			'MCP_NOTES'		=> null,
+			'MCP_WARN'		=> null,
+			'MCP_LOGS'		=> null,
+			'MCP_BAN'		=> null,
+		),
+		'ucp' => array(
+			'UCP_MAIN'			=> null,
+			'UCP_PROFILE'		=> null,
+			'UCP_PREFS'			=> null,
+			'UCP_PM'			=> null,
+			'UCP_USERGROUPS'	=> null,
+			'UCP_ZEBRA'			=> null,
+		),
+	);
 
 	/**
 	 * @var array
 	 */
-	protected $module_categories_basenames;
+	protected $module_categories_basenames = array(
+		'UCP_PM' => 'ucp_pm',
+	);
 
 	/**
 	 * @var array
 	 */
-	protected $module_extras;
+	protected $module_extras = array(
+		'acp'	=> array(
+			'ACP_QUICK_ACCESS' => array(
+				'ACP_MANAGE_USERS',
+				'ACP_GROUPS_MANAGE',
+				'ACP_MANAGE_FORUMS',
+				'ACP_MOD_LOGS',
+				'ACP_BOTS',
+				'ACP_PHP_INFO',
+			),
+			'ACP_FORUM_BASED_PERMISSIONS' => array(
+				'ACP_FORUM_PERMISSIONS',
+				'ACP_FORUM_PERMISSIONS_COPY',
+				'ACP_FORUM_MODERATORS',
+				'ACP_USERS_FORUM_PERMISSIONS',
+				'ACP_GROUPS_FORUM_PERMISSIONS',
+			),
+		),
+	);
 
 	/**
 	 * Constructor
@@ -68,92 +148,6 @@ class add_modules extends \phpbb\install\task_base
 		$this->module_manager		= $container->get('module.manager');
 
 		parent::__construct(true);
-
-		$this->module_categories = array(
-			'acp' => array(
-				'ACP_CAT_GENERAL' => array(
-					'ACP_QUICK_ACCESS',
-					'ACP_BOARD_CONFIGURATION',
-					'ACP_CLIENT_COMMUNICATION',
-					'ACP_SERVER_CONFIGURATION',
-				),
-				'ACP_CAT_FORUMS' => array(
-					'ACP_MANAGE_FORUMS',
-					'ACP_FORUM_BASED_PERMISSIONS',
-				),
-				'ACP_CAT_POSTING' => array(
-					'ACP_MESSAGES',
-					'ACP_ATTACHMENTS',
-				),
-				'ACP_CAT_USERGROUP' => array(
-					'ACP_CAT_USERS',
-					'ACP_GROUPS',
-					'ACP_USER_SECURITY',
-				),
-				'ACP_CAT_PERMISSIONS' => array(
-					'ACP_GLOBAL_PERMISSIONS',
-					'ACP_FORUM_BASED_PERMISSIONS',
-					'ACP_PERMISSION_ROLES',
-					'ACP_PERMISSION_MASKS',
-				),
-				'ACP_CAT_CUSTOMISE' => array(
-					'ACP_STYLE_MANAGEMENT',
-					'ACP_EXTENSION_MANAGEMENT',
-					'ACP_LANGUAGE',
-				),
-				'ACP_CAT_MAINTENANCE' => array(
-					'ACP_FORUM_LOGS',
-					'ACP_CAT_DATABASE',
-				),
-				'ACP_CAT_SYSTEM' => array(
-					'ACP_AUTOMATION',
-					'ACP_GENERAL_TASKS',
-					'ACP_MODULE_MANAGEMENT',
-				),
-				'ACP_CAT_DOT_MODS' => null,
-			),
-			'mcp' => array(
-				'MCP_MAIN'		=> null,
-				'MCP_QUEUE'		=> null,
-				'MCP_REPORTS'	=> null,
-				'MCP_NOTES'		=> null,
-				'MCP_WARN'		=> null,
-				'MCP_LOGS'		=> null,
-				'MCP_BAN'		=> null,
-			),
-			'ucp' => array(
-				'UCP_MAIN'			=> null,
-				'UCP_PROFILE'		=> null,
-				'UCP_PREFS'			=> null,
-				'UCP_PM'			=> null,
-				'UCP_USERGROUPS'	=> null,
-				'UCP_ZEBRA'			=> null,
-			),
-		);
-
-		$this->module_categories_basenames = array(
-			'UCP_PM' => 'ucp_pm',
-		);
-
-		$this->module_extras = array(
-			'acp'	=> array(
-				'ACP_QUICK_ACCESS' => array(
-					'ACP_MANAGE_USERS',
-					'ACP_GROUPS_MANAGE',
-					'ACP_MANAGE_FORUMS',
-					'ACP_MOD_LOGS',
-					'ACP_BOTS',
-					'ACP_PHP_INFO',
-				),
-				'ACP_FORUM_BASED_PERMISSIONS' => array(
-					'ACP_FORUM_PERMISSIONS',
-					'ACP_FORUM_PERMISSIONS_COPY',
-					'ACP_FORUM_MODERATORS',
-					'ACP_USERS_FORUM_PERMISSIONS',
-					'ACP_GROUPS_FORUM_PERMISSIONS',
-				),
-			),
-		);
 	}
 
 	/**