<?php $this->outputTitle(); ?>

' . '
'
@@ -1176,7 +1176,7 @@ class WebInstallerOptions extends WebInstallerPage {
 			'config_wgRightsIcon' => '[license_button]',
 		) );
 		$styleUrl = $server . dirname( dirname( $this->parent->getUrl() ) ) .
-			'/skins/common/config-cc.css';
+			'/mw-config/config-cc.css';
 		$iframeUrl = 'http://creativecommons.org/license/?' .
 			wfArrayToCgi( array(
 				'partner' => 'MediaWiki',
diff --git a/mw-config/config-cc.css b/mw-config/config-cc.css
new file mode 100644
index 0000000000..ecd10fa666
--- /dev/null
+++ b/mw-config/config-cc.css
@@ -0,0 +1,56 @@
+/**
+ * Copy of CC standard stylesheet, plus tweaks for iframe usage
+ */
+
+body {
+	margin: 0;
+	background: #eee;
+	font-family: Verdana;
+	color: #333;
+}
+
+#main {
+	border: 1px solid #D0D0D0;
+	background: #fff;
+	margin: 0.5em;
+}
+
+/**
+ * Looks like you have to specify the width of #menu
+ * or IE5 Mac stretches it all the way across the div, and
+ * Opera streches it half way.
+ */
+
+#main #menu {
+	border-left: 1px dotted #ccc;
+	float: right;
+	width: 230px;
+	background: white;
+	margin: 0 0 10px 10px;
+}
+
+td, h3, p, h1, pre {
+	margin: 0 20px 20px 20px;
+	font-size: 11px;
+	line-height: 140%;
+}
+
+.header {
+	padding-left: 10px;
+	padding-top: 10px;
+}
+
+.nav {
+	padding-left: 10px;
+	padding-bottom: 10px;
+	font-size: 11px;
+	margin-bottom: 16px;
+}
+
+#menu p {
+	font-size: 11px;
+}
+
+.dent {
+	margin-left: 64px;
+}
diff --git a/mw-config/config.css b/mw-config/config.css
new file mode 100644
index 0000000000..17b2039215
--- /dev/null
+++ b/mw-config/config.css
@@ -0,0 +1,174 @@
+.env-check {
+	font-size: 90%;
+	margin: 1em 0 1em 2.5em;
+}
+
+.config-section {
+	margin-top: 2em;
+}
+
+.config-block {
+	margin-top: 2em;
+	display: block;
+
+}
+
+.config-block-label {
+	display: block;
+	margin-bottom: .2em;
+}
+
+.config-block-label label, .config-label {
+	font-weight: bold;
+	padding-right: .5em;
+	padding-top: .2em;
+}
+
+.config-block-elements {
+	margin-left: 2em;
+}
+
+.config-block-elements li {
+	list-style: none;
+}
+
+.config-input {
+	clear: left;
+	zoom: 100%; /* IE hack */
+}
+
+.config-page-wrapper {
+	padding: 0.5em;
+}
+
+.config-page-list {
+	float: right;
+	width: 12em;
+	border: 1px solid #aaa;
+	background: #fff;
+	padding: 0.5em;
+	/* 3em left margin to leave space between the list and the page-content */
+	margin: 0.5em 0.5em 0.5em 3.5em;
+}
+
+.config-page {
+	padding: 0.5em 0.5em 0.5em 2em;
+	margin: 0.5em 0.5em 0.5em 0.5em;
+	background: #eee;
+}
+
+.config-submit {
+	clear: left;
+	text-align: center;
+	padding: 1em;
+}
+
+.config-submit input {
+	margin-left: 0.5em;
+	margin-right: 0.5em;
+}
+
+.config-page-disabled {
+	color: #aaa;
+}
+
+.config-error-box {
+	border: 2px solid #f00;
+}
+
+.config-page-current {
+	font-weight: bold;
+}
+
+.config-message {
+	display: list-item;
+	line-height: 1.5em;
+	/* @embed */
+	list-style-image: url(images/bullet.gif);
+	list-style-type: square;
+}
+
+.config-input-text {
+	width: 20em;
+	margin-right: 1em;
+}
+
+.config-input-check {
+	margin-left: 10em;
+}
+
+.config-skins-item {
+	/* Clearfix */
+	clear: left;
+	overflow: hidden;
+}
+
+.config-skins-item .config-input-check {
+	margin-left: 10em;
+	width: 20em;
+	float: left;
+}
+
+.config-skins-item .config-skins-use-as-default {
+	float: left;
+}
+
+.error {
+	color: red;
+	background-color: #fff;
+	font-weight: bold;
+	left: 1em;
+	font-size: 100%;
+}
+
+.config-settings-block {
+	list-style-type: none;
+	list-style-image: none;
+	margin: 0;
+	padding: 0;
+}
+
+.btn-install {
+	font-weight: bold;
+	font-size: 110%;
+	padding: .2em .3em;
+}
+
+.success-message {
+	font-weight: bold;
+	font-size: 110%;
+	color: green;
+}
+
+.success-box {
+	font-size: 130%;
+}
+
+.config-cc-wrapper {
+	clear: left;
+	/* If you change this height, also change it in WebInstallerOptions::submitCC() */
+	height: 54em;
+}
+
+.config-plainlink a {
+	background: none !important;
+	padding: 0 !important;
+}
+
+.config-download-link {
+	font-size: 1.8em;
+	margin-left: 2em;
+}
+
+.config-download-link a {
+	background: url(images/download-32.png) no-repeat center left;
+	padding-left: 40px; /* 32 px for the image (above), plus some breathing room */
+	height: 32px; /* provide enough vertical room for the image */
+	display: inline-block; /* allow the height property (above) to work */
+	line-height: 32px; /* center the text vertically */
+}
+
+#config-live-log {
+	overflow: hidden;
+	min-width: 20em;
+}
diff --git a/mw-config/config.js b/mw-config/config.js
new file mode 100644
index 0000000000..2886e08e86
--- /dev/null
+++ b/mw-config/config.js
@@ -0,0 +1,108 @@
+( function ( $ ) {
+	$( function () {
+		var $label, labelText;
+
+		function syncText() {
+			var value = $(this).val()
+				.replace( /[\[\]\{\}|#<>%+? ]/g, '_' )
+				.replace( /&/, '&' )
+				.replace( /__+/g, '_' )
+				.replace( /^_+/, '' )
+				.replace( /_+$/, '' );
+			value = value.substr( 0, 1 ).toUpperCase() + value.substr( 1 );
+			$label.text( labelText.replace( '$1', value ) );
+		}
+
+		// Set up the help system
+		$( '.mw-help-field-data' )
+			.hide()
+			.closest( '.mw-help-field-container' )
+				.find( '.mw-help-field-hint' )
+					.show()
+					.click( function () {
+						$(this)
+							.closest( '.mw-help-field-container' )
+								.find( '.mw-help-field-data' )
+									.slideToggle( 'fast' );
+					} );
+
+		// Show/hide code for DB-specific options
+		// FIXME: Do we want slow, fast, or even non-animated (instantaneous) showing/hiding here?
+		$( '.dbRadio' ).each( function () {
+			$( document.getElementById( $(this).attr( 'rel' ) ) ).hide();
+		} );
+		$( document.getElementById( $( '.dbRadio:checked' ).attr( 'rel' ) ) ).show();
+		$( '.dbRadio' ).click( function () {
+			var $checked = $( '.dbRadio:checked' ),
+				$wrapper = $( document.getElementById( $checked.attr( 'rel' ) ) );
+			if ( $wrapper.is( ':hidden' ) ) {
+				$( '.dbWrapper' ).hide( 'slow' );
+				$wrapper.show( 'slow' );
+			}
+		} );
+
+		// Scroll to the bottom of upgrade log
+		$( '#config-live-log' ).children( 'textarea' ).each( function () {
+			this.scrollTop = this.scrollHeight;
+		} );
+
+		// Show/hide Creative Commons thingy
+		$( '.licenseRadio' ).click( function () {
+			var $wrapper = $( '#config-cc-wrapper' );
+			if ( $( '#config__LicenseCode_cc-choose' ).is( ':checked' ) ) {
+				$wrapper.show( 'slow' );
+			} else {
+				$wrapper.hide( 'slow' );
+			}
+		} );
+
+		// Show/hide random stuff (email, upload)
+		$( '.showHideRadio' ).click( function () {
+			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
+			if ( $(this).is( ':checked' ) ) {
+				$wrapper.show( 'slow' );
+			} else {
+				$wrapper.hide( 'slow' );
+			}
+		} );
+		$( '.hideShowRadio' ).click( function () {
+			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
+			if ( $(this).is( ':checked' ) ) {
+				$wrapper.hide( 'slow' );
+			} else {
+				$wrapper.show( 'slow' );
+			}
+		} );
+
+		// Hide "other" textboxes by default
+		// Should not be done in CSS for javascript disabled compatibility
+		$( '.enabledByOther' ).closest( '.config-block' ).hide();
+
+		// Enable/disable "other" textboxes
+		$( '.enableForOther' ).click( function () {
+			var $textbox = $( document.getElementById( $(this).attr( 'rel' ) ) );
+			// FIXME: Ugh, this is ugly
+			if ( $(this).val() === 'other' ) {
+				$textbox.removeProp( 'readonly' ).closest( '.config-block' ).slideDown( 'fast' );
+			} else {
+				$textbox.prop( 'readonly', true ).closest( '.config-block' ).slideUp( 'fast' );
+			}
+		} );
+
+		// Synchronize radio button label for sitename with textbox
+		$label = $( 'label[for=config__NamespaceType_site-name]' );
+		labelText = $label.text();
+		$label.text( labelText.replace( '$1', '' ) );
+		$( '#config_wgSitename' ).on( 'keyup change', syncText ).each( syncText );
+
+		// Show/Hide memcached servers when needed
+		$( 'input[name$="config_wgMainCacheType"]' ).change( function () {
+			var $memc = $( '#config-memcachewrapper' );
+			if ( $( 'input[name$="config_wgMainCacheType"]:checked' ).val() === 'memcached' ) {
+				$memc.show( 'slow' );
+			} else {
+				$memc.hide( 'slow' );
+			}
+		} );
+	} );
+}( jQuery ) );
diff --git a/mw-config/images/ajax-loader.gif b/mw-config/images/ajax-loader.gif
new file mode 100644
index 0000000000..72203fdd7f
Binary files /dev/null and b/mw-config/images/ajax-loader.gif differ
diff --git a/mw-config/images/bullet.gif b/mw-config/images/bullet.gif
new file mode 100644
index 0000000000..b43de48a47
Binary files /dev/null and b/mw-config/images/bullet.gif differ
diff --git a/mw-config/images/critical-32.png b/mw-config/images/critical-32.png
new file mode 100644
index 0000000000..9b38e6a278
Binary files /dev/null and b/mw-config/images/critical-32.png differ
diff --git a/mw-config/images/download-32.png b/mw-config/images/download-32.png
new file mode 100644
index 0000000000..e5b8318e6a
Binary files /dev/null and b/mw-config/images/download-32.png differ
diff --git a/mw-config/images/info-32.png b/mw-config/images/info-32.png
new file mode 100644
index 0000000000..ab09e1d5f4
Binary files /dev/null and b/mw-config/images/info-32.png differ
diff --git a/mw-config/images/installer-logo.png b/mw-config/images/installer-logo.png
new file mode 100644
index 0000000000..8c42118385
Binary files /dev/null and b/mw-config/images/installer-logo.png differ
diff --git a/mw-config/images/tick-32.png b/mw-config/images/tick-32.png
new file mode 100644
index 0000000000..34cfa9ce2f
Binary files /dev/null and b/mw-config/images/tick-32.png differ
diff --git a/mw-config/images/warning-32.png b/mw-config/images/warning-32.png
new file mode 100644
index 0000000000..0400734c48
Binary files /dev/null and b/mw-config/images/warning-32.png differ
diff --git a/resources/Resources.php b/resources/Resources.php
index 5b6a11dc6a..d98fd930df 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1380,6 +1380,15 @@ return array(
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
 	),
 
+	/* MediaWiki Installer */
+
+	'mediawiki.legacy.config' => array(
+		// Used in the web installer. Test it after modifying this definition!
+		'scripts' => 'mw-config/config.js',
+		'styles' => array( 'mw-config/config.css' ),
+		'dependencies' => 'mediawiki.legacy.wikibits',
+	),
+
 	/* MediaWiki Legacy */
 
 	'mediawiki.legacy.ajax' => array(
@@ -1397,14 +1406,6 @@ return array(
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
 		'localBasePath' => $GLOBALS['wgStyleDirectory'],
 	),
-	'mediawiki.legacy.config' => array(
-		// Used in the web installer. Test it after modifying this definition!
-		'scripts' => 'common/config.js',
-		'styles' => array( 'common/config.css' ),
-		'remoteBasePath' => $GLOBALS['wgStylePath'],
-		'localBasePath' => $GLOBALS['wgStyleDirectory'],
-		'dependencies' => 'mediawiki.legacy.wikibits',
-	),
 	'mediawiki.legacy.protect' => array(
 		'scripts' => 'common/protect.js',
 		'remoteBasePath' => $GLOBALS['wgStylePath'],
diff --git a/skins/common/config-cc.css b/skins/common/config-cc.css
deleted file mode 100644
index ecd10fa666..0000000000
--- a/skins/common/config-cc.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copy of CC standard stylesheet, plus tweaks for iframe usage
- */
-
-body {
-	margin: 0;
-	background: #eee;
-	font-family: Verdana;
-	color: #333;
-}
-
-#main {
-	border: 1px solid #D0D0D0;
-	background: #fff;
-	margin: 0.5em;
-}
-
-/**
- * Looks like you have to specify the width of #menu
- * or IE5 Mac stretches it all the way across the div, and
- * Opera streches it half way.
- */
-
-#main #menu {
-	border-left: 1px dotted #ccc;
-	float: right;
-	width: 230px;
-	background: white;
-	margin: 0 0 10px 10px;
-}
-
-td, h3, p, h1, pre {
-	margin: 0 20px 20px 20px;
-	font-size: 11px;
-	line-height: 140%;
-}
-
-.header {
-	padding-left: 10px;
-	padding-top: 10px;
-}
-
-.nav {
-	padding-left: 10px;
-	padding-bottom: 10px;
-	font-size: 11px;
-	margin-bottom: 16px;
-}
-
-#menu p {
-	font-size: 11px;
-}
-
-.dent {
-	margin-left: 64px;
-}
diff --git a/skins/common/config.css b/skins/common/config.css
deleted file mode 100644
index 17b2039215..0000000000
--- a/skins/common/config.css
+++ /dev/null
@@ -1,174 +0,0 @@
-.env-check {
-	font-size: 90%;
-	margin: 1em 0 1em 2.5em;
-}
-
-.config-section {
-	margin-top: 2em;
-}
-
-.config-block {
-	margin-top: 2em;
-	display: block;
-
-}
-
-.config-block-label {
-	display: block;
-	margin-bottom: .2em;
-}
-
-.config-block-label label, .config-label {
-	font-weight: bold;
-	padding-right: .5em;
-	padding-top: .2em;
-}
-
-.config-block-elements {
-	margin-left: 2em;
-}
-
-.config-block-elements li {
-	list-style: none;
-}
-
-.config-input {
-	clear: left;
-	zoom: 100%; /* IE hack */
-}
-
-.config-page-wrapper {
-	padding: 0.5em;
-}
-
-.config-page-list {
-	float: right;
-	width: 12em;
-	border: 1px solid #aaa;
-	background: #fff;
-	padding: 0.5em;
-	/* 3em left margin to leave space between the list and the page-content */
-	margin: 0.5em 0.5em 0.5em 3.5em;
-}
-
-.config-page {
-	padding: 0.5em 0.5em 0.5em 2em;
-	margin: 0.5em 0.5em 0.5em 0.5em;
-	background: #eee;
-}
-
-.config-submit {
-	clear: left;
-	text-align: center;
-	padding: 1em;
-}
-
-.config-submit input {
-	margin-left: 0.5em;
-	margin-right: 0.5em;
-}
-
-.config-page-disabled {
-	color: #aaa;
-}
-
-.config-error-box {
-	border: 2px solid #f00;
-}
-
-.config-page-current {
-	font-weight: bold;
-}
-
-.config-message {
-	display: list-item;
-	line-height: 1.5em;
-	/* @embed */
-	list-style-image: url(images/bullet.gif);
-	list-style-type: square;
-}
-
-.config-input-text {
-	width: 20em;
-	margin-right: 1em;
-}
-
-.config-input-check {
-	margin-left: 10em;
-}
-
-.config-skins-item {
-	/* Clearfix */
-	clear: left;
-	overflow: hidden;
-}
-
-.config-skins-item .config-input-check {
-	margin-left: 10em;
-	width: 20em;
-	float: left;
-}
-
-.config-skins-item .config-skins-use-as-default {
-	float: left;
-}
-
-.error {
-	color: red;
-	background-color: #fff;
-	font-weight: bold;
-	left: 1em;
-	font-size: 100%;
-}
-
-.config-settings-block {
-	list-style-type: none;
-	list-style-image: none;
-	margin: 0;
-	padding: 0;
-}
-
-.btn-install {
-	font-weight: bold;
-	font-size: 110%;
-	padding: .2em .3em;
-}
-
-.success-message {
-	font-weight: bold;
-	font-size: 110%;
-	color: green;
-}
-
-.success-box {
-	font-size: 130%;
-}
-
-.config-cc-wrapper {
-	clear: left;
-	/* If you change this height, also change it in WebInstallerOptions::submitCC() */
-	height: 54em;
-}
-
-.config-plainlink a {
-	background: none !important;
-	padding: 0 !important;
-}
-
-.config-download-link {
-	font-size: 1.8em;
-	margin-left: 2em;
-}
-
-.config-download-link a {
-	background: url(images/download-32.png) no-repeat center left;
-	padding-left: 40px; /* 32 px for the image (above), plus some breathing room */
-	height: 32px; /* provide enough vertical room for the image */
-	display: inline-block; /* allow the height property (above) to work */
-	line-height: 32px; /* center the text vertically */
-}
-
-#config-live-log {
-	overflow: hidden;
-	min-width: 20em;
-}
diff --git a/skins/common/config.js b/skins/common/config.js
deleted file mode 100644
index 2886e08e86..0000000000
--- a/skins/common/config.js
+++ /dev/null
@@ -1,108 +0,0 @@
-( function ( $ ) {
-	$( function () {
-		var $label, labelText;
-
-		function syncText() {
-			var value = $(this).val()
-				.replace( /[\[\]\{\}|#<>%+? ]/g, '_' )
-				.replace( /&/, '&' )
-				.replace( /__+/g, '_' )
-				.replace( /^_+/, '' )
-				.replace( /_+$/, '' );
-			value = value.substr( 0, 1 ).toUpperCase() + value.substr( 1 );
-			$label.text( labelText.replace( '$1', value ) );
-		}
-
-		// Set up the help system
-		$( '.mw-help-field-data' )
-			.hide()
-			.closest( '.mw-help-field-container' )
-				.find( '.mw-help-field-hint' )
-					.show()
-					.click( function () {
-						$(this)
-							.closest( '.mw-help-field-container' )
-								.find( '.mw-help-field-data' )
-									.slideToggle( 'fast' );
-					} );
-
-		// Show/hide code for DB-specific options
-		// FIXME: Do we want slow, fast, or even non-animated (instantaneous) showing/hiding here?
-		$( '.dbRadio' ).each( function () {
-			$( document.getElementById( $(this).attr( 'rel' ) ) ).hide();
-		} );
-		$( document.getElementById( $( '.dbRadio:checked' ).attr( 'rel' ) ) ).show();
-		$( '.dbRadio' ).click( function () {
-			var $checked = $( '.dbRadio:checked' ),
-				$wrapper = $( document.getElementById( $checked.attr( 'rel' ) ) );
-			if ( $wrapper.is( ':hidden' ) ) {
-				$( '.dbWrapper' ).hide( 'slow' );
-				$wrapper.show( 'slow' );
-			}
-		} );
-
-		// Scroll to the bottom of upgrade log
-		$( '#config-live-log' ).children( 'textarea' ).each( function () {
-			this.scrollTop = this.scrollHeight;
-		} );
-
-		// Show/hide Creative Commons thingy
-		$( '.licenseRadio' ).click( function () {
-			var $wrapper = $( '#config-cc-wrapper' );
-			if ( $( '#config__LicenseCode_cc-choose' ).is( ':checked' ) ) {
-				$wrapper.show( 'slow' );
-			} else {
-				$wrapper.hide( 'slow' );
-			}
-		} );
-
-		// Show/hide random stuff (email, upload)
-		$( '.showHideRadio' ).click( function () {
-			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
-			if ( $(this).is( ':checked' ) ) {
-				$wrapper.show( 'slow' );
-			} else {
-				$wrapper.hide( 'slow' );
-			}
-		} );
-		$( '.hideShowRadio' ).click( function () {
-			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
-			if ( $(this).is( ':checked' ) ) {
-				$wrapper.hide( 'slow' );
-			} else {
-				$wrapper.show( 'slow' );
-			}
-		} );
-
-		// Hide "other" textboxes by default
-		// Should not be done in CSS for javascript disabled compatibility
-		$( '.enabledByOther' ).closest( '.config-block' ).hide();
-
-		// Enable/disable "other" textboxes
-		$( '.enableForOther' ).click( function () {
-			var $textbox = $( document.getElementById( $(this).attr( 'rel' ) ) );
-			// FIXME: Ugh, this is ugly
-			if ( $(this).val() === 'other' ) {
-				$textbox.removeProp( 'readonly' ).closest( '.config-block' ).slideDown( 'fast' );
-			} else {
-				$textbox.prop( 'readonly', true ).closest( '.config-block' ).slideUp( 'fast' );
-			}
-		} );
-
-		// Synchronize radio button label for sitename with textbox
-		$label = $( 'label[for=config__NamespaceType_site-name]' );
-		labelText = $label.text();
-		$label.text( labelText.replace( '$1', '' ) );
-		$( '#config_wgSitename' ).on( 'keyup change', syncText ).each( syncText );
-
-		// Show/Hide memcached servers when needed
-		$( 'input[name$="config_wgMainCacheType"]' ).change( function () {
-			var $memc = $( '#config-memcachewrapper' );
-			if ( $( 'input[name$="config_wgMainCacheType"]:checked' ).val() === 'memcached' ) {
-				$memc.show( 'slow' );
-			} else {
-				$memc.hide( 'slow' );
-			}
-		} );
-	} );
-}( jQuery ) );
diff --git a/skins/common/images/critical-32.png b/skins/common/images/critical-32.png
deleted file mode 100644
index 9b38e6a278..0000000000
Binary files a/skins/common/images/critical-32.png and /dev/null differ
diff --git a/skins/common/images/download-32.png b/skins/common/images/download-32.png
deleted file mode 100644
index e5b8318e6a..0000000000
Binary files a/skins/common/images/download-32.png and /dev/null differ
diff --git a/skins/common/images/info-32.png b/skins/common/images/info-32.png
deleted file mode 100644
index ab09e1d5f4..0000000000
Binary files a/skins/common/images/info-32.png and /dev/null differ
diff --git a/skins/common/images/tick-32.png b/skins/common/images/tick-32.png
deleted file mode 100644
index 34cfa9ce2f..0000000000
Binary files a/skins/common/images/tick-32.png and /dev/null differ
diff --git a/skins/common/images/warning-32.png b/skins/common/images/warning-32.png
deleted file mode 100644
index 0400734c48..0000000000
Binary files a/skins/common/images/warning-32.png and /dev/null differ