Merge branch 'prep-release-3.0.13'

* prep-release-3.0.13: (242 commits) [prep-release-3.0.13] Bump version numbers for 3.0.13 release [prep-release-3.0.13] Highlight security relevant changes [develop-olympus] Add changelog for 3.0.13 release. [develop-olympus] Bump version numbers for 3.0.13-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.13 releases. [ticket/13531] Send 404 Not Found. [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO). [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables. [ticket/13526] Correctly validate the ucp_pm_options form key. [ticket/13523] Install PHPUnit manually instead of from PEAR. [ticket/13519] Correctly validate imagick path as path and not string [ticket/11613] Allow cookies to work on netbios domains [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3 [ticket/10442] Adds <dd> </dd> to <dl> for xhtml correctness [ticket/13341] Change coverage to whitelist to prevent errors with temp files. [ticket/13331] Use docs target for this branch, add docs-all for dev branches. [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. [ticket/13234] Fix conditions and CS [ticket/13234] Never allow autologin/remember me to modify the userid ...
Merge branch 'prep-release-3.0.12'
2025-09-10 08:10:44 +02:00 · 2015-01-26 19:04:21 +01:00 · 2013-09-28 15:40:10 +02:00 · 2012-08-20 17:09:18 +02:00
2077 changed files with 59969 additions and 154103 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,18 +0,0 @@
-# This file is for standardising the coding style between different editors
-# http://editorconfig.org/
-
-root = true
-
-[*]
-end_of_line = lf
-indent_size = 4
-indent_style = tab
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.yml]
-indent_size = 4
-indent_style = space
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,16 @@
 *~
 /phpunit.xml
-/phpBB/cache/*
-!/phpBB/cache/.htaccess
-!/phpBB/cache/index.html
+/phpBB/cache/*.html
+/phpBB/cache/*.php
+/phpBB/cache/*.lock
 /phpBB/composer.phar
 /phpBB/config*.php
 /phpBB/ext/*
 /phpBB/files/*
 /phpBB/images/avatars/gallery/*
 /phpBB/images/avatars/upload/*
-/phpBB/images/ranks/*
-/phpBB/install/schemas/schema.json
-/phpBB/language/*
-!/phpBB/language/en
 /phpBB/store/*
-/phpBB/styles/*
-!/phpBB/styles/prosilver
-!/phpBB/styles/subsilver2
 /phpBB/vendor
-/tests/phpbb_unit_tests.sqlite*
+/tests/phpbb_unit_tests.sqlite2
 /tests/test_config*.php
 /tests/tmp/*
-/tests/vendor
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,49 +1,40 @@
 language: php
+php:
+  - 5.2
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+env:
+  - DB=mysql
+
+before_script:
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'mariadb' ]; then travis/setup-mariadb.sh; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysql' ]; then mysql -e 'SET GLOBAL storage_engine=MyISAM;'; fi"
+  - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then travis/install-phpunit-5-2.sh; fi"
+  - cd phpBB
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi"
+  - cd ..
+  - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' ]; then sudo apt-get update; sudo apt-get install -y parallel libimage-exiftool-perl; fi"
+
+script:
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then php -d include_path='.:phpunit' phpunit/phpunit.php --configuration travis/phpunit-$DB-5-2-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' ]; then find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' || exit 1; fi"

 matrix:
  include:
-    - php: 5.3.3
-      env: DB=mysqli
-    - php: 5.3
-      env: DB=mysqli # MyISAM
-    - php: 5.4
-      env: DB=mysqli
-    - php: 5.4
-      env: DB=mysql
    - php: 5.4
      env: DB=mariadb
    - php: 5.4
      env: DB=postgres
-    - php: 5.4
-      env: DB=sqlite3
-    - php: 5.4
-      env: DB=mysqli;SLOWTESTS=1
-    - php: 5.5
-      env: DB=mysqli
-    - php: 5.6
-      env: DB=mysqli
-    - php: hhvm
-      env: DB=mysqli
  allow_failures:
    - php: hhvm
  fast_finish: true
-
-services:
-  - redis-server
-
-install:
-  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
-
-before_script:
-  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
-  - phantomjs --webdriver=8910 > /dev/null &
-
-script:
-  - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
-  - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION
-  - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION
-  - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
-  - sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
-  - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
-
--- a/README.md
+++ b/README.md
@@ -8,14 +8,6 @@ phpBB is a free bulletin board written in PHP.

 Find support and lots more on [phpBB.com](http://www.phpbb.com)! Discuss the development on [area51](http://area51.phpbb.com/phpBB/index.php).

-## INSTALLING DEPENDENCIES
-
-To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies.
-
-	cd phpBB
-	php ../composer.phar install --dev
-
-
 ## CONTRIBUTE

 1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@

 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.1.3" />
-	<property name="prevversion" value="3.1.3-RC2" />
-	<property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2, 3.1.3-RC1" />
+	<property name="newversion" value="3.0.13" />
+	<property name="prevversion" value="3.0.13-RC1" />
+	<property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12" />
 	<!-- no configuration should be needed beyond this point -->

 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -73,50 +73,6 @@
 			passthru="true" />
 	</target>

-	<target name="sniff">
-		<exec command="phpBB/vendor/bin/phpcs
-				-s
-				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-strict-core.xml
-				--ignore=${project.basedir}/phpBB/phpbb/db/migration/data/v30x/*
-				phpBB/phpbb"
-			dir="." returnProperty="retval-php-strict" passthru="true" />
-		<exec command="phpBB/vendor/bin/phpcs
-				-s
-				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-legacy-core.xml
-				--ignore=${project.basedir}/phpBB/cache/*
-				--ignore=${project.basedir}/phpBB/develop/*
-				--ignore=${project.basedir}/phpBB/ext/*
-				--ignore=${project.basedir}/phpBB/includes/diff/*.php
-				--ignore=${project.basedir}/phpBB/includes/sphinxapi.php
-				--ignore=${project.basedir}/phpBB/includes/utf/data/*
-				--ignore=${project.basedir}/phpBB/install/data/*
-				--ignore=${project.basedir}/phpBB/install/database_update.php
-				--ignore=${project.basedir}/phpBB/phpbb/*
-				--ignore=${project.basedir}/phpBB/vendor/*
-				phpBB"
-			dir="." returnProperty="retval-php-legacy" passthru="true" />
-		<exec command="phpBB/vendor/bin/phpcs
-				-s
-				--extensions=php
-				--standard=build/code_sniffer/ruleset-php-extensions.xml
-				--ignore=${project.basedir}/phpBB/ext/*/tests/*
-				--ignore=${project.basedir}/phpBB/ext/*/vendor/*
-				phpBB/ext"
-			dir="." returnProperty="retval-php-ext" passthru="true" />
-		<if>
-			<or>
-				<not><equals arg1="${retval-php-strict}" arg2="0" /></not>
-				<not><equals arg1="${retval-php-legacy}" arg2="0" /></not>
-				<not><equals arg1="${retval-php-ext}" arg2="0" /></not>
-			</or>
-			<then>
-				<fail message="PHP Code Sniffer failed." />
-			</then>
-		</if>
-	</target>
-
 	<!-- Builds docs for current branch into build/api/output/master -->
 	<target name="docs">
 		<exec dir="."
@@ -151,7 +107,6 @@

 		<exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} >
 			../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" />
-		<exec dir="build/old_versions" command="LC_ALL=C diff -qr release-${version} release-${newversion} | grep 'Only in release-${version}' > ../new_version/patches/phpBB-${version}_to_${newversion}.deleted" escape="false" />
 	</target>

 	<target name="prepare-new-version">
@@ -266,7 +221,7 @@
 							command="git archive ${revision} composer.phar | tar -xf - -C ${dir}"
 							checkreturn="true" />
 						<exec dir="${dir}"
-							command="php composer.phar install --no-dev --optimize-autoloader"
+							command="php composer.phar install --no-dev"
 							checkreturn="true"
 							passthru="true" />
 						<delete file="${dir}/composer.phar" />
@@ -280,17 +235,10 @@
 			</else>
 		</if>

-		<!-- Create schema.json -->
-		<exec dir="${dir}" command="php develop/create_schema_files.php" />
-
 		<delete file="${dir}/config.php" />
 		<delete dir="${dir}/develop" />
 		<delete dir="${dir}/install/data" />

-		<phingcall target="clean-vendor-dir">
-			<property name="dir" value="${dir}" />
-		</phingcall>
-
 		<echo msg="Setting permissions for checkout of ${revision} in ${dir}" />
 		<!-- set permissions of all files to 644, directories to 755 -->
 		<exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" />
@@ -302,91 +250,6 @@
 		<chmod mode="0777" file="${dir}/images/avatars/upload" />
 	</target>

-	<target name="clean-vendor-dir">
-		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
-		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
-		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
-		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
-		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
-
-		<delete dir="${dir}/vendor/psr/log/Psr/Log/Test" />
-		<delete file="${dir}/vendor/psr/log/.gitignore" />
-		<delete file="${dir}/vendor/psr/log/README.md" />
-
-		<delete dir="${dir}/vendor/symfony/config/Symfony/Component/Config/Tests" />
-		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/.gitignore" />
-		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/README.md" />
-		<delete file="${dir}/vendor/symfony/config/Symfony/Component/Config/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/console/Symfony/Component/Console/Tests" />
-		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/.gitignore" />
-		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/README.md" />
-		<delete file="${dir}/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/debug/Symfony/Component/Debug/Tests" />
-		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/.gitignore" />
-		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/README.md" />
-		<delete file="${dir}/vendor/symfony/debug/Symfony/Component/Debug/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/README.md" />
-		<delete file="${dir}/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/README.md" />
-		<delete file="${dir}/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/Tests" />
-		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore" />
-		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/README.md" />
-		<delete file="${dir}/vendor/symfony/filesystem/Symfony/Component/Filesystem/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Tests" />
-		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/.gitignore" />
-		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/README.md" />
-		<delete file="${dir}/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/Tests" />
-		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/.gitignore" />
-		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/README.md" />
-		<delete file="${dir}/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/routing/Symfony/Component/Routing/Tests" />
-		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/.gitignore" />
-		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/README.md" />
-		<delete file="${dir}/vendor/symfony/routing/Symfony/Component/Routing/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/Tests" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/README.md" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/twig/twig/doc" />
-		<delete dir="${dir}/vendor/twig/twig/ext" />
-		<delete dir="${dir}/vendor/twig/twig/test" />
-		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
-		<delete file="${dir}/vendor/twig/twig/.gitignore" />
-		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
-		<delete file="${dir}/vendor/twig/twig/AUTHORS" />
-		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
-		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/twig/twig/README.markdown" />
-	</target>
-
 	<target name="clean-diff-dir">
 		<delete dir="${dir}/cache" />
 		<delete dir="${dir}/docs" />
--- a/build/build_announcement.php
+++ b/build/build_announcement.php
@@ -2,13 +2,9 @@
 <?php
 /**
 *
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
+* @package build
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

@@ -26,20 +22,16 @@ $checksum_algorithm = $_SERVER['argv'][4];
 $series_version = substr($version, 0, 3);
 $base_url = "https://download.phpbb.com/pub/release/$series_version";

-if (version_compare($version, "$series_version.0", '<'))
+if (strpos($version, 'RC') === false)
 {
-	// Everything before 3.x.0, i.e. unstable (e.g. alpha, beta, rc)
-	$url = "$base_url/unstable/$version";
-}
-else if (strpos($version, 'RC') !== false)
-{
-	// Release candidate of stable release
-	$url = "$base_url/qa/$version";
+	// Final release
+	$install_url	= "$base_url/$version";
+	$update_url		= "$base_url/update/to_$version";
 }
 else
 {
-	// Stable release (e.g. 3.x.0, 3.x.1, 3.x.2, 3.x.3-PL1)
-	$url = "$base_url/$version";
+	$install_url	= "$base_url/release_candidates/$version";
+	$update_url		= "$base_url/release_candidates/update/other_to_$version";
 }

 if ($mode === 'bbcode')
@@ -66,19 +58,41 @@ function phpbb_string_ends_with($haystack, $needle)
 	return substr($haystack, -strlen($needle)) === $needle;
 }

+function phpbb_is_update_file($filename)
+{
+	return strpos($filename, '_to_') !== false;
+}
+
 function phpbb_get_checksum($checksum_file)
 {
 	return array_shift(explode(' ', file_get_contents($checksum_file)));
 }

+$install_files = $update_files = array();
 foreach (phpbb_rnatsort(array_diff(scandir($root), array('.', '..'))) as $filename)
 {
 	if (phpbb_string_ends_with($filename, $checksum_algorithm))
 	{
 		continue;
 	}
+	else if (phpbb_is_update_file($filename))
+	{
+		$update_files[] = $filename;
+	}
 	else
 	{
-		printf($template, $url, $filename, phpbb_get_checksum("$root/$filename.$checksum_algorithm"));
+		$install_files[] = $filename;
 	}
 }
+
+foreach ($install_files as $filename)
+{
+	printf($template, $install_url, $filename, phpbb_get_checksum("$root/$filename.$checksum_algorithm"));
+}
+
+echo "\n";
+
+foreach ($update_files as $filename)
+{
+	printf($template, $update_url, $filename, phpbb_get_checksum("$root/$filename.$checksum_algorithm"));
+}
--- a/build/build_changelog.php
+++ b/build/build_changelog.php
@@ -2,13 +2,9 @@
 <?php
 /**
 *
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
+* @package build
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

@@ -20,7 +16,7 @@ if ($_SERVER['argc'] != 2)

 $fixVersion = $_SERVER['argv'][1];

-$query = 'project IN (PHPBB3, SECURITY)
+$query = 'project = PHPBB3
 	AND resolution = Fixed
 	AND fixVersion = "' . $fixVersion . '"
 	AND status IN ("Unverified Fix", Closed)';
--- a/build/build_helper.php
+++ b/build/build_helper.php
@@ -1,13 +1,9 @@
 <?php
 /**
 *
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
+* @package build
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

@@ -316,63 +312,4 @@ class build_package

 		return $result;
 	}
-
-	/**
-	* Collect the list of the deleted files from a list of deleted files and folders.
-	*
-	* @param string $deleted_filename   The full path to a file containing the list of deleted files and directories
-	* @param string $package_name       The name of the package
-	* @return array
-	*/
-	public function collect_deleted_files($deleted_filename, $package_name)
-	{
-		$result = array();
-		$file_contents = file($deleted_filename);
-
-		foreach ($file_contents as $filename)
-		{
-			$filename = trim($filename);
-
-			if (!$filename)
-			{
-				continue;
-			}
-
-			$filename = str_replace('Only in ' . $package_name, '', $filename);
-			$filename = ltrim($filename, '/');
-
-			if (substr($filename, 0, 1) == ':')
-			{
-				$replace = '';
-			}
-			else
-			{
-				$replace = '/';
-			}
-
-			$filename = str_replace(': ', $replace, $filename);
-
-			if (is_dir("{$this->locations['old_versions']}{$package_name}/{$filename}"))
-			{
-				$iterator = new \RecursiveIteratorIterator(
-					new \RecursiveDirectoryIterator(
-						"{$this->locations['old_versions']}{$package_name}/{$filename}",
-						\FilesystemIterator::UNIX_PATHS | \FilesystemIterator::SKIP_DOTS
-					),
-					\RecursiveIteratorIterator::LEAVES_ONLY
-				);
-
-				foreach ($iterator as $file_info)
-				{
-					$result[] = "{$filename}/{$iterator->getSubPathname()}";
-				}
-			}
-			else
-			{
-				$result[] = $filename;
-			}
-		}
-
-		return $result;
-	}
 }
--- a/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
@@ -1,222 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* Checks that each PHP source file contains a valid header as defined by the
-* phpBB Coding Guidelines.
-*
-* @package code_sniffer
-* @author Manuel Pichler <mapi@phpundercontrol.org>
-*/
-class phpbb_Sniffs_Commenting_FileCommentSniff implements PHP_CodeSniffer_Sniff
-{
-	/**
-	* Returns an array of tokens this test wants to listen for.
-	*
-	* @return array
-	*/
-	public function register()
-	{
-		return array(T_OPEN_TAG);
-	}
-
-	/**
-	* Processes this test, when one of its tokens is encountered.
-	*
-	* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-	* @param int				  $stackPtr  The position of the current token
-	*										in the stack passed in $tokens.
-	*
-	* @return null
-	*/
-	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-	{
-		// We are only interested in the first file comment.
-		if ($stackPtr !== 0)
-		{
-			if ($phpcsFile->findPrevious(T_OPEN_TAG, $stackPtr - 1) !== false)
-			{
-				return;
-			}
-		}
-
-		// Fetch next non whitespace token
-		$tokens = $phpcsFile->getTokens();
-		$start  = $phpcsFile->findNext(T_WHITESPACE, $stackPtr + 1, null, true);
-
-		// Skip empty files
-		if ($tokens[$start]['code'] === T_CLOSE_TAG)
-		{
-			return;
-		}
-		// Mark as error if this is not a doc comment
-		else if ($start === false || $tokens[$start]['code'] !== T_DOC_COMMENT)
-		{
-			$phpcsFile->addError('Missing required file doc comment.', $stackPtr);
-			return;
-		}
-
-		// Find comment end token
-		$end = $phpcsFile->findNext(T_DOC_COMMENT, $start + 1, null, true) - 1;
-
-		// If there is no end, skip processing here
-		if ($end === false)
-		{
-			return;
-		}
-
-		// List of found comment tags
-		$tags = array();
-
-		// check comment lines without the first(/**) an last(*/) line
-		for ($i = $start + 1, $c = $end - 1; $i <= $c; ++$i)
-		{
-			$line = $tokens[$i]['content'];
-
-			// Check that each line starts with a '*'
-			if (substr($line, 0, 1) !== '*' && substr($line, 0, 2) !== ' *')
-			{
-				$message = 'The file doc comment should not be indented.';
-				$phpcsFile->addWarning($message, $i);
-			}
-			else if (preg_match('/^[ ]?\*\s+@([\w]+)\s+(.*)$/', $line, $match) !== 0)
-			{
-				if (!isset($tags[$match[1]]))
-				{
-					$tags[$match[1]] = array();
-				}
-
-				$tags[$match[1]][] = array($match[2], $i);
-			}
-		}
-
-		// Check that the first and last line is empty
-		if (trim($tokens[$start + 1]['content']) !== '*')
-		{
-			$message = 'The first file comment line should be empty.';
-			$phpcsFile->addWarning($message, ($start + 1));
-		}
-		if (trim($tokens[$end - 1]['content']) !== '*')
-		{
-			$message = 'The last file comment line should be empty.';
-			$phpcsFile->addWarning($message, $end - 1);
-		}
-
-		//$this->processPackage($phpcsFile, $start, $tags);
-		//$this->processVersion($phpcsFile, $start, $tags);
-		$this->processCopyright($phpcsFile, $start, $tags);
-		$this->processLicense($phpcsFile, $start, $tags);
-	}
-
-	/**
-	* Checks that the tags array contains a valid package tag
-	*
-	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return null
-	*/
-	protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
-	{
-		if (!isset($tags['package']))
-		{
-			$message = 'Missing require @package tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr);
-		}
-		else if (preg_match('/^([\w]+)$/', $tags['package'][0]) === 0)
-		{
-			$message = 'Invalid content found for @package tag.';
-			$phpcsFile->addWarning($message, $tags['package'][1]);
-		}
-	}
-
-	/**
-	* Checks that the tags array contains a valid version tag
-	*
-	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return null
-	*/
-	protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
-	{
-		if (!isset($tags['version']))
-		{
-			$message = 'Missing require @version tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr);
-		}
-		else if (preg_match('/^\$Id:[^\$]+\$$/', $tags['version'][0]) === 0)
-		{
-			$message = 'Invalid content found for @version tag, use "$Id: $".';
-			$phpcsFile->addError($message, $tags['version'][1]);
-		}
-	}
-
-	/**
-	* Checks that the tags array contains a valid copyright tag
-	*
-	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return null
-	*/
-	protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
-	{
-		$copyright = '(c) phpBB Limited <https://www.phpbb.com>';
-
-		if (!isset($tags['copyright']))
-		{
-			$message = 'Missing require @copyright tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr);
-		}
-		else if ($tags['copyright'][0][0] !== $copyright)
-		{
-			$message = 'Invalid content found for the first @copyright tag, use "' . $copyright . '".';
-			$phpcsFile->addError($message, $tags['copyright'][0][1]);
-		}
-	}
-
-	/**
-	* Checks that the tags array contains a valid license tag
-	*
-	* @param PHP_CodeSniffer_File $phpcsFile The context source file instance.
-	* @param integer The stack pointer for the first comment token.
-	* @param array(string=>array) $tags The found file doc comment tags.
-	*
-	* @return null
-	*/
-	protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
-	{
-		$license = 'GNU General Public License, version 2 (GPL-2.0)';
-
-		if (!isset($tags['license']))
-		{
-			$message = 'Missing require @license tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr);
-		}
-		else if (sizeof($tags['license']) !== 1)
-		{
-			$message = 'It must be only one @license tag in file doc comment.';
-			$phpcsFile->addError($message, $ptr);
-		}
-		else if (trim($tags['license'][0][0]) !== $license)
-		{
-			$message = 'Invalid content found for @license tag, use '
-				. '"' . $license . '".';
-			$phpcsFile->addError($message, $tags['license'][0][1]);
-		}
-	}
-}
--- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
+++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php
@@ -1,234 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-/**
-* Checks that each use statement is used.
-*/
-class phpbb_Sniffs_Namespaces_UnusedUseSniff implements PHP_CodeSniffer_Sniff
-{
-	/**
-	* {@inheritdoc}
-	*/
-	public function register()
-	{
-		return array(T_USE);
-	}
-
-	protected function check($phpcsFile, $found_name, $full_name, $short_name, $line)
-	{
-
-		if ($found_name === $full_name)
-		{
-			$error = 'Either use statement or full name must be used.';
-			$phpcsFile->addError($error, $line, 'FullName');
-		}
-
-		if ($found_name === $short_name)
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* {@inheritdoc}
-	*/
-	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-	{
-		if ($this->should_ignore_use($phpcsFile, $stackPtr) === true)
-		{
-			return;
-		}
-
-		$tokens = $phpcsFile->getTokens();
-
-		$class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1));
-
-		$find = array(
-			T_NS_SEPARATOR,
-			T_STRING,
-			T_WHITESPACE,
-		);
-
-		$class_name_end = $phpcsFile->findNext($find, ($stackPtr + 1), null, true);
-
-		$aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true);
-		if ($aliasing_as_position !== false)
-		{
-			$alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true);
-			$class_name_short = $tokens[$alias_position]['content'];
-			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1));
-		}
-		else
-		{
-			$class_name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start));
-			$class_name_short = $tokens[$class_name_end - 1]['content'];
-		}
-
-		$ok = false;
-
-		// Checks in simple statements (new, instanceof and extends)
-		foreach (array(T_INSTANCEOF, T_NEW, T_EXTENDS) as $keyword)
-		{
-			$old_simple_statement = $stackPtr;
-			while (($simple_statement = $phpcsFile->findNext($keyword, ($old_simple_statement + 1))) !== false)
-			{
-				$old_simple_statement = $simple_statement;
-
-				$simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1));
-				$simple_class_name_end = $phpcsFile->findNext($find, ($simple_statement + 1), null, true);
-
-				$simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start)));
-
-				$ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) ? true : $ok;
-			}
-		}
-
-		// Checks paamayim nekudotayim
-		$old_paamayim_nekudotayim = $stackPtr;
-		while (($paamayim_nekudotayim = $phpcsFile->findNext(T_PAAMAYIM_NEKUDOTAYIM, ($old_paamayim_nekudotayim + 1))) !== false)
-		{
-			$old_paamayim_nekudotayim = $paamayim_nekudotayim;
-
-			$paamayim_nekudotayim_class_name_start = $phpcsFile->findPrevious($find, $paamayim_nekudotayim - 1, null, true);
-			$paamayim_nekudotayim_class_name_end = $paamayim_nekudotayim - 1;
-
-			$paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start)));
-
-			$ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) ? true : $ok;
-		}
-
-		// Checks in implements
-		$old_implements = $stackPtr;
-		while (($implements = $phpcsFile->findNext(T_IMPLEMENTS, ($old_implements + 1))) !== false)
-		{
-			$old_implements = $implements;
-
-			$old_implemented_class = $implements;
-			while (($implemented_class = $phpcsFile->findNext(T_STRING, ($old_implemented_class + 1), null, false, null, true)) !== false)
-			{
-				$old_implemented_class = $implemented_class;
-
-				$implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1));
-				$implements_class_name_end = $phpcsFile->findNext($find, ($implemented_class - 1), null, true);
-
-				$implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start)));
-
-				$ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) ? true : $ok;
-			}
-		}
-
-		// Checks in type hinting
-		$old_function_declaration = $stackPtr;
-		while (($function_declaration = $phpcsFile->findNext(T_FUNCTION, ($old_function_declaration + 1))) !== false)
-		{
-			$old_function_declaration = $function_declaration;
-
-			// Check docblocks
-			$find = array(
-				T_COMMENT,
-				T_DOC_COMMENT,
-				T_CLASS,
-				T_FUNCTION,
-				T_OPEN_TAG,
-			);
-
-			$comment_end = $phpcsFile->findPrevious($find, ($function_declaration - 1));
-			if ($comment_end !== false)
-			{
-				if (!$tokens[$comment_end]['code'] !== T_DOC_COMMENT)
-				{
-					$comment_start = ($phpcsFile->findPrevious(T_DOC_COMMENT, ($comment_end - 1), null, true) + 1);
-					$comment      = $phpcsFile->getTokensAsString($comment_start, ($comment_end - $comment_start + 1));
-
-					try
-					{
-						$comment_parser = new PHP_CodeSniffer_CommentParser_FunctionCommentParser($comment, $phpcsFile);
-						$comment_parser->parse();
-
-						// Check @param
-						foreach ($comment_parser->getParams() as $param) {
-							$type = $param->getType();
-							$types = explode('|', str_replace('[]', '', $type));
-							foreach ($types as $type)
-							{
-								$ok = $this->check($phpcsFile, $type, $class_name_full, $class_name_short, $param->getLine() + $comment_start) ? true : $ok;
-							}
-						}
-
-						// Check @return
-						$return = $comment_parser->getReturn();
-						if ($return !== null)
-						{
-							$type = $return->getValue();
-							$types = explode('|', str_replace('[]', '', $type));
-							foreach ($types as $type)
-							{
-								$ok = $this->check($phpcsFile, $type, $class_name_full, $class_name_short, $return->getLine() + $comment_start) ? true : $ok;
-							}
-						}
-					}
-					catch (PHP_CodeSniffer_CommentParser_ParserException $e)
-					{
-						$line = ($e->getLineWithinComment() + $comment_start);
-						$phpcsFile->addError($e->getMessage(), $line, 'FailedParse');
-					}
-				}
-			}
-
-			// Check type hint
-			$params = $phpcsFile->getMethodParameters($function_declaration);
-			foreach ($params as $param)
-			{
-				$ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) ? true : $ok;
-			}
-		}
-
-		if (!$ok)
-		{
-			$error = 'There must not be unused USE statements.';
-			$phpcsFile->addError($error, $stackPtr, 'Unused');
-		}
-	}
-
-	/**
-	* Check if this use statement is part of the namespace block.
-	*
-	* @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-	* @param int                  $stackPtr  The position of the current token in
-	*                                        the stack passed in $tokens.
-	*
-	* @return bool
-	*/
-	private function should_ignore_use(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-	{
-		$tokens = $phpcsFile->getTokens();
-
-		// Ignore USE keywords inside closures.
-		$next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-		if ($tokens[$next]['code'] === T_OPEN_PARENTHESIS)
-		{
-			return true;
-		}
-
-		// Ignore USE keywords for traits.
-		if ($phpcsFile->hasCondition($stackPtr, array(T_CLASS, T_TRAIT)) === true)
-		{
-			return true;
-		}
-
-		return false;
-
-	}
-}
--- a/build/code_sniffer/ruleset-minimum.xml
+++ b/build/code_sniffer/ruleset-minimum.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB Minimum Standard">
-
- <description>phpBB minimum coding standard</description>
-
- <!-- All code files MUST use only UTF-8 without BOM. -->
- <rule ref="Generic.Files.ByteOrderMark" />
-
- <!-- All code files MUST use the Unix LF (linefeed) line ending. -->
- <rule ref="Generic.Files.LineEndings" />
-
- <!-- Tabs MUST be used for indentation -->
- <rule ref="Generic.WhiteSpace.DisallowSpaceIndent" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-extensions.xml
+++ b/build/code_sniffer/ruleset-php-extensions.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Strict Standard Extensions">
-
- <description>phpBB coding standard for PHP files of phpBB extensions</description>
-
- <rule ref="./ruleset-php-strict.xml" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-legacy-core.xml
+++ b/build/code_sniffer/ruleset-php-legacy-core.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Legacy Standard Core">
-
- <description>phpBB legacy coding standard for PHP files of phpBB core</description>
-
- <rule ref="./ruleset-php-legacy.xml" />
-
- <!-- Each file MUST start with a valid header as defined by the Coding Guidelines -->
- <rule ref="./phpbb/Sniffs/Commenting/FileCommentSniff.php" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-legacy.xml
+++ b/build/code_sniffer/ruleset-php-legacy.xml
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Legacy Standard">
-
- <description>phpBB legacy coding standard for PHP files</description>
-
- <rule ref="./ruleset-minimum.xml" />
-
- <!-- "for (; bar; )" should be "while (bar)" instead -->
- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" />
-
- <!-- A method MUST not only call its parent -->
- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
-
- <!-- The body of each structure MUST be enclosed by braces. -->
- <rule ref="Generic.ControlStructures.InlineControlStructure" />
-
- <!-- There MUST not be more than one statement per line. -->
- <rule ref="Generic.Formatting.DisallowMultipleStatements" />
-
- <!-- Call-time pass-by-reference MUST not be used. -->
- <rule ref="Generic.Functions.CallTimePassByReference.NotAllowed" />
-
- <!-- Filenames MUST be lowercase. -->
- <rule ref="Generic.Files.LowercasedFilename" />
-
- <!-- The function brace MUST be on the line following the function declaration
-      and MUST be indented to the same column as the start of the function declaration. -->
- <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman" />
-
- <!-- There MUST be exactly one space after a cast. -->
- <rule ref="Generic.Formatting.SpaceAfterCast" />
-
- <!-- Class constants MUST be declared in all upper case with underscore separators. -->
- <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
-
- <!-- Only <?php, no short tags. -->
- <rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound" />
-
- <!-- Method arguments with default values MUST go at the end of the argument list. -->
- <rule ref="PEAR.Functions.ValidDefaultValue" />
-
- <!-- Each file MUST end with exactly one newline character -->
- <rule ref="PSR2.Files.EndFileNewline" />
-
- <!-- When referencing arrays there MUST NOT be any whitespace around the opening bracket
-      or before the closing bracket. -->
- <rule ref="Squiz.Arrays.ArrayBracketSpacing" />
-
- <!-- The "else if" statement MUST be written with a space between the words else and if. -->
- <rule ref="Squiz.ControlStructures.ElseIfDeclaration" />
-
- <!-- There MUST be a space between each element of a foreach loop. -->
- <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration" />
-
- <!-- In a for loop declaration, there MUST be no space inside the brackets
-      and there MUST be 0 spaces before and 1 space after semicolons. -->
- <rule ref="Squiz.ControlStructures.ForLoopDeclaration" />
-
- <!-- In the argument list, there MUST NOT be a space before each comma,
-      and there MUST be one space after each comma. -->
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
-  <properties>
-   <property name="equalsSpacing" value="1"/>
-  </properties>
- </rule>
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint" />
-
- <!-- All built-in PHP functions MUST be called lowercased. -->
- <rule ref="Squiz.Functions.LowercaseFunctionKeywords" />
-
- <!-- The eval() function MUST NOT be used. -->
- <rule ref="Squiz.PHP.Eval" />
-
- <!-- There MUST NOT be trailing whitespace at the end of lines. -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />
-
- <!-- There MUST NOT be whitespace before the first content of a file -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile" />
-
- <!-- There MUST NOT be whitespace after the last content of a file -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile" />
-
- <!-- Functions MUST NOT contain multiple empty lines in a row -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines" />
-
- <!-- The ?> closing tag MUST be omitted from files containing only PHP. -->
- <rule ref="Zend.Files.ClosingTag" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-strict-core.xml
+++ b/build/code_sniffer/ruleset-php-strict-core.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Strict Standard Core">
-
- <description>phpBB coding standard for PHP files of phpBB core</description>
-
- <rule ref="./ruleset-php-legacy-core.xml" />
- <rule ref="./ruleset-php-strict.xml" />
-
-</ruleset>
--- a/build/code_sniffer/ruleset-php-strict.xml
+++ b/build/code_sniffer/ruleset-php-strict.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpBB PHP Strict Standard">
-
- <description>phpBB coding standard for PHP files</description>
-
- <rule ref="./ruleset-php-legacy.xml" />
-
- <!-- There SHOULD NOT be more than 80 characters per line
-      There MUST NOT be more than 120 characters per line -->
- <!--
- <rule ref="Generic.Files.LineLength">
-  <properties>
-   <property name="lineLimit" value="80"/>
-   <property name="absoluteLineLimit" value="120"/>
-  </properties>
- </rule>
- -->
-
- <!-- The PHP constants true, false, and null MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseConstant" />
-
- <!-- PHP keywords MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseKeyword" />
-
- <!-- Constructors MUST be called __construct() instead of after the class. -->
- <rule ref="Generic.NamingConventions.ConstructorName" />
-
- <!-- Classes etc. MUST be namespaced -->
- <rule ref="PSR1.Classes.ClassDeclaration.MissingNamespace" />
-
- <!-- A file MUST not contain more than one class/interface -->
- <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses" />
-
- <!-- Files containing classes MUST not have any side-effects -->
- <rule ref="PSR1.Files.SideEffects.FoundWithSymbols" />
-
- <!-- When present, all use declarations MUST go after the namespace declaration.
-      There MUST be one use keyword per declaration.
-      There MUST be one blank line after the use block. -->
- <rule ref="PSR2.Namespaces.UseDeclaration" />
-
- <!-- There MUST be one blank line after the namespace declaration -->
- <rule ref="PSR2.Namespaces.NamespaceDeclaration" />
-
- <!-- There MUST NOT be unused use statements. -->
- <rule ref="./phpbb/Sniffs/Namespaces/UnusedUseSniff.php" />
-
-</ruleset>
--- a/build/package.php
+++ b/build/package.php
@@ -2,13 +2,9 @@
 <?php
 /**
 *
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
+* @package build
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

@@ -49,10 +45,6 @@ if (sizeof($package->old_packages))
 			$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch',
 			$_package_name
 		);
-		$diff_file_changes[$_package_name]['deleted'] = $package->collect_deleted_files(
-			$package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.deleted',
-			$_package_name
-		);
 	}

 	// Now put those files determined within the correct directories
@@ -129,7 +121,6 @@ if (sizeof($package->old_packages))

 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $dest_filename_dir);
 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $dest_filename_dir);
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/vendor ' . $dest_filename_dir);

 		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update');
 		$package->run_command('mkdir ' . $dest_filename_dir . '/install/update/old');
@@ -147,12 +138,6 @@ if (sizeof($package->old_packages))
 			{
 				unset($file_contents['all'][$index]);
 			}
-
-			$source_filename = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $file;
-			if (!file_exists($source_filename))
-			{
-				unset($file_contents['all'][$index]);
-			}
 		}

 		// First of all, fill the 'old' directory
@@ -188,27 +173,16 @@ if (sizeof($package->old_packages))
 			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
 		}

-		/**
-		* We try to keep the update packages as small as possible while creating them.
-		* However, we sometimes need to include additional files that are not included
-		* in the diff in order to be able to correctly include the relatively
-		* referenced files from the same or subsequent directories.
-		*/
-		$copy_relative_directories = array(
-			'config/'	=> array(
-				'copied'	=> false,
-				'copy'		=> array(
-					'config/*.yml' => 'config',
-				),
-			),
-		);
-
 		// Then fill the 'new' directory
 		foreach ($file_contents['all'] as $file)
 		{
 			$source_filename = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $file;
 			$dest_filename = $dest_filename_dir . '/install/update/new/' . $file;
-			$filename = $file;
+
+			if (!file_exists($source_filename))
+			{
+				continue;
+			}

 			// Create Directories along the way?
 			$file = explode('/', $file);
@@ -230,73 +204,6 @@ if (sizeof($package->old_packages))
 			}

 			$package->run_command('cp ' . $source_filename . ' ' . $dest_filename);
-
-			foreach ($copy_relative_directories as $reference => $data)
-			{
-				// Copy all relative referenced files if needed
-				if (strpos($filename, $reference) === 0 && !$data['copied'])
-				{
-					foreach ($data['copy'] as $source_dir_files => $destination_dir)
-					{
-						// Create directories along the way?
-						$directories = explode('/', $destination_dir);
-
-						chdir($dest_filename_dir . '/install/update/new');
-						foreach ($directories as $dir)
-						{
-							$dir = trim($dir);
-							if ($dir)
-							{
-								if (!file_exists('./' . $dir))
-								{
-									$package->run_command('mkdir ' . $dir);
-								}
-								chdir('./' . $dir);
-							}
-						}
-						$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_dir_files;
-						$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
-						$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
-					}
-					$copy_relative_directories[$reference]['copied'] = true;
-				}
-			}
-		}
-
-		/**
-		* We need to always copy the template and asset files that we need in
-		* the update, to ensure that the page is displayed correctly.
-		*/
-		$copy_update_files = array(
-			'adm/images/*'			=> 'adm/images',
-			'adm/style/admin.css'	=> 'adm/style',
-			'adm/style/admin.js'	=> 'adm/style',
-			'adm/style/ajax.js'		=> 'adm/style',
-			'adm/style/install_*'	=> 'adm/style',
-			'assets/javascript/*'	=> 'assets/javascript',
-		);
-
-		foreach ($copy_update_files as $source_files => $destination_dir)
-		{
-			// Create directories along the way?
-			$directories = explode('/', $destination_dir);
-
-			chdir($dest_filename_dir . '/install/update/new');
-			foreach ($directories as $dir)
-			{
-				$dir = trim($dir);
-				if ($dir)
-				{
-					if (!file_exists('./' . $dir))
-					{
-						$package->run_command('mkdir ' . $dir);
-					}
-					chdir('./' . $dir);
-				}
-			}
-			$source_dir_files = $package->locations['old_versions'] . $package->get('simple_name') . '/' . $source_files;
-			$destination_dir = $dest_filename_dir . '/install/update/new/' . $destination_dir;
-			$package->run_command('cp ' . $source_dir_files . ' ' . $destination_dir);
 		}

 		// Build index.php file for holding the file structure
@@ -314,32 +221,29 @@ $update_info = array(

 		if (sizeof($file_contents['all']))
 		{
-			$index_contents .= "\t'files'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['all']) . "',\n\t),\n";
+			$index_contents .= '\'files\'		=> array(\'' . implode("',\n\t'", $file_contents['all']) . '\'),
+';
 		}
 		else
 		{
-			$index_contents .= "\t'files'		=> array(),\n";
+			$index_contents .= '\'files\'		=> array(),
+';
 		}

 		if (sizeof($file_contents['binary']))
 		{
-			$index_contents .= "\t'binary'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['binary']) . "',\n\t),\n";
+			$index_contents .= '\'binary\'		=> array(\'' . implode("',\n\t'", $file_contents['binary']) . '\'),
+';
 		}
 		else
 		{
-			$index_contents .= "\t'binary'		=> array(),\n";
+			$index_contents .= '\'binary\'		=> array(),
+';
 		}

-		if (sizeof($file_contents['deleted']))
-		{
-			$index_contents .= "\t'deleted'		=> array(\n\t\t'" . implode("',\n\t\t'", $file_contents['deleted']) . "',\n\t),\n";
-		}
-		else
-		{
-			$index_contents .= "\t'deleted'		=> array(),\n";
-		}
+		$index_contents .= ');

-		$index_contents .= ");\n";
+?' . '>';

 		$fp = fopen($dest_filename_dir . '/install/update/index.php', 'wt');
 		fwrite($fp, $index_contents);
@@ -352,7 +256,6 @@ $update_info = array(
 	// Copy the install files to their respective locations
 	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('patch_directory'));
 	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('patch_directory'));
-	$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/vendor ' . $package->get('patch_directory'));

 	// Remove some files
 	chdir($package->get('patch_directory') . '/install');
@@ -394,7 +297,6 @@ if (sizeof($package->old_packages))
 		$package->run_command('mkdir ' . $package->get('files_directory') . '/release');
 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/docs ' . $package->get('files_directory') . '/release');
 		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/install ' . $package->get('files_directory') . '/release');
-		$package->run_command('cp -Rp ' . $package->get('dest_dir') . '/vendor ' . $package->get('files_directory') . '/release');

 		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_install.php');
 		$package->run_command('rm -v ' . $package->get('files_directory') . '/release/install/install_update.php');
@@ -470,22 +372,14 @@ chdir($package->get('dest_dir') . '/install');
 // $package->run_command('rm -v database_update.php');
 $package->run_command('rm -v install_update.php');

-chdir($package->get('dest_dir'));
-$package->run_command('mv -v styles/subsilver2 ../subsilver2');
-$package->run_command('cp -p docs/COPYING ../subsilver2/license.txt');
-
 chdir($package->locations['package_dir']);
 foreach ($compress_programs as $extension => $compress_command)
 {
 	$package->begin_status('Packaging phpBB for ' . $extension);
 	$package->run_command('rm -v ./release_files/' . $package->get('release_filename') . ".{$extension}");
-	$package->run_command('rm -v ./release_files/subsilver2_' . $package->get('new_version_number') . ".{$extension}");

 	// Build Package
 	$package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name'));
-
-	// Build subSilver2 Package
-	$package->run_command("$compress_command ./release_files/subsilver2_" . $package->get('new_version_number') . '.' . $extension . ' subsilver2');
 }

 // Microsoft Web PI packaging
--- a/git-tools/commit-msg-hook-range.sh
+++ b/git-tools/commit-msg-hook-range.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 #
-# This file is part of the phpBB Forum Software package.
-#
-# @copyright (c) phpBB Limited <https://www.phpbb.com>
-# @license GNU General Public License, version 2 (GPL-2.0)
-#
-# For full copyright and license information, please see
-# the docs/CREDITS.txt file.
+# @copyright (c) 2014 phpBB Group
+# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 #
 # Calls the git commit-msg hook on all non-merge commits in a given commit range.
 #
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@@ -2,13 +2,9 @@
 <?php
 /**
 *
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

--- a/git-tools/setup_github_network.php
+++ b/git-tools/setup_github_network.php
@@ -2,13 +2,9 @@
 <?php
 /**
 *
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */

--- a/phpBB/.htaccess
+++ b/phpBB/.htaccess
@@ -1,30 +1,12 @@
-<IfModule mod_rewrite.c>
-RewriteEngine on
-
 #
 # Uncomment the statement below if you want to make use of
 # HTTP authentication and it does not already work.
 # This could be required if you are for example using PHP via Apache CGI.
 #
+#<IfModule mod_rewrite.c>
+#RewriteEngine on
 #RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
-
-#
-# The following 3 lines will rewrite URLs passed through the front controller
-# to not require app.php in the actual URL. In other words, a controller is
-# by default accessed at /app.php/my/controller, but can also be accessed at
-# /my/controller
-#
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)$ app.php [QSA,L]
-
-#
-# If symbolic links are not already being followed,
-# uncomment the line below.
-# http://anothersysadmin.wordpress.com/2008/06/10/mod_rewrite-forbidden-403-with-apache-228/
-#
-#Options +FollowSymLinks
-</IfModule>
+#</IfModule>

 # With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
 # module mod_authz_host to a new module called mod_access_compat (which may be
--- a/phpBB/adm/images/alert_close.png
+++ b/phpBB/adm/images/alert_close.png
--- a/phpBB/adm/images/arrow_down.gif
+++ b/phpBB/adm/images/arrow_down.gif
--- a/phpBB/adm/images/arrow_left.gif
+++ b/phpBB/adm/images/arrow_left.gif
--- a/phpBB/adm/images/arrow_right.gif
+++ b/phpBB/adm/images/arrow_right.gif
--- a/phpBB/adm/images/arrow_up.gif
+++ b/phpBB/adm/images/arrow_up.gif
--- a/phpBB/adm/images/bg_tabs1.gif
+++ b/phpBB/adm/images/bg_tabs1.gif
--- a/phpBB/adm/images/bg_tabs2.gif
+++ b/phpBB/adm/images/bg_tabs2.gif
--- a/phpBB/adm/images/corners_left.gif
+++ b/phpBB/adm/images/corners_left.gif
--- a/phpBB/adm/images/corners_left2.gif
+++ b/phpBB/adm/images/corners_left2.gif
--- a/phpBB/adm/images/corners_right.gif
+++ b/phpBB/adm/images/corners_right.gif
--- a/phpBB/adm/images/corners_right2.gif
+++ b/phpBB/adm/images/corners_right2.gif
--- a/phpBB/adm/images/icon_folder.gif
+++ b/phpBB/adm/images/icon_folder.gif
--- a/phpBB/adm/images/icon_folder_link.gif
+++ b/phpBB/adm/images/icon_folder_link.gif
--- a/phpBB/adm/images/icon_folder_lock.gif
+++ b/phpBB/adm/images/icon_folder_lock.gif
--- a/phpBB/adm/images/icon_subfolder.gif
+++ b/phpBB/adm/images/icon_subfolder.gif
--- a/phpBB/adm/images/loading.gif
+++ b/phpBB/adm/images/loading.gif
--- a/phpBB/adm/images/no_avatar.gif
+++ b/phpBB/adm/images/no_avatar.gif
--- a/phpBB/adm/images/toggle.gif
+++ b/phpBB/adm/images/toggle.gif
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -1,13 +1,10 @@
 <?php
 /**
 *
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
+* @package acp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */

@@ -21,7 +18,6 @@ define('NEED_SID', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 require($phpbb_root_path . 'common.' . $phpEx);
-require($phpbb_root_path . 'includes/functions_acp.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_module.' . $phpEx);

@@ -46,6 +42,7 @@ if (!$auth->acl_get('a_'))

 // We define the admin variables now, because the user is now able to use the admin related features...
 define('IN_ADMIN', true);
+$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './';

 // Some oft used variables
 $safe_mode		= (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) === 'on') ? true : false;
@@ -53,17 +50,13 @@ $file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_up
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');

-// Set custom style for admin area
-$template->set_custom_style(array(
-	array(
-		'name' 		=> 'adm',
-		'ext_path' 	=> 'adm/style/',
-	),
-), $phpbb_admin_path . 'style');
-
-$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
+// Set custom template for admin area
+$template->set_custom_template($phpbb_admin_path . 'style', 'admin');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');

+// the acp template is never stored in the database
+$user->theme['template_storedb'] = false;
+
 // Instantiate new module
 $module = new p_master();

@@ -88,3 +81,553 @@ $template->set_filenames(array(
 ));

 adm_page_footer();
+
+/**
+* Header for acp pages
+*/
+function adm_page_header($page_title)
+{
+	global $config, $db, $user, $template;
+	global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID;
+
+	if (defined('HEADER_INC'))
+	{
+		return;
+	}
+
+	define('HEADER_INC', true);
+
+	// gzip_compression
+	if ($config['gzip_compress'])
+	{
+		if (@extension_loaded('zlib') && !headers_sent())
+		{
+			ob_start('ob_gzhandler');
+		}
+	}
+
+	$template->assign_vars(array(
+		'PAGE_TITLE'			=> $page_title,
+		'USERNAME'				=> $user->data['username'],
+
+		'SID'					=> $SID,
+		'_SID'					=> $_SID,
+		'SESSION_ID'			=> $user->session_id,
+		'ROOT_PATH'				=> $phpbb_admin_path,
+
+		'U_LOGOUT'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
+		'U_ADM_LOGOUT'			=> append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'),
+		'U_ADM_INDEX'			=> append_sid("{$phpbb_admin_path}index.$phpEx"),
+		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),
+
+		'T_IMAGES_PATH'			=> "{$phpbb_root_path}images/",
+		'T_SMILIES_PATH'		=> "{$phpbb_root_path}{$config['smilies_path']}/",
+		'T_AVATAR_PATH'			=> "{$phpbb_root_path}{$config['avatar_path']}/",
+		'T_AVATAR_GALLERY_PATH'	=> "{$phpbb_root_path}{$config['avatar_gallery_path']}/",
+		'T_ICONS_PATH'			=> "{$phpbb_root_path}{$config['icons_path']}/",
+		'T_RANKS_PATH'			=> "{$phpbb_root_path}{$config['ranks_path']}/",
+		'T_UPLOAD_PATH'			=> "{$phpbb_root_path}{$config['upload_path']}/",
+
+		'ICON_MOVE_UP'				=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
+		'ICON_MOVE_UP_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />',
+		'ICON_MOVE_DOWN'			=> '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
+		'ICON_MOVE_DOWN_DISABLED'	=> '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />',
+		'ICON_EDIT'					=> '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
+		'ICON_EDIT_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />',
+		'ICON_DELETE'				=> '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
+		'ICON_DELETE_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />',
+		'ICON_SYNC'					=> '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+		'ICON_SYNC_DISABLED'		=> '<img src="' . $phpbb_admin_path . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />',
+
+		'S_USER_LANG'			=> $user->lang['USER_LANG'],
+		'S_CONTENT_DIRECTION'	=> $user->lang['DIRECTION'],
+		'S_CONTENT_ENCODING'	=> 'UTF-8',
+		'S_CONTENT_FLOW_BEGIN'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
+		'S_CONTENT_FLOW_END'	=> ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
+	));
+
+	// application/xhtml+xml not used because of IE
+	header('Content-type: text/html; charset=UTF-8');
+
+	header('Cache-Control: private, no-cache="set-cookie"');
+	header('Expires: 0');
+	header('Pragma: no-cache');
+
+	return;
+}
+
+/**
+* Page footer for acp pages
+*/
+function adm_page_footer($copyright_html = true)
+{
+	global $db, $config, $template, $user, $auth, $cache;
+	global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+	// Output page creation time
+	if (defined('DEBUG'))
+	{
+		$mtime = explode(' ', microtime());
+		$totaltime = $mtime[0] + $mtime[1] - $starttime;
+
+		if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report'))
+		{
+			$db->sql_report('display');
+		}
+
+		$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
+
+		if ($auth->acl_get('a_') && defined('DEBUG_EXTRA'))
+		{
+			if (function_exists('memory_get_usage'))
+			{
+				if ($memory_usage = memory_get_usage())
+				{
+					global $base_memory_usage;
+					$memory_usage -= $base_memory_usage;
+					$memory_usage = get_formatted_filesize($memory_usage);
+
+					$debug_output .= ' | Memory Usage: ' . $memory_usage;
+				}
+			}
+
+			$debug_output .= ' | <a href="' . build_url() . '&amp;explain=1">Explain</a>';
+		}
+	}
+
+	$template->assign_vars(array(
+		'DEBUG_OUTPUT'		=> (defined('DEBUG')) ? $debug_output : '',
+		'TRANSLATION_INFO'	=> (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
+		'S_COPYRIGHT_HTML'	=> $copyright_html,
+		'CREDIT_LINE'		=> $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group'),
+		'VERSION'			=> $config['version'])
+	);
+
+	$template->display('body');
+
+	garbage_collection();
+	exit_handler();
+}
+
+/**
+* Generate back link for acp pages
+*/
+function adm_back_link($u_action)
+{
+	global $user;
+	return '<br /><br /><a href="' . $u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>';
+}
+
+/**
+* Build select field options in acp pages
+*/
+function build_select($option_ary, $option_default = false)
+{
+	global $user;
+
+	$html = '';
+	foreach ($option_ary as $value => $title)
+	{
+		$selected = ($option_default !== false && $value == $option_default) ? ' selected="selected"' : '';
+		$html .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$title] . '</option>';
+	}
+
+	return $html;
+}
+
+/**
+* Build radio fields in acp pages
+*/
+function h_radio($name, $input_ary, $input_default = false, $id = false, $key = false, $separator = '')
+{
+	global $user;
+
+	$html = '';
+	$id_assigned = false;
+	foreach ($input_ary as $value => $title)
+	{
+		$selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : '';
+		$html .= '<label><input type="radio" name="' . $name . '"' . (($id && !$id_assigned) ? ' id="' . $id . '"' : '') . ' value="' . $value . '"' . $selected . (($key) ? ' accesskey="' . $key . '"' : '') . ' class="radio" /> ' . $user->lang[$title] . '</label>' . $separator;
+		$id_assigned = true;
+	}
+
+	return $html;
+}
+
+/**
+* Build configuration template for acp configuration pages
+*/
+function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
+{
+	global $user, $module;
+
+	$tpl = '';
+	$name = 'config[' . $config_key . ']';
+
+	// Make sure there is no notice printed out for non-existent config options (we simply set them)
+	if (!isset($new[$config_key]))
+	{
+		$new[$config_key] = '';
+	}
+
+	switch ($tpl_type[0])
+	{
+		case 'text':
+		case 'password':
+			$size = (int) $tpl_type[1];
+			$maxlength = (int) $tpl_type[2];
+
+			$tpl = '<input id="' . $key . '" type="' . $tpl_type[0] . '"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="' . $name . '" value="' . $new[$config_key] . '"' . (($tpl_type[0] === 'password') ?  ' autocomplete="off"' : '') . ' />';
+		break;
+
+		case 'dimension':
+			$size = (int) $tpl_type[1];
+			$maxlength = (int) $tpl_type[2];
+
+			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
+		break;
+
+		case 'textarea':
+			$rows = (int) $tpl_type[1];
+			$cols = (int) $tpl_type[2];
+
+			$tpl = '<textarea id="' . $key . '" name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '">' . $new[$config_key] . '</textarea>';
+		break;
+
+		case 'radio':
+			$key_yes	= ($new[$config_key]) ? ' checked="checked"' : '';
+			$key_no		= (!$new[$config_key]) ? ' checked="checked"' : '';
+
+			$tpl_type_cond = explode('_', $tpl_type[1]);
+			$type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true;
+
+			$tpl_no = '<label><input type="radio" name="' . $name . '" value="0"' . $key_no . ' class="radio" /> ' . (($type_no) ? $user->lang['NO'] : $user->lang['DISABLED']) . '</label>';
+			$tpl_yes = '<label><input type="radio" id="' . $key . '" name="' . $name . '" value="1"' . $key_yes . ' class="radio" /> ' . (($type_no) ? $user->lang['YES'] : $user->lang['ENABLED']) . '</label>';
+
+			$tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . $tpl_no : $tpl_no . $tpl_yes;
+		break;
+
+		case 'select':
+		case 'custom':
+
+			$return = '';
+
+			if (isset($vars['method']))
+			{
+				$call = array($module->module, $vars['method']);
+			}
+			else if (isset($vars['function']))
+			{
+				$call = $vars['function'];
+			}
+			else
+			{
+				break;
+			}
+
+			if (isset($vars['params']))
+			{
+				$args = array();
+				foreach ($vars['params'] as $value)
+				{
+					switch ($value)
+					{
+						case '{CONFIG_VALUE}':
+							$value = $new[$config_key];
+						break;
+
+						case '{KEY}':
+							$value = $key;
+						break;
+					}
+
+					$args[] = $value;
+				}
+			}
+			else
+			{
+				$args = array($new[$config_key], $key);
+			}
+
+			$return = call_user_func_array($call, $args);
+
+			if ($tpl_type[0] == 'select')
+			{
+				$tpl = '<select id="' . $key . '" name="' . $name . '">' . $return . '</select>';
+			}
+			else
+			{
+				$tpl = $return;
+			}
+
+		break;
+
+		default:
+		break;
+	}
+
+	if (isset($vars['append']))
+	{
+		$tpl .= $vars['append'];
+	}
+
+	return $tpl;
+}
+
+/**
+* Going through a config array and validate values, writing errors to $error. The validation method  accepts parameters separated by ':' for string and int.
+* The first parameter defines the type to be used, the second the lower bound and the third the upper bound. Only the type is required.
+*/
+function validate_config_vars($config_vars, &$cfg_array, &$error)
+{
+	global $phpbb_root_path, $user;
+	$type	= 0;
+	$min	= 1;
+	$max	= 2;
+
+	foreach ($config_vars as $config_name => $config_definition)
+	{
+		if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
+		{
+			continue;
+		}
+
+		if (!isset($config_definition['validate']))
+		{
+			continue;
+		}
+
+		$validator = explode(':', $config_definition['validate']);
+
+		// Validate a bit. ;) (0 = type, 1 = min, 2= max)
+		switch ($validator[$type])
+		{
+			case 'string':
+				$length = utf8_strlen($cfg_array[$config_name]);
+
+				// the column is a VARCHAR
+				$validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255;
+
+				if (isset($validator[$min]) && $length < $validator[$min])
+				{
+					$error[] = sprintf($user->lang['SETTING_TOO_SHORT'], $user->lang[$config_definition['lang']], $validator[$min]);
+				}
+				else if (isset($validator[$max]) && $length > $validator[2])
+				{
+					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$config_definition['lang']], $validator[$max]);
+				}
+			break;
+
+			case 'bool':
+				$cfg_array[$config_name] = ($cfg_array[$config_name]) ? 1 : 0;
+			break;
+
+			case 'int':
+				$cfg_array[$config_name] = (int) $cfg_array[$config_name];
+
+				if (isset($validator[$min]) && $cfg_array[$config_name] < $validator[$min])
+				{
+					$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$config_definition['lang']], $validator[$min]);
+				}
+				else if (isset($validator[$max]) && $cfg_array[$config_name] > $validator[$max])
+				{
+					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$config_definition['lang']], $validator[$max]);
+				}
+
+				if (strpos($config_name, '_max') !== false)
+				{
+					// Min/max pairs of settings should ensure that min <= max
+					// Replace _max with _min to find the name of the minimum
+					// corresponding configuration variable
+					$min_name = str_replace('_max', '_min', $config_name);
+
+					if (isset($cfg_array[$min_name]) && is_numeric($cfg_array[$min_name]) && $cfg_array[$config_name] < $cfg_array[$min_name])
+					{
+						// A minimum value exists and the maximum value is less than it
+						$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$config_definition['lang']], (int) $cfg_array[$min_name]);
+					}
+				}
+			break;
+
+			case 'email':
+				if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name]))
+				{
+					$error[] = $user->lang['EMAIL_INVALID_EMAIL'];
+				}
+			break;
+
+			// Absolute path
+			case 'script_path':
+				if (!$cfg_array[$config_name])
+				{
+					break;
+				}
+
+				$destination = str_replace('\\', '/', $cfg_array[$config_name]);
+
+				if ($destination !== '/')
+				{
+					// Adjust destination path (no trailing slash)
+					if (substr($destination, -1, 1) == '/')
+					{
+						$destination = substr($destination, 0, -1);
+					}
+
+					$destination = str_replace(array('../', './'), '', $destination);
+
+					if ($destination[0] != '/')
+					{
+						$destination = '/' . $destination;
+					}
+				}
+
+				$cfg_array[$config_name] = trim($destination);
+
+			break;
+
+			// Absolute path
+			case 'lang':
+				if (!$cfg_array[$config_name])
+				{
+					break;
+				}
+
+				$cfg_array[$config_name] = basename($cfg_array[$config_name]);
+
+				if (!file_exists($phpbb_root_path . 'language/' . $cfg_array[$config_name] . '/'))
+				{
+					$error[] = $user->lang['WRONG_DATA_LANG'];
+				}
+			break;
+
+			// Relative path (appended $phpbb_root_path)
+			case 'rpath':
+			case 'rwpath':
+				if (!$cfg_array[$config_name])
+				{
+					break;
+				}
+
+				$destination = $cfg_array[$config_name];
+
+				// Adjust destination path (no trailing slash)
+				if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\')
+				{
+					$destination = substr($destination, 0, -1);
+				}
+
+				$destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination);
+				if ($destination && ($destination[0] == '/' || $destination[0] == "\\"))
+				{
+					$destination = '';
+				}
+
+				$cfg_array[$config_name] = trim($destination);
+
+			// Path being relative (still prefixed by phpbb_root_path), but with the ability to escape the root dir...
+			case 'path':
+			case 'wpath':
+
+				if (!$cfg_array[$config_name])
+				{
+					break;
+				}
+
+				$cfg_array[$config_name] = trim($cfg_array[$config_name]);
+
+				// Make sure no NUL byte is present...
+				if (strpos($cfg_array[$config_name], "\0") !== false || strpos($cfg_array[$config_name], '%00') !== false)
+				{
+					$cfg_array[$config_name] = '';
+					break;
+				}
+
+				if (!file_exists($phpbb_root_path . $cfg_array[$config_name]))
+				{
+					$error[] = sprintf($user->lang['DIRECTORY_DOES_NOT_EXIST'], $cfg_array[$config_name]);
+				}
+
+				if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_dir($phpbb_root_path . $cfg_array[$config_name]))
+				{
+					$error[] = sprintf($user->lang['DIRECTORY_NOT_DIR'], $cfg_array[$config_name]);
+				}
+
+				// Check if the path is writable
+				if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath')
+				{
+					if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !phpbb_is_writable($phpbb_root_path . $cfg_array[$config_name]))
+					{
+						$error[] = sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $cfg_array[$config_name]);
+					}
+				}
+
+			break;
+		}
+	}
+
+	return;
+}
+
+/**
+* Checks whatever or not a variable is OK for use in the Database
+* param mixed $value_ary An array of the form array(array('lang' => ..., 'value' => ..., 'column_type' =>))'
+* param mixed $error The error array
+*/
+function validate_range($value_ary, &$error)
+{
+	global $user;
+
+	$column_types = array(
+		'BOOL'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => 1),
+		'USINT'	=> array('php_type' => 'int',		'min' => 0, 				'max' => 65535),
+		'UINT'	=> array('php_type' => 'int', 		'min' => 0, 				'max' => (int) 0x7fffffff),
+		// Do not use (int) 0x80000000 - it evaluates to different
+		// values on 32-bit and 64-bit systems.
+		// Apparently -2147483648 is a float on 32-bit systems,
+		// despite fitting in an int, thus explicit cast is needed.
+		'INT'	=> array('php_type' => 'int', 		'min' => (int) -2147483648,	'max' => (int) 0x7fffffff),
+		'TINT'	=> array('php_type' => 'int',		'min' => -128,				'max' => 127),
+
+		'VCHAR'	=> array('php_type' => 'string', 	'min' => 0, 				'max' => 255),
+	);
+	foreach ($value_ary as $value)
+	{
+		$column = explode(':', $value['column_type']);
+		$max = $min = 0;
+		$type = 0;
+		if (!isset($column_types[$column[0]]))
+		{
+			continue;
+		}
+		else
+		{
+			$type = $column_types[$column[0]];
+		}
+
+		switch ($type['php_type'])
+		{
+			case 'string' :
+				$max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max'];
+				if (utf8_strlen($value['value']) > $max)
+				{
+					$error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$value['lang']], $max);
+				}
+			break;
+
+			case 'int':
+				$min = (isset($column[1])) ? max($column[1],$type['min']) : $type['min'];
+				$max = (isset($column[2])) ? min($column[2],$type['max']) : $type['max'];
+				if ($value['value'] < $min)
+				{
+					$error[] = sprintf($user->lang['SETTING_TOO_LOW'], $user->lang[$value['lang']], $min);
+				}
+				else if ($value['value'] > $max)
+				{
+					$error[] = sprintf($user->lang['SETTING_TOO_BIG'], $user->lang[$value['lang']], $max);
+				}
+			break;
+		}
+	}
+}
+
+?>
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF U_BACK -->
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@@ -54,7 +54,7 @@
 		<!-- ELSE -->

 			<dl>
-				<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{options.CONTENT}</dd>
 			</dl>

@@ -78,11 +78,11 @@
 		<legend>{L_SECURE_TITLE}</legend>
 		<p>{L_DOWNLOAD_ADD_IPS_EXPLAIN}</p>
 	<dl>
-		<dt><label for="ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>
+		<dt><label for="ip_hostname">{L_IP_HOSTNAME}:</label></dt>
 		<dd><textarea id="ip_hostname" cols="40" rows="3" name="ips"></textarea></dd>
 	</dl>
 	<dl>
-		<dt><label for="exclude">{L_IP_EXCLUDE}{L_COLON}</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
+		<dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt>
 		<dd><label><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES}</label>
 			<label><input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
 	</dl>
@@ -97,7 +97,7 @@
 	<!-- IF S_DEFINED_IPS -->
 			<p>{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}</p>
 		<dl>
-			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}{L_COLON}</label></dt>
+			<dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt>
 			<dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd>
 		</dl>

@@ -122,11 +122,11 @@
 			{
 				if (newimage == 'no_image')
 				{
-					document.getElementById('image_upload_icon').src = "{ROOT_PATH}images/spacer.gif";
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif";
 				}
 				else
 				{
-					document.getElementById('image_upload_icon').src = "{ROOT_PATH}{IMG_PATH}/" + newimage;
+					document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage;
 				}
 			}

@@ -172,41 +172,41 @@

 			<legend>{L_LEGEND}</legend>
 		<dl>
-			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>
+			<dt><label for="group_name">{L_GROUP_NAME}:</label></dt>
 			<dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="category">{L_SPECIAL_CATEGORY}{L_COLON}</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
+			<dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt>
 			<dd>{S_CATEGORY_SELECT}</dd>
 		</dl>
 		<dl>
-			<dt><label for="allowed">{L_ALLOWED}{L_COLON}</label></dt>
+			<dt><label for="allowed">{L_ALLOWED}:</label></dt>
 			<dd><input type="checkbox" class="radio" id="allowed" name="allow_group" value="1"<!-- IF ALLOW_GROUP --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}{L_COLON}</label></dt>
+			<dt><label for="allow_in_pm">{L_ALLOW_IN_PM}:</label></dt>
 			<dd><input type="checkbox" class="radio" id="allow_in_pm" name="allow_in_pm" value="1"<!-- IF ALLOW_IN_PM --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="upload_icon">{L_UPLOAD_ICON}{L_COLON}</label></dt>
+			<dt><label for="upload_icon">{L_UPLOAD_ICON}:</label></dt>
 			<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
 					<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
 			</select></dd>
-			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
+			<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
 		</dl>
 		<dl>
-			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
-			<dd><input type="number" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
+			<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt>
+			<dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}{L_COLON}</label></dt>
+			<dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt>
 			<dd><div id="ext">{ASSIGNED_EXTENSIONS}</div> <span>[<a href="{U_EXTENSIONS}">{L_GO_TO_EXTENSIONS}</a> ]</span></dd>
 			<dd><select name="extensions[]" id="assigned_extensions" class="narrow" onchange="show_extensions(this);" multiple="multiple" size="8">{S_EXTENSION_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}{L_COLON}</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label></dd>
-			<dd><label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
+			<dt><label for="allowed_forums">{L_ALLOWED_FORUMS}:</label><br /><span>{L_ALLOWED_FORUMS_EXPLAIN}</span></dt>
+			<dd><label><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS}</label>
+				<label><input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</label></dd>
 			<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
 		</dl>

@@ -224,7 +224,7 @@
 		<fieldset class="tabulated">
 		<legend>{L_TITLE}</legend>

-		<table class="table1">
+		<table cellspacing="1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<thead>
 		<tr>
@@ -248,13 +248,13 @@
 					<!-- ELSE --><br /><span>&raquo; {L_ALLOWED_IN_PM_POST}</span><!-- ENDIF -->
 				</td>
 				<td>{groups.CATEGORY}</td>
-				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>&nbsp;</td>
+				<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
 			</tr>
 		<!-- END groups -->
 		</tbody>
 		</table>
 		<p class="quick">
-				{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" maxlength="30" />
+				{L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" />
 				<input class="button2" name="add" type="submit" value="{L_SUBMIT}" />
 		</p>
 		{S_FORM_TOKEN}
@@ -284,12 +284,14 @@
 	</fieldset>
 	</form>

+	<br />
+
 	<form id="change_ext" method="post" action="{U_ACTION}">

 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>

-	<table class="table1">
+	<table cellspacing="1">
 		<col class="row1" /><col class="row1" /><col class="row2" />
 	<thead>
 	<tr>
@@ -329,24 +331,24 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>

-	<table class="table1 zebra-table fixed-width-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th style="width: 15%;">{L_FILEDATE}</th>
-		<th style="width: 15%;">{L_FILESIZE}</th>
-		<th style="width: 15%;">{L_ATTACH_POST_ID}</th>
-		<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
-		<th style="width: 15%;">{L_DELETE}</th>
+		<th>{L_FILEDATE}</th>
+		<th>{L_FILESIZE}</th>
+		<th>{L_ATTACH_POST_ID}</th>
+		<th>{L_ATTACH_TO_POST}</th>
+		<th>{L_DELETE}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN orphan -->
-		<tr>
+		<!-- IF orphan.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td>
 			<td>{orphan.FILETIME}</td>
 			<td>{orphan.FILESIZE}</td>
-			<td><strong>{L_ATTACH_ID}{L_COLON} </strong><input type="number" name="post_id[{orphan.ATTACH_ID}]" maxlength="10" value="{orphan.POST_ID}" style="width: 75%;" /></td>
+			<td><strong>{L_ATTACH_ID}: </strong><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td>
 			<td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td>
 			<td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td>
 		</tr>
@@ -369,96 +371,6 @@
 	</fieldset>
 	</form>

-<!-- ELSEIF S_MANAGE -->
-
-	<form id="attachments" method="post" action="{U_ACTION}">
-
-	<fieldset class="tabulated">
-	<legend>{L_TITLE}</legend>
-
-	<div class="pagination top-pagination">
-	<!-- IF .pagination or TOTAL_FILES -->
-		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
-		<!-- IF .pagination -->
-			&bull; <!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
-			&bull; {PAGE_NUMBER}
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-	</div>
-
-<!-- IF .attachments -->
-	<table class="table1 zebra-table fixed-width-table">
-	<thead>
-	<tr>
-		<th>{L_FILENAME}</th>
-		<th style="width: 15%;">{L_POSTED}</th>
-		<th style="width: 15%;" class="centered-text">{L_FILESIZE}</th>
-		<th style="width: 10%;" class="centered-text">{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN attachments -->
-		<tr>
-			<td>
-				<!-- IF attachments.S_IN_MESSAGE -->{L_EXTENSION_GROUP}{L_COLON} <strong><!-- IF attachments.EXT_GROUP_NAME -->{attachments.EXT_GROUP_NAME}<!-- ELSE -->{L_NO_EXT_GROUP}<!-- ENDIF --></strong><br />{attachments.L_DOWNLOAD_COUNT}<br />{L_IN} {L_PRIVATE_MESSAGE}
-				<!-- ELSE --><a href="{attachments.U_FILE}" style="font-weight: bold;">{attachments.REAL_FILENAME}</a><br /><!-- IF attachments.COMMENT -->{attachments.COMMENT}<br /><!-- ENDIF -->{attachments.L_DOWNLOAD_COUNT}<br />{L_TOPIC}{L_COLON} <a href="{attachments.U_VIEW_TOPIC}">{attachments.TOPIC_TITLE}</a><!-- ENDIF -->
-			</td>
-			<td>{attachments.FILETIME}<br />{L_POST_BY_AUTHOR} {attachments.ATTACHMENT_POSTER}</td>
-			<td class="centered-text">{attachments.FILESIZE}</td>
-			<td class="centered-text"><input type="checkbox" class="radio" name="delete[{attachments.ATTACH_ID}]" /></td>
-		</tr>
-	<!-- END attachments -->
-	</tbody>
-	</table>
-<!-- ELSE -->
-	<div class="errorbox">
-		<p>{L_NO_ATTACHMENTS}</p>
-	</div>
 <!-- ENDIF -->

-	<!-- IF TOTAL_FILES -->
-	<div class="pagination">
-		{L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} &bull; {L_TOTAL_SIZE}{L_COLON} {TOTAL_SIZE}
-		<!-- IF .pagination -->
-			&bull; <!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
-			&bull; {PAGE_NUMBER}
-		<!-- ENDIF -->
-	</div>
-	<!-- ENDIF -->
-
-	<fieldset class="display-options">
-		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
-		<input class="button2" type="submit" value="{L_GO}" name="sort" />
-	</fieldset>
-
-	<hr />
-
-<!-- IF .attachments -->
-	<fieldset class="quick">
-		<input class="button2" type="submit" name="submit" value="{L_DELETE_MARKED}" /><br />
-		<p class="small">
-			<a href="#" onclick="marklist('attachments', 'delete', true); return false;">{L_MARK_ALL}</a> &bull;
-			<a href="#" onclick="marklist('attachments', 'delete', false); return false;">{L_UNMARK_ALL}</a>		
-		</p>
-	</fieldset>
-<!-- ENDIF -->
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-	<!-- IF S_ACTION_OPTIONS -->
-	<fieldset>
-		<legend>{L_RESYNC_STATS}</legend>
-		<form id="action_stats_form" method="post" action="{U_ACTION}">
-			<dl>
-				<dt><label for="action_stats">{L_RESYNC_FILES_STATS}</label><br /><span>{L_RESYNC_FILES_STATS_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
-			</dl>
-		</form>
-	</fieldset>
-	<!-- ENDIF -->
-<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_avatar_options_gravatar.html
+++ b/phpBB/adm/style/acp_avatar_options_gravatar.html
@@ -1,11 +0,0 @@
-<dl>
-	<dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
-	<dd><input type="email" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
-</dl>
-<dl>
-	<dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
-	<dd>
-		<input type="number" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="number" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
-	</dd>
-</dl>
--- a/phpBB/adm/style/acp_avatar_options_local.html
+++ b/phpBB/adm/style/acp_avatar_options_local.html
@@ -1,20 +0,0 @@
-<dl>
-	<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
-	<dd><select name="avatar_local_cat" id="category">
-		<!-- BEGIN avatar_local_cats -->
-		<option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
-		<!-- END avatar_local_cats -->
-	</select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
-</dl>
-	<!-- IF AVATAR_LOCAL_SHOW -->
-	<ul id="gallery">
-	<!-- BEGIN avatar_local_row -->
-	<!-- BEGIN avatar_local_col -->
-		<li>
-			<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
-			<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label>
-		</li>
-	<!-- END avatar_local_col -->
-	<!-- END avatar_local_row -->
-	</ul>
-	<!-- ENDIF -->
--- a/phpBB/adm/style/acp_avatar_options_remote.html
+++ b/phpBB/adm/style/acp_avatar_options_remote.html
@@ -1,11 +0,0 @@
-<dl>
-	<dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
-	<dd><input type="url" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
-</dl>
-<dl>
-	<dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
-	<dd>
-		<input type="number" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; 
-		<input type="number" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
-	</dd>
-</dl>
--- a/phpBB/adm/style/acp_avatar_options_upload.html
+++ b/phpBB/adm/style/acp_avatar_options_upload.html
@@ -1,11 +0,0 @@
-<dl>
-	<dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
-	<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
-</dl>
-
-<!-- IF S_UPLOAD_AVATAR_URL -->
-	<dl>
-		<dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
-		<dd><input type="url" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
-	</dl>
-<!-- ENDIF -->
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <p>{L_ACP_BAN_EXPLAIN}</p>

@@ -13,34 +13,27 @@

 	var ban_length = new Array();
 		ban_length[-1] = '';
+	<!-- BEGIN ban_length -->
+		ban_length['{ban_length.BAN_ID}'] = '{ban_length.A_LENGTH}';
+	<!-- END ban_length -->
+
 	var ban_reason = new Array();
 		ban_reason[-1] = '';
+	<!-- BEGIN ban_reason -->
+		ban_reason['{ban_reason.BAN_ID}'] = '{ban_reason.A_REASON}';
+	<!-- END ban_reason -->
+
 	var ban_give_reason = new Array();
 		ban_give_reason[-1] = '';
-
-	<!-- BEGIN bans -->
-		ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}';
-		<!-- IF bans.A_REASON -->
-			ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}';
-		<!-- ENDIF -->
-		<!-- IF bans.A_GIVE_REASON -->
-			ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}';
-		<!-- ENDIF -->
-	<!-- END bans -->
+	<!-- BEGIN ban_give_reason -->
+		ban_give_reason['{ban_give_reason.BAN_ID}'] = '{ban_give_reason.A_REASON}';
+	<!-- END ban_give_reason -->

 	function display_details(option)
 	{
-		document.getElementById('unbanlength').value = ban_length[option];
-		if (option in ban_reason) {
-			document.getElementById('unbanreason').innerHTML = ban_reason[option];
-		} else {
-			document.getElementById('unbanreason').innerHTML = '';
-		}
-		if (option in ban_give_reason) {
-			document.getElementById('unbangivereason').innerHTML = ban_give_reason[option];
-		} else {
-			document.getElementById('unbangivereason').innerHTML = '';
-		}
+		document.getElementById('acp_unban').unbangivereason.innerHTML = ban_give_reason[option];
+		document.getElementById('acp_unban').unbanreason.innerHTML = ban_reason[option];
+		document.getElementById('acp_unban').unbanlength.value = ban_length[option];
 	}

 // ]]>
@@ -51,26 +44,26 @@
 <fieldset>
 	<legend>{L_TITLE}</legend>
 <dl>
-	<dt><label for="ban">{L_BAN_CELL}{L_COLON}</label></dt>
+	<dt><label for="ban">{L_BAN_CELL}:</label></dt>
 	<dd><textarea name="ban" cols="40" rows="3" id="ban"></textarea></dd>
 	<!-- IF S_USERNAME_BAN --><dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd><!-- ENDIF -->
 </dl>
 <dl>
-	<dt><label for="banlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
+	<dt><label for="banlength">{L_BAN_LENGTH}:</label></dt>
 	<dd><label for="banlength"><select name="banlength" id="banlength" onchange="if(this.value==-1){document.getElementById('banlengthother').style.display = 'block';}else{document.getElementById('banlengthother').style.display='none';}">{S_BAN_END_OPTIONS}</select></label></dd>
 	<dd id="banlengthother" style="display: none;"><label><input type="text" name="banlengthother" class="inputbox" /><br /><span>{L_YEAR_MONTH_DAY}</span></label></dd>
 </dl>
 <dl>
-	<dt><label for="banexclude">{L_BAN_EXCLUDE}{L_COLON}</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
+	<dt><label for="banexclude">{L_BAN_EXCLUDE}:</label><br /><span>{L_BAN_EXCLUDE_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" name="banexclude" value="1" class="radio" /> {L_YES}</label>
 		<label><input type="radio" name="banexclude" id="banexclude" value="0" checked="checked" class="radio" /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="banreason">{L_BAN_REASON}{L_COLON}</label></dt>
+	<dt><label for="banreason">{L_BAN_REASON}:</label></dt>
 	<dd><input name="banreason" type="text" class="text medium" maxlength="255" id="banreason" /></dd>
 </dl>
 <dl>
-	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
+	<dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt>
 	<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
 </dl>

@@ -95,19 +88,19 @@

 <!-- IF S_BANNED_OPTIONS -->
 	<dl>
-		<dt><label for="unban">{L_BAN_CELL}{L_COLON}</label></dt>
+		<dt><label for="unban">{L_BAN_CELL}:</label></dt>
 		<dd><select id="unban" name="unban[]" multiple="multiple" size="10" style="width: 50%" onchange="if (this.selectedIndex > -1) display_details(this.options[this.selectedIndex].value); else display_details(-1);">{BANNED_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="unbanlength">{L_BAN_LENGTH}{L_COLON}</label></dt>
+		<dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt>
 		<dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="unbanreason">{L_BAN_REASON}{L_COLON}</label></dt>
+		<dt><label for="unbanreason">{L_BAN_REASON}:</label></dt>
 		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>
 	<dl>
-		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
+		<dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt>
 		<dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80">&nbsp;</textarea></dd>
 	</dl>

@@ -128,4 +121,4 @@

 </form>

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT_BBCODE -->

@@ -47,8 +47,6 @@
 	</dl>
 	</fieldset>

-	<!-- EVENT acp_bbcodes_edit_fieldsets_after -->
-
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
@@ -58,7 +56,7 @@
 	
 	<br />

-	<table class="table1" id="down">
+	<table cellspacing="1" id="down">
 	<thead>
 	<tr>
 		<th colspan="2">{L_TOKENS}</th>
@@ -73,7 +71,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN token -->
-		<tr style="vertical-align: top;">
+		<tr valign="top">
 			<td class="row1">{token.TOKEN}</td>
 			<td class="row2">{token.EXPLAIN}</td>
 		</tr>
@@ -92,7 +90,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_BBCODES}</legend>

-	<table class="table1 zebra-table" id="down">
+	<table cellspacing="1" id="down">
 	<thead>
 	<tr>
 		<th>{L_BBCODE_TAG}</th>
@@ -101,9 +99,9 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN bbcodes -->
-		<tr>
+		<!-- IF bbcodes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="text-align: center;">{bbcodes.BBCODE_TAG}</td>
-			<td class="actions"><!-- EVENT acp_bbcodes_actions_prepend --> <a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> <!-- EVENT acp_bbcodes_actions_append --></td>
+			<td style="text-align: right; width: 40px;"><a href="{bbcodes.U_EDIT}">{ICON_EDIT}</a> <a href="{bbcodes.U_DELETE}">{ICON_DELETE}</a></td>
 		</tr>
 	<!-- BEGINELSE -->
 		<tr class="row3">
--- a/phpBB/adm/style/acp_board.html
+++ b/phpBB/adm/style/acp_board.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_TITLE}</h1>

@@ -25,7 +25,7 @@
 	<!-- ELSE -->

 		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{options.CONTENT}</dd>
 		</dl>

@@ -33,12 +33,9 @@
 <!-- END options -->

 <!-- IF S_AUTH -->
-	</fieldset>
 	<!-- BEGIN auth_tpl -->
-		<!-- INCLUDE {auth_tpl.TEMPLATE_FILE} -->
+		{auth_tpl.TPL}
 	<!-- END auth_tpl -->
-	<fieldset>
-		<legend>{L_ACP_SUBMIT_CHANGES}</legend>
 <!-- ENDIF -->

 	<p class="submit-buttons">
--- a/phpBB/adm/style/acp_bots.html
+++ b/phpBB/adm/style/acp_bots.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT_BOT -->

@@ -22,27 +22,27 @@
 	<fieldset>
 		<legend>{L_TITLE}</legend>
 	<dl>
-		<dt><label for="bot_name">{L_BOT_NAME}{L_COLON}</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
+		<dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt>
 		<dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_style">{L_BOT_STYLE}{L_COLON}</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
+		<dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt>
 		<dd><select id="bot_style" name="bot_style">{S_STYLE_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_lang">{L_BOT_LANG}{L_COLON}</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
+		<dt><label for="bot_lang">{L_BOT_LANG}:</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
 		<dd><select id="bot_lang" name="bot_lang">{S_LANG_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_active">{L_BOT_ACTIVE}{L_COLON}</label></dt>
+		<dt><label for="bot_active">{L_BOT_ACTIVE}:</label></dt>
 		<dd><select id="bot_active" name="bot_active">{S_ACTIVE_OPTIONS}</select></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_agent">{L_BOT_AGENT}{L_COLON}</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
+		<dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt>
 		<dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="bot_ip">{L_BOT_IP}{L_COLON}</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
+		<dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt>
 		<dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd>
 	</dl>

@@ -62,7 +62,7 @@

 	<form id="acp_bots" method="post" action="{U_ACTION}">

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_BOT_NAME}</th>
@@ -73,12 +73,12 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN bots -->
-		<tr>
+		<!-- IF bots.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="width: 50%;">{bots.BOT_NAME}</td>
 			<td style="width: 15%; white-space: nowrap;" align="center">&nbsp;{bots.LAST_VISIT}&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_ACTIVATE_DEACTIVATE}">{bots.L_ACTIVATE_DEACTIVATE}</a>&nbsp;</td>
 			<td style="text-align: center;">&nbsp;<a href="{bots.U_EDIT}">{L_EDIT}</a>&nbsp;</td>
-			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a>&nbsp;</td>
+			<td style="text-align: center;">&nbsp;<a href="{bots.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
 			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{bots.BOT_ID}" /></td>
 		</tr>
 	<!-- END bots -->
--- a/phpBB/adm/style/acp_captcha.html
+++ b/phpBB/adm/style/acp_captcha.html
@@ -1,12 +1,11 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_ACP_VC_SETTINGS}</h1>

 <p>{L_ACP_VC_SETTINGS_EXPLAIN}</p>

-<p>{L_ACP_VC_EXT_GET_MORE}</p>

 <form id="acp_captcha" method="post" action="{U_ACTION}">

@@ -14,25 +13,25 @@
 <legend>{L_GENERAL_OPTIONS}</legend>

 <dl>
-	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
+	<dt><label for="enable_confirm">{L_VISUAL_CONFIRM_REG}:</label><br /><span>{L_VISUAL_CONFIRM_REG_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="enable_confirm" name="enable_confirm" value="1"<!-- IF REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="enable_confirm" value="0"<!-- IF not REG_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="max_reg_attempts">{L_REG_LIMIT}{L_COLON}</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
-	<dd><input id="max_reg_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
+	<dt><label for="max_reg_attempts">{L_REG_LIMIT}:</label><br /><span>{L_REG_LIMIT_EXPLAIN}</span></dt>
+	<dd><input id="max_reg_attempts" type="text" size="4" maxlength="4" name="max_reg_attempts" value="{REG_LIMIT}" /></dd>
 </dl>
 <dl>
-	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}{L_COLON}</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
-	<dd><input id="max_login_attempts" type="number" size="4" maxlength="4" min="0" max="9999" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
+	<dt><label for="max_login_attempts">{L_MAX_LOGIN_ATTEMPTS}:</label><br /><span>{L_MAX_LOGIN_ATTEMPTS_EXPLAIN}</span></dt>
+	<dd><input id="max_login_attempts" type="text" size="4" maxlength="4" name="max_login_attempts" value="{MAX_LOGIN_ATTEMPTS}" /></dd>
 </dl>
 <dl>
-	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
+	<dt><label for="enable_post_confirm">{L_VISUAL_CONFIRM_POST}:</label><br /><span>{L_VISUAL_CONFIRM_POST_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="enable_post_confirm" name="enable_post_confirm" value="1"<!-- IF POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="enable_post_confirm" value="0"<!-- IF not POST_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}{L_COLON}</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
+	<dt><label for="confirm_refresh">{L_VISUAL_CONFIRM_REFRESH}:</label><br /><span>{L_VISUAL_CONFIRM_REFRESH_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="confirm_refresh" name="confirm_refresh" value="1"<!-- IF CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="confirm_refresh" value="0"<!-- IF not CONFIRM_REFRESH --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
@@ -41,12 +40,12 @@
 <fieldset>
 <legend>{L_AVAILABLE_CAPTCHAS}</legend>
 <dl>
-	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}{L_COLON}</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
+	<dt><label for="captcha_select">{L_CAPTCHA_SELECT}:</label><br /><span>{L_CAPTCHA_SELECT_EXPLAIN}</span></dt>
 	<dd><select id="captcha_select" name="select_captcha" onchange="(document.getElementById('acp_captcha')).submit()" >{CAPTCHA_SELECT}</select></dd>
 </dl>
 <!-- IF S_CAPTCHA_HAS_CONFIG -->
 <dl>
-	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}{L_COLON}</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
+	<dt><label for="configure">{L_CAPTCHA_CONFIGURE}:</label><br /><span>{L_CAPTCHA_CONFIGURE_EXPLAIN}</span></dt>
 	<dd><input class="button2" type="submit" id="configure" name="configure" value="{L_CONFIGURE}" /></dd>
 </dl>
 <!-- ENDIF -->
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -1,76 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-
-	var form_name = 'acp_contact';
-	var text_name = 'contact_admin_info';
-	var load_draft = false;
-	var upload = false;
-	var imageTag = false;
-
-// ]]>
-</script>
-
-<a id="maincontent"></a>
-
-<h1>{L_ACP_CONTACT_SETTINGS}</h1>
-
-<p>{L_ACP_CONTACT_SETTINGS_EXPLAIN}</p>
-
-<form id="acp_contact" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_GENERAL_OPTIONS}</legend>
-		<dl>
-			<dt><label for="contact_admin_form_enable">{L_CONTACT_US_ENABLE}{L_COLON}</label><br /><span>{L_CONTACT_US_ENABLE_EXPLAIN}</span></dt>
-			<dd>
-				<label><input type="radio" class="radio" id="contact_admin_form_enable" name="contact_admin_form_enable" value="1"<!-- IF CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
-				<label><input type="radio" class="radio" name="contact_admin_form_enable" value="0"<!-- IF not CONTACT_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label>
-			</dd>
-		</dl>
-	</fieldset>
-
-	<!-- IF CONTACT_US_INFO_PREVIEW -->
-	<fieldset>
-		<legend>{L_CONTACT_US_INFO_PREVIEW}</legend>
-		<p>{CONTACT_US_INFO_PREVIEW}</p>
-	</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_CONTACT_US_INFO}</legend>
-		<p>{L_CONTACT_US_INFO_EXPLAIN}</p>
-
-		<!-- INCLUDE acp_posting_buttons.html -->
-
-		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
-			</dt>
-
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;">
-				<textarea name="contact_admin_info" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{CONTACT_US_INFO}</textarea>
-			</dd>
-
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
-				<!-- IF S_BBCODE_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_bbcode"<!-- IF S_BBCODE_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_BBCODE}</label>
-				<!-- ENDIF -->
-				<!-- IF S_SMILIES_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_smilies"<!-- IF S_SMILIES_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_SMILIES}</label>
-				<!-- ENDIF -->
-				<!-- IF S_LINKS_ALLOWED -->
-				<label><input type="checkbox" class="radio" name="disable_magic_url"<!-- IF S_MAGIC_URL_DISABLE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_DISABLE_MAGIC_URL}</label>
-				<!-- ENDIF -->
-			</dd>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
-		</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-</form>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF MODE eq 'restore' -->
 	<h1>{L_ACP_RESTORE}</h1>
@@ -13,7 +13,7 @@
 	<fieldset>
 		<legend>{L_RESTORE_OPTIONS}</legend>
 	<dl>
-		<dt><label for="file">{L_SELECT_FILE}{L_COLON}</label></dt>
+		<dt><label for="file">{L_SELECT_FILE}:</label></dt>
 		<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
 	</dl>

@@ -57,26 +57,26 @@
 	<fieldset>
 		<legend>{L_BACKUP_OPTIONS}</legend>
 	<dl>
-		<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>
+		<dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
 			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
 			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="method">{L_FILE_TYPE}{L_COLON}</label></dt>
+		<dt><label for="method">{L_FILE_TYPE}:</label></dt>
 		<dd><!-- BEGIN methods -->
 		<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
 		<!-- END methods --></dd>
 	</dl>
 	<dl>
-		<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>
+		<dt><label for="where">{L_ACTION}:</label></dt>
 		<dd>
 			<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
 			<label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label>
 		</dd>
 	</dl>
 	<dl>
-		<dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt>
+		<dt><label for="table">{L_TABLE_SELECT}:</label></dt>
 		<dd><select id="table" name="table[]" size="10" multiple="multiple">
 		<!-- BEGIN tables -->
 			<option value="{tables.TABLE}">{tables.TABLE}</option>
--- a/phpBB/adm/style/acp_disallow.html
+++ b/phpBB/adm/style/acp_disallow.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_ACP_DISALLOW_USERNAMES}</h1>

@@ -11,7 +11,7 @@
 <fieldset>
 	<legend>{L_ADD_DISALLOW_TITLE}</legend>
 <dl>
-	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt>
 	<dd><input id="user" type="text" class="text medium" maxlength="255" name="disallowed_user" /></dd>
 </dl>

@@ -28,7 +28,7 @@
 	<legend>{L_DELETE_DISALLOW_TITLE}</legend>
 <!-- IF S_DISALLOWED_NAMES -->
 	<dl>
-		<dt><label for="disallowed">{L_USERNAME}{L_COLON}</label></dt>
+		<dt><label for="disallowed">{L_USERNAME}:</label></dt>
 		<dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd>
 	</dl>

--- a/phpBB/adm/style/acp_email.html
+++ b/phpBB/adm/style/acp_email.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_ACP_MASS_EMAIL}</h1>

@@ -18,37 +18,35 @@
 <fieldset>
 	<legend>{L_COMPOSE}</legend>
 <dl>
-	<dt><label for="group">{L_SEND_TO_GROUP}{L_COLON}</label></dt>
+	<dt><label for="group">{L_SEND_TO_GROUP}:</label></dt>
 	<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
 </dl>
 <dl>
-	<dt><label for="usernames">{L_SEND_TO_USERS}{L_COLON}</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
+	<dt><label for="usernames">{L_SEND_TO_USERS}:</label><br /><span>{L_SEND_TO_USERS_EXPLAIN}</span></dt>
 	<dd><textarea name="usernames" id="usernames" rows="5" cols="40">{USERNAMES}</textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
 <dl>
-	<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
+	<dt><label for="subject">{L_SUBJECT}:</label></dt>
 	<dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd>
 </dl>
 <dl>
-	<dt><label for="message">{L_MASS_MESSAGE}{L_COLON}</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
+	<dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt>
 	<dd><textarea id="message" name="message" rows="10" cols="60">{MESSAGE}</textarea></dd>
 </dl>
 <dl>
-	<dt><label for="priority">{L_MAIL_PRIORITY}{L_COLON}</label></dt>
+	<dt><label for="priority">{L_MAIL_PRIORITY}:</label></dt>
 	<dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd>
 </dl>
 <dl>
-	<dt><label for="banned">{L_MAIL_BANNED}{L_COLON}</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>
+	<dt><label for="banned">{L_MAIL_BANNED}:</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt>
 	<dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio" /></dd>
 </dl>
 <dl>
-	<dt><label for="send">{L_SEND_IMMEDIATELY}{L_COLON}</label></dt>
+	<dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt>
 	<dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd>
 </dl>

-<!-- EVENT acp_email_options_after -->
-
 <p class="submit-buttons">
 	<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" />&nbsp;
 	<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
--- a/phpBB/adm/style/acp_ext_delete_data.html
+++ b/phpBB/adm/style/acp_ext_delete_data.html
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_DELETE_DATA_EXPLAIN}</p>
-
-	<!-- IF MIGRATOR_ERROR -->
-	<div class="errorbox">
-		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
-		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-	</div>
-	<!-- ELSEIF PRE -->
-	<div class="errorbox">
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
-
-	<form id="acp_extensions" method="post" action="{U_PURGE}">
-	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_DELETE_DATA}</legend>
-		<input class="button1" type="submit" name="delete_data" value="{L_EXTENSION_DELETE_DATA}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
-			<p>{L_EXTENSION_DELETE_DATA_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_DELETE_DATA_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -1,139 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<!-- IF S_VERSIONCHECK -->
-	<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
-		<p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-	</div>
-	<!-- ELSE IF S_VERSIONCHECK_STATUS == 0 -->
-	<div class="errorbox notice">
-		<p>{L_VERSIONCHECK_FAIL}</p>
-		<p>{VERSIONCHECK_FAIL_REASON}</p>
-		<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-	</div>
-	<!-- ELSE IF S_VERSIONCHECK_STATUS == 1 -->
-	<div class="errorbox notice">
-		<p>{VERSIONCHECK_FAIL_REASON}</p>
-	</div>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_EXT_DETAILS}</legend>
-		<!-- IF META_DISPLAY_NAME -->
-		<dl>
-			<dt><label>{L_DISPLAY_NAME}{L_COLON}</label></dt>
-			<dd><strong id="meta_display_name">{META_DISPLAY_NAME}</strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label>{L_CLEAN_NAME}{L_COLON}</label></dt>
-			<dd><strong id="meta_name">{META_NAME}</strong></dd>
-		</dl>
-		<!-- IF META_DESCRIPTION -->
-		<dl>
-			<dt><label>{L_DESCRIPTION}{L_COLON}</label></dt>
-			<dd><span id="meta_description">{META_DESCRIPTION}</span></dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label>{L_VERSION}{L_COLON}</label></dt>
-			<dd><span id="meta_version">{META_VERSION}</span></dd>
-		</dl>
-		<!-- IF META_HOMEPAGE -->
-		<dl>
-			<dt><label>{L_HOMEPAGE}{L_COLON}</label></dt>
-			<dd><strong id="meta_homepage"><a href="{META_HOMEPAGE}">{META_HOMEPAGE}</a></strong></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF META_TIME -->
-		<dl>
-			<dt><label>{L_TIME}{L_COLON}</label></dt>
-			<dd><span id="meta_time">{META_TIME}</span></dd>
-		</dl>
-		<!-- ENDIF -->
-		<dl>
-			<dt><label>{L_LICENSE}{L_COLON}</label></dt>
-			<dd><span id="meta_license">{META_LICENSE}</span></dd>
-		</dl>
-	</fieldset>
-
-	<!-- IF S_VERSIONCHECK && not S_UP_TO_DATE -->
-	<fieldset>
-		<legend>{L_LATEST_VERSION}</legend>
-		<!-- BEGIN updates_available -->
-		<fieldset>
-			<dl>
-				<dt><label>{L_VERSION}{L_COLON}</label></dt>
-				<dd><strong>{updates_available.current}</strong></dd>
-			</dl>
-			<!-- IF updates_available.download-->
-			<dl>
-				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
-				<dd><strong><a href="{updates_available.download}">{L_DOWNLOAD} {META_NAME} {LATEST_VERSION}</a></strong></dd>
-			</dl>
-			<!-- ENDIF -->
-			<!-- IF updates_available.announcement -->
-			<dl>
-				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
-				<dd><strong><a href="{updates_available.announcement}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
-			</dl>
-			<!-- ENDIF -->
-		</fieldset>
-		<!-- END updates_available -->
-	</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF META_REQUIRE_PHPBB || META_REQUIRE_PHP -->
-	<fieldset>
-		<legend>{L_REQUIREMENTS}</legend>
-		<!-- IF META_REQUIRE_PHPBB -->
-		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label>{L_PHPBB_VERSION}{L_COLON}</label></dt>
-			<dd><span id="require_phpbb">{META_REQUIRE_PHPBB}</span></dd>
-		</dl>
-		<!-- ENDIF -->
-		<!-- IF META_REQUIRE_PHP -->
-		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
-			<dt><label>{L_PHP_VERSION}{L_COLON}</label></dt>
-			<dd><span id="require_php">{META_REQUIRE_PHP}</span></dd>
-		</dl>
-		<!-- ENDIF -->
-	</fieldset>
-	<!-- ENDIF -->
-
-	<fieldset>
-		<legend>{L_AUTHOR_INFORMATION}</legend>
-		<!-- BEGIN meta_authors -->
-		<fieldset>
-			<dl>
-				<dt><label>{L_AUTHOR_NAME}{L_COLON}</label></dt>
-				<dd><strong>{meta_authors.AUTHOR_NAME}</strong></dd>
-			</dl>
-			<!-- IF meta_authors.AUTHOR_EMAIL -->
-			<dl>
-				<dt><label>{L_AUTHOR_EMAIL}{L_COLON}</label></dt>
-				<dd><strong><a href="mailto:{meta_authors.AUTHOR_EMAIL}">{meta_authors.AUTHOR_EMAIL}</a></strong></dd>
-			</dl>
-			<!-- ENDIF -->
-			<!-- IF meta_authors.AUTHOR_HOMEPAGE -->
-			<dl>
-				<dt><label>{L_AUTHOR_HOMEPAGE}{L_COLON}</label></dt>
-				<dd><strong><a href="{meta_authors.AUTHOR_HOMEPAGE}">{meta_authors.AUTHOR_HOMEPAGE}</a></strong></dd>
-			</dl>
-			<!-- ENDIF -->
-			<!-- IF meta_authors.AUTHOR_ROLE -->
-			<dl>
-				<dt><label>{L_AUTHOR_ROLE}{L_COLON}</label></dt>
-				<dd><strong>{meta_authors.AUTHOR_ROLE}</strong></dd>
-			</dl>
-			<!-- ENDIF -->
-		</fieldset>
-		<!-- END meta_authors -->
-	</fieldset>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -1,34 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
-
-	<!-- IF PRE -->
-	<fieldset>
-		<h2>{L_CONFIRM}</h2>
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</fieldset>
-
-	<form id="acp_extensions" method="post" action="{U_DISABLE}">
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="successbox notice">
-			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_DISABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -1,40 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-	<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-	<p>{L_EXTENSION_ENABLE_EXPLAIN}</p>
-
-	<!-- IF MIGRATOR_ERROR -->
-	<div class="errorbox">
-		<p><strong>{L_MIGRATION_EXCEPTION_ERROR}</strong></p>
-		<p>{MIGRATOR_ERROR}</p>
-		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-	</div>
-	<!-- ELSEIF PRE -->
-	<fieldset>
-		<h2>{L_CONFIRM}</h2>
-		<p>{L_CONFIRM_MESSAGE}</p>
-	</fieldset>
-
-	<form id="acp_extensions" method="post" action="{U_ENABLE}">
-	<fieldset class="submit-buttons">
-		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
-		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
-	</fieldset>
-	</form>
-	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="successbox notice">
-			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
-		</div>
-	<!-- ELSE -->
-		<div class="successbox">
-			<p>{L_EXTENSION_ENABLE_SUCCESS}</p>
-			<br />
-			<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -1,115 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-	<h1>{L_EXTENSIONS_ADMIN}</h1>
-
-	<p>{L_EXTENSIONS_EXPLAIN}</p>
-
-	<fieldset class="quick">
-		<span class="small"><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE_ALL}</a> &bull; <a href="javascript:phpbb.toggleDisplay('version_check_settings');">{L_SETTINGS}</a></span>
-	</fieldset>
-
-	<form id="version_check_settings" method="post" action="{U_ACTION}" style="display:none">
-
-	<fieldset>
-		<legend>{L_EXTENSIONS_VERSION_CHECK_SETTINGS}</legend>
-		<dl>
-			<dt><label for="force_unstable">{L_FORCE_UNSTABLE}{L_COLON}</label></dt>
-			<dd>
-				<label><input type="radio" id="force_unstable" name="force_unstable" class="radio" value="1"<!-- IF FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="force_unstable" class="radio" value="0"<!-- IF not FORCE_UNSTABLE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-
-		<p class="submit-buttons">
-			<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-			<input class="button2" type="reset" name="reset" value="{L_RESET}" />
-			<input type="hidden" name="action" value="set_config_version_check_force_unstable" />
-			{S_FORM_TOKEN}
-		</p>
-	</fieldset>
-	</form>
-
-	<table class="table1">
-		<col class="row1" ><col class="row1" ><col class="row2" ><col class="row2" >
-	<thead>
-		<tr>
-			<th>{L_EXTENSION_NAME}</th>
-			<th style="text-align: center; width: 20%;">{L_CURRENT_VERSION}</th>
-			<th style="text-align: center; width: 10%;">{L_EXTENSION_OPTIONS}</th>
-			<th style="text-align: center; width: 25%;">{L_EXTENSION_ACTIONS}</th>
-		</tr>
-	</thead>
-	<tbody>
-		<!-- IF .enabled -->
-		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_ENABLED}</strong></td>
-		</tr>
-		<!-- BEGIN enabled -->
-		<tr class="ext_enabled">
-			<td><strong>{enabled.META_DISPLAY_NAME}</strong></td>
-			<td style="text-align: center;">
-				<!-- IF enabled.S_VERSIONCHECK -->
-				<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
-				<!-- ELSE -->
-				{enabled.META_VERSION}
-				<!-- ENDIF -->
-			</td>
-			<td style="text-align: center;"><a href="{enabled.U_DETAILS}">{L_DETAILS}</a></td>
-			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{enabled.actions.U_ACTION}"<!-- IF enabled.actions.L_ACTION_EXPLAIN --> title="{enabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{enabled.actions.L_ACTION}</a>
-					<!-- IF not enabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
-			</td>
-		</tr>
-		<!-- END enabled -->
-		<!-- ENDIF -->
-
-		<!-- IF .disabled -->
-		<tr>
-			<td class="row3" colspan="4"><strong>{L_EXTENSIONS_DISABLED}</strong></td>
-		</tr>
-		<!-- BEGIN disabled -->
-		<tr class="ext_disabled">
-			<td><strong>{disabled.META_DISPLAY_NAME}</strong></td>
-			<td style="text-align: center;">
-				<!-- IF disabled.S_VERSIONCHECK -->
-				<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>
-				<!-- ELSE -->
-				{disabled.META_VERSION}
-				<!-- ENDIF -->
-			</td>
-			<td style="text-align: center;">
-				<!-- IF disabled.U_DETAILS --><a href="{disabled.U_DETAILS}">{L_DETAILS}</a><!-- ENDIF -->
-			</td>
-			<td style="text-align: center;">
-				<!-- BEGIN actions -->
-					<a href="{disabled.actions.U_ACTION}"<!-- IF disabled.actions.L_ACTION_EXPLAIN --> title="{disabled.actions.L_ACTION_EXPLAIN}"<!-- ENDIF -->>{disabled.actions.L_ACTION}</a>
-					<!-- IF not disabled.actions.S_LAST_ROW -->&nbsp;|&nbsp;<!-- ENDIF -->
-				<!-- END actions -->
-			</td>
-		</tr>
-		<!-- END disabled -->
-		<!-- ENDIF -->
-	</tbody>
-	</table>
-
-	<table class="table1">
-	<tr>
-		<th>{L_EXTENSION_UPDATE_HEADLINE}</th>
-	</tr>
-	<tr>
-		<td class="row3">{L_EXTENSION_UPDATE_EXPLAIN}</td>
-	</tr>
-	<tr>
-		<th>{L_EXTENSION_REMOVE_HEADLINE}</th>
-	</tr>
-	<tr>
-		<td class="row3">{L_EXTENSION_REMOVE_EXPLAIN}</td>
-	</tr>
-	</tbody>
-	</table>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT_FORUM -->

@@ -14,45 +14,45 @@
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 				if (value == {FORUM_POST})
 				{
-					phpbb.toggleDisplay('type_actions', -1);
+					dE('type_actions', -1);
 				}
 				else
 				{
-					phpbb.toggleDisplay('type_actions', 1);
+					dE('type_actions', 1);
 				}
 			<!-- ENDIF -->

 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 				if (value == {FORUM_LINK})
 				{
-					phpbb.toggleDisplay('cat_to_link_actions', 1);
+					dE('cat_to_link_actions', 1);
 				}
 				else
 				{
-					phpbb.toggleDisplay('cat_to_link_actions', -1);
+					dE('cat_to_link_actions', -1);
 				}
 			<!-- ENDIF -->

 			if (value == {FORUM_POST})
 			{
-				phpbb.toggleDisplay('forum_post_options', 1);
-				phpbb.toggleDisplay('forum_link_options', -1);
-				phpbb.toggleDisplay('forum_rules_options', 1);
-				phpbb.toggleDisplay('forum_cat_options', -1);
+				dE('forum_post_options', 1);
+				dE('forum_link_options', -1);
+				dE('forum_rules_options', 1);
+				dE('forum_cat_options', -1);
 			}
 			else if (value == {FORUM_LINK})
 			{
-				phpbb.toggleDisplay('forum_post_options', -1);
-				phpbb.toggleDisplay('forum_link_options', 1);
-				phpbb.toggleDisplay('forum_rules_options', -1);
-				phpbb.toggleDisplay('forum_cat_options', -1);
+				dE('forum_post_options', -1);
+				dE('forum_link_options', 1);
+				dE('forum_rules_options', -1);
+				dE('forum_cat_options', -1);
 			}
 			else if (value == {FORUM_CAT})
 			{
-				phpbb.toggleDisplay('forum_post_options', -1);
-				phpbb.toggleDisplay('forum_link_options', -1);
-				phpbb.toggleDisplay('forum_rules_options', 1);
-				phpbb.toggleDisplay('forum_cat_options', 1);
+				dE('forum_post_options', -1);
+				dE('forum_link_options', -1);
+				dE('forum_rules_options', 1);
+				dE('forum_cat_options', 1);
 			}
 		}

@@ -64,30 +64,30 @@
 		{
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 				<!-- IF S_FORUM_POST -->
-					phpbb.toggleDisplay('type_actions', -1);
+					dE('type_actions', -1);
 				<!-- ENDIF -->
 			<!-- ENDIF -->

 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 				<!-- IF S_FORUM_CAT -->
-					phpbb.toggleDisplay('cat_to_link_actions', -1);
+					dE('cat_to_link_actions', -1);
 				<!-- ENDIF -->
 			<!-- ENDIF -->

 			<!-- IF not S_FORUM_POST -->
-				phpbb.toggleDisplay('forum_post_options', -1);
+				dE('forum_post_options', -1);
 			<!-- ENDIF -->

 			<!-- IF not S_FORUM_CAT -->
-				phpbb.toggleDisplay('forum_cat_options', -1);
+				dE('forum_cat_options', -1);
 			<!-- ENDIF -->

 			<!-- IF not S_FORUM_LINK -->
-				phpbb.toggleDisplay('forum_link_options', -1);
+				dE('forum_link_options', -1);
 			<!-- ENDIF -->

 			<!-- IF S_FORUM_LINK -->
-			phpbb.toggleDisplay('forum_rules_options', -1);
+			dE('forum_rules_options', -1);
 			<!-- ENDIF -->
 		}

@@ -111,15 +111,14 @@

 	<fieldset>
 		<legend>{L_FORUM_SETTINGS}</legend>
-	<!-- EVENT acp_forums_main_settings_prepend -->
 	<dl>
-		<dt><label for="forum_type">{L_FORUM_TYPE}{L_COLON}</label></dt>
+		<dt><label for="forum_type">{L_FORUM_TYPE}:</label></dt>
 		<dd><select id="forum_type" name="forum_type" onchange="display_options(this.options[this.selectedIndex].value);">{S_FORUM_TYPE_OPTIONS}</select></dd>
 	</dl>
 	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 	<div id="type_actions">
 		<dl>
-			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}{L_COLON}</label></dt>
+			<dt><label for="type_action">{L_DECIDE_MOVE_DELETE_CONTENT}:</label></dt>
 			<dd><label><input type="radio" class="radio" name="type_action" value="delete"<!-- IF not S_MOVE_FORUM_OPTIONS --> checked="checked" id="type_action"<!-- ENDIF --> /> {L_DELETE_ALL_POSTS}</label></dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS --><dd><label><input type="radio" class="radio" name="type_action" id="type_action" value="move" checked="checked" /> {L_MOVE_POSTS_TO}</label> <select name="to_forum_id">{S_MOVE_FORUM_OPTIONS}</select></dd><!-- ENDIF -->
 		</dl>
@@ -128,7 +127,7 @@
 	<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 	<div id="cat_to_link_actions">
 		<dl>
-			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}{L_COLON}</label></dt>
+			<dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt>
 			<!-- IF S_FORUMS_LIST -->
 				<dd><label><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
 			<!-- ELSE -->
@@ -138,59 +137,58 @@
 	</div>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="parent">{L_FORUM_PARENT}{L_COLON}</label></dt>
+		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
 		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
 	</dl>
 	<!-- IF S_CAN_COPY_PERMISSIONS -->
 		<dl>
-			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="forum_name">{L_FORUM_NAME}{L_COLON}</label></dt>
+		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>
 		<dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_desc">{L_FORUM_DESC}{L_COLON}</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
-		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45" data-bbcode="true">{FORUM_DESC}</textarea></dd>
+		<dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt>
+		<dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd>
 		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_image">{L_FORUM_IMAGE}{L_COLON}</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
+		<dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt>
 		<dd><input class="text medium" type="text" id="forum_image" name="forum_image" value="{FORUM_IMAGE}" maxlength="255" /></dd>
 		<!-- IF FORUM_IMAGE_SRC -->
 			<dd><img src="{FORUM_IMAGE_SRC}" alt="{L_FORUM_IMAGE}" /></dd>
 		<!-- ENDIF -->
 	</dl>
 	<dl>
-		<dt><label for="forum_password">{L_FORUM_PASSWORD}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
+		<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
 		<dd><input type="password" id="forum_password" name="forum_password" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
+		<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
 		<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="<!-- IF S_FORUM_PASSWORD_SET -->&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;<!-- ENDIF -->" autocomplete="off" /></dd>
 	</dl>
 	<!-- IF S_FORUM_PASSWORD_SET -->
 	<dl>
-		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}{L_COLON}</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
+		<dt><label for="forum_password_unset">{L_FORUM_PASSWORD_UNSET}:</label><br /><span>{L_FORUM_PASSWORD_UNSET_EXPLAIN}</span></dt>
 		<dd><input id="forum_password_unset" name="forum_password_unset" type="checkbox" /></dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="forum_style">{L_FORUM_STYLE}{L_COLON}</label></dt>
+		<dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt>
 		<dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd>
 	</dl>
-	<!-- EVENT acp_forums_main_settings_append -->
 	</fieldset>

 	<div id="forum_cat_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
-			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}{L_COLON}</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
+			<dt><label for="display_active">{L_DISPLAY_ACTIVE_TOPICS}:</label><br /><span>{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_active" value="1"<!-- IF S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_active" value="0"<!-- IF not S_ENABLE_ACTIVE_TOPICS --> id="display_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
@@ -200,102 +198,85 @@
 	<div id="forum_post_options">
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
-		<!-- EVENT acp_forums_normal_settings_prepend -->
 		<dl>
-			<dt><label for="forum_status">{L_FORUM_STATUS}{L_COLON}</label></dt>
+			<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
 			<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}{L_COLON}</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
+			<dt><label for="display_subforum_list">{L_LIST_SUBFORUMS}:</label><br /><span>{L_LIST_SUBFORUMS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_subforum_list" value="1"<!-- IF S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_subforum_list" value="0"<!-- IF not S_DISPLAY_SUBFORUM_LIST --> id="display_subforum_list" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}{L_COLON}</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
+			<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}{L_COLON}</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
+			<dt><label for="enable_quick_reply">{L_ENABLE_QUICK_REPLY}:</label><br /><span>{L_ENABLE_QUICK_REPLY_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_quick_reply" value="1"<!-- IF S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_quick_reply" value="0"<!-- IF not S_ENABLE_QUICK_REPLY --> id="enable_quick_reply" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}{L_COLON}</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
+			<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}{L_COLON}</label></dt>
+			<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
 			<dd><label><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="display_recent">{L_ENABLE_RECENT}{L_COLON}</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
+			<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}{L_COLON}</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
-			<dd><input type="number" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" min="0" max="9999" /></dd>
+			<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
+			<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd>
 		</dl>
-		<!-- EVENT acp_forums_normal_settings_append -->
 		</fieldset>

 		<fieldset>
 			<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
-		<!-- EVENT acp_forums_prune_settings_prepend -->
 		<dl>
-			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}{L_COLON}</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
+			<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
+			<dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt>
+			<dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+			<dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1"<!-- IF S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="prune_old_polls" value="0"<!-- IF not S_PRUNE_OLD_POLLS --> id="prune_old_polls" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>
+			<dt><label for="prune_announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
 			<dd><label><input type="radio" class="radio" name="prune_announce" value="1"<!-- IF S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="prune_announce" value="0"<!-- IF not S_PRUNE_ANNOUNCE --> id="prune_announce" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="prune_sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>
+			<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
 			<dd><label><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
-		<dl>
-			<dt><label for="enable_shadow_prune">{L_FORUM_PRUNE_SHADOW}{L_COLON}</label><br /><span>{L_FORUM_PRUNE_SHADOW_EXPLAIN}</span></dt>
-			<dd><label><input type="radio" class="radio" name="enable_shadow_prune" value="1"<!-- IF S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" class="radio" name="enable_shadow_prune" value="0"<!-- IF not S_PRUNE_SHADOW_ENABLE --> id="enable_shadow_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_shadow_freq">{L_AUTO_PRUNE_SHADOW_FREQ}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_FREQ_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_freq" name="prune_shadow_freq" value="{PRUNE_SHADOW_FREQ}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
-		</dl>
-		<dl>
-			<dt><label for="prune_shadow_days">{L_AUTO_PRUNE_SHADOW_DAYS}{L_COLON}</label><br /><span>{L_AUTO_PRUNE_SHADOW_DAYS_EXPLAIN}</span></dt>
-			<dd><input type="number" id="prune_shadow_days" name="prune_shadow_days" value="{PRUNE_SHADOW_DAYS}" maxlength="4" size="4" min="0" max="9999" /> {L_DAYS}</dd>
-		</dl>
-		<!-- EVENT acp_forums_prune_settings_append -->
 		</fieldset>
 	</div>

@@ -303,16 +284,16 @@
 		<fieldset>
 			<legend>{L_GENERAL_FORUM_SETTINGS}</legend>
 		<dl>
-			<dt><label for="link_display_on_index">{L_LIST_INDEX}{L_COLON}</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
+			<dt><label for="link_display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="link_display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="link_display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="link_display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="forum_link">{L_FORUM_LINK}{L_COLON}</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
+			<dt><label for="forum_link">{L_FORUM_LINK}:</label><br /><span>{L_FORUM_LINK_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="forum_link" name="forum_link" value="{FORUM_DATA_LINK}" maxlength="255" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}{L_COLON}</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
+			<dt><label for="forum_link_track">{L_FORUM_LINK_TRACK}:</label><br /><span>{L_FORUM_LINK_TRACK_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="forum_link_track" value="1"<!-- IF S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="forum_link_track" value="0"<!-- IF not S_FORUM_LINK_TRACK --> id="forum_link_track" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
@@ -322,25 +303,23 @@
 	<div id="forum_rules_options">
 		<fieldset>
 			<legend>{L_FORUM_RULES}</legend>
-		<!-- EVENT acp_forums_rules_settings_prepend -->
 		<dl>
-			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}{L_COLON}</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
+			<dt><label for="forum_rules_link">{L_FORUM_RULES_LINK}:</label><br /><span>{L_FORUM_RULES_LINK_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="forum_rules_link" name="forum_rules_link" value="{FORUM_RULES_LINK}" maxlength="255" /></dd>
 		</dl>
 	<!-- IF FORUM_RULES_PREVIEW -->
 		<dl>
-			<dt><label>{L_FORUM_RULES_PREVIEW}{L_COLON}</label></dt>
+			<dt><label>{L_FORUM_RULES_PREVIEW}:</label></dt>
 			<dd>{FORUM_RULES_PREVIEW}</dd>
 		</dl>
 	<!-- ENDIF -->
 		<dl>
-			<dt><label for="forum_rules">{L_FORUM_RULES}{L_COLON}</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
-			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70" data-bbcode="true">{FORUM_RULES_PLAIN}</textarea></dd>
+			<dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt>
+			<dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd>
 			<dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
 				<label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd>
 		</dl>
-		<!-- EVENT acp_forums_rules_settings_append -->
 		</fieldset>
 	</div>

@@ -372,12 +351,12 @@
 	<fieldset>
 		<legend>{L_FORUM_DELETE}</legend>
 	<dl>
-		<dt><label>{L_FORUM_NAME}{L_COLON}</label></dt>
+		<dt><label>{L_FORUM_NAME}:</label></dt>
 		<dd><strong>{FORUM_NAME}</strong></dd>
 	</dl>
 	<!-- IF S_FORUM_POST -->
 		<dl>
-			<dt><label for="delete_action">{L_ACTION}{L_COLON}</label></dt>
+			<dt><label for="delete_action">{L_ACTION}:</label></dt>
 			<dd><label><input type="radio" class="radio" id="delete_action" name="action_posts" value="delete" checked="checked" /> {L_DELETE_ALL_POSTS}</label></dd>
 			<!-- IF S_MOVE_FORUM_OPTIONS -->
 				<dd><label><input type="radio" class="radio" name="action_posts" value="move" /> {L_MOVE_POSTS_TO}</label> <select name="posts_to_id">{S_MOVE_FORUM_OPTIONS}</select></dd>
@@ -386,7 +365,7 @@
 	<!-- ENDIF -->
 	<!-- IF S_HAS_SUBFORUMS -->
 		<dl>
-			<dt><label for="sub_delete_action">{L_ACTION}{L_COLON}</label></dt>
+			<dt><label for="sub_delete_action">{L_ACTION}:</label></dt>
 			<dd><label><input type="radio" class="radio" id="sub_delete_action" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</label></dd>
 			<!-- IF S_FORUMS_LIST -->
 				<dd><label><input type="radio" class="radio" name="action_subforums" value="move" /> {L_MOVE_SUBFORUMS_TO}</label> <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd>
@@ -457,26 +436,35 @@
 		</div>
 	<!-- ENDIF -->

-	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF -->]<!-- ENDIF --></strong></p>
+	<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>

 	<!-- IF .forums -->
-		<table class="table1 forums">
+		<table cellspacing="1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN forums -->
 			<tr>
-				<td class="folder">{forums.FOLDER_IMAGE}</td>
-				<td class="forum-desc">
+				<td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td>
+				<td>
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
 					<strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong>
 					<!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF -->
-					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}{L_COLON} <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}{L_COLON} <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
+					<!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <strong>{forums.FORUM_POSTS}</strong></span><!-- ENDIF -->
 				</td>
-				<td class="actions">
-					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="up"><a href="{forums.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-					<span class="down"><a href="{forums.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
+				<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
+					<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
+						<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
 					<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
 					<!-- IF not forums.S_FORUM_LINK -->
 						<a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
@@ -494,7 +482,7 @@
 	<form id="fselect" method="post" action="{U_SEL_ACTION}">

 	<fieldset class="quick">
-		{L_SELECT_FORUM}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>
+		{L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select>

 		<input class="button2" type="submit" value="{L_GO}" />
 		{S_FORM_TOKEN}
--- a/phpBB/adm/style/acp_forums_copy_perm.html
+++ b/phpBB/adm/style/acp_forums_copy_perm.html
@@ -9,7 +9,7 @@

 <fieldset>
 	<dl>
-		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+		<dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 		<dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd>
 	</dl>
 	<div style="text-align: center;">{S_FORM_TOKEN}{S_HIDDEN_FIELDS}
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT -->

@@ -17,16 +17,16 @@
 		</div>
 	<!-- ENDIF -->

-	<form id="settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">
+	<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>

 	<fieldset>
 		<legend>{L_GROUP_DETAILS}</legend>
 	<dl>
-		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}{L_COLON}</label></dt>
+		<dt><label<!-- IF not S_SPECIAL_GROUP --> for="group_name"<!-- ENDIF -->>{L_GROUP_NAME}:</label></dt>
 		<dd><!-- IF S_SPECIAL_GROUP --><strong>{GROUP_NAME}</strong><!-- ENDIF --><input name="group_name" type="<!-- IF S_SPECIAL_GROUP -->hidden<!-- ELSE -->text<!-- ENDIF -->" id="group_name" value="{GROUP_INTERNAL_NAME}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_desc">{L_GROUP_DESC}{L_COLON}</label></dt>
+		<dt><label for="group_desc">{L_GROUP_DESC}:</label></dt>
 		<dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd>
 		<dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label>
 			<label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label>
@@ -34,7 +34,7 @@
 	</dl>
 	<!-- IF not S_SPECIAL_GROUP -->
 		<dl>
-			<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
+			<dt><label for="group_type">{L_GROUP_TYPE}:</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
 			<dd>
 				<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
 				<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
@@ -48,7 +48,7 @@

 	<!-- IF S_ADD_GROUP and S_GROUP_PERM -->
 		<dl>
-			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}{L_COLON}</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
+			<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
 			<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>
 		</dl>
 	<!-- ENDIF -->
@@ -56,53 +56,42 @@

 	<fieldset>
 		<legend>{L_GROUP_OPTIONS_SAVE}</legend>
-	<!-- EVENT acp_group_options_before -->
 	<!-- IF S_USER_FOUNDER -->
 	<dl>
-		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}{L_COLON}</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
+		<dt><label for="group_founder_manage">{L_GROUP_FOUNDER_MANAGE}:</label><br /><span>{L_GROUP_FOUNDER_MANAGE_EXPLAIN}</span></dt>
 		<dd><input name="group_founder_manage" type="checkbox" value="1" class="radio" id="group_founder_manage"{GROUP_FOUNDER_MANAGE} /></dd>
 	</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}{L_COLON}</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
+		<dt><label for="group_skip_auth">{L_GROUP_SKIP_AUTH}:</label><br /><span>{L_GROUP_SKIP_AUTH_EXPLAIN}</span></dt>
 		<dd><input name="group_skip_auth" type="checkbox" value="1" class="radio" id="group_skip_auth"{GROUP_SKIP_AUTH} /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_legend">{L_GROUP_LEGEND}{L_COLON}</label></dt>
+		<dt><label for="group_legend">{L_GROUP_LEGEND}:</label></dt>
 		<dd><input name="group_legend" type="checkbox" value="1" class="radio" id="group_legend"{GROUP_LEGEND} /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_teampage">{L_GROUP_TEAMPAGE}{L_COLON}</label></dt>
-		<dd><input name="group_teampage" type="checkbox" value="1" class="radio" id="group_teampage"{GROUP_TEAMPAGE} /></dd>
-	</dl>
-	<dl>
-		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}{L_COLON}</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
+		<dt><label for="group_receive_pm">{L_GROUP_RECEIVE_PM}:</label><br /><span>{L_GROUP_RECEIVE_PM_EXPLAIN}</span></dt>
 		<dd><input name="group_receive_pm" type="checkbox" value="1" class="radio" id="group_receive_pm"{GROUP_RECEIVE_PM} /></dd>
 	</dl>
-	<!-- EVENT acp_group_options_after -->
 	</fieldset>

 	<fieldset>
 		<legend>{L_GROUP_SETTINGS_SAVE}</legend>
 	<dl>
-		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}{L_COLON}</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
-		<dd><input name="group_message_limit" type="number" id="group_message_limit" maxlength="4" size="4" min="0" max="9999" value="{GROUP_MESSAGE_LIMIT}" /></dd>
+		<dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt>
+		<dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}{L_COLON}</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
-		<dd><input name="group_max_recipients" type="number" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
+		<dt><label for="group_max_recipients">{L_GROUP_MAX_RECIPIENTS}:</label><br /><span>{L_GROUP_MAX_RECIPIENTS_EXPLAIN}</span></dt>
+		<dd><input name="group_max_recipients" type="text" id="group_max_recipients" maxlength="10" size="4" value="{GROUP_MAX_RECIPIENTS}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd>
-			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />
-			<!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>
-			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
-			<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
-		</dd>
+		<dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
+		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /><!-- IF GROUP_COLOUR -->&nbsp;<span style="background-color: #{GROUP_COLOUR}">&nbsp; &nbsp;</span><!-- ENDIF -->&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd>
 	</dl>
 	<dl>
-		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
+		<dt><label for="group_rank">{L_GROUP_RANK}:</label></dt>
 		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
@@ -110,26 +99,67 @@
 	<fieldset>
 		<legend>{L_GROUP_AVATAR}</legend>
 	<dl>
-		<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-		<dd>{AVATAR}</dd>
-		<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
+		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dd>{AVATAR_IMAGE}</dd>
+		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
 	</dl>
-	<dl>
-		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
-		<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-			<!-- BEGIN avatar_drivers -->
-			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
-			<!-- END avatar_drivers -->
-		</select></dd>
-	</dl>
-	<div id="avatar_options">
-	<!-- BEGIN avatar_drivers -->
-	<div id="avatar_option_{avatar_drivers.DRIVER}">
-		<p>{avatar_drivers.L_EXPLAIN}</p>
-		{avatar_drivers.OUTPUT}
-	</div>
-	<!-- END avatar_drivers -->
-	</div>
+	<!-- IF not S_IN_AVATAR_GALLERY -->
+		<!-- IF S_CAN_UPLOAD -->
+			<dl>
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dd><input type="file" id="uploadfile" name="uploadfile" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<dl>
+			<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+			<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
+		</dl>
+		<dl>
+			<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+			<dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
+		</dl>
+		<!-- IF S_DISPLAY_GALLERY -->
+			<dl>
+				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_AVATAR_GALLERY}</legend>
+		<dl>
+			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
+		</dl>
+		<dl>
+			<table cellspacing="1">
+			<!-- BEGIN avatar_row -->
+			<tr>
+				<!-- BEGIN avatar_column -->
+					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+				<!-- END avatar_column -->
+			</tr>
+			<tr>
+				<!-- BEGIN avatar_option_column -->
+					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+				<!-- END avatar_option_column -->
+			</tr>
+			<!-- END avatar_row -->
+			</table>
+		</dl>
+		</fieldset>
+
+		<fieldset class="quick" style="margin-top: -15px;">
+			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		</fieldset>
+
+	<!-- ENDIF -->
 	</fieldset>

 	<fieldset class="submit-buttons">
@@ -154,7 +184,7 @@
 		<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
 	</fieldset>

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
@@ -169,7 +199,7 @@
 		<td class="row3" colspan="5"><strong>{L_GROUP_LEAD}</strong></td>
 	</tr>
 	<!-- BEGIN leader -->
-		<tr>
+		<!-- IF leader.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td><!-- IF leader.USERNAME_COLOUR --><a href="{leader.U_USER_EDIT}" style="color: #{leader.USERNAME_COLOUR};" class="username-coloured">{leader.USERNAME}</a><!-- ELSE --><a href="{leader.U_USER_EDIT}">{leader.USERNAME}</a><!-- ENDIF --></td>
 			<td style="text-align: center;"><!-- IF leader.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
 			<td style="text-align: center;">{leader.JOINED}</td>
@@ -178,7 +208,7 @@
 		</tr>
 	<!-- BEGINELSE -->
 		<tr>
-			<td colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
+			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MODS}</td>
 		</tr>
 	<!-- END leader -->
 	<tr>
@@ -190,7 +220,7 @@
 			<td class="row3" colspan="5"><strong>{L_GROUP_PENDING}</strong></td>
 		</tr>
 		<!-- ELSE -->
-		<tr>
+			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td><!-- IF member.USERNAME_COLOUR --><a href="{member.U_USER_EDIT}" style="color: #{member.USERNAME_COLOUR};" class="username-coloured">{member.USERNAME}</a><!-- ELSE --><a href="{member.U_USER_EDIT}">{member.USERNAME}</a><!-- ENDIF --></td>
 			<td style="text-align: center;"><!-- IF member.S_GROUP_DEFAULT -->{L_YES}<!-- ELSE -->{L_NO}<!-- ENDIF --></td>
 			<td style="text-align: center;">{member.JOINED}</td>
@@ -200,16 +230,16 @@
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
 		<tr>
-			<td colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
+			<td class="row1" colspan="5" style="text-align: center;">{L_GROUPS_NO_MEMBERS}</td>
 		</tr>
 	<!-- END member -->
 	</tbody>
 	</table>
+	<!-- IF PAGINATION -->
 	<div class="pagination">
-	<!-- IF .pagination -->
-		<!-- INCLUDE pagination.html -->
-	<!-- ENDIF -->
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
+	<!-- ENDIF -->

 	<fieldset class="quick">
 		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
@@ -224,17 +254,17 @@
 	<fieldset>
 		<legend>{L_ADD_USERS}</legend>
 	<dl>
-		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>
+		<dt><label for="leader">{L_USER_GROUP_LEADER}:</label></dt>
 		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
 			<label><input name="leader" type="radio" class="radio" id="leader" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="default">{L_USER_GROUP_DEFAULT}{L_COLON}</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
+		<dt><label for="default">{L_USER_GROUP_DEFAULT}:</label><br /><span>{L_USER_GROUP_DEFAULT_EXPLAIN}</span></dt>
 		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
 			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
 		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 	</dl>
@@ -265,7 +295,7 @@

 	<form id="acp_groups" method="post" action="{U_ACTION}">

-	<table class="table1">
+	<table cellspacing="1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
@@ -288,7 +318,7 @@

 	<fieldset class="quick">
 		<!-- IF S_GROUP_ADD -->
-			{L_CREATE_GROUP}{L_COLON} <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			{L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
 			<input type="hidden" name="add" value="1" />
 		<!-- ENDIF -->
 		{S_FORM_TOKEN}
@@ -299,7 +329,7 @@

 	<p>{L_SPECIAL_GROUPS_EXPLAIN}</p>

-	<table class="table1">
+	<table cellspacing="1">
 		<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
@@ -316,7 +346,7 @@
 			<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
 			<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
 			<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
-			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}" data-ajax="row_delete">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+			<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
 		</tr>
 		<!-- ENDIF -->
 	<!-- END groups -->
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -1,171 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-
-	<h1>{L_MANAGE_LEGEND}</h1>
-
-	<form id="legend_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_LEGEND_SETTINGS}</legend>
-		<dl>
-			<dt><label for="legend_sort_groupname">{L_LEGEND_SORT_GROUPNAME}{L_COLON}</label><br /><span>{L_LEGEND_SORT_GROUPNAME_EXPLAIN}</span></dt>
-			<dd>
-				<label><input type="radio" name="legend_sort_groupname" class="radio" value="1"<!-- IF LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
-		<input type="hidden" name="action" value="set_config_legend" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-	<p>{L_LEGEND_EXPLAIN}</p>
-
-	<table class="table1">
-		<col class="col1" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_GROUP_TYPE}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN legend -->
-		<tr>
-			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
-			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
-			<td class="actions">
-				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
-				<span class="up"><a href="{legend.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-				<span class="down"><a href="{legend.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
-				<a href="{legend.U_DELETE}">{ICON_DELETE}</a>
-			</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
-		</tr>
-	<!-- END legend -->
-	</tbody>
-	</table>
-
-	<form id="legend_add_group" method="post" action="{U_ACTION_LEGEND}">
-		<fieldset class="quick">
-			<select name="g">
-				<option value="0">{L_SELECT_GROUP}</option>
-				<!-- BEGIN add_legend -->
-					<option<!-- IF add_legend.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_legend.GROUP_ID}">{add_legend.GROUP_NAME}</option>
-				<!-- END add_legend -->
-			</select>
-			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-			<input type="hidden" name="action" value="add" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-
-	<h1>{L_MANAGE_TEAMPAGE}</h1>
-
-	<form id="teampage_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>
-
-	<fieldset>
-		<legend>{L_TEAMPAGE_SETTINGS}</legend>
-		<dl>
-			<dt><label for="teampage_memberships">{L_TEAMPAGE_MEMBERSHIPS}{L_COLON}</label></dt>
-			<dd>
-				<label><input type="radio" name="teampage_memberships" class="radio" value="0"<!-- IF DISPLAY_MEMBERSHIPS == 0 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_FIRST}</label><br />
-				<label><input type="radio" name="teampage_memberships" class="radio" value="1"<!-- IF DISPLAY_MEMBERSHIPS == 1 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_DEFAULT}</label><br />
-				<label><input type="radio" name="teampage_memberships" class="radio" value="2"<!-- IF DISPLAY_MEMBERSHIPS == 2 --> checked="checked"<!-- ENDIF --> /> {L_TEAMPAGE_DISP_ALL}</label>
-			</dd>
-		</dl>
-		<dl>
-			<dt><label for="teampage_forums">{L_TEAMPAGE_FORUMS}{L_COLON}</label><br /><span>{L_TEAMPAGE_FORUMS_EXPLAIN}</span></dt>
-			<dd>
-				<label><input type="radio" name="teampage_forums" class="radio" value="1"<!-- IF DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-				<label><input type="radio" name="teampage_forums" class="radio" value="0"<!-- IF not DISPLAY_FORUMS --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
-			</dd>
-		</dl>
-
-	<p class="submit-buttons">
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" name="reset" value="{L_RESET}" />
-		<input type="hidden" name="action" value="set_config_teampage" />
-		{S_FORM_TOKEN}
-	</p>
-	</fieldset>
-	</form>
-
-	<p>{L_TEAMPAGE_EXPLAIN}</p>
-
-	<!-- IF S_TEAMPAGE_CATEGORY and CURRENT_CATEGORY_NAME --><p><strong><a href="{U_ACTION}">{L_TEAMPAGE}</a> &raquo; {CURRENT_CATEGORY_NAME}</strong></p><!-- ENDIF -->
-
-	<table class="table1">
-		<col class="col1" /><col class="col2" /><col class="col2" />
-	<thead>
-	<tr>
-		<th style="width: 50%">{L_GROUP}</th>
-		<th>{L_GROUP_TYPE}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN teampage -->
-		<tr>
-			<td>
-				<!-- IF teampage.U_CATEGORY -->
-					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
-				<!-- ELSE -->
-					<strong<!-- IF teampage.GROUP_COLOUR --> style="color: {teampage.GROUP_COLOUR}"<!-- ENDIF -->>{teampage.GROUP_NAME}</strong>
-				<!-- ENDIF -->
-			</td>
-			<td style="text-align: center;"><!-- IF teampage.GROUP_TYPE -->{teampage.GROUP_TYPE}<!-- ELSE -->-<!-- ENDIF -->
-			</td></td>
-			<td class="actions">
-				<span class="up-disabled" style="display: none;">{ICON_MOVE_UP_DISABLED}</span>
-				<span class="up"><a href="{teampage.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-				<span class="down"><a href="{teampage.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
-				<a href="{teampage.U_DELETE}">{ICON_DELETE}</a>
-			</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr>
-			<td colspan="3" class="row3">{L_NO_GROUPS_ADDED}</td>
-		</tr>
-	<!-- END teampage -->
-	</tbody>
-	</table>
-
-	<!-- IF not S_TEAMPAGE_CATEGORY -->
-	<form id="teampage_add_category" method="post" action="{U_ACTION_TEAMPAGE}">
-		<fieldset class="quick">
-			<input class="inputbox autowidth" type="text" maxlength="255" name="category_name" placeholder="{L_GROUP_CATEGORY_NAME}" />
-			<input class="button2" type="submit" name="submit" value="{L_ADD_GROUP_CATEGORY}" />
-			<input type="hidden" name="action" value="add_category" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-	<!-- ENDIF -->
-
-	<form id="teampage_add_group" method="post" action="{U_ACTION_TEAMPAGE}">
-		<fieldset class="quick">
-			<select name="g">
-				<option value="0">{L_SELECT_GROUP}</option>
-				<!-- BEGIN add_teampage -->
-					<option<!-- IF add_teampage.GROUP_SPECIAL --> class="sep"<!-- ENDIF --> value="{add_teampage.GROUP_ID}">{add_teampage.GROUP_NAME}</option>
-				<!-- END add_teampage -->
-			</select>
-			<input class="button2" type="submit" name="submit" value="{L_ADD}" />
-			<input type="hidden" name="action" value="add" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</form>
-
-<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_icons.html
+++ b/phpBB/adm/style/acp_icons.html
@@ -1,13 +1,13 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT -->

 	<script type="text/javascript" defer="defer">
 	// <![CDATA[
 	<!-- IF S_ADD_CODE -->
-
+	
 			var smiley = Array();
 			<!-- BEGIN smile -->
 				smiley['{smile.SMILEY_URL}'] = Array();
@@ -22,7 +22,7 @@
 			{
 				var use_element = smiley[newimage];

-				document.getElementById('add_image_src').src = '{ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
+				document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
 				document.getElementById('add_code').value = use_element['code'];
 				document.getElementById('add_emotion').value = use_element['emotion'];
 				document.getElementById('add_width').value = use_element['width'];
@@ -37,10 +37,10 @@
 					}
 				}
 			}
-
+		
 	<!-- ENDIF -->

-
+	
 	function toggle_select(icon, display, select)
 	{
 		var disp = document.getElementById('order_disp_' + select);
@@ -74,7 +74,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>

-	<table class="table1 zebra-table" id="smilies">
+	<table cellspacing="1" id="smilies">
 	<thead>
 	<tr>
 		<th colspan="{COLSPAN}">{L_CONFIG}</th>
@@ -100,16 +100,16 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN items -->
-		<tr>
-
+		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+	
 		<td style="text-align: center;"><img src="{items.IMG_SRC}" alt="" title="" /><input type="hidden" name="image[{items.IMG}]" value="1" /></td>
 		<td style="vertical-align: top;">[{items.IMG}]</td>
 		<!-- IF S_SMILIES -->
 			<td><input class="text post" type="text" name="code[{items.IMG}]" value="{items.CODE}" size="10" maxlength="50" /></td>
 			<td><input class="text post" type="text" name="emotion[{items.IMG}]" value="{items.EMOTION}" size="10" maxlength="50" /></td>
 		<!-- ENDIF -->
-		<td><input class="text post" type="number" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
-		<td><input class="text post" type="number" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
+		<td><input class="text post" type="text" size="3" name="width[{items.IMG}]" value="{items.WIDTH}" /></td>
+		<td><input class="text post" type="text" size="3" name="height[{items.IMG}]" value="{items.HEIGHT}" /></td>
 		<td>
 			<input type="checkbox" class="radio" name="display_on_posting[{items.IMG}]"{items.POSTING_CHECKED} onclick="toggle_select('{items.A_IMG}', this.checked, '{items.S_ROW_COUNT}');"/>
 			<!-- IF items.S_ID -->
@@ -121,7 +121,7 @@
 				<optgroup id="order_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING}" <!-- IF not items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_DISPLAY}</optgroup>
 				<optgroup id="order_no_disp_{items.S_ROW_COUNT}" label="{L_DISPLAY_POSTING_NO}" <!-- IF  items.POSTING_CHECKED -->disabled="disabled" class="disabled-options" <!-- ENDIF -->>{S_ORDER_LIST_UNDISPLAY}</optgroup>
 			</select></td>
-		<!-- ENDIF -->
+		<!-- ENDIF -->	
 		<!-- IF S_ADD -->
 			<td><input type="checkbox" class="radio" name="add_img[{items.IMG}]" value="1" /></td>
 		<!-- ENDIF -->
@@ -136,8 +136,8 @@
 		<td style="vertical-align: top;"><img src="{IMG_SRC}" id="add_image_src" alt="" title="" /></td>
 		<td><input class="text post" type="text" name="add_code" id="add_code" value="{CODE}" size="10" maxlength="50" /></td>
 		<td><input class="text post" type="text" name="add_emotion" id="add_emotion" value="{EMOTION}" size="10" maxlength="50" /></td>
-		<td><input class="text post" type="number" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
-		<td><input class="text post" type="number" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
+		<td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td>
+		<td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td>
 		<td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td>
 		<td><select id="order_add_order" name="add_order">
 				<optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup>
@@ -147,8 +147,6 @@
 	</tr>
 	<!-- ENDIF -->
 	<!-- ELSE -->
-	</thead>
-	<tbody>
 	<tr class="row3">
 		<td colspan="{COLSPAN}">{L_NO_ICONS}</td>
 	</tr>
@@ -176,7 +174,7 @@

 	<fieldset>
 		<legend>{L_IMPORT}</legend>
-
+	
 	<!-- IF not S_PAK_OPTIONS -->
 		<p>{L_NO_PAK_OPTIONS}</p>

@@ -220,7 +218,7 @@

 	<legend>{L_TITLE}</legend>

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_TITLE}</th>
@@ -238,18 +236,16 @@
 				<td class="row3" colspan="{COLSPAN}" style="text-align: center;">{L_NOT_DISPLAYED}</td>
 			</tr>
 		<!-- ENDIF -->
-		<tr>
+		<!-- IF items.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="width: 85%; text-align: center;"><img src="{items.IMG_SRC}" width="{items.WIDTH}" height="{items.HEIGHT}" alt="{items.ALT_TEXT}" title="{items.ALT_TEXT}" /></td>
 			<!-- IF S_SMILIES -->
 				<td style="text-align: center;">{items.CODE}</td>
 				<td style="text-align: center;">{items.EMOTION}</td>
 			<!-- ENDIF -->
-			<td class="actions" style="text-align: right;">
-				<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-				<span class="up"><a href="{items.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-				<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-				<span class="down"><a href="{items.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
-				<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
+			<td style="text-align: right; white-space: nowrap;">
+				<!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF -->&nbsp;
+				<!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF -->
+				&nbsp;<a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}">{ICON_DELETE}</a>
 			</td>
 		</tr>
 	<!-- BEGINELSE -->
@@ -259,11 +255,7 @@
 	<!-- END items -->
 	</tbody>
 	</table>
-	<div class="pagination">
-	<!-- IF .pagination -->
-		<!-- INCLUDE pagination.html -->
-	<!-- ENDIF -->
-	</div>
+	<div>{PAGINATION}</div>
 	<p class="quick">
 		<input class="button2" name="add" type="submit" value="{L_ICON_ADD}" />&nbsp; &nbsp;<input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" />
 	</p>
--- a/phpBB/adm/style/acp_inactive.html
+++ b/phpBB/adm/style/acp_inactive.html
@@ -1,20 +1,22 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

-<h1>{L_INACTIVE_USERS}</h1>
+<h2>{L_INACTIVE_USERS}</h2>

 <p>{L_INACTIVE_USERS_EXPLAIN}</p>

 <form id="inactive" method="post" action="{U_ACTION}">

-<!-- IF .pagination -->
+<div class="clearfix"></div>
+
+<!-- IF PAGINATION -->
 <div class="pagination">
-	<!-- INCLUDE pagination.html -->
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 </div>
 <!-- ENDIF -->

-<table class="table1 zebra-table">
+<table cellspacing="1">
 <thead>
 <tr>
 	<th>{L_USERNAME}</th>
@@ -27,10 +29,11 @@
 </thead>
 <tbody>
 <!-- BEGIN inactive -->
-	<tr>
+	<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
 		<td style="vertical-align: top;">
 			{inactive.USERNAME_FULL}
-			<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+			<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
 		</td>
 		<td style="vertical-align: top;">{inactive.JOINED}</td>
 		<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
@@ -50,15 +53,15 @@
 </table>

 <fieldset class="display-options">
-	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination -->&nbsp;{L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}<!-- IF PAGINATION -->&nbsp;{L_USERS_PER_PAGE}: <input class="inputbox autowidth" type="text" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF -->
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 </fieldset>

 <hr />

-<!-- IF .pagination -->
+<!-- IF PAGINATION -->
 	<div class="pagination">
-		<!-- INCLUDE pagination.html -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
 <!-- ENDIF -->

@@ -71,4 +74,4 @@

 </form>

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_ACP_JABBER_SETTINGS}</h1>

@@ -21,36 +21,36 @@
 	<p>{L_JAB_GTALK_NOTE}</p>
 <!-- ENDIF -->
 <dl>
-	<dt><label for="jab_enable">{L_JAB_ENABLE}{L_COLON}</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
+	<dt><label for="jab_enable">{L_JAB_ENABLE}:</label><br /><span>{L_JAB_ENABLE_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="jab_enable" name="jab_enable" value="1"<!-- IF JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_ENABLED}</label>
 		<label><input type="radio" class="radio" name="jab_enable" value="0"<!-- IF not JAB_ENABLE --> checked="checked"<!-- ENDIF --> /> {L_DISABLED}</label></dd>
 </dl>
 <dl>
-	<dt><label for="jab_host">{L_JAB_SERVER}{L_COLON}</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
+	<dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt>
 	<dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd>
 </dl>
 <dl>
-	<dt><label for="jab_port">{L_JAB_PORT}{L_COLON}</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
+	<dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd>
 </dl>
 <dl>
-	<dt><label for="jab_username">{L_JAB_USERNAME}{L_COLON}</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
+	<dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt>
 	<dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd>
 </dl>
 <dl>
-	<dt><label for="jab_password">{L_JAB_PASSWORD}{L_COLON}</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
+	<dt><label for="jab_password">{L_JAB_PASSWORD}:</label><br /><span>{L_JAB_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
 </dl>
 <!-- IF S_CAN_USE_SSL -->
 <dl>
-	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}{L_COLON}</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
+	<dt><label for="jab_use_ssl">{L_JAB_USE_SSL}:</label><br /><span>{L_JAB_USE_SSL_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" id="jab_use_ssl" name="jab_use_ssl" value="1"<!-- IF JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="jab_use_ssl" value="0"<!-- IF not JAB_USE_SSL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <!-- ENDIF -->
 <dl>
-	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}{L_COLON}</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
-	<dd><input type="number" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" min="0" max="99999" /></dd>
+	<dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt>
+	<dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd>
 </dl>

 </fieldset>
--- a/phpBB/adm/style/acp_language.html
+++ b/phpBB/adm/style/acp_language.html
@@ -1,8 +1,30 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

-<!-- IF S_DETAILS -->
+<!-- IF S_SELECT_METHOD -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_SELECT_DOWNLOAD_FORMAT}</h1>
+
+	<form id="selectmethod" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_DOWNLOAD_AS}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+
+	<p class="quick">
+		<input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" />
+	</p>
+	</fieldset>
+
+	</form>
+
+<!-- ELSEIF S_DETAILS -->

 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>

@@ -13,19 +35,19 @@
 	<fieldset>
 		<legend>{LANG_LOCAL_NAME}</legend>
 	<dl>
-		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}{L_COLON}</label></dt>
+		<dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt>
 		<dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}{L_COLON}</label></dt>
+		<dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt>
 		<dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label>{L_LANG_ISO_CODE}{L_COLON}</label></dt>
+		<dt><label>{L_LANG_ISO_CODE}:</label></dt>
 		<dd><strong>{LANG_ISO}</strong></dd>
 	</dl>
 	<dl>
-		<dt><label for="lang_author">{L_LANG_AUTHOR}{L_COLON}</label></dt>
+		<dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt>
 		<dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd>
 	</dl>

@@ -36,39 +58,160 @@
 	</fieldset>
 	</form>

-	<!-- IF .missing_files -->
-		<h3 class="error">{L_MISSING_FILES}</h3>
+	<br /><br />

-		<fieldset>
-			<legend>{L_MISSING_LANG_FILES}</legend>
-			<!-- BEGIN missing_files -->
-			&raquo; {missing_files.FILE_NAME}<br />
-			<!-- END missing_files -->
+	<!-- IF S_MISSING_FILES -->
+		<div class="errorbox">
+			<h3>{L_MISSING_FILES}</h3>
+			<p>{MISSING_FILES}</p>
+		</div>
+		<br /><br />
+	<!-- ENDIF -->
+
+	<!-- IF S_MISSING_VARS -->
+		<h1>{L_MISSING_LANG_VARIABLES}</h1>
+
+		<p>{L_MISSING_VARS_EXPLAIN}</p>
+
+		<form id="missing" method="post" action="{U_MISSING_ACTION}">
+
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_LANGUAGE_KEY}</th>
+			<th>{L_LANGUAGE_VARIABLE}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN missing -->
+			<tr class="row4">
+				<td><strong>{missing.FILE}</strong></td>
+				<td style="text-align: right;"><input type="submit" name="missing_file[{missing.KEY}]" value="{L_SELECT}" class="button2" /></td>
+			</tr>
+			{missing.TPL}
+		<!-- END missing -->
+		</tbody>
+		</table>
+		<div>{S_FORM_TOKEN}</div>
+		</form>
+
+		<br /><br />
+	<!-- ENDIF -->
+
+	<a name="entries"></a>
+
+	<h1>{L_LANGUAGE_ENTRIES}</h1>
+
+	<p>{L_LANGUAGE_ENTRIES_EXPLAIN}</p>
+
+	<form id="lang_entries" method="post" action="{U_ENTRY_ACTION}">
+
+	<!-- IF S_FROM_STORE -->
+		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
+			<input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> 
 		</fieldset>
 	<!-- ENDIF -->

-	<!-- IF .missing_varfile -->
-		<h3 class="error">{L_MISSING_VARS_EXPLAIN}</h3>
+	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
+		<select name="language_file">{S_LANG_OPTIONS}</select>&nbsp;<input type="submit" class="button2" name="change" value="{L_SELECT}" />
+	</fieldset>

-		<fieldset>
-			<legend>{L_MISSING_LANG_VARIABLES}</legend>
-			<!-- BEGIN missing_varfile -->
-			<dl>
-				<dt><label>{missing_varfile.FILE_NAME}</label></dt>
-				<!-- BEGIN variable -->
-				<dd>{missing_varfile.variable.VAR_NAME}</dd>
-				<!-- END variable -->
-			</dl>
-			<!-- END missing_varfile -->
-		</fieldset>
+	<p>&nbsp;<br />&nbsp;</p>
+
+
+	<!--[if lt IE 8]>
+	<style type="text/css">
+	/* <![CDATA[ */
+		input.langvalue, textarea.langvalue {
+		width: 450px;
+		}
+	/* ]]> */
+	</style>
+	<![endif]-->
+
+	<table cellspacing="1">
+	<thead>
+	<!-- IF S_EMAIL_FILE -->
+		<tr>
+			<th colspan="2">{L_FILE_CONTENTS}</th>
+		</tr>
+	<!-- ELSE -->
+		<tr>
+			<th>{L_LANGUAGE_KEY}</th>
+			<th>{L_LANGUAGE_VARIABLE}</th>
+		</tr>
 	<!-- ENDIF -->
+	<tr>
+		<td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td>
+		<td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+	</tr>
+	<tr>
+		<td class="row3" style="text-align: right;">	
+		<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}:&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF S_EMAIL_FILE -->
+		<tr>
+			<td class="row2" colspan="2" style="text-align: center;"><textarea name="entry" id="entry" cols="80" rows="20">{LANG}</textarea></td>
+		</tr>
+	<!-- ELSE -->
+		{TPL}
+	<!-- ENDIF -->
+	<tr>
+		<td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" />&nbsp;&nbsp;<input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td>
+	</tr>
+	</tbody>
+	</table>
+	</form>
+
+<!-- ELSEIF S_UPLOAD -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_UPLOAD_SETTINGS}</h1>
+
+	<form id="upload" method="post" action="{U_ACTION}">
+
+	<!-- IF S_CONNECTION_SUCCESS -->
+		<div class="successbox">
+			<p>{L_CONNECTION_SUCCESS}</p>
+		</div>
+	<!-- ELSEIF S_CONNECTION_FAILED -->
+		<div class="errorbox">
+			<p>{L_CONNECTION_FAILED}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<fieldset>
+		<legend>{L_UPLOAD_SETTINGS}</legend>
+	<dl>
+		<dt><label>{L_UPLOAD_METHOD}:</label></dt>
+		<dd><strong>{NAME}</strong></dd>
+	</dl>
+	<!-- BEGIN data -->
+	<dl>
+		<dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
+		<dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
+	</dl>
+	<!-- END data -->
+	</fieldset>
+	
+	<fieldset class="quick">
+		{HIDDEN}
+		{S_FORM_TOKEN}
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		<input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
+	</fieldset>
+	</form>
+
 <!-- ELSE -->

 	<h1>{L_ACP_LANGUAGE_PACKS}</h1>

 	<p>{L_ACP_LANGUAGE_PACKS_EXPLAIN}</p>

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_LANGUAGE_PACK_NAME}</th>
@@ -83,12 +226,12 @@
 		<td class="row3" colspan="5"><strong>{L_INSTALLED_LANGUAGE_PACKS}</strong></td>
 	</tr>
 	<!-- BEGIN lang -->
-	<tr>
+		<!-- IF lang.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td><a href="{lang.U_DETAILS}">{lang.ENGLISH_NAME}</a> {lang.TAG}</td>
 		<td>{lang.LOCAL_NAME}</td>
 		<td style="text-align: center;"><strong>{lang.ISO}</strong></td>
 		<td style="text-align: center;">{lang.USED_BY}</td>
-		<td style="text-align: center;"><a href="{lang.U_DELETE}">{L_DELETE}</a></td>
+		<td style="text-align: center;">&nbsp;<a href="{lang.U_DOWNLOAD}">{L_DOWNLOAD}</a>&nbsp;|&nbsp;<a href="{lang.U_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END lang -->
 	<!-- IF .notinst -->
@@ -97,7 +240,7 @@
 	</tr>
 	<!-- ENDIF -->
 	<!-- BEGIN notinst -->
-	<tr>
+		<!-- IF notinst.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td>{notinst.NAME}</td>
 		<td>{notinst.LOCAL_NAME}</td>
 		<td style="text-align: center;"><strong>{notinst.ISO}</strong></td>
--- a/phpBB/adm/style/acp_logs.html
+++ b/phpBB/adm/style/acp_logs.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_TITLE}</h1>

@@ -8,32 +8,35 @@

 <form id="list" method="post" action="{U_ACTION}">

-<fieldset class="display-options search-box">
-	{L_SEARCH_KEYWORDS}{L_COLON} <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+<fieldset class="display-options" style="float: left">
+	{L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
 </fieldset>

-<!-- IF .pagination -->
-<div class="pagination top-pagination">
-	<!-- INCLUDE pagination.html -->
+<!-- IF PAGINATION -->
+<div class="pagination" style="float: right; margin: 15px 0 2px 0">
+	<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 </div>
 <!-- ENDIF -->

+<div class="clearfix">&nbsp;</div>
+<div><br style="clear: both;" /></div>
+
 <!-- IF .log -->
-	<table class="table1 zebra-table fixed-width-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
-		<th style="width: 15%;">{L_USERNAME}</th>
-		<th style="width: 15%;">{L_IP}</th>
-		<th style="width: 20%;">{L_TIME}</th>
+		<th>{L_USERNAME}</th>
+		<th>{L_IP}</th>
+		<th>{L_TIME}</th>
 		<th>{L_ACTION}</th>
 		<!-- IF S_CLEARLOGS -->
-			<th style="width: 50px;">{L_MARK}</th>
+			<th>{L_MARK}</th>
 		<!-- ENDIF -->
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN log -->
-		<tr>
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td>
 				{log.USERNAME}
 				<!-- IF log.REPORTEE_USERNAME -->
@@ -51,9 +54,9 @@
 	</tbody>
 	</table>

-<!-- IF .pagination -->
+<!-- IF PAGINATION -->
 	<div class="pagination">
-		<!-- INCLUDE pagination.html -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
 <!-- ENDIF -->

@@ -64,7 +67,7 @@
 <!-- ENDIF -->

 <fieldset class="display-options">
-	{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
+	{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
 	<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -72,7 +75,7 @@

 <!-- IF S_SHOW_FORUMS -->
 	<fieldset class="quick">
-		{L_SELECT_FORUM}{L_COLON} <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
+		{L_SELECT_FORUM}: <select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{S_FORUM_BOX}</select>
 		<input class="button2" type="submit" value="{L_GO}" />
 	</fieldset>
 <!-- ENDIF -->
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_RESTORE_PERMISSIONS -->

@@ -17,7 +17,6 @@
 	<!-- IF S_VERSIONCHECK_FAIL -->
 		<div class="errorbox notice">
 			<p>{L_VERSIONCHECK_FAIL}</p>
-			<p>{VERSIONCHECK_FAIL_REASON}</p>
 			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
 	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
@@ -27,12 +26,6 @@
 		</div>
 	<!-- ENDIF -->

-	<!-- IF S_SEARCH_INDEX_MISSING -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{L_NO_SEARCH_INDEX}</p>
-		</div>
-	<!-- ENDIF -->

 	<!-- IF S_REMOVE_INSTALL -->
 		<div class="errorbox">
@@ -83,9 +76,7 @@
 		</div>
 	<!-- ENDIF -->

-	<!-- EVENT acp_main_notice_after -->
-
-	<table class="table1 two-columns no-header" data-no-responsive-header="true">
+	<table cellspacing="1">
 		<caption>{L_FORUM_STATS}</caption>
 		<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 	<thead>
@@ -98,56 +89,56 @@
 	</thead>
 	<tbody>
 	<tr>
-		<td>{L_NUMBER_POSTS}{L_COLON} </td>
+		<td>{L_NUMBER_POSTS}: </td>
 		<td><strong>{TOTAL_POSTS}</strong></td>
-		<td>{L_POSTS_PER_DAY}{L_COLON} </td>
+		<td>{L_POSTS_PER_DAY}: </td>
 		<td><strong>{POSTS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_NUMBER_TOPICS}{L_COLON} </td>
+		<td>{L_NUMBER_TOPICS}: </td>
 		<td><strong>{TOTAL_TOPICS}</strong></td>
-		<td>{L_TOPICS_PER_DAY}{L_COLON} </td>
+		<td>{L_TOPICS_PER_DAY}: </td>
 		<td><strong>{TOPICS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_NUMBER_USERS}{L_COLON} </td>
+		<td>{L_NUMBER_USERS}: </td>
 		<td><strong>{TOTAL_USERS}</strong></td>
-		<td>{L_USERS_PER_DAY}{L_COLON} </td>
+		<td>{L_USERS_PER_DAY}: </td>
 		<td><strong>{USERS_PER_DAY}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_NUMBER_FILES}{L_COLON} </td>
+		<td>{L_NUMBER_FILES}: </td>
 		<td><strong>{TOTAL_FILES}</strong></td>
-		<td>{L_FILES_PER_DAY}{L_COLON} </td>
+		<td>{L_FILES_PER_DAY}: </td>
 		<td><strong>{FILES_PER_DAY}</strong></td>
 	</tr>


 	<tr>
-		<td>{L_BOARD_STARTED}{L_COLON} </td>
+		<td>{L_BOARD_STARTED}: </td>
 		<td><strong>{START_DATE}</strong></td>
-		<td>{L_AVATAR_DIR_SIZE}{L_COLON} </td>
+		<td>{L_AVATAR_DIR_SIZE}: </td>
 		<td><strong>{AVATAR_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_DATABASE_SIZE}{L_COLON} </td>
+		<td>{L_DATABASE_SIZE}: </td>
 		<td><strong>{DBSIZE}</strong></td>
-		<td>{L_UPLOAD_DIR_SIZE}{L_COLON} </td>
+		<td>{L_UPLOAD_DIR_SIZE}: </td>
 		<td><strong>{UPLOAD_DIR_SIZE}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_DATABASE_SERVER_INFO}{L_COLON} </td>
+		<td>{L_DATABASE_SERVER_INFO}: </td>
 		<td><strong>{DATABASE_INFO}</strong></td>
-		<td>{L_GZIP_COMPRESSION}{L_COLON} </td>
+		<td>{L_GZIP_COMPRESSION}: </td>
 		<td><strong>{GZIP_COMPRESSION}</strong></td>
 	</tr>
 	<tr>
-		<td>{L_BOARD_VERSION}{L_COLON} </td>
+		<td>{L_BOARD_VERSION}: </td>
 		<td>
 			<strong><a href="{U_VERSIONCHECK}" <!-- IF S_VERSION_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF --> title="{L_MORE_INFORMATION}">{BOARD_VERSION}</a></strong> [&nbsp;<a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a>&nbsp;]
 		</td>
 	<!-- IF S_TOTAL_ORPHAN -->
-		<td>{L_NUMBER_ORPHAN}{L_COLON} </td>
+		<td>{L_NUMBER_ORPHAN}: </td>
 		<td><strong>{TOTAL_ORPHAN}</strong></td>
 	<!-- ELSE -->
 		<td>&nbsp;</td>
@@ -161,14 +152,14 @@
 		<fieldset>
 			<legend>{L_STATISTIC_RESYNC_OPTIONS}</legend>

-			<form id="action_online_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_online_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_online">{L_RESET_ONLINE}</label><br /><span>&nbsp;</span></dt>
 					<dd><input type="hidden" name="action" value="online" /><input class="button2" type="submit" id="action_online" name="action_online" value="{L_RUN}" /></dd>
 				</dl>
 			</form>

-			<form id="action_date_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_date_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_date">{L_RESET_DATE}</label><br /><span>&nbsp;</span></dt>
 					<dd><input type="hidden" name="action" value="date" /><input class="button2" type="submit" id="action_date" name="action_date" value="{L_RUN}" /></dd>
@@ -197,22 +188,19 @@
 			</form>

 			<!-- IF S_FOUNDER -->
-			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_purge_sessions_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_purge_sessions">{L_PURGE_SESSIONS}</label><br /><span>{L_PURGE_SESSIONS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
-			<!-- ENDIF -->
-
-			<form id="action_purge_cache_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_purge_cache_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
-
-			<!-- EVENT acp_main_actions_append -->
+			<!-- ENDIF -->
  		</fieldset>
 	<!-- ENDIF -->

@@ -223,7 +211,7 @@

 		<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>

-		<table class="table1 zebra-table">
+		<table cellspacing="1">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
@@ -234,7 +222,8 @@
 		</thead>
 		<tbody>
 		<!-- BEGIN log -->
-			<tr>
+			<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
 				<td>{log.USERNAME}</td>
 				<td style="text-align: center;">{log.IP}</td>
 				<td style="text-align: center;">{log.DATE}</td>
@@ -243,6 +232,9 @@
 		<!-- END log -->
 		</tbody>
 		</table>
+
+		<br />
+
 	<!-- ENDIF -->

 	<!-- IF S_INACTIVE_USERS -->
@@ -252,7 +244,7 @@

 		<div style="text-align: right;"><a href="{U_INACTIVE_USERS}">&raquo; {L_VIEW_INACTIVE_USERS}</a></div>

-		<table class="table1 zebra-table">
+		<table cellspacing="1">
 		<thead>
 		<tr>
 			<th>{L_USERNAME}</th>
@@ -264,10 +256,11 @@
 		</thead>
 		<tbody>
 		<!-- BEGIN inactive -->
-			<tr>
+			<!-- IF inactive.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
 				<td style="vertical-align: top;">
 					{inactive.USERNAME_FULL}
-					<!-- IF inactive.POSTS --><br />{L_POSTS}{L_COLON} <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
+					<!-- IF inactive.POSTS --><br />{L_POSTS}: <strong>{inactive.POSTS}</strong> [<a href="{inactive.U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a>]<!-- ENDIF -->
 				</td>
 				<td style="vertical-align: top;">{inactive.JOINED}</td>
 				<td style="vertical-align: top;">{inactive.INACTIVE_DATE}</td>
@@ -284,8 +277,9 @@
 		<!-- END inactive -->
 		</tbody>
 		</table>
+
 	<!-- ENDIF -->

 <!-- ENDIF -->

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT_MODULE -->

@@ -10,11 +10,11 @@
 		{
 			if (value == 'category')
 			{
-				phpbb.toggleDisplay('modoptions', -1);
+				dE('modoptions', -1);
 			}
 			else
 			{
-				phpbb.toggleDisplay('modoptions', 1);
+				dE('modoptions', 1);
 			}
 		}

@@ -72,37 +72,37 @@
 	<fieldset>
 		<legend>{L_GENERAL_OPTIONS}</legend>
 	<dl>
-		<dt><label for="module_langname">{L_MODULE_LANGNAME}{L_COLON}</label><br />
+		<dt><label for="module_langname">{L_MODULE_LANGNAME}:</label><br />
 		<span>{L_MODULE_LANGNAME_EXPLAIN}</span></dt>
 		<dd><input name="module_langname" type="text" class="text medium" id="module_langname" value="{MODULE_LANGNAME}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="module_type">{L_MODULE_TYPE}{L_COLON}</label></dt>
+		<dt><label for="module_type">{L_MODULE_TYPE}:</label></dt>
 		<dd><select name="module_type" id="module_type" onchange="display_options(this.value);"><option value="category"<!-- IF S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_CATEGORY}</option><option value="module"<!-- IF not S_IS_CAT --> selected="selected"<!-- ENDIF -->>{L_MODULE}</option></select></dd>
 	</dl>
 	<dl>
-		<dt><label for="parent_id">{L_PARENT}{L_COLON}</label></dt>
+		<dt><label for="parent_id">{L_PARENT}:</label></dt>
 		<dd><select name="module_parent_id" id="parent_id">{S_CAT_OPTIONS}</select></dd>
 	</dl>
 	<hr />
 	<dl>
-		<dt><label for="module_enabled">{L_MODULE_ENABLED}{L_COLON}</label></dt>
+		<dt><label for="module_enabled">{L_MODULE_ENABLED}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="module_enabled" id="module_enabled" value="1"<!-- IF MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="module_enabled" value="0"<!-- IF not MODULE_ENABLED --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<div id="modoptions"<!-- IF S_IS_CAT --> style="display: none;"<!-- ENDIF -->>
 		<dl>
-			<dt><label for="module_display">{L_MODULE_DISPLAYED}{L_COLON}</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
+			<dt><label for="module_display">{L_MODULE_DISPLAYED}:</label><br /><span>{L_MODULE_DISPLAYED_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" name="module_display" id="module_display" value="1"<!-- IF MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="module_display" value="0"<!-- IF not MODULE_DISPLAY --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_basename">{L_CHOOSE_MODULE}{L_COLON}</label><br />
+			<dt><label for="module_basename">{L_CHOOSE_MODULE}:</label><br />
 			<span>{L_CHOOSE_MODULE_EXPLAIN}</span></dt>
 			<dd><select name="module_basename" id="module_basename" onchange="display_modes(this.value);">{S_MODULE_NAMES}</select></dd>
 		</dl>
 		<dl>
-			<dt><label for="module_mode">{L_CHOOSE_MODE}{L_COLON}</label><br />
+			<dt><label for="module_mode">{L_CHOOSE_MODE}:</label><br />
 			<span>{L_CHOOSE_MODE_EXPLAIN}</span></dt>
 			<dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd>
 		</dl>
@@ -132,7 +132,7 @@
 		</div>
 	<!-- ENDIF -->

-	<table class="table1">
+	<table cellspacing="1">
 	<tbody>
 	<tr>
 		<td class="row3">{NAVIGATION}<!-- IF S_NO_MODULES --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a> | <!-- IF MODULE_ENABLED --><a href="{U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->]<!-- ENDIF --></td>
@@ -141,7 +141,7 @@
 	</table>

 	<!-- IF .modules -->
-		<table class="table1">
+		<table cellspacing="1">
 			<col class="row1" /><col class="row1" /><col class="row2" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN modules -->
@@ -149,13 +149,22 @@
 				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
-				<td class="actions">
-					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="up"><a href="{modules.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-					<span class="down"><a href="{modules.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
+				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
+					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
+						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ELSE -->
+						{ICON_MOVE_UP_DISABLED}
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
 					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
-					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
+					<a href="{modules.U_DELETE}">{ICON_DELETE}</a>
 				</td>
 			</tr>
 		<!-- END modules -->
@@ -192,7 +201,7 @@
 	
 	<form id="mselect" method="post" action="{U_SEL_ACTION}">
 	<fieldset class="quick">
-		{L_SELECT_MODULE}{L_COLON} <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 
+		{L_SELECT_MODULE}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{MODULE_BOX}</select> 

 		<input class="button2" type="submit" value="{L_GO}" />
 	</fieldset>
--- a/phpBB/adm/style/acp_permission_roles.html
+++ b/phpBB/adm/style/acp_permission_roles.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT -->

@@ -36,11 +36,11 @@
 	<fieldset>
 		<legend>{L_ROLE_DETAILS}</legend>
 	<dl>
-		<dt><label for="role_name">{L_ROLE_NAME}{L_COLON}</label></dt>
+		<dt><label for="role_name">{L_ROLE_NAME}:</label></dt>
 		<dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="role_description">{L_ROLE_DESCRIPTION}{L_COLON}</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
+		<dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt>
 		<dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd>
 	</dl>

@@ -60,7 +60,7 @@

 	<p>

-	<a id="acl"></a>
+	<a name="acl"></a>

 	<a href="#maincontent">&raquo; {L_BACK_TO_TOP}</a><br />
 	<br /><br />
@@ -90,8 +90,9 @@
 			</div>
 			<!-- BEGIN auth -->
 			<div class="permissions-panel" id="options00{auth.S_ROW_COUNT}"<!-- IF auth.S_FIRST_ROW --><!-- ELSE --> style="display: none;"<!-- ENDIF -->>
+				<span class="corners-top"><span></span></span>
 				<div class="tablewrap">
-					<table id="table00{auth.S_ROW_COUNT}" class="table1 not-responsive">
+					<table id="table00{auth.S_ROW_COUNT}" cellspacing="1">
 					<colgroup>
 						<col class="permissions-name" />
 						<col class="permissions-yes" />
@@ -119,6 +120,7 @@
 					</tbody>
 					</table>
 				</div>
+				<span class="corners-bottom"><span></span></span>
 			</div>
 			<!-- END auth -->
 		</div>
@@ -142,7 +144,7 @@

 	<form id="acp_roles" method="post" action="{U_ACTION}">

-	<table class="table1">
+	<table cellspacing="1">
 		<col class="col2" /><col class="col2" /><col class="col1" /><col class="col2" /><col class="col2" />
 	<thead>
 	<tr>
@@ -157,13 +159,22 @@
 			<!-- IF roles.ROLE_DESCRIPTION --><br /><span>{roles.ROLE_DESCRIPTION}</span><!-- ENDIF -->
 		</td>
 		<td style="width: 30%; text-align: center; vertical-align: top; white-space: nowrap;"><!-- IF roles.U_DISPLAY_ITEMS --><a href="{roles.U_DISPLAY_ITEMS}">{L_VIEW_ASSIGNED_ITEMS}</a><!-- ELSE -->{L_VIEW_ASSIGNED_ITEMS}<!-- ENDIF --></td>
-		<td class="actions">
-			<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-			<span class="up"><a href="{roles.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-			<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-			<span class="down"><a href="{roles.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
+		<td style="width: 80px; text-align: right; vertical-align: top; white-space: nowrap;">
+			<!-- IF roles.S_FIRST_ROW && not roles.S_LAST_ROW -->
+				{ICON_MOVE_UP_DISABLED}
+				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+			<!-- ELSEIF not roles.S_FIRST_ROW && not roles.S_LAST_ROW-->
+				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+				<a href="{roles.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+			<!-- ELSEIF roles.S_LAST_ROW && not roles.S_FIRST_ROW -->
+				<a href="{roles.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ELSE -->
+				{ICON_MOVE_UP_DISABLED}
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ENDIF -->	
 			<a href="{roles.U_EDIT}" title="{L_EDIT_ROLE}">{ICON_EDIT}</a> 
-			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}" data-ajax="row_delete">{ICON_DELETE}</a>
+			<a href="{roles.U_REMOVE}" title="{L_REMOVE_ROLE}">{ICON_DELETE}</a>
 		</td>
 	</tr>
 	<!-- END roles -->
@@ -171,14 +182,14 @@
 	</table>

 	<fieldset class="quick">
-		{L_CREATE_ROLE}{L_COLON} <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
+		{L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br />
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>

 	<!-- IF S_DISPLAY_ROLE_MASK -->

-		<a id="assigned_to"></a>
+		<a name="assigned_to"></a>

 		<h1>{L_ROLE_ASSIGNED_TO}</h1>

@@ -188,4 +199,4 @@

 <!-- ENDIF -->

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_INTRO -->

@@ -19,7 +19,7 @@
 	<p>{L_EXPLAIN}</p>

 	<!-- IF S_FORUM_NAMES -->
-		<p><strong>{L_FORUMS}{L_COLON}</strong> {FORUM_NAMES}</p>
+		<p><strong>{L_FORUMS}:</strong> {FORUM_NAMES}</p>
 	<!-- ENDIF -->

 	<!-- IF S_SELECT_FORUM -->
@@ -30,7 +30,7 @@
 			<legend>{L_LOOK_UP_FORUM}</legend>
 			<!-- IF S_FORUM_MULTIPLE --><p>{L_LOOK_UP_FORUMS_EXPLAIN}</p><!-- ENDIF -->
 		<dl>
-			<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+			<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
 			<dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd>
 			<!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF -->
 		</dl>
@@ -52,7 +52,7 @@
 				<legend>{L_LOOK_UP_FORUM}</legend>
 				<p>{L_SELECT_FORUM_SUBFORUM_EXPLAIN}</p>
 			<dl>
-				<dt><label for="sforum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+				<dt><label for="sforum">{L_LOOK_UP_FORUM}:</label></dt>
 				<dd><select id="sforum" name="subforum_id">{S_SUBFORUM_OPTIONS}</select></dd>
 			</dl>

@@ -74,7 +74,7 @@
 		<fieldset>
 			<legend>{L_LOOK_UP_USER}</legend>
 		<dl>
-			<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>
+			<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 			<dd><input class="text medium" type="text" id="username" name="username[]" /></dd>
 			<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 			<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
@@ -95,7 +95,7 @@
 		<fieldset>
 			<legend>{L_LOOK_UP_GROUP}</legend>
 		<dl>
-			<dt><label for="group">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+			<dt><label for="group">{L_LOOK_UP_GROUP}:</label></dt>
 			<dd><select name="group_id[]" id="group">{S_GROUP_OPTIONS}</select></dd>
 		</dl>

@@ -110,7 +110,7 @@

 		<!-- ELSEIF S_SELECT_USERGROUP -->

-		<div class="column1">
+		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">

 		<!-- IF S_CAN_SELECT_USER -->

@@ -155,7 +155,7 @@

 		</div>

-		<div class="column2">
+		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">

 		<!-- IF S_CAN_SELECT_GROUP -->

@@ -200,7 +200,7 @@

 	<!-- ELSEIF S_SELECT_USERGROUP_VIEW -->

-		<div class="column1">
+		<div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;">

 			<h1>{L_USERS}</h1>

@@ -225,7 +225,7 @@
 			<fieldset>
 				<legend>{L_LOOK_UP_USER}</legend>
 			<dl>
-				<dt><label for="username">{L_FIND_USERNAME}{L_COLON}</label></dt>
+				<dt><label for="username">{L_FIND_USERNAME}:</label></dt>
 				<dd><input type="text" id="username" name="username[]" /></dd>
 				<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 				<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
@@ -241,7 +241,7 @@

 		</div>

-		<div class="column2">
+		<div style="float: {S_CONTENT_FLOW_END}; width: 48%">

 			<h1>{L_USERGROUPS}</h1>

@@ -266,7 +266,7 @@
 			<fieldset>
 				<legend>{L_LOOK_UP_GROUP}</legend>
 			<dl>
-				<dt><label for="group_select">{L_LOOK_UP_GROUP}{L_COLON}</label></dt>
+				<dt><label for="group_select">{L_LOOK_UP_GROUP}:</label></dt>
 				<dd><select name="group_id[]" id="group_select">{S_ADD_GROUP_OPTIONS}</select></dd>
 				<dd>&nbsp;</dd>
 			</dl>
@@ -317,14 +317,14 @@
 		<fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};">
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
-			{L_SELECT_TYPE}{L_COLON} <select name="type">{S_PERMISSION_DROPDOWN}</select>
+			{L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select>

 			<input class="button2" type="submit" name="submit" value="{L_GO}" />
 		</fieldset>
 		</form>
 	<!-- ENDIF -->

-	<br class="responsive-hide" /><br class="responsive-hide" />
+	<br /><br />

 	<!-- include tooltip file -->
 	<script type="text/javascript" src="style/tooltip.js"></script>
@@ -340,7 +340,7 @@

 	<!-- INCLUDE permission_mask.html -->

-	<br class="responsive-hide" /><br class="responsive-hide" />
+	<br /><br />

 	<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
 		<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
@@ -348,10 +348,10 @@
 		{S_FORM_TOKEN}
 	</fieldset>

-	<br class="responsive-hide" /><br class="responsive-hide" />
+	<br /><br />

 	</form>

 <!-- ENDIF -->

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_php_info.html
+++ b/phpBB/adm/style/acp_php_info.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_ACP_PHP_INFO}</h1>

@@ -10,4 +10,4 @@
 	{PHPINFO}
 </div>

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_posting_buttons.html
+++ b/phpBB/adm/style/acp_posting_buttons.html
@@ -1,70 +0,0 @@
-<script type="text/javascript">
-// <![CDATA[
-
-	// Define the bbCode tags
-	var bbcode = new Array();
-	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
-
-	// Helpline messages
-	var help_line = {
-		b: '{LA_BBCODE_B_HELP}',
-		i: '{LA_BBCODE_I_HELP}',
-		u: '{LA_BBCODE_U_HELP}',
-		q: '{LA_BBCODE_Q_HELP}',
-		c: '{LA_BBCODE_C_HELP}',
-		l: '{LA_BBCODE_L_HELP}',
-		o: '{LA_BBCODE_O_HELP}',
-		p: '{LA_BBCODE_P_HELP}',
-		w: '{LA_BBCODE_W_HELP}',
-		a: '{LA_BBCODE_A_HELP}',
-		s: '{LA_BBCODE_S_HELP}',
-		f: '{LA_BBCODE_F_HELP}',
-		y: '{LA_BBCODE_Y_HELP}',
-		d: '{LA_BBCODE_D_HELP}'
-		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
-		<!-- END custom_tags -->
-	}
-
-// ]]>
-</script>
-
-<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
-
-<!-- EVENT acp_posting_buttons_before -->
-<div id="format-buttons">
-	<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}" />
-	<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
-	<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
-	<!-- IF S_BBCODE_QUOTE -->
-		<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
-	<!-- ENDIF -->
-	<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
-	<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
-	<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
-	<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}" />
-	<!-- IF S_BBCODE_IMG -->
-		<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
-	<!-- ENDIF -->
-	<!-- IF S_LINKS_ALLOWED -->
-		<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
-	<!-- ENDIF -->
-	<!-- IF S_BBCODE_FLASH -->
-		<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}" />
-	<!-- ENDIF -->
-	<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
-		<option value="50">{L_FONT_TINY}</option>
-		<option value="85">{L_FONT_SMALL}</option>
-		<option value="100" selected="selected">{L_FONT_NORMAL}</option>
-		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 150 -->
-		<option value="150">{L_FONT_LARGE}</option>
-		<!-- IF not MAX_FONT_SIZE or MAX_FONT_SIZE >= 200 -->
-		<option value="200">{L_FONT_HUGE}</option>
-		<!-- ENDIF -->
-		<!-- ENDIF -->
-	</select>
-	<!-- BEGIN custom_tags -->
-	<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}" />
-	<!-- END custom_tags -->
-</div>
-<!-- EVENT acp_posting_buttons_after -->
--- a/phpBB/adm/style/acp_profile.html
+++ b/phpBB/adm/style/acp_profile.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT -->

@@ -24,22 +24,22 @@
 		<fieldset>
 			<legend>{L_TITLE}</legend>
 		<dl>
-			<dt><label>{L_FIELD_TYPE}{L_COLON}</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
+			<dt><label>{L_FIELD_TYPE}:</label><br /><span>{L_FIELD_TYPE_EXPLAIN}</span></dt>
 			<dd><strong>{FIELD_TYPE}</strong></dd>
 		</dl>
 		<!-- IF S_EDIT_MODE -->
 		<dl>
-			<dt><label>{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dt><label>{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
 			<dd><input type="hidden" name="field_ident" value="{FIELD_IDENT}" /><strong>{FIELD_IDENT}</strong></dd>
 		</dl>
 		<!-- ELSE -->
 		<dl>
-			<dt><label for="field_ident">{L_FIELD_IDENT}{L_COLON}</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
+			<dt><label for="field_ident">{L_FIELD_IDENT}:</label><br /><span>{L_FIELD_IDENT_EXPLAIN}</span></dt>
 			<dd><input class="text medium" type="text" id="field_ident" name="field_ident" value="{FIELD_IDENT}" /></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_no_view">{L_DISPLAY_PROFILE_FIELD}:</label><br /><span>{L_DISPLAY_PROFILE_FIELD_EXPLAIN}</span></dt>
 			<dd><label><input type="radio" class="radio" id="field_no_view" name="field_no_view" value="0"<!-- IF not S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label><input type="radio" class="radio" name="field_no_view" value="1"<!-- IF S_FIELD_NO_VIEW --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 		</dl>
@@ -48,43 +48,29 @@
 		<fieldset>
 			<legend>{L_VISIBILITY_OPTION}</legend>
 		<dl>
-			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}{L_COLON}</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
+			<dt><label for="field_show_profile">{L_DISPLAY_AT_PROFILE}:</label><br /><span>{L_DISPLAY_AT_PROFILE_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_profile" name="field_show_profile" value="1"<!-- IF S_SHOW_PROFILE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}{L_COLON}</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
+			<dt><label for="field_show_on_reg">{L_DISPLAY_AT_REGISTER}:</label><br /><span>{L_DISPLAY_AT_REGISTER_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_reg" name="field_show_on_reg" value="1"<!-- IF S_SHOW_ON_REG --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_pm">{L_DISPLAY_ON_PM}{L_COLON}</label><br /><span>{L_DISPLAY_ON_PM_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_on_pm" name="field_show_on_pm" value="1"<!-- IF S_SHOW_ON_PM --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}{L_COLON}</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
+			<dt><label for="field_show_on_vt">{L_DISPLAY_ON_VT}:</label><br /><span>{L_DISPLAY_ON_VT_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_on_vt" name="field_show_on_vt" value="1"<!-- IF S_SHOW_ON_VT --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_on_ml">{L_DISPLAY_ON_MEMBERLIST}{L_COLON}</label><br /><span>{L_DISPLAY_ON_MEMBERLIST_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_show_on_ml" name="field_show_on_ml" value="1"<!-- IF S_SHOW_ON_MEMBERLIST --> checked="checked"<!-- ENDIF --> /></dd>
-		</dl>
-		<dl>
-			<dt><label for="field_required">{L_REQUIRED_FIELD}{L_COLON}</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_required">{L_REQUIRED_FIELD}:</label><br /><span>{L_REQUIRED_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_required" name="field_required" value="1"<!-- IF S_FIELD_REQUIRED --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}{L_COLON}</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_show_novalue">{L_SHOW_NOVALUE_FIELD}:</label><br /><span>{L_SHOW_NOVALUE_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_show_novalue" name="field_show_novalue" value="1"<!-- IF S_FIELD_SHOW_NOVALUE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
 		<dl>
-			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}{L_COLON}</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
+			<dt><label for="field_hide">{L_HIDE_PROFILE_FIELD}:</label><br /><span>{L_HIDE_PROFILE_FIELD_EXPLAIN}</span></dt>
 			<dd><input type="checkbox" class="radio" id="field_hide" name="field_hide" value="1"<!-- IF S_FIELD_HIDE --> checked="checked"<!-- ENDIF --> /></dd>
 		</dl>
-		<dl>
-			<dt><label for="field_is_contact">{L_FIELD_IS_CONTACT}{L_COLON}</label><br /><span>{L_FIELD_IS_CONTACT_EXPLAIN}</span></dt>
-			<dd><input type="checkbox" class="radio" id="field_is_contact" name="field_is_contact" value="1"<!-- IF S_FIELD_CONTACT --> checked="checked"<!-- ENDIF --> /></dd>
-			<dd><input class="text medium" type="text" name="field_contact_desc" id="field_contact_desc" value="{FIELD_CONTACT_DESC}" /> <label for="field_contact_desc">{L_FIELD_CONTACT_DESC}</label></dd>
-			<dd><input class="text medium" type="text" name="field_contact_url" id="field_contact_url" value="{FIELD_CONTACT_URL}" /> <label for="field_contact_url">{L_FIELD_CONTACT_URL}</label></dd>
-		</dl>
 		</fieldset>

 		<!-- IF S_EDIT_MODE -->
@@ -96,22 +82,22 @@
 		<fieldset>
 			<legend>{L_LANG_SPECIFIC}</legend>
 		<dl>
-			<dt><label for="lang_name">{L_USER_FIELD_NAME}{L_COLON}</label></dt>
+			<dt><label for="lang_name">{L_USER_FIELD_NAME}:</label></dt>
 			<dd><input class="text medium" type="text" id="lang_name" name="lang_name" value="{LANG_NAME}" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}{L_COLON}</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
+			<dt><label for="lang_explain">{L_FIELD_DESCRIPTION}:</label><br /><span>{L_FIELD_DESCRIPTION_EXPLAIN}</span></dt>
 			<dd><textarea id="lang_explain" name="lang_explain" rows="3" cols="80">{LANG_EXPLAIN}</textarea></dd>
 		</dl>
 		<!-- IF S_TEXT or S_STRING -->
 			<dl>
-				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}{L_COLON}</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
+				<dt><label for="lang_default_value">{L_DEFAULT_VALUE}:</label><br /><span>{L_DEFAULT_VALUE_EXPLAIN}</span></dt>
 				<dd><!-- IF S_STRING --><input class="text medium" type="text" id="lang_default_value" name="lang_default_value" value="{LANG_DEFAULT_VALUE}" /><!-- ELSE --><textarea id="lang_default_value" name="lang_default_value" rows="5" cols="80">{LANG_DEFAULT_VALUE}</textarea><!-- ENDIF --></dd>
 			</dl>
 		<!-- ENDIF -->
 		<!-- IF S_BOOL or S_DROPDOWN -->
 			<dl>
-				<dt><label for="lang_options">{L_ENTRIES}{L_COLON}</label>
+				<dt><label for="lang_options">{L_ENTRIES}:</label>
 					<!-- IF S_EDIT_MODE and S_DROPDOWN -->
 						<br /><span>{L_EDIT_DROPDOWN_LANG_EXPLAIN}</span>
 					<!-- ELSE -->
@@ -140,7 +126,7 @@
 			<legend>{L_TITLE}</legend>
 		<!-- BEGIN option -->
 			<dl>
-				<dt><label>{option.TITLE}{L_COLON}</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
+				<dt><label>{option.TITLE}:</label><!-- IF option.EXPLAIN --><br /><span>{option.EXPLAIN}</span><!-- ENDIF --></dt>
 				<dd>{option.FIELD}</dd>
 			</dl>
 		<!-- END option -->
@@ -163,7 +149,7 @@
 				<legend>{options.LANGUAGE}</legend>
 			<!-- BEGIN field -->
 				<dl>
-					<dt><label>{options.field.L_TITLE}{L_COLON}</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
+					<dt><label>{options.field.L_TITLE}:</label><!-- IF options.field.L_EXPLAIN --><br /><span>{options.field.L_EXPLAIN}</span><!-- ENDIF --></dt>
 					{options.field.FIELD}
 				</dl>
 			<!-- END field -->
@@ -195,7 +181,7 @@
 		</div>
 	<!-- ENDIF -->

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_FIELD_IDENT}</th>
@@ -205,22 +191,29 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN fields -->
-	<tr>
+		<!-- IF fields.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
 		<td>{fields.FIELD_IDENT}</td>
 		<td>{fields.FIELD_TYPE}</td>
-		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}" data-ajax="activate_deactivate">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>
+		<td style="text-align: center;"><a href="{fields.U_ACTIVATE_DEACTIVATE}">{fields.L_ACTIVATE_DEACTIVATE}</a><!-- IF fields.S_NEED_EDIT --> | <a href="{fields.U_TRANSLATE}" style="color: red;">{L_TRANSLATE}</a><!-- ENDIF --></td>

-		<td class="actions" style="width: 80px;">
-			<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-			<span class="up"><a href="{fields.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-			<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-			<span class="down"><a href="{fields.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
+		<td style="width: 80px; text-align: right; white-space: nowrap;">
+			<!-- IF fields.S_FIRST_ROW && not fields.S_LAST_ROW -->
+				{ICON_MOVE_UP_DISABLED}
+				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+			<!-- ELSEIF not fields.S_FIRST_ROW && not fields.S_LAST_ROW-->
+				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+				<a href="{fields.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+			<!-- ELSEIF fields.S_LAST_ROW && not fields.S_FIRST_ROW -->
+				<a href="{fields.U_MOVE_UP}">{ICON_MOVE_UP}</a>
+				{ICON_MOVE_DOWN_DISABLED}
+			<!-- ENDIF -->
 			<!-- IF not fields.S_NEED_EDIT -->
 				<a href="{fields.U_EDIT}">{ICON_EDIT}</a>
 			<!-- ELSE -->
 				{ICON_EDIT_DISABLED}
 			<!-- ENDIF -->
-			<a href="{fields.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
+			<a href="{fields.U_DELETE}">{ICON_DELETE}</a>
 		</td>

 	</tr>
--- a/phpBB/adm/style/acp_prune_forums.html
+++ b/phpBB/adm/style/acp_prune_forums.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_PRUNED -->

@@ -8,7 +8,7 @@

 	<p>{L_PRUNE_SUCCESS}</p>

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_FORUM}</th>
@@ -18,7 +18,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN pruned -->
-	<tr>
+		<!-- IF pruned.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td style="text-align: center;">{pruned.FORUM_NAME}</td>
 		<td style="text-align: center;">{pruned.NUM_TOPICS}</td>
 		<td style="text-align: center;">{pruned.NUM_POSTS}</td>
@@ -43,7 +43,7 @@
 		<legend>{L_SELECT_FORUM}</legend>
 		<p>{L_LOOK_UP_FORUMS_EXPLAIN}</p>
 	<dl>
-		<dt><label for="forum">{L_LOOK_UP_FORUM}{L_COLON}</label></dt>
+		<dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt>
 		<dd><select id="forum" name="f[]" multiple="multiple" size="10">{S_FORUM_OPTIONS}</select></dd>
 		<dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd>
 	</dl>
@@ -65,32 +65,32 @@

 	<h2>{L_FORUM}</h2>

-	<p>{L_SELECTED_FORUMS}{L_COLON} {FORUM_LIST}</p>
+	<p>{L_SELECTED_FORUMS}: {FORUM_LIST}</p>

 	<form id="acp_prune" method="post" action="{U_ACTION}">

 	<fieldset>
 		<legend>{L_FORUM_PRUNE}</legend>
 	<dl>
-		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}{L_COLON}</label></dt>
-		<dd><input type="number" id="prune_days" name="prune_days" /></dd>
+		<dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt>
+		<dd><input type="text" id="prune_days" name="prune_days" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}{L_COLON}</label></dt>
-		<dd><input type="number" id="prune_vieweddays" name="prune_vieweddays" /></dd>
+		<dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt>
+		<dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="polls">{L_PRUNE_OLD_POLLS}{L_COLON}</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
+		<dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="prune_old_polls" value="1" /> {L_YES}</label>
 			<label><input type="radio" class="radio" id="polls" name="prune_old_polls" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}{L_COLON}</label></dt>
+		<dt><label for="announce">{L_PRUNE_ANNOUNCEMENTS}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="prune_announce" value="1" /> {L_YES}</label>
 			<label><input type="radio" class="radio" id="announce" name="prune_announce" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="sticky">{L_PRUNE_STICKY}{L_COLON}</label></dt>
+		<dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES}</label>
 			<label><input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_ACP_PRUNE_USERS}</h1>

@@ -9,60 +9,39 @@
 <form id="acp_prune" method="post" action="{U_ACTION}">
 	
 <fieldset>
-	<legend>{L_CRITERIA}</legend>
+	<legend>{L_ACP_PRUNE_USERS}</legend>
 <dl>
-	<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
+	<dt><label for="username">{L_USERNAME}:</label></dt>
 	<dd><input type="text" id="username" name="username" /></dd>
 </dl>
 <dl>
-	<dt><label for="email">{L_EMAIL}{L_COLON}</label></dt>
+	<dt><label for="email">{L_EMAIL}:</label></dt>
 	<dd><input type="text" id="email" name="email" /></dd>
 </dl>
 <dl>
-	<dt><label for="joined_after">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
-	<dd>
-		<strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" />
-		<br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" />
-	</dd>
+	<dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt>
+	<dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd>
 </dl>
 <dl>
-	<dt><label for="active">{L_LAST_ACTIVE}{L_COLON}</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
+	<dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt>
 	<dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd>
 </dl>
 <dl>
-	<dt><label for="count">{L_POSTS}{L_COLON}</label></dt>
-	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="number" id="count" name="count" /></dd>
+	<dt><label for="count">{L_POSTS}:</label></dt>
+	<dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd>
 </dl>
 <dl>
-	<dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}{L_COLON}</label></dt>
-	<dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="number" id="posts_on_queue" name="posts_on_queue" /></dd>
-</dl>
-<!-- IF S_GROUP_LIST -->
-<dl>
-	<dt><label for="group_id">{L_GROUP}{L_COLON}</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</span></dt>
-	<dd><select id="group_id" name="group_id">{S_GROUP_LIST}</select></dd>
-</dl>
-<!-- ENDIF -->
-</fieldset>
-
-<fieldset>
-	<legend>{L_USERNAMES}</legend>
-<dl>
-	<dt><label for="users">{L_ACP_PRUNE_USERS}{L_COLON}</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
+	<dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt>
 	<dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd>
 	<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 </dl>
-</fieldset>
-
-<fieldset>
-	<legend>{L_OPTIONS}</legend>
 <dl>
-	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}{L_COLON}</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
+	<dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label>
 		<label><input type="radio" class="radio" id="deleteposts" name="deleteposts" value="0" checked="checked" /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}{L_COLON}</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
+	<dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
 		<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
 </dl>
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT -->

@@ -24,32 +24,27 @@
 	
 	<fieldset>
 		<legend>{L_ACP_RANKS}</legend>
-
-	<!-- EVENT acp_ranks_edit_before -->
-
 	<dl>
-		<dt><label for="title">{L_RANK_TITLE}{L_COLON}</label></dt>
+		<dt><label for="title">{L_RANK_TITLE}:</label></dt>
 		<dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="rank_image">{L_RANK_IMAGE}{L_COLON}</label></dt>
+		<dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt>
 		<dd><select name="rank_image" id="rank_image" onchange="update_image(this.options[selectedIndex].value);">{S_FILENAME_LIST}</select></dd>
 		<dd><img src="{RANK_IMAGE}" id="image" alt="" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="special_rank">{L_RANK_SPECIAL}{L_COLON}</label></dt>
-		<dd><label><input onclick="phpbb.toggleDisplay('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input onclick="phpbb.toggleDisplay('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dt><label for="special_rank">{L_RANK_SPECIAL}:</label></dt>
+		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
-	<div id="posts"<!-- IF S_SPECIAL_RANK --> style="display: none;"<!-- ENDIF -->>
+	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
-		<dt><label for="min_posts">{L_RANK_MINIMUM}{L_COLON}</label></dt>
-		<dd><input name="min_posts" type="number" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
+		<dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt>
+		<dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd>
 	</dl>
 	</div>

-	<!-- EVENT acp_ranks_edit_after -->
-
 	<p class="submit-buttons">
 		<input type="hidden" name="action" value="save" />

@@ -70,26 +65,22 @@
 	<fieldset class="tabulated">
 	<legend>{L_ACP_MANAGE_RANKS}</legend>

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
-		<!-- EVENT acp_ranks_list_header_before -->
 		<th>{L_RANK_IMAGE}</th>
 		<th>{L_RANK_TITLE}</th>
 		<th>{L_RANK_MINIMUM}</th>
-		<!-- EVENT acp_ranks_list_header_after -->
 		<th>{L_ACTION}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN ranks -->
-	<tr>
-		<!-- EVENT acp_ranks_list_column_before -->
+		<!-- IF ranks.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td style="text-align: center;"><!-- IF ranks.S_RANK_IMAGE --><img src="{ranks.RANK_IMAGE}" alt="{ranks.RANK_TITLE}" title="{ranks.RANK_TITLE}" /><!-- ELSE -->&nbsp; - &nbsp;<!-- ENDIF --></td>
 		<td style="text-align: center;">{ranks.RANK_TITLE}</td>
 		<td style="text-align: center;"><!-- IF ranks.S_SPECIAL_RANK -->&nbsp; - &nbsp;<!-- ELSE -->{ranks.MIN_POSTS}<!-- ENDIF --></td>
-		<!-- EVENT acp_ranks_list_column_after -->
-		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a></td>
+		<td style="text-align: center;"><a href="{ranks.U_EDIT}">{ICON_EDIT}</a> <a href="{ranks.U_DELETE}">{ICON_DELETE}</a></td>
 	</tr>
 	<!-- END ranks -->
 	</tbody>
--- a/phpBB/adm/style/acp_reasons.html
+++ b/phpBB/adm/style/acp_reasons.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT_REASON -->

@@ -29,7 +29,7 @@
 		<legend>{L_TITLE}</legend>
 		<p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p>
 	<dl>
-		<dt><label for="reason_title">{L_REASON_TITLE}{L_COLON}</label></dt>
+		<dt><label for="reason_title">{L_REASON_TITLE}:</label></dt>
 		<dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
@@ -39,7 +39,7 @@
 	</dl>
 	<!-- ENDIF -->
 	<dl>
-		<dt><label for="reason_description">{L_REASON_DESCRIPTION}{L_COLON}</label></dt>
+		<dt><label for="reason_description">{L_REASON_DESCRIPTION}:</label></dt>
 		<dd><textarea name="reason_description" id="reason_description" rows="8" cols="80">{REASON_DESCRIPTION}</textarea></dd>
 	</dl>
 	<!-- IF S_TRANSLATED -->
@@ -68,7 +68,7 @@
 	<legend>{L_ACP_REASONS}</legend>

 	<!-- IF .reasons -->
-		<table class="table1">
+		<table cellspacing="1">
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<thead>
 		<tr>
@@ -86,14 +86,20 @@
 					<br /><span>{reasons.REASON_DESCRIPTION}</span>
 				</td>
 				<td style="width: 100px;">{reasons.REASON_COUNT}</td>
-				<td class="actions" style="width: 80px;">
-					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
-					<span class="up"><a href="{reasons.U_MOVE_UP}" data-ajax="row_up">{ICON_MOVE_UP}</a></span>
-					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
-					<span class="down"><a href="{reasons.U_MOVE_DOWN}" data-ajax="row_down">{ICON_MOVE_DOWN}</a></span>
+				<td style="width: 80px; text-align: right; white-space: nowrap;">
+					<!-- IF reasons.S_FIRST_ROW && not reasons.S_LAST_ROW -->
+						{ICON_MOVE_UP_DISABLED}
+						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+					<!-- ELSEIF not reasons.S_FIRST_ROW && not reasons.S_LAST_ROW-->
+						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
+						<a href="{reasons.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
+					<!-- ELSEIF reasons.S_LAST_ROW && not reasons.S_FIRST_ROW -->
+						<a href="{reasons.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
+						{ICON_MOVE_DOWN_DISABLED}
+					<!-- ENDIF -->
 					<a href="{reasons.U_EDIT}">{ICON_EDIT}</a> 
 					<!-- IF reasons.U_DELETE -->
-						<a href="{reasons.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
+						<a href="{reasons.U_DELETE}">{ICON_DELETE}</a>
 					<!-- ELSE -->
 						{ICON_DELETE_DISABLED}
 					<!-- ENDIF -->
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_SETTINGS -->
 	<h1>{L_ACP_SEARCH_SETTINGS}</h1>
@@ -12,47 +12,47 @@
 	<fieldset>
 		<legend>{L_GENERAL_SEARCH_SETTINGS}</legend>
 	<dl>
-		<dt><label for="load_search">{L_YES_SEARCH}{L_COLON}</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
+		<dt><label for="load_search">{L_YES_SEARCH}:</label><br /><span>{L_YES_SEARCH_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" id="load_search" name="config[load_search]" value="1"<!-- IF S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="config[load_search]" value="0"<!-- IF not S_YES_SEARCH --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl>
-		<dt><label for="search_interval">{L_SEARCH_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
+		<dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt>
+		<dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
-		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}{L_COLON}</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
-		<dd><input id="search_anonymous_interval" type="number" size="4" maxlength="4" min="0" max="9999" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
+		<dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt>
+		<dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd>
 	</dl>
 	<dl>
-		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}{L_COLON}</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
+		<dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt>
 		<dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}{L_COLON}</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
-		<dd><input id="min_search_author_chars" type="number" size="4" maxlength="4" min="0" max="9999" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
+		<dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt>
+		<dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
-		<dd><input id="max_num_search_keywords" type="number" size="4" maxlength="4" min="0" max="9999" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
+		<dt><label for="max_num_search_keywords">{L_MAX_NUM_SEARCH_KEYWORDS}:</label><br /><span>{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
+		<dd><input id="max_num_search_keywords" type="text" size="4" maxlength="4" name="config[max_num_search_keywords]" value="{MAX_NUM_SEARCH_KEYWORDS}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}{L_COLON}</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
-		<dd><input id="search_store_results" type="number" size="4" maxlength="6" min="0" max="999999" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
+		<dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt>
+		<dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd>
 	</dl>
 	</fieldset>

 	<fieldset>
 		<legend>{L_SEARCH_TYPE}</legend>
 	<dl>
-		<dt><label for="search_type">{L_SEARCH_TYPE}{L_COLON}</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="search_type" name="config[search_type]" data-togglable-settings="true">{S_SEARCH_TYPES}</select></dd>
+		<dt><label for="search_type">{L_SEARCH_TYPE}:</label><br /><span>{L_SEARCH_TYPE_EXPLAIN}</span></dt>
+		<dd><select id="search_type" name="config[search_type]">{S_SEARCH_TYPES}</select></dd>
 	</dl>
 	</fieldset>

 	<!-- BEGIN backend -->

-		<fieldset id="search_{backend.IDENTIFIER}_settings">
+		<fieldset>
 			<legend>{backend.NAME}</legend>
 		{backend.SETTINGS}
 		</fieldset>
@@ -110,9 +110,9 @@

 				{backend.S_HIDDEN_FIELDS}

-				<legend>{L_INDEX_STATS}{L_COLON} {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
+				<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>

-				<table class="table1">
+				<table cellspacing="1">
 					<caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption>
 					<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
 				<thead>
@@ -126,9 +126,9 @@
 				<tbody>
 				<!-- BEGIN data -->
 					<tr>
-						<td>{backend.data.STATISTIC_1}{L_COLON}</td>
+						<td>{backend.data.STATISTIC_1}:</td>
 						<td>{backend.data.VALUE_1}</td>
-						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->{L_COLON}<!-- ENDIF --></td>
+						<td>{backend.data.STATISTIC_2}<!-- IF backend.data.STATISTIC_2 -->:<!-- ENDIF --></td>
 						<td>{backend.data.VALUE_2}</td>
 					</tr>
 				<!-- END data -->
@@ -139,11 +139,9 @@

 			<p class="quick">
 			<!-- IF backend.S_INDEXED -->
-				<input type="hidden" name="action" value="delete" />
-				<input class="button2" type="submit" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
+				<input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" />
 			<!-- ELSE -->
-				<input type="hidden" name="action" value="create" />
-				<input class="button2" type="submit" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
+				<input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" />
 			<!-- ENDIF -->
 			</p>
 			{S_FORM_TOKEN}
--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <h1>{L_SEND_STATISTICS}</h1>

@@ -17,8 +17,8 @@ function iframe_updated()
 		return;
 	}

-	phpbb.toggleDisplay('questionnaire-form', -1);
-	phpbb.toggleDisplay('questionnaire-thanks', 1);
+	dE('questionnaire-form', -1);
+	dE('questionnaire-thanks', 1);
 }
 //]]>
 </script>
@@ -31,10 +31,10 @@ function iframe_updated()

 	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>

-	<p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
+	<p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>

 	<div id="configlist">
-		<input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}" />
+		<input type="button" class="button2" onclick="dE('show-button', 1); dE('configlist', -1);" value="{L_HIDE_STATISTICS}" />
 		<p class="submit-buttons">
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
@@ -61,4 +61,11 @@ function iframe_updated()
 	<p><strong>{L_THANKS_SEND_STATISTICS}</strong><br /><br /><a href="{U_ACP_MAIN}">&laquo; {L_GO_ACP_MAIN}</a></p>
 </div>

-<!-- INCLUDE overall_footer.html -->
+<script type="text/javascript">
+//<![CDATA[
+	dE('configlist', -1);
+	dE('questionnaire-thanks', -1);
+//]]>
+</script>
+
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -1,164 +1,541 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

-<!-- IF S_STYLE_DETAILS -->
-	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-<!-- ENDIF -->
+<!-- IF S_DELETE -->

-<!-- IF S_CONFIRM_ACTION -->
-<form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>

-<fieldset>
-	<h1>{MESSAGE_TITLE}</h1>
-	<p>{MESSAGE_TEXT}</p>
-	<!-- IF S_CONFIRM_DELETE -->
-	<label><input type="checkbox" class="checkbox" name="confirm_delete_files" /> {L_DELETE_FROM_FS}</label>
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label>{L_NAME}:</label></dt>
+		<dd><strong>{NAME}</strong></dd>
+	</dl>
+	<dl>
+		<dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt>
+		<dd><select id="new_id" name="new_id">{S_REPLACE_OPTIONS}</select></dd>
+	</dl>
+	<!-- IF S_DELETE_STYLE -->
+		<hr />
+		<dl>
+			<dt><label for="new_template_id">{L_DELETE_TEMPLATE}:</label><br /><span>{L_REPLACE_TEMPLATE_EXPLAIN}</span></dt>
+			<dd><select id="new_template_id" name="new_template_id">{S_REPLACE_TEMPLATE_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="new_theme_id">{L_DELETE_THEME}:</label><br /><span>{L_REPLACE_THEME_EXPLAIN}</span></dt>
+			<dd><select id="new_theme_id" name="new_theme_id">{S_REPLACE_THEME_OPTIONS}</select></dd>
+		</dl>
+		<dl>
+			<dt><label for="new_imageset_id">{L_DELETE_IMAGESET}:</label><br /><span>{L_REPLACE_IMAGESET_EXPLAIN}</span></dt>
+			<dd><select id="new_imageset_id" name="new_imageset_id">{S_REPLACE_IMAGESET_OPTIONS}</select></dd>
+		</dl>
 	<!-- ENDIF -->

-	{S_HIDDEN_FIELDS}
+	<p class="quick">
+		<input class="button1" type="submit" name="update" value="{L_DELETE}" />
+		{S_FORM_TOKEN}
+	</p>
+	</fieldset>
+	</form>

-	<div style="text-align: center;">
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp; 
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
-	</div>
+<!-- ELSEIF S_EDIT_IMAGESET -->

-</fieldset>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>

-</form>
-<!-- ELSE -->
+	<h1>{L_TITLE}</h1>

-<!-- IF L_TITLE --><h1>{L_TITLE}</h1><!-- ENDIF -->
+	<p>{L_EXPLAIN}</p>

-<!-- IF L_EXPLAIN --><p>{L_EXPLAIN}</p><!-- ENDIF -->
+	<!-- IF SUCCESS -->
+		<div class="successbox">
+			<p>{L_IMAGESET_UPDATED}</p>
+		</div>
+	<!-- ENDIF -->

-<form id="acp_styles" method="post" action="{U_ACTION}">
-{S_HIDDEN_FIELDS}
-{S_FORM_TOKEN}
+	<!-- IF ERROR -->
+		<div class="errorbox">
+			<p>{L_NO_IMAGE}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<script type="text/javascript" defer="defer">
+	// <![CDATA[
+		function update_image(newimage)
+		{
+			document.getElementById('newimg').src = (newimage) ? '../styles/{A_PATH}/imageset/' + encodeURI(newimage) : 'images/no_image.png';
+		}
+	// ]]>
+	</script>
+	<script type="text/javascript">
+	// <![CDATA[
+		/**
+		* Handle displaying/hiding the dimension fields
+		*/
+		function display_options(value)
+		{
+			if (value == 0)
+			{
+				dE('img_dimensions', -1);
+			}
+			else
+			{
+				dE('img_dimensions', 1);
+			}
+		}
+
+		/**
+		* Init the wanted display functionality if javascript is enabled.
+		* If javascript is not available, the user is still able to properly administer.
+		*/
+		onload = function()
+		{
+			<!-- IF not IMAGE_SIZE -->
+				dE('img_dimensions', -1);
+			<!-- ENDIF -->
+		}
+	// ]]>
+	</script>
+
+	<form method="post" action="{U_ACTION}">
+
+	<fieldset class="quick" style="text-align: left;">
+		<legend>{L_SELECT_IMAGE}</legend>
+		{L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();">
+		<!-- BEGIN category -->
+			<option class="sep" value="" disabled="disabled">{category.NAME}</option>
+				<!-- BEGIN images --><option value="{category.images.VALUE}"<!-- IF category.images.SELECTED--> selected="selected"<!-- ENDIF -->>&nbsp;&nbsp;&nbsp;&nbsp;{category.images.TEXT}</option>
+				<!-- END images -->
+			<!-- END category -->
+		</select>&nbsp; <input class="button1" type="submit" value="{L_SELECT}" tabindex="100" />
+	</fieldset>

-<!-- IF S_STYLE_DETAILS -->
-	<input type="hidden" name="id" value="{STYLE_ID}" />
 	<fieldset>
+		<legend>{L_EDIT_IMAGESET}</legend>
 	<dl>
-		<dt><label for="name">{L_STYLE_NAME}{L_COLON}</label></dt>
-		<dd><input type="text" id="name" name="style_name" value="{STYLE_NAME}" /></dd>
+		<dt><label>{L_CURRENT_IMAGE}:</label></dt>
+		<dd><img src="<!-- IF IMAGE_REQUEST -->{IMAGE_REQUEST}<!-- ELSE -->images/no_image.png<!-- ENDIF -->" alt="" /></dd>
 	</dl>
 	<dl>
-		<dt><label>{L_STYLE_PATH}{L_COLON}</label></dt>
-		<dd><strong>{STYLE_PATH}</strong></dd>
+		<dt><label>{L_SELECTED_IMAGE}:</label></dt>
+		<dd><img src="{IMG_SRC}" id="newimg" alt="" /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+	<legend>{L_IMAGE}</legend>
+	<dl>
+		<dt><label for="imgpath">{L_IMAGE}:</label></dt>
+		<dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>
+			<!-- BEGIN imagesetlist -->
+			<option class="sep" value=""><!-- IF imagesetlist.TYPE -->{L_LOCALISED_IMAGES}<!-- ELSE -->{L_GLOBAL_IMAGES}<!-- ENDIF --></option>
+				<!-- BEGIN images -->
+				<option value="{imagesetlist.images.VALUE}"<!-- IF imagesetlist.images.SELECTED--> selected="selected"<!-- ENDIF -->>{imagesetlist.images.TEXT}</option>
+				<!-- END images -->
+			<!-- END imagesetlist -->
+			</select>
+		</dd>
 	</dl>
 	<dl>
-		<dt><label for="name">{L_COPYRIGHT}{L_COLON}</label></dt>
-		<dd><strong>{STYLE_COPYRIGHT}</strong></dd>
+		<dt><label for="imgsize">{L_INCLUDE_DIMENSIONS}:</label><br /><span>{L_DIMENSIONS_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" name="imgsize" id="imgsize" onclick="display_options(1);" value="1"<!-- IF IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="imgsize" onclick="display_options(0);" value="0"<!-- IF not IMAGE_SIZE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
-	<dl>
-		<dt><label for="style_parent">{L_INHERITING_FROM}{L_COLON}</label></dt>
-		<dd><select id="style_parent" name="style_parent">
-			<option value=""<!-- IF STYLE_PARENT == 0 --> selected="selected"<!-- ENDIF -->> - </option>
-			<!-- BEGIN parent_styles -->
-				<option value="{parent_styles.STYLE_ID}"<!-- IF parent_styles.STYLE_ID == STYLE_PARENT --> selected="selected"<!-- ENDIF -->>{parent_styles.SPACER}{parent_styles.STYLE_NAME}</option>
-			<!-- END parent_styles -->
-		</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="style_active">{L_STYLE_ACTIVE}{L_COLON}</label></dt>
-		<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
-	</dl>
-	<!-- IF not S_STYLE_DEFAULT -->
+	<div id="img_dimensions">
 		<dl>
-			<dt><label for="style_default">{L_STYLE_DEFAULT}{L_COLON}</label></dt>
-			<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
-				<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
+			<dt><label for="imgwidth">{L_IMAGE_WIDTH}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
+			<dd><input id="imgwidth" type="text" name="imgwidth" value="{IMAGE_SIZE}" /></dd>
 		</dl>
+		<dl>
+			<dt><label for="imgheight">{L_IMAGE_HEIGHT}:</label><br /><span>{L_AUTOMATIC_EXPLAIN}</span></dt>
+			<dd><input id="imgheight" type="text" name="imgheight" value="{IMAGE_HEIGHT}" /></dd>
+		</dl>
+	</div>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="button2" type="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_EDIT}</h1>
+
+	<p>{L_EDIT_EXPLAIN}</p>
+
+	<p>{L_SELECTED}: <strong>{SELECTED_TEMPLATE}</strong></p>
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
+	<fieldset>
+		<legend>{L_SELECT}</legend>
+	<dl>
+		<dt><label for="template_file">{L_FILE}:</label></dt>
+		<dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd>
+	</dl>
+	{S_FORM_TOKEN}
+	</fieldset>
+	<!-- ENDIF -->
+	</form>
+
+	<!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) -->
+		<script type="text/javascript" defer="defer">
+		// <![CDATA[
+
+			function change_editor_height(height)
+			{
+				height = Number(height);
+
+				if (isNaN(height))
+				{
+					return;
+				}
+
+				editor = document.getElementById('template_data');
+				editor.rows = Math.max(5, Math.min(height, 999));
+
+				append_text_rows('acp_styles', height);
+				append_text_rows('acp_template', height);
+			}
+
+			function append_text_rows(form_name, value)
+			{
+				value = Number(value);
+
+				if (isNaN(value))
+				{
+					return;
+				}
+
+				url = document.getElementById(form_name).action;
+
+				// Make sure &amp; is actually... &
+				url = url.replace(/&amp;/g, '&');
+
+				var_start = url.indexOf('&text_rows=');
+				if (var_start == -1)
+				{
+					document.getElementById(form_name).action = url + "&text_rows=" + value;
+				}
+				else
+				{
+					url_start = url.substring(0, var_start + 1);
+					var_end = url.substring(var_start + 1).indexOf('&');
+					if (var_end == -1)
+					{
+						document.getElementById(form_name).action = url_start + "text_rows=" + value;
+					}
+					else
+					{
+						document.getElementById(form_name).action = url_start + url.substring(var_end + var_start + 2) + "&text_rows=" + value;
+					}
+				}
+			}
+
+		// ]]>
+		</script>
+
+		<form id="acp_template" method="post" action="{U_ACTION}">
+
+		<fieldset>
+			<legend>{L_EDITOR}</legend>
+		<!-- IF S_EDIT_TEMPLATE or (S_EDIT_THEME and not S_THEME_IN_DB) -->
+		<dl>
+			<dt><label>{L_SELECTED_FILE}:</label></dt>
+			<dd>{TEMPLATE_FILE}</dd>
+		</dl>
+		<!-- ENDIF -->
+		<dl>
+			<dt><label for="text_rows">{L_EDITOR_HEIGHT}:</label></dt>
+			<dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd>
+		</dl>
+		<textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea>
+		</fieldset>
+
+		<fieldset class="submit-buttons">
+			<legend>{L_SUBMIT}</legend>
+			{S_HIDDEN_FIELDS}
+			{S_FORM_TOKEN}
+			<input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" />
+		</fieldset>
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_CACHE -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TEMPLATE_CACHE}</h1>
+
+	<p>{L_TEMPLATE_CACHE_EXPLAIN}</p>
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+	<fieldset class="tabulated">
+	<legend>{L_TEMPLATE_CACHE}</legend>
+
+	<table cellspacing="1">
+	<thead>
+	<tr>
+		<th>{L_CACHE_FILENAME}</th>
+		<th>{L_CACHE_FILESIZE}</th>
+		<th>{L_CACHE_CACHED}</th>
+		<th>{L_CACHE_MODIFIED}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN file -->
+		<!-- IF file.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td><a href="{file.U_VIEWSOURCE}" onclick="popup(this.href, 750, 550, '_source'); return false;">{file.FILENAME_PATH}</a></td>
+			<td>{file.FILESIZE}</td>
+			<td>{file.CACHED}</td>
+			<td>{file.MODIFIED}</td>
+			<td><input type="checkbox" class="radio" name="delete[]" value="{file.FILENAME}" /></td>
+		</tr>
+	<!-- BEGINELSE -->
+		<tr class="row1">
+			<td colspan="5">{L_TEMPLATE_CACHE_EMPTY}</td>
+		</tr>
+	<!-- END file -->
+	</tbody>
+	</table>
+
+	<p class="quick">
+		<span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br />
+		{S_FORM_TOKEN}
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" />
+	</p>
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_EXPORT -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF S_ERROR_MSG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label>{L_NAME}:</label></dt>
+		<dd><strong>{NAME}</strong></dd>
+	</dl>
+	<!-- IF S_STYLE -->
+		<dl>
+			<dt><label for="inc_template">{L_INCLUDE_TEMPLATE}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="inc_template" name="inc_template" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_template" value="0" /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="inc_theme">{L_INCLUDE_THEME}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="inc_theme" name="inc_theme" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_theme" value="0" /> {L_NO}</label></dd>
+		</dl>
+		<dl>
+			<dt><label for="inc_imageset">{L_INCLUDE_IMAGESET}:</label></dt>
+			<dd><label><input type="radio" class="radio" id="inc_imageset" name="inc_imageset" value="1" checked="checked" /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="inc_imageset" value="0" /> {L_NO}</label></dd>
+		</dl>
+	<!-- ENDIF -->
+	<dl>
+		<dt><label for="store">{L_DOWNLOAD_STORE}:</label><br /><span>{L_DOWNLOAD_STORE_EXPLAIN}</span></dt>
+		<dd><label><input type="radio" class="radio" id="store" name="store" value="1" checked="checked" /> {L_EXPORT_STORE}</label>
+			<label><input type="radio" class="radio" name="store" value="0" /> {L_EXPORT_DOWNLOAD}</label></dd>
+	</dl>
+	<dl>
+		<dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt>
+		<dd>{FORMAT_BUTTONS}</dd>
+	</dl>
+
+	<p class="quick">
+		{S_FORM_TOKEN}
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+	</p>
+	</fieldset>
+
+
+	</form>
+
+<!-- ELSEIF S_FRONTEND -->
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
+
+	<table cellspacing="1">
+		<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
+	<thead>
+	<tr>
+		<th>{L_NAME}</th>
+		<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
+		<th>{L_OPTIONS}</th>
+		<th>{L_ACTIONS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<tr>
+		<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
+	</tr>
+	<!-- BEGIN installed -->
+	<!-- IF installed.S_INACTIVE and not $INACTIVE_STYLES -->
+		<!-- DEFINE $INACTIVE_STYLES = 1 -->
+		<tr>
+			<td class="row3" colspan="{$COLSPAN}"><strong>{L_INACTIVE_STYLES}</strong></td>
+		</tr>
+	<!-- ENDIF -->
+	<tr>
+		<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
+		<!-- IF S_STYLE -->
+			<td style="text-align: center;">{installed.STYLE_COUNT}</td>
+		<!-- ENDIF -->
+		<td style="text-align: center;">
+			{installed.S_OPTIONS}
+		</td>
+		<td style="text-align: center;">
+			<!-- IF S_STYLE -->
+				<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
+			<!-- ENDIF -->
+			{installed.S_ACTIONS}
+			<!-- IF S_STYLE -->
+				| <a href="{installed.U_PREVIEW}">{L_PREVIEW}</a>
+			<!-- ENDIF -->
+		</td>
+	</tr>
+	<!-- END installed -->
+	<tr>
+		<td class="row3" colspan="{$COLSPAN}"><strong>{L_UNINSTALLED}</strong></td>
+	</tr>
+	<!-- IF not .uninstalled -->
+		<tr>
+			<td class="row1" colspan="{$COLSPAN}" style="text-align: center;">{L_NO_UNINSTALLED}</td>
+		</tr>
+	<!-- ENDIF -->
+	<!-- BEGIN uninstalled -->
+		<tr>
+			<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><strong>{uninstalled.NAME}</strong><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
+			<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
+		</tr>
+	<!-- END uninstalled -->
+	</tbody>
+	</table>
+
+	<!-- IF S_STYLE -->
+		<form id="acp_styles" method="post" action="{U_ACTION}">
+
+		<fieldset class="quick">
+			<legend>{L_CREATE}</legend>
+			{L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" />
+		</fieldset>
+
+		</form>
+	<!-- ENDIF -->
+
+<!-- ELSEIF S_DETAILS -->
+
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+
+	<h1>{L_TITLE}</h1>
+
+	<p>{L_EXPLAIN}</p>
+
+	<!-- IF S_ERROR_MSG -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_styles" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TITLE}</legend>
+	<dl>
+		<dt><label for="name">{L_NAME}:</label></dt>
+		<dd><!-- IF S_INSTALL --><strong id="name">{NAME}</strong><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd>
+	</dl>
+	<dl>
+		<dt><label for="copyright">{L_COPYRIGHT}:</label></dt>
+		<dd><!-- IF S_INSTALL --><strong id="copyright">{COPYRIGHT}</strong><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd>
+	</dl>
+	<!-- IF S_SUPERTEMPLATE -->
+	<dl>
+		<dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt>
+		<dd><strong id="inheriting">{S_SUPERTEMPLATE}</strong></dd>
+	</dl>
+	<!-- ENDIF -->
+	<!-- IF S_STYLE and not S_BASIS -->
+		<dl>
+			<dt><label for="template_id">{L_STYLE_TEMPLATE}:</label></dt>
+			<dd><!-- IF S_INSTALL --><strong id="template_id">{TEMPLATE_NAME}</strong><!-- ELSE --><select id="template_id" name="template_id">{S_TEMPLATE_OPTIONS}</select><!-- ENDIF --></dd>
+		</dl>
+		<dl>
+			<dt><label for="theme_id">{L_STYLE_THEME}:</label></dt>
+			<dd><!-- IF S_INSTALL --><strong id="theme_id">{THEME_NAME}</strong><!-- ELSE --><select id="theme_id" name="theme_id">{S_THEME_OPTIONS}</select><!-- ENDIF --></dd>
+		</dl>
+		<dl>
+			<dt><label for="imageset_id">{L_STYLE_IMAGESET}:</label></dt>
+			<dd><!-- IF S_INSTALL --><strong id="imageset_id">{IMAGESET_NAME}</strong><!-- ELSE --><select id="imageset_id" name="imageset_id">{S_IMAGESET_OPTIONS}</select><!-- ENDIF --></dd>
+		</dl>
+	<!-- ENDIF -->
+	<!-- IF (S_TEMPLATE or S_THEME) and (S_LOCATION or not S_INSTALL) -->
+		<dl>
+			<dt><label for="store_db">{L_LOCATION}:</label><br /><span><!-- IF S_STORE_DB_DISABLED -->{L_LOCATION_DISABLED_EXPLAIN}<!-- ELSE -->{L_LOCATION_EXPLAIN}<!-- ENDIF --></span></dt>
+			<dd><label><input type="radio" class="radio" name="store_db" value="0"<!-- IF not S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF --> />{L_STORE_FILESYSTEM}</label>
+				<label><input type="radio" class="radio" name="store_db" value="1"<!-- IF S_STORE_DB --> id="store_db" checked="checked"<!-- ENDIF --> <!-- IF S_STORE_DB_DISABLED -->disabled="disabled" <!-- ENDIF -->/> {L_STORE_DATABASE}</label></dd>
+		</dl>
+	<!-- ENDIF -->
+	<!-- IF S_STYLE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_OPTIONS}</legend>
+		<dl>
+			<dt><label for="style_active">{L_STYLE_ACTIVE}:</label></dt>
+			<dd><label><input type="radio" class="radio" name="style_active" value="1"<!-- IF S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label><input type="radio" class="radio" name="style_active" value="0"<!-- IF not S_STYLE_ACTIVE --> id="style_active" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		</dl>
+		<!-- IF not S_STYLE_DEFAULT -->
+			<dl>
+				<dt><label for="style_default">{L_STYLE_DEFAULT}:</label></dt>
+				<dd><label><input type="radio" class="radio" name="style_default" value="1" /> {L_YES}</label>
+					<label><input type="radio" class="radio" id="style_default" name="style_default" value="0" checked="checked" /> {L_NO}</label></dd>
+			</dl>
+		<!-- ENDIF -->
 	<!-- ENDIF -->
 	</fieldset>

 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-<!-- ENDIF -->

-<!-- IF .styles_list -->
-	<table class="table1 styles">
-	<thead>
-	<tr>
-		<th>{L_STYLE_NAME}</th>
-		<!-- IF not STYLES_LIST_HIDE_COUNT --><th width="10%" style="white-space: nowrap; text-align: center;">{L_STYLE_USED_BY}</th><!-- ENDIF -->
-		<th width="25%" style="white-space: nowrap; text-align: center;">{L_ACTIONS}</th>
-		{STYLES_LIST_EXTRA}
-		<th>&nbsp;</th>
-	</tr>
-	</thead>
-	<!-- BEGIN styles_list -->
-	<tbody id="styles-list-{styles_list.S_ROW_COUNT}">
-	<tr<!-- IF styles_list.STYLE_ID and not styles_list.STYLE_ACTIVE --> class="row-inactive"<!-- ENDIF -->>
-		<!-- IF styles_list.LEVEL is odd -->
-			<!-- IF $ROW_CLASS == 'row1a' --><!-- DEFINE $ROW_CLASS = 'row1b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row1a' --><!-- ENDIF -->
-		<!-- ELSE -->
-			<!-- IF $ROW_CLASS == 'row2a' --><!-- DEFINE $ROW_CLASS = 'row2b' --><!-- ELSE --><!-- DEFINE $ROW_CLASS = 'row2a' --><!-- ENDIF -->
-		<!-- ENDIF -->
-		<td class="{$ROW_CLASS}" style="padding-{S_CONTENT_FLOW_BEGIN}: {styles_list.PADDING}px;">
-			<!-- IF styles_list.STYLE_ID and styles_list.COMMENT == '' and styles_list.STYLE_ACTIVE -->
-				<div class="default-style" style="display: none; float: {S_CONTENT_FLOW_END};">
-					<input class="radio" type="radio" name="default" value="{styles_list.STYLE_ID}"<!-- IF styles_list.DEFAULT --> checked="checked"<!-- ELSE --><!-- DEFINE $S_DEFAULT = 1 --><!-- ENDIF --> title="{L_STYLE_DEFAULT}" />
-				</div>
-			<!-- ENDIF -->
-			<!-- IF styles_list.DEFAULT or styles_list.SHOW_COPYRIGHT -->
-				<strong>{styles_list.STYLE_NAME}</strong>
-				<!-- IF styles_list.SHOW_COPYRIGHT and styles_list.COMMENT == '' --><span><br />{styles_list.STYLE_COPYRIGHT}</span><!-- ENDIF -->
-			<!-- ELSE -->
-				<span>{styles_list.STYLE_NAME}</span>
-			<!-- ENDIF -->
-			<!-- IF styles_list.COMMENT != '' -->
-				<span class="error"><br />{styles_list.COMMENT}</span>
-			<!-- ENDIF -->
-			<!-- IF not styles_list.STYLE_ID and styles_list.COMMENT == '' -->
-				<span class="style-path"><br />{L_STYLE_PATH}{L_COLON} {styles_list.STYLE_PATH_FULL}</span>
-			<!-- ENDIF -->
-		</td>
-		<!-- IF not STYLES_LIST_HIDE_COUNT -->
-			<td class="{$ROW_CLASS} users">{styles_list.USERS}</td>
-		<!-- ENDIF -->
-		<td class="{$ROW_CLASS} actions">
-			<!-- BEGIN actions -->
-				<!-- IF styles_list.actions.S_ROW_COUNT > 0 --> | <!-- ENDIF -->
-				<!-- IF styles_list.actions.U_ACTION -->
-					<a href="{styles_list.actions.U_ACTION}"{styles_list.actions.U_ACTION_ATTR}>{styles_list.actions.L_ACTION}</a>
-				<!-- ENDIF -->
-				{styles_list.actions.HTML}
-			<!-- END actions -->
-		</td>
-		{styles_list.EXTRA}
-		<td class="{$ROW_CLASS} mark" width="20">
-			<!-- IF styles_list.STYLE_ID -->
-				<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
-			<!-- ELSE -->
-				<!-- IF styles_list.COMMENT != '' -->
-					&nbsp;
-				<!-- ELSE -->
-					<input class="checkbox" type="checkbox" name="dirs[]" value="{styles_list.STYLE_PATH}" />
-				<!-- ENDIF -->
-			<!-- ENDIF -->
-		</td>
-	</tr>
-	</tbody>
-	<!-- END styles_list -->
-	</table>
-<!-- ENDIF -->
-
-<!-- IF .extra_actions -->
-	<fieldset class="quick">
-		<!-- BEGIN extra_actions -->
-			<input type="submit" name="{extra_actions.ACTION_NAME}" class="button2" value="{extra_actions.L_ACTION}" />
-		<!-- END extra_actions -->
-	</fieldset>
-<!-- ENDIF -->
-
-</form>
+	</form>

 <!-- ENDIF -->

--- a/phpBB/adm/style/acp_update.html
+++ b/phpBB/adm/style/acp_update.html
@@ -1,46 +1,52 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>
+	
+<!-- IF S_VERSION_CHECK -->

-<h1>{L_VERSION_CHECK}</h1>
+	<h1>{L_VERSION_CHECK}</h1>

-<p>{L_VERSION_CHECK_EXPLAIN}</p>
+	<p>{L_VERSION_CHECK_EXPLAIN}</p>

-<!-- IF S_UP_TO_DATE -->
-	<div class="successbox">
-		<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-	</div>
-<!-- ELSE -->
-	<div class="errorbox">
-		<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
-	</div>
-<!-- ENDIF -->
+	<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
+		<div class="successbox">
+			<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+		</div>
+	<!-- ELSE -->
+		<div class="errorbox">
+			<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
+		</div>
+	<!-- ENDIF -->

-<fieldset>
-	<legend></legend>
-	<dl>
-		<dt><label>{L_CURRENT_VERSION}</label></dt>
-		<dd><strong>{CURRENT_VERSION}</strong></dd>
-	</dl>
-</fieldset>
+	<!-- IF NEXT_FEATURE_VERSION -->
+		<div class="errorbox">
+			<p>{UPGRADE_INSTRUCTIONS}</p>
+		</div>
+	<!-- ENDIF -->

-<!-- BEGIN updates_available -->
 	<fieldset>
 		<legend></legend>
-		<dl>
-			<dt><label>{L_LATEST_VERSION}</label></dt>
-			<dd><strong>{updates_available.current}</strong></dd>
-		</dl>
-		<dl>
-			<dt><label>{L_RELEASE_ANNOUNCEMENT}</label></dt>
-			<dd><strong><a href="{updates_available.announcement}">{updates_available.announcement}</a></strong></dd>
-		</dl>
+	<dl>
+		<dt><label>{L_CURRENT_VERSION}</label></dt>
+		<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
+	</dl>
+	<dl>
+		<dt><label>{L_LATEST_VERSION}</label></dt>
+		<dd><strong>{LATEST_VERSION}</strong></dd>
+	</dl>
 	</fieldset>
-<!-- END updates_available -->

-<!-- IF not S_UP_TO_DATE -->
-	{UPDATE_INSTRUCTIONS}
-	<br /><br />
+	<!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->
+		{L_UPDATE_INSTRUCTIONS_INCOMPLETE}
+		<br /><br />
+		{UPDATE_INSTRUCTIONS}
+		<br /><br />
+	<!-- ENDIF -->
+	<!-- IF not S_UP_TO_DATE -->
+		{UPDATE_INSTRUCTIONS}
+		<br /><br />
+	<!-- ENDIF -->
+
 <!-- ENDIF -->

-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_SELECT_USER -->

@@ -13,7 +13,7 @@
 	<fieldset>
 		<legend>{L_SELECT_USER}</legend>
 	<dl>
-		<dt><label for="username">{L_ENTER_USERNAME}{L_COLON}</label></dt>
+		<dt><label for="username">{L_ENTER_USERNAME}:</label></dt>
 		<dd><input class="text medium" type="text" id="username" name="username" /></dd>
 		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
 		<dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd>
@@ -68,7 +68,7 @@
 	<form id="mode_select" method="post" action="{U_MODE_SELECT}">

 	<fieldset class="quick">
-		{L_SELECT_FORM}{L_COLON} <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
+		{L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -106,7 +106,7 @@
 	<fieldset>
 		<legend>{L_ACP_USER_RANK}</legend>
 	<dl>
-		<dt><label for="user_rank">{L_USER_RANK}{L_COLON}</label></dt>
+		<dt><label for="user_rank">{L_USER_RANK}:</label></dt>
 		<dd><select name="user_rank" id="user_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>
@@ -125,7 +125,7 @@

 	<form id="user_groups" method="post" action="{U_ACTION}">

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<tbody>
 	<!-- BEGIN group -->
 		<!-- IF group.S_NEW_GROUP_TYPE -->
@@ -133,7 +133,7 @@
 			<td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td>
 		</tr>
 		<!-- ELSE -->
-			<tr>
+			<!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 				<td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td>
 				<td><!-- IF group.S_IS_MEMBER --><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --><!-- ELSEIF not group.S_IS_MEMBER and group.U_APPROVE --><a href="{group.U_APPROVE}">{L_GROUP_APPROVE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
 				<td><!-- IF group.S_IS_MEMBER and not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE -->&nbsp;<!-- ENDIF --></td>
@@ -146,7 +146,7 @@

 	<!-- IF S_GROUP_OPTIONS -->
 		<fieldset class="quick">
-			{L_USER_GROUP_ADD}{L_COLON} <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+			{L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 			{S_FORM_TOKEN}
 		</fieldset>
 	<!-- ENDIF -->
@@ -157,27 +157,27 @@
 	<form id="user_attachments" method="post" action="{U_ACTION}">


+	<!-- IF PAGINATION -->
 	<div class="pagination">
-	<!-- IF .pagination -->
-		<!-- INCLUDE pagination.html -->
-	<!-- ENDIF -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
+	<!-- ENDIF -->

 	<!-- IF .attach -->
-	<table class="table1 zebra-table fixed-width-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th style="width: 20%;">{L_POST_TIME}</th>
-		<th style="width: 20%;">{L_FILESIZE}</th>
-		<th style="width: 20%;">{L_DOWNLOADS}</th>
-		<th style="width: 50px;">{L_MARK}</th>
+		<th>{L_POST_TIME}</th>
+		<th>{L_FILESIZE}</th>
+		<th>{L_DOWNLOADS}</th>
+		<th>{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN attach -->
-	<tr>
-		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}{L_COLON} </strong><!-- ELSE --><strong>{L_POST}{L_COLON} </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
+		<!-- IF attach.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+		<td><a href="{attach.U_DOWNLOAD}">{attach.REAL_FILENAME}</a><br /><span class="small"><!-- IF attach.S_IN_MESSAGE --><strong>{L_PM}: </strong><!-- ELSE --><strong>{L_POST}: </strong><!-- ENDIF --><a href="{attach.U_VIEW_TOPIC}">{attach.TOPIC_TITLE}</a></span></td>
 		<td style="text-align: center">{attach.POST_TIME}</td>
 		<td style="text-align: center">{attach.SIZE}</td>
 		<td style="text-align: center">{attach.DOWNLOAD_COUNT}</td>
@@ -192,15 +192,15 @@
 	</div>
 	<!-- ENDIF -->
 	<fieldset class="display-options">
-		{L_SORT_BY}{L_COLON} <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
+		{L_SORT_BY}: <select name="sk">{S_SORT_KEY}</select> <select name="sd">{S_SORT_DIR}</select>
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
 	<hr />
+	<!-- IF PAGINATION -->
 	<div class="pagination">
-	<!-- IF .pagination -->
-		<!-- INCLUDE pagination.html -->
-	<!-- ENDIF -->
+		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
+	<!-- ENDIF -->

 	<fieldset class="quick">
 		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
@@ -219,7 +219,7 @@
 	<form id="select_forum" method="post" action="{U_ACTION}">

 		<fieldset class="quick" style="text-align: left;">
-			{L_SELECT_FORUM}{L_COLON} <select name="f">{S_FORUM_OPTIONS}</select>
+			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select>
 			<input class="button2" type="submit" value="{L_GO}" name="select" />
 			{S_FORM_TOKEN}
 		</fieldset>
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -1,36 +1,78 @@
-	<form id="avatar_settings" method="post" action="{U_ACTION}" enctype="multipart/form-data">
+	<form id="avatar_settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->>

 	<fieldset>
 		<legend>{L_ACP_USER_AVATAR}</legend>
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+	<dl>
+		<dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
+		<dd>{AVATAR_IMAGE}</dd>
+		<dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd>
+	</dl>
+	<!-- IF not S_IN_AVATAR_GALLERY -->
+		<!-- IF S_UPLOAD_FILE -->
+			<dl> 
+				<dt><label for="uploadfile">{L_UPLOAD_AVATAR_FILE}:</label></dt>
+				<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_MAX_FILESIZE}" /><input type="file" id="uploadfile" name="uploadfile" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_REMOTE_UPLOAD -->
+			<dl>
+				<dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
+				<dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_ALLOW_REMOTE -->
+			<dl>
+				<dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
+				<dd><input name="remotelink" type="text" id="remotelink" value="" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
+				<dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>{L_PIXEL} &times; </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>{L_PIXEL}</span></dd>
+			</dl>
+		<!-- ENDIF -->
+		<!-- IF S_DISPLAY_GALLERY -->
+			<dl> 
+				<dt><label>{L_AVATAR_GALLERY}:</label></dt>
+				<dd><input class="button2" type="submit" name="display_gallery" value="{L_DISPLAY_GALLERY}" /></dd>
+			</dl>
+		<!-- ENDIF -->
+	<!-- ELSE -->
+		</fieldset>
+
+		<fieldset>
+			<legend>{L_AVATAR_GALLERY}</legend>
 		<dl>
-			<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
-			<dd>{AVATAR}</dd>
-			<dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
+			<dt><label for="category">{L_AVATAR_CATEGORY}:</label></dt>
+			<dd><select name="category" id="category">{S_CAT_OPTIONS}</select>&nbsp;<input class="button2" type="submit" value="{L_GO}" name="display_gallery" /></dd>
 		</dl>
-	</fieldset>
-	<fieldset>
-		<legend>{L_AVATAR_SELECT}</legend>
 		<dl>
-			<dt><label>{L_AVATAR_TYPE}</label></dt>
-			<dd><select name="avatar_driver" id="avatar_driver" data-togglable-settings="true">
-				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
-				<!-- END avatar_drivers -->
-			</select></dd>
+			<table cellspacing="1">
+			<!-- BEGIN avatar_row -->
+			<tr> 
+				<!-- BEGIN avatar_column -->
+					<td class="row1" style="text-align: center;"><img src="{avatar_row.avatar_column.AVATAR_IMAGE}" alt="{avatar_row.avatar_column.AVATAR_NAME}" title="{avatar_row.avatar_column.AVATAR_NAME}" /></td>
+				<!-- END avatar_column -->
+			</tr>
+			<tr>
+				<!-- BEGIN avatar_option_column -->
+					<td class="row2" style="text-align: center;"><input type="radio" class="radio" name="avatar_select" value="{avatar_row.avatar_option_column.S_OPTIONS_AVATAR}" /></td>
+				<!-- END avatar_option_column -->
+			</tr>
+			<!-- END avatar_row -->
+			</table>
 		</dl>
-		<div id="avatar_options">
-		<!-- BEGIN avatar_drivers -->
-			<div id="avatar_option_{avatar_drivers.DRIVER}">
-				<p>{avatar_drivers.L_EXPLAIN}</p>
-				{avatar_drivers.OUTPUT}
-			</div>
-		<!-- END avatar_drivers -->
-		</div>
+		</fieldset>
+		
+		<fieldset class="quick" style="margin-top: -15px;">
+			<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
+		</fieldset>
+	
+	<!-- ENDIF -->
 	</fieldset>

 	<fieldset class="quick">
-		<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
-	{S_FORM_TOKEN}
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+		{S_FORM_TOKEN}
 	</fieldset>
-	</form>
+	
+	</form>
--- a/phpBB/adm/style/acp_users_feedback.html
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -1,13 +1,13 @@
 	<form id="list" method="post" action="{U_ACTION}">

+	<!-- IF PAGINATION -->
 	<div class="pagination">
-	<!-- IF .pagination -->
-		<!-- INCLUDE pagination.html -->
-	<!-- ENDIF -->
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
+	<!-- ENDIF -->

 	<!-- IF .log -->
-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
@@ -19,7 +19,8 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN log -->
-		<tr>
+		<!-- IF log.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
 			<td>{log.USERNAME}</td>
 			<td style="text-align: center;">{log.IP}</td>
 			<td style="text-align: center;">{log.DATE}</td>
@@ -39,15 +40,15 @@
 	<!-- ENDIF -->
 	
 	<fieldset class="display-options">
-		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
+		{L_DISPLAY_LOG}: &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
 		<input class="button2" type="submit" value="{L_GO}" name="sort" />
 	</fieldset>
 	<hr />
+	<!-- IF PAGINATION -->
 	<div class="pagination">
-	<!-- IF .pagination -->
-		<!-- INCLUDE pagination.html -->
-	<!-- ENDIF -->
+			<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
+	<!-- ENDIF -->

 	<!-- IF S_CLEARLOGS -->
 		<fieldset class="quick">
@@ -72,4 +73,4 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 	</fieldset>
 	{S_FORM_TOKEN}
-	</form>
+	</form>
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -3,70 +3,60 @@
 <fieldset>
 	<legend>{L_ACP_USER_OVERVIEW}</legend>
 <dl>
-	<dt><label for="user">{L_USERNAME}{L_COLON}</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
+	<dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt>
 	<dd><input type="text" id="user" name="user" value="{USER}" /></dd>
 	<!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF -->
 </dl>
 <!-- IF S_USER_INACTIVE -->
 <dl>
-	<dt><label>{L_USER_IS_INACTIVE}{L_COLON}</label></dt>
+	<dt><label>{L_USER_IS_INACTIVE}:</label></dt>
 	<dd><strong>{USER_INACTIVE_REASON}</strong></dd>
 </dl>
 <!-- ENDIF -->
 <dl>
-	<dt><label>{L_REGISTERED}{L_COLON}</label></dt>
+	<dt><label>{L_REGISTERED}:</label></dt>
 	<dd><strong>{USER_REGISTERED}</strong></dd>
 </dl>
 <!-- IF S_USER_IP -->
 <dl>
-	<dt><label>{L_REGISTERED_IP}{L_COLON}</label></dt>
+	<dt><label>{L_REGISTERED_IP}:</label></dt>
 	<dd><a href="{U_SHOW_IP}">{REGISTERED_IP}</a></dd>
 	<dd>[ <a href="{U_WHOIS}" onclick="popup(this.href, 700, 500, '_whois'); return false;">{L_WHOIS}</a> ]</dd>
 </dl>
 <!-- ENDIF -->
 <dl>
-	<dt><label>{L_LAST_ACTIVE}{L_COLON}</label></dt>
+	<dt><label>{L_LAST_ACTIVE}:</label></dt>
 	<dd><strong>{USER_LASTACTIVE}</strong></dd>
 </dl>
 <dl>
-	<dt><label>{L_POSTS}{L_COLON}</label></dt>
-	<dd>
-		<strong>
-			<!-- IF USER_HAS_POSTS and U_SEARCH_USER -->
-				<a href="{U_SEARCH_USER}">{USER_POSTS}</a>
-			<!-- ELSE -->
-				{USER_POSTS}
-			<!-- ENDIF -->
-		</strong>
-		<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE -->
-			(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)
-		<!-- ELSEIF POSTS_IN_QUEUE -->
-			({L_POSTS_IN_QUEUE})
-		<!-- ENDIF -->
-	</dd>
+	<dt><label>{L_POSTS}:</label></dt>
+	<dd><strong><!-- IF USER_HAS_POSTS and U_SEARCH_USER --><a href="{U_SEARCH_USER}">{USER_POSTS}</a><!-- ELSE -->{USER_POSTS}<!-- ENDIF --></strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
 </dl>
 <dl>
-	<dt><label>{L_WARNINGS}{L_COLON}</label></dt>
+	<dt><label>{L_WARNINGS}:</label></dt>
 	<dd><strong>{USER_WARNINGS}</strong></dd>
 </dl>
 <dl>
-	<dt><label for="user_founder">{L_FOUNDER}{L_COLON}</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
+	<dt><label for="user_founder">{L_FOUNDER}:</label><br /><span>{L_FOUNDER_EXPLAIN}</span></dt>
 	<dd><label><input type="radio" class="radio" name="user_founder" value="1"<!-- IF S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input type="radio" class="radio" name="user_founder" value="0"<!-- IF not S_USER_FOUNDER --> id="user_founder" checked="checked"<!-- ENDIF --><!-- IF not S_FOUNDER --> disabled="disabled"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="user_email">{L_EMAIL}{L_COLON}</label></dt>
-	<dd><input class="text medium" type="email" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
+	<dt><label for="user_email">{L_EMAIL}:</label></dt>
+	<dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd>
 </dl>
 <dl>
-	<dt><label for="new_password">{L_NEW_PASSWORD}{L_COLON}</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
+	<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt>
+	<dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" autocomplete="off" /></dd>
+</dl>
+<dl>
+	<dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd>
 </dl>
 <dl>
-	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
+	<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt>
 	<dd><input type="password" id="password_confirm" name="password_confirm" value="" autocomplete="off" /></dd>
 </dl>
-<!-- EVENT acp_users_overview_options_append -->

 <p class="quick">
 	<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
@@ -86,11 +76,11 @@
 		{
 			if (option != 'banuser' && option != 'banemail' && option != 'banip')
 			{
-				phpbb.toggleDisplay('reasons', -1);
+				dE('reasons', -1);
 				return;
 			}

-			phpbb.toggleDisplay('reasons', 1);
+			dE('reasons', 1);

 			element = document.getElementById('user_quick_tools').ban_reason;

@@ -121,16 +111,16 @@
 	<fieldset>
 		<legend>{L_USER_TOOLS}</legend>
 	<dl>
-		<dt><label for="quicktools">{L_QUICK_TOOLS}{L_COLON}</label></dt>
+		<dt><label for="quicktools">{L_QUICK_TOOLS}:</label></dt>
 		<dd><select id="quicktools" name="action" onchange="display_reason(this.options[this.selectedIndex].value);">{S_ACTION_OPTIONS}</select></dd>
 	</dl>
 	<div style="display: none;" id="reasons">
 		<dl>
-			<dt><label for="ban_reason">{L_BAN_REASON}{L_COLON}</label></dt>
+			<dt><label for="ban_reason">{L_BAN_REASON}:</label></dt>
 			<dd><input name="ban_reason" type="text" class="text medium" maxlength="3000" id="ban_reason" /></dd>
 		</dl>
 		<dl>
-			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
+			<dt><label for="ban_give_reason">{L_BAN_GIVE_REASON}:</label></dt>
 			<dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd>
 		</dl>
 	</div>
@@ -149,7 +139,7 @@
 			<fieldset>
 				<legend>{L_DELETE_USER}</legend>
 				<dl>
-					<dt><label for="delete_type">{L_DELETE_USER}{L_COLON}</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
+					<dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt>
 					<dd>
 					<!-- IF USER_HAS_POSTS -->
 						<select id="delete_type" name="delete_type"><option class="sep" value="">{L_SELECT_OPTION}</option><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select>
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -5,147 +5,154 @@
 </script>

 	<form id="user_prefs" method="post" action="{U_ACTION}">
-	<!-- EVENT acp_users_prefs_prepend -->
+
 	<fieldset>
 		<legend>{L_UCP_PREFS_PERSONAL}</legend>
-	<!-- EVENT acp_users_prefs_personal_prepend -->
 	<dl> 
-		<dt><label for="viewemail">{L_SHOW_EMAIL}{L_COLON}</label></dt>
+		<dt><label for="viewemail">{L_SHOW_EMAIL}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="viewemail" value="1"<!-- IF VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="viewemail" value="0"<!-- IF not VIEW_EMAIL --> id="viewemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="massemail">{L_ADMIN_EMAIL}{L_COLON}</label></dt>
+		<dt><label for="massemail">{L_ADMIN_EMAIL}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="massemail" value="1"<!-- IF MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="massemail" value="0"<!-- IF not MASS_EMAIL --> id="massemail" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="allowpm">{L_ALLOW_PM}{L_COLON}</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
+		<dt><label for="allowpm">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="allowpm" value="1"<!-- IF ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="allowpm" value="0"<!-- IF not ALLOW_PM --> id="allowpm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="hideonline">{L_HIDE_ONLINE}{L_COLON}</label></dt>
+		<dt><label for="hideonline">{L_HIDE_ONLINE}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="hideonline" value="1"<!-- IF HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="hideonline" value="0"<!-- IF not HIDE_ONLINE --> id="hideonline" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="notifymethod">{L_NOTIFY_METHOD}{L_COLON}</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
+		<dt><label for="notifymethod">{L_NOTIFY_METHOD}:</label><br /><span>{L_NOTIFY_METHOD_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF NOTIFY_EMAIL --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
 			<label><input type="radio" class="radio" name="notifymethod" value="1"<!-- IF NOTIFY_IM --> id="notifymethod" checked="checked"<!-- ENDIF --><!-- IF S_JABBER_DISABLED --> disabled="disabled"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
 			<label><input type="radio" class="radio" name="notifymethod" value="2"<!-- IF NOTIFY_BOTH --> id="notifymethod" checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="notifypm">{L_NOTIFY_ON_PM}{L_COLON}</label></dt>
+		<dt><label for="notifypm">{L_NOTIFY_ON_PM}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="notifypm" value="1"<!-- IF NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
+		<dt><label for="popuppm">{L_POPUP_ON_PM}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
 		<dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd>
 	</dl>
 	<dl> 
-		<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt>
+		<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
 		<dd><select id="style" name="style">{S_STYLE_OPTIONS}</select></dd>
 	</dl>
-	<!-- INCLUDE timezone_option.html -->
 	<dl> 
-		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
+		<dt><label for="tz">{L_BOARD_TIMEZONE}:</label></dt>
+		<dd><select id="tz" name="tz" style="width: 100%;">{S_TZ_OPTIONS}</select></dd>
+	</dl>
+	<dl> 
+		<dt><label for="dst">{L_BOARD_DST}:</label></dt>
+		<dd><label><input type="radio" class="radio" name="dst" value="1"<!-- IF DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input type="radio" class="radio" name="dst" value="0"<!-- IF not DST --> id="dst" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+	</dl>
+	<dl> 
+		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
+		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
 		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
-	<!-- EVENT acp_users_prefs_personal_append -->
 	</fieldset>

 	<fieldset>
 		<legend>{L_UCP_PREFS_POST}</legend>
-	<!-- EVENT acp_users_prefs_post_prepend -->
 	<dl> 
-		<dt><label for="bbcode">{L_DEFAULT_BBCODE}{L_COLON}</label></dt>
+		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="smilies">{L_DEFAULT_SMILIES}{L_COLON}</label></dt>
+		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="sig">{L_DEFAULT_ADD_SIG}{L_COLON}</label></dt>
+		<dt><label for="sig">{L_DEFAULT_ADD_SIG}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="sig" value="1"<!-- IF ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="sig" value="0"<!-- IF not ATTACH_SIG --> id="sig" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="notify">{L_DEFAULT_NOTIFY}{L_COLON}</label></dt>
+		<dt><label for="notify">{L_DEFAULT_NOTIFY}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="notify" value="1"<!-- IF NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="notify" value="0"<!-- IF not NOTIFY --> id="notify" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
-	<!-- EVENT acp_users_prefs_post_append -->
 	</fieldset>

 	<fieldset>
 		<legend>{L_UCP_PREFS_VIEW}</legend>
-	<!-- EVENT acp_users_prefs_view_prepend -->
 	<dl> 
-		<dt><label for="view_images">{L_VIEW_IMAGES}{L_COLON}</label></dt>
+		<dt><label for="view_images">{L_VIEW_IMAGES}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_images" value="1"<!-- IF VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_images" value="0"<!-- IF not VIEW_IMAGES --> id="view_images" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_flash">{L_VIEW_FLASH}{L_COLON}</label></dt>
+		<dt><label for="view_flash">{L_VIEW_FLASH}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_flash" value="1"<!-- IF VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_flash" value="0"<!-- IF not VIEW_FLASH --> id="view_flash" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_smilies">{L_VIEW_SMILIES}{L_COLON}</label></dt>
+		<dt><label for="view_smilies">{L_VIEW_SMILIES}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_smilies" value="1"<!-- IF VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_smilies" value="0"<!-- IF not VIEW_SMILIES --> id="view_smilies" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_sigs">{L_VIEW_SIGS}{L_COLON}</label></dt>
+		<dt><label for="view_sigs">{L_VIEW_SIGS}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_sigs" value="1"<!-- IF VIEW_SIGS --> id="view_sigs" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_sigs" value="0"<!-- IF not VIEW_SIGS --> id="view_sigss" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_avatars">{L_VIEW_AVATARS}{L_COLON}</label></dt>
+		<dt><label for="view_avatars">{L_VIEW_AVATARS}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_avatars" value="1"<!-- IF VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_avatars" value="0"<!-- IF not VIEW_AVATARS --> id="view_avatars" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}{L_COLON}</label></dt>
+		<dt><label for="view_wordcensor">{L_DISABLE_CENSORS}:</label></dt>
 		<dd><label><input type="radio" class="radio" name="view_wordcensor" value="1"<!-- IF VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="view_wordcensor" value="0"<!-- IF not VIEW_WORDCENSOR --> id="view_wordcensor" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DAYS}{L_COLON}</label></dt>
+		<dt><label>{L_VIEW_TOPICS_DAYS}:</label></dt>
 		<dd>{S_TOPIC_SORT_DAYS}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_TOPICS_KEY}{L_COLON}</label></dt>
+		<dt><label>{L_VIEW_TOPICS_KEY}:</label></dt>
 		<dd>{S_TOPIC_SORT_KEY}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_TOPICS_DIR}{L_COLON}</label></dt>
+		<dt><label>{L_VIEW_TOPICS_DIR}:</label></dt>
 		<dd>{S_TOPIC_SORT_DIR}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_POSTS_DAYS}{L_COLON}</label></dt>
+		<dt><label>{L_VIEW_POSTS_DAYS}:</label></dt>
 		<dd>{S_POST_SORT_DAYS}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_POSTS_KEY}{L_COLON}</label></dt>
+		<dt><label>{L_VIEW_POSTS_KEY}:</label></dt>
 		<dd>{S_POST_SORT_KEY}</dd>
 	</dl>
 	<dl> 
-		<dt><label>{L_VIEW_POSTS_DIR}{L_COLON}</label></dt>
+		<dt><label>{L_VIEW_POSTS_DIR}:</label></dt>
 		<dd>{S_POST_SORT_DIR}</dd>
 	</dl>
-	<!-- EVENT acp_users_prefs_view_append -->
 	</fieldset>
-	<!-- EVENT acp_users_prefs_append -->
+
 	<fieldset class="quick">
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
 	</fieldset>

-	</form>
+	</form>
--- a/phpBB/adm/style/acp_users_profile.html
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -3,12 +3,44 @@
 	<fieldset>
 		<legend>{L_USER_PROFILE}</legend>
 	<dl>
-		<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
-		<dd><input type="email" id="jabber" name="jabber" value="{JABBER}" /></dd>
+		<dt><label for="icq">{L_UCP_ICQ}:</label></dt>
+		<dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd>
 	</dl>
 	<dl>
-		<dt><label for="birthday">{L_BIRTHDAY}{L_COLON}</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
-		<dd>{L_DAY}{L_COLON} <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}{L_COLON} <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}{L_COLON} <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
+		<dt><label for="aim">{L_UCP_AIM}:</label></dt>
+		<dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="msn">{L_UCP_MSNM}:</label></dt>
+		<dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="yim">{L_UCP_YIM}:</label></dt>
+		<dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="jabber">{L_UCP_JABBER}:</label></dt>
+		<dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="website">{L_WEBSITE}:</label></dt>
+		<dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="location">{L_LOCATION}:</label></dt>
+		<dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="occupation">{L_OCCUPATION}:</label></dt>
+		<dd><textarea id="occupation" name="occupation" rows="3" cols="30">{OCCUPATION}</textarea></dd>
+	</dl>
+	<dl>
+		<dt><label for="interests">{L_INTERESTS}:</label></dt>
+		<dd><textarea id="interests" name="interests" rows="3" cols="30">{INTERESTS}</textarea></dd>
+	</dl>
+	<dl> 
+		<dt><label for="birthday">{L_BIRTHDAY}:</label><br /><span>{L_BIRTHDAY_EXPLAIN}</span></dt>
+		<dd>{L_DAY}: <select id="birthday" name="bday_day">{S_BIRTHDAY_DAY_OPTIONS}</select> {L_MONTH}: <select name="bday_month">{S_BIRTHDAY_MONTH_OPTIONS}</select> {L_YEAR}: <select name="bday_year">{S_BIRTHDAY_YEAR_OPTIONS}</select></dd>
 	</dl>
 	</fieldset>

@@ -16,8 +48,8 @@
 		<fieldset>
 			<legend>{L_USER_CUSTOM_PROFILE_FIELDS}</legend>
 		<!-- BEGIN profile_fields -->
-		<dl>
-			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
+		<dl> 
+			<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}:</label><!-- IF profile_fields.LANG_EXPLAIN --><br /><span>{profile_fields.LANG_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>{profile_fields.FIELD}</dd>
 			<!-- IF profile_fields.ERROR -->
 				<dd><span class="small" style="color: red;">{profile_fields.ERROR}</span></dd>
@@ -31,4 +63,4 @@
 		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-	</form>
+	</form>
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -3,12 +3,36 @@

 	var form_name = 'user_signature';
 	var text_name = 'signature';
-	var load_draft = false;
-	var upload = false;
+
+	// Define the bbCode tags
+	var bbcode = new Array();
+	var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->);
 	var imageTag = false;

+	// Helpline messages
+	var help_line = {
+		b: '{LA_BBCODE_B_HELP}',
+		i: '{LA_BBCODE_I_HELP}',
+		u: '{LA_BBCODE_U_HELP}',
+		q: '{LA_BBCODE_Q_HELP}',
+		c: '{LA_BBCODE_C_HELP}',
+		l: '{LA_BBCODE_L_HELP}',
+		o: '{LA_BBCODE_O_HELP}',
+		p: '{LA_BBCODE_P_HELP}',
+		w: '{LA_BBCODE_W_HELP}',
+		s: '{LA_BBCODE_S_HELP}',
+		f: '{LA_BBCODE_F_HELP}',
+		y: '{LA_BBCODE_Y_HELP}',
+		d: '{LA_BBCODE_D_HELP}',
+		tip: '{L_STYLES_TIP}'
+		<!-- BEGIN custom_tags -->
+			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
+		<!-- END custom_tags -->
+	}
+
 // ]]>
 </script>
+<script type="text/javascript" src="{T_TEMPLATE_PATH}/editor.js"></script>

 <form id="user_signature" method="post" action="{U_ACTION}">

@@ -23,12 +47,52 @@
 		<legend>{L_SIGNATURE}</legend>
 		<p>{L_SIGNATURE_EXPLAIN}</p>

-		<!-- INCLUDE acp_posting_buttons.html -->
+		<div id="format-buttons">
+			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" onmouseout="helpline('tip')" />
+			<input type="button" class="button2" accesskey="y" name="addlistitem" value="[*]" style="width: 40px" onclick="bbstyle(-1)" onmouseover="helpline('y')" onmouseout="helpline('tip')" />
+			<!-- IF S_BBCODE_IMG -->
+				<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_LINKS_ALLOWED -->
+				<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->
+			<!-- IF S_BBCODE_FLASH -->
+				<input type="button" class="button2" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" onmouseover="helpline('d')" onmouseout="helpline('tip')" />
+			<!-- ENDIF -->

-		<dl class="responsive-columns">
-			<dt style="width: 90px;" id="color_palette_placeholder" data-orientation="v" data-height="12" data-width="15" data-bbcode="true">
+			{L_FONT_SIZE}: <select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}" onmouseover="helpline('f')" onmouseout="helpline('tip')">
+				<option value="50">{L_FONT_TINY}</option>
+				<option value="85">{L_FONT_SMALL}</option>
+				<option value="100" selected="selected">{L_FONT_NORMAL}</option>
+				<option value="150">{L_FONT_LARGE}</option>
+				<option value="200">{L_FONT_HUGE}</option>
+			</select>
+		<!-- IF .custom_tags -->
+			<br /><br />
+			<!-- BEGIN custom_tags -->
+				<input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
+			<!-- END custom_tags -->
+		<!-- ENDIF -->
+
+		</div>
+
+		<p><input type="text" class="text full" style="border: 0; background: none;" name="helpbox" value="{L_STYLES_TIP}" /></p>
+
+		<dl>
+			<dt style="width: 90px;">
+				<script type="text/javascript">
+				// <![CDATA[
+					colorPalette('v', 12, 10);
+				// ]]>
+				</script>
 			</dt>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" data-bbcode="true">{SIGNATURE}</textarea></dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px;"><textarea name="signature" rows="10" cols="60" style="width: 95%;" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();">{SIGNATURE}</textarea></dd>
 			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 5px;">
 			<!-- IF S_BBCODE_ALLOWED -->
 				<label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
@@ -40,7 +104,7 @@
 				<label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
 			<!-- ENDIF -->
 			</dd>
-			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}{L_COLON} </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
+			<dd style="margin-{S_CONTENT_FLOW_BEGIN}: 90px; margin-top: 10px;"><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}</dd>
 		</dl>
 	</fieldset>

@@ -49,4 +113,4 @@
 		<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
 		{S_FORM_TOKEN}
 	</fieldset>
-</form>
+</form>
--- a/phpBB/adm/style/acp_users_warnings.html
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -1,7 +1,7 @@
 	<form id="list" method="post" action="{U_ACTION}">

 	<!-- IF .warn -->
-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
@@ -12,7 +12,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN warn -->
-		<tr>
+		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td>{warn.USERNAME}</td>
 			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
 			<td>{warn.ACTION}</td>
--- a/phpBB/adm/style/acp_words.html
+++ b/phpBB/adm/style/acp_words.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>

 <!-- IF S_EDIT_WORD -->

@@ -47,7 +47,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ADD_WORD}" />
 	</p>

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th>{L_WORD}</th>
@@ -57,10 +57,10 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN words -->
-	<tr>
+		<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td style="text-align: center;">{words.WORD}</td>
 		<td style="text-align: center;">{words.REPLACEMENT}</td>
-		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>&nbsp;</td>
+		<td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
 	</tr>
 	<!-- BEGINELSE -->
 	<tr class="row3">
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
--- a/phpBB/adm/style/admin.js
+++ b/phpBB/adm/style/admin.js
@@ -1,250 +0,0 @@
-/**
-* phpBB3 ACP functions
-*/
-
-/**
-* Parse document block
-*/
-function parse_document(container) 
-{
-	var test = document.createElement('div'),
-		oldBrowser = (typeof test.style.borderRadius == 'undefined');
-
-	delete test;
-
-	/**
-	* Navigation
-	*/
-	container.find('#menu').each(function() {
-		var menu = $(this),
-			blocks = menu.children('.menu-block');
-
-		if (!blocks.length) {
-			return;
-		}
-
-		// Set onclick event
-		blocks.children('a.header').click(function() {
-			var parent = $(this).parent();
-			if (!parent.hasClass('active')) {
-				parent.siblings().removeClass('active');
-			}
-			parent.toggleClass('active');
-		});
-
-		// Set active menu
-		menu.find('#activemenu').parents('.menu-block').addClass('active');
-
-		// Check if there is active menu
-		if (!blocks.filter('.active').length) {
-			blocks.filter(':first').addClass('active');
-		}
-	});
-
-	/**
-	* Responsive tables
-	*/
-	container.find('table').not('.not-responsive').each(function() {
-		var $this = $(this),
-			th = $this.find('thead > tr > th'),
-			columns = th.length,
-			headers = [],
-			totalHeaders = 0,
-			i, headersLength;
-
-		// Find columns
-		$this.find('colgroup:first').children().each(function(i) {
-			var column = $(this);
-			$this.find('td:nth-child(' + (i + 1) + ')').addClass(column.prop('className'));
-		});
-
-		// Styles table
-		if ($this.hasClass('styles')) {
-			$this.find('td:first-child[style]').each(function() {
-				var style = $(this).attr('style');
-				if (style.length) {
-					$(this).parent('tr').attr('style', style.toLowerCase().replace('padding', 'margin')).addClass('responsive-style-row');
-				}
-			});
-		}
-
-		// Find each header
-		if (!$this.data('no-responsive-header'))
-		{
-			th.each(function(column) {
-				var cell = $(this),
-					colspan = parseInt(cell.attr('colspan')),
-					dfn = cell.attr('data-dfn'),
-					text = dfn ? dfn : $.trim(cell.text());
-
-				if (text == '&nbsp;') text = '';
-				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
-
-				for (i=0; i<colspan; i++) {
-					headers.push(text);
-				}
-				totalHeaders ++;
-
-				if (dfn && !column) {
-					$this.addClass('show-header');
-				}
-			});
-		}
-		
-		headersLength = headers.length;
-
-		// Add header text to each cell as <dfn>
-		$this.addClass('responsive');
-
-		if (totalHeaders < 2) {
-			$this.addClass('show-header');
-			return;
-		}
-
-		$this.find('tbody > tr').each(function() {
-			var row = $(this),
-				cells = row.children('td'),
-				column = 0;
-
-			if (cells.length == 1) {
-				row.addClass('big-column');
-				return;
-			}
-
-			cells.each(function() {
-				var cell = $(this),
-					colspan = parseInt(cell.attr('colspan')),
-					text = $.trim(cell.text());
-
-				if (headersLength <= column) {
-					return;
-				}
-
-				if ((text.length && text !== '-') || cell.children().length) {
-					if (headers[column] != '') {
-						cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
-					}
-				}
-				else {
-					cell.addClass('empty');
-				}
-
-				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
-				column += colspan;
-			});
-		});
-
-		// Remove <dfn> in disabled extensions list
-		$this.find('tr.ext_disabled > .empty:nth-child(2) + .empty').siblings(':first-child').children('dfn').remove();
-	});
-
-	/**
-	* Hide empty responsive tables
-	*/
-	container.find('table.responsive > tbody').each(function() {
-		var items = $(this).children('tr');
-		if (items.length == 0)
-		{
-			$(this).parent('table:first').addClass('responsive-hide');
-		}
-	});
-
-	/**
-	* Fieldsets with empty <span>
-	*/
-	container.find('fieldset dt > span:last-child').each(function() {
-		var $this = $(this);
-		if ($this.html() == '&nbsp;') {
-			$this.addClass('responsive-hide');
-		}
-		
-	});
-
-	/**
-	* Responsive tabs
-	*/
-	container.find('#tabs').not('[data-skip-responsive]').each(function() {
-		var $this = $(this),
-			$body = $('body'),
-			ul = $this.children(),
-			tabs = ul.children().not('[data-skip-responsive]'),
-			links = tabs.children('a'),
-			item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link">&nbsp;</a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
-			menu = item.find('.dropdown-contents'),
-			maxHeight = 0,
-			lastWidth = false,
-			responsive = false;
-
-		links.each(function() {
-			var link = $(this);
-			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
-		})
-
-		function check() {
-			var width = $body.width(),
-				height = $this.height();
-
-			if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) {
-				return;
-			}
-
-			tabs.show();
-			item.hide();
-
-			lastWidth = width;
-			height = $this.height();
-			if (height <= maxHeight) {
-				responsive = false;
-				if (item.hasClass('dropdown-visible')) {
-					phpbb.toggleDropdown.call(item.find('a.responsive-tab-link').get(0));
-				}
-				return;
-			}
-
-			responsive = true;
-			item.show();
-			menu.html('');
-
-			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
-				total = availableTabs.length,
-				i, tab;
-
-			for (i = total - 1; i >= 0; i --) {
-				tab = availableTabs.eq(i);
-				menu.prepend(tab.clone(true).removeClass('tab'));
-				tab.hide();
-				if ($this.height() <= maxHeight) {
-					menu.find('a').click(function() { check(true); });
-					return;
-				}
-			}
-			menu.find('a').click(function() { check(true); });
-		}
-
-		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab', verticalDirection: 'down'});
-
-		check(true);
-		$(window).resize(check);
-	});
-}
-
-/**
-* Run onload functions
-*/
-(function($) {
-	$(document).ready(function() {
-		// Swap .nojs and .hasjs
-		$('body.nojs').toggleClass('nojs hasjs');
-
-		// Focus forms
-		$('form[data-focus]:first').each(function() {
-			$('#' + this.getAttribute('data-focus')).focus();
-		});
-
-		parse_document($('body'));
-
-		// Hide configlist and success message in send statistics page
-		phpbb.toggleDisplay('configlist', -1);
-		phpbb.toggleDisplay('questionnaire-thanks', -1);
-	});
-})(jQuery);
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -1,89 +0,0 @@
-/* global phpbb */
-
-(function($) {  // Avoid conflicts with other libraries
-
-'use strict';
-
-/**
- * The following callbacks are for reording items. row_down
- * is triggered when an item is moved down, and row_up is triggered when
- * an item is moved up. It moves the row up or down, and deactivates /
- * activates any up / down icons that require it (the ones at the top or bottom).
- */
-phpbb.addAjaxCallback('row_down', function(res) {
-	if (typeof res.success === 'undefined' || !res.success) {
-		return;
-	}
-
-	var $firstTr = $(this).parents('tr'),
-		$secondTr = $firstTr.next();
-
-	$firstTr.insertAfter($secondTr);
-});
-
-phpbb.addAjaxCallback('row_up', function(res) {
-	if (typeof res.success === 'undefined' || !res.success) {
-		return;
-	}
-
-	var $secondTr = $(this).parents('tr'),
-		$firstTr = $secondTr.prev();
-
-	$secondTr.insertBefore($firstTr);
-});
-
-/**
- * This callback replaces activate links with deactivate links and vice versa.
- * It does this by replacing the text, and replacing all instances of "activate"
- * in the href with "deactivate", and vice versa.
- */
-phpbb.addAjaxCallback('activate_deactivate', function(res) {
-	var $this = $(this),
-		newHref = $this.attr('href');
-
-	$this.text(res.text);
-
-	if (newHref.indexOf('deactivate') !== -1) {
-		newHref = newHref.replace('deactivate', 'activate');
-	} else {
-		newHref = newHref.replace('activate', 'deactivate');
-	}
-
-	$this.attr('href', newHref);
-});
-
-/**
- * The removes the parent row of the link or form that triggered the callback,
- * and is good for stuff like the removal of forums.
- */
-phpbb.addAjaxCallback('row_delete', function(res) {
-	if (res.SUCCESS !== false) {
-		$(this).parents('tr').remove();
-	}
-});
-
-
-
-$('[data-ajax]').each(function() {
-	var $this = $(this),
-		ajax = $this.attr('data-ajax');
-
-	if (ajax !== 'false') {
-		var fn = (ajax !== 'true') ? ajax : null;
-		phpbb.ajaxify({
-			selector: this,
-			refresh: $this.attr('data-refresh') !== undefined,
-			callback: fn
-		});
-	}
-});
-
-/**
-* Automatically resize textarea
-*/
-$(function() {
-	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
-});
-
-
-})(jQuery); // Avoid conflicts with other libraries
--- a/phpBB/adm/style/auth_provider_ldap.html
+++ b/phpBB/adm/style/auth_provider_ldap.html
@@ -1,35 +0,0 @@
-<fieldset id="auth_ldap_settings">
-	<legend>{L_LDAP}</legend>
-	<dl>
-		<dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt>
-		<dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt>
-		<dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd>
-	</dl>
-</fieldset>
--- a/phpBB/adm/style/auth_provider_oauth.html
+++ b/phpBB/adm/style/auth_provider_oauth.html
@@ -1,18 +0,0 @@
-
-<div id="auth_oauth_settings">
-	<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p>
-
-	<!-- BEGIN oauth_services -->
-	<fieldset>
-		<legend>{oauth_services.ACTUAL_NAME}</legend>
-		<dl>
-			<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
-			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
-			<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
-		</dl>
-	</fieldset>
-	<!-- END oauth_services -->
-</div>
--- a/phpBB/adm/style/captcha_default_acp_demo.html
+++ b/phpBB/adm/style/captcha_default_acp_demo.html
@@ -1,4 +1,4 @@
 <dl>
-	<dt><label for="captcha_preview">{L_PREVIEW}{L_COLON}</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
+	<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt>
 	<dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
 </dl>
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>
 	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>

 <h1>{L_ACP_VC_SETTINGS}</h1>
@@ -14,32 +14,32 @@
 <legend>{L_GENERAL_OPTIONS}</legend>

 <dl>
-	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_foreground_noise">{L_CAPTCHA_GD_FOREGROUND_NOISE}:</label><br /><span>{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_foreground_noise" name="captcha_gd_foreground_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input name="captcha_gd_foreground_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_FOREGROUND_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="number" /></dd>
+	<dt><label for="captcha_gd_x_grid">{L_CAPTCHA_GD_X_GRID}:</label><br /><span>{L_CAPTCHA_GD_X_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_x_grid" name="captcha_gd_x_grid" value="{CAPTCHA_GD_X_GRID}" type="text" /></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
-	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="number" /></dd>
+	<dt><label for="captcha_gd_y_grid">{L_CAPTCHA_GD_Y_GRID}:</label><br /><span>{L_CAPTCHA_GD_Y_GRID_EXPLAIN}</span></dt>
+	<dd><input id="captcha_gd_y_grid" name="captcha_gd_y_grid" value="{CAPTCHA_GD_Y_GRID}" type="text" /></dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_wave">{L_CAPTCHA_GD_WAVE}:</label><br /><span>{L_CAPTCHA_GD_WAVE_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_wave" name="captcha_gd_wave" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input name="captcha_gd_wave" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_WAVE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 </dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_3d_noise">{L_CAPTCHA_GD_3D_NOISE}:</label><br /><span>{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_3d_noise" name="captcha_gd_3d_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 		<label><input name="captcha_gd_3d_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_3D_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 </dd>
 </dl>
 <dl>
-	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}{L_COLON}</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
+	<dt><label for="captcha_gd_fonts">{L_CAPTCHA_GD_FONTS}:</label><br /><span>{L_CAPTCHA_GD_FONTS_EXPLAIN}</span></dt>
 	<dd><label><input id="captcha_gd_fonts" name="captcha_gd_fonts" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 1 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_DEFAULT}</label>
 		<label><input name="captcha_gd_fonts" value="2" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 2 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_NEW}</label>
 		<label><input name="captcha_gd_fonts" value="3" class="radio" type="radio"<!-- IF CAPTCHA_GD_FONTS == 3 --> checked="checked"<!-- ENDIF --> /> {L_CAPTCHA_FONT_LOWER}</label>
--- a/phpBB/adm/style/captcha_qa_acp.html
+++ b/phpBB/adm/style/captcha_qa_acp.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->

-<a id="maincontent"></a>
+<a name="maincontent"></a>


 	<a href="<!-- IF U_LIST -->{U_LIST}<!-- ELSE -->{U_ACTION}<!-- ENDIF -->" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
@@ -14,7 +14,7 @@
 	<fieldset class="tabulated">
 	<legend>{L_QUESTIONS}</legend>

-	<table class="table1 zebra-table">
+	<table cellspacing="1">
 	<thead>
 	<tr>
 		<th colspan="3">{L_QUESTIONS}</th>
@@ -27,12 +27,14 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN questions -->
-	<tr>
+
+		<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+
 		<td style="text-align: left;">{questions.QUESTION_TEXT}</td>
 		<td style="text-align: center;">{questions.QUESTION_LANG}</td>
 		<td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a>&nbsp;<a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
-	</tr>
-	<!-- END questions -->
+		</tr>
+		<!-- END questions -->
 	</tbody>
 	</table>
 	<fieldset class="quick">
@@ -57,7 +59,7 @@
 	<fieldset>
 		<legend>{L_EDIT_QUESTION}</legend>
 	<dl>
-		<dt><label for="strict">{L_QUESTION_STRICT}{L_COLON}</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
+		<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
 		<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
--- a/Show More
+++ b/Show More