diff --git a/app/config/sql/db_acl.sql b/app/config/sql/db_acl.sql
index 60928472e..4ef0c832d 100644
--- a/app/config/sql/db_acl.sql
+++ b/app/config/sql/db_acl.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2007,	Cake Software Foundation, Inc.
+# Copyright 2005-2008,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/app/config/sql/i18n.sql b/app/config/sql/i18n.sql
index 40d87622e..f7b6195a4 100644
--- a/app/config/sql/i18n.sql
+++ b/app/config/sql/i18n.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2007,	Cake Software Foundation, Inc.
+# Copyright 2005-2008,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/app/config/sql/sessions.sql b/app/config/sql/sessions.sql
index d21e8cede..75be419a1 100644
--- a/app/config/sql/sessions.sql
+++ b/app/config/sql/sessions.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2007,	Cake Software Foundation, Inc.
+# Copyright 2005-2008,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/app/views/pages/js/empty b/app/views/pages/js/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/pages/rss/empty b/app/views/pages/rss/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/pages/xml/empty b/app/views/pages/xml/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/cake/console/libs/templates/skel/config/core.php b/cake/console/libs/templates/skel/config/core.php
index b4ae06295..037db6f8b 100644
--- a/cake/console/libs/templates/skel/config/core.php
+++ b/cake/console/libs/templates/skel/config/core.php
@@ -41,6 +41,10 @@
  * In development mode, you need to click the flash message to continue.
  */
 	Configure::write('debug', 2);
+/**
+ * Application wide charset encoding
+ */
+	Configure::write('App.encoding', 'UTF-8');
 /**
  * To configure CakePHP *not* to use mod_rewrite and to
  * use CakePHP pretty URLs, remove these .htaccess
diff --git a/cake/console/libs/templates/skel/config/sql/db_acl.sql b/cake/console/libs/templates/skel/config/sql/db_acl.sql
index 39d32764b..672ca4b98 100644
--- a/cake/console/libs/templates/skel/config/sql/db_acl.sql
+++ b/cake/console/libs/templates/skel/config/sql/db_acl.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2007,	Cake Software Foundation, Inc.
+# Copyright 2005-2008,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/cake/console/libs/templates/skel/config/sql/i18n.sql b/cake/console/libs/templates/skel/config/sql/i18n.sql
index 99c469745..eb589aec1 100644
--- a/cake/console/libs/templates/skel/config/sql/i18n.sql
+++ b/cake/console/libs/templates/skel/config/sql/i18n.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2007,	Cake Software Foundation, Inc.
+# Copyright 2005-2008,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/cake/console/libs/templates/skel/config/sql/sessions.sql b/cake/console/libs/templates/skel/config/sql/sessions.sql
index d21e8cede..75be419a1 100644
--- a/cake/console/libs/templates/skel/config/sql/sessions.sql
+++ b/cake/console/libs/templates/skel/config/sql/sessions.sql
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright 2005-2007,	Cake Software Foundation, Inc.
+# Copyright 2005-2008,	Cake Software Foundation, Inc.
 #								1785 E. Sahara Avenue, Suite 490-204
 #								Las Vegas, Nevada 89104
 #
diff --git a/cake/console/libs/templates/skel/webroot/css/cake.generic.css b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
index e019c07d6..4040d00de 100644
--- a/cake/console/libs/templates/skel/webroot/css/cake.generic.css
+++ b/cake/console/libs/templates/skel/webroot/css/cake.generic.css
@@ -33,7 +33,7 @@ body {
 	background-color: #003d4c;
 	color: #fff;
 	font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
-	font-size:13px;
+	font-size:90%;
 	margin: 0;
 }
 a {
@@ -56,7 +56,7 @@ h1, h2, h3, h4 {
 }
 h1 {
 	color: #003d4c;
-	font-size: 130%;
+	font-size: 100%;
 	margin: 0.1em 0;
 }
 h2 {
@@ -92,7 +92,6 @@ ul, li {
 #header h1 {
 	background: url('../img/cake.icon.gif') no-repeat left;
 	color: #ffffff;
-	font-size: 110%;
 	padding: 0px 30px;
 }
 #header h1 a {
@@ -325,6 +324,7 @@ p.error {
 p.error em {
 	color: #000;
 	font-weight: normal;
+	line-height: 140%;
 }
 .notice {
 	background-color: #ffcc00;
diff --git a/cake/console/libs/templates/skel/webroot/index.php b/cake/console/libs/templates/skel/webroot/index.php
index 0bdb2e241..039697f38 100644
--- a/cake/console/libs/templates/skel/webroot/index.php
+++ b/cake/console/libs/templates/skel/webroot/index.php
@@ -30,7 +30,7 @@
  * Do not change
  */
 	if (!defined('DS')) {
-		 define('DS', DIRECTORY_SEPARATOR);
+		define('DS', DIRECTORY_SEPARATOR);
 	}
 /**
  * These defines should only be edited if you have cake installed in
@@ -38,41 +38,41 @@
  * Each define has a commented line of code that explains what you would change.
  */
 	if (!defined('ROOT')) {
-		 //define('ROOT', 'FULL PATH TO DIRECTORY WHERE APP DIRECTORY IS LOCATED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
-		 //You should also use the DS define to separate your directories
-		 define('ROOT', dirname(dirname(dirname(__FILE__))));
+		//define('ROOT', 'FULL PATH TO DIRECTORY WHERE APP DIRECTORY IS LOCATED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
+		//You should also use the DS define to separate your directories
+		define('ROOT', dirname(dirname(dirname(__FILE__))));
 	}
 	if (!defined('APP_DIR')) {
-		 //define('APP_DIR', 'DIRECTORY NAME OF APPLICATION');
-		 define('APP_DIR', basename(dirname(dirname(__FILE__))));
+		//define('APP_DIR', 'DIRECTORY NAME OF APPLICATION');
+		define('APP_DIR', basename(dirname(dirname(__FILE__))));
 	}
 /**
  * This only needs to be changed if the cake installed libs are located
  * outside of the distributed directory structure.
  */
 	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-		 //define ('CAKE_CORE_INCLUDE_PATH', 'FULL PATH TO DIRECTORY WHERE CAKE CORE IS INSTALLED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
-		 //You should also use the DS define to separate your directories
-		 define('CAKE_CORE_INCLUDE_PATH', ROOT);
+		//define ('CAKE_CORE_INCLUDE_PATH', 'FULL PATH TO DIRECTORY WHERE CAKE CORE IS INSTALLED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
+		//You should also use the DS define to separate your directories
+		define('CAKE_CORE_INCLUDE_PATH', ROOT);
 	}
 ///////////////////////////////
 //DO NOT EDIT BELOW THIS LINE//
 ///////////////////////////////
 	if (!defined('WEBROOT_DIR')) {
-		 define('WEBROOT_DIR', basename(dirname(__FILE__)));
+		define('WEBROOT_DIR', basename(dirname(__FILE__)));
 	}
 	if (!defined('WWW_ROOT')) {
-		 define('WWW_ROOT', dirname(__FILE__) . DS);
+		define('WWW_ROOT', dirname(__FILE__) . DS);
 	}
 	if (!defined('CORE_PATH')) {
-		 if (function_exists('ini_set')) {
-			  ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'));
-			  define('APP_PATH', null);
-			  define('CORE_PATH', null);
-		 } else {
-			  define('APP_PATH', ROOT . DS . APP_DIR . DS);
-			  define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-		 }
+		if (function_exists('ini_set')) {
+			ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'));
+			define('APP_PATH', null);
+			define('CORE_PATH', null);
+		} else {
+			define('APP_PATH', ROOT . DS . APP_DIR . DS);
+			define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+		}
 	}
 	if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 		trigger_error("Can't find CakePHP core.  Check the value of CAKE_CORE_INCLUDE_PATH in app/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
@@ -80,10 +80,10 @@
 	if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
 		return;
 	} else {
-		 $Dispatcher = new Dispatcher();
-		 $Dispatcher->dispatch($url);
+		$Dispatcher = new Dispatcher();
+		$Dispatcher->dispatch($url);
 	}
 	if (Configure::read() > 0) {
-		 echo "<!-- " . round(getMicrotime() - $TIME_START, 4) . "s -->";
+		echo "<!-- " . round(getMicrotime() - $TIME_START, 4) . "s -->";
 	}
 ?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/skel/webroot/test.php b/cake/console/libs/templates/skel/webroot/test.php
index 9502a7919..4ac8ab56c 100644
--- a/cake/console/libs/templates/skel/webroot/test.php
+++ b/cake/console/libs/templates/skel/webroot/test.php
@@ -62,6 +62,13 @@ ini_set('display_errors', 1);
 if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
 	trigger_error("Can't find CakePHP core.  Check the value of CAKE_CORE_INCLUDE_PATH in app/webroot/test.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 }
+
+$corePath = Configure::corePaths('cake');
+if (isset($corePath[0])) {
+	define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
+} else {
+	define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
+}
 require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_manager.php';
 
 if (Configure::read('debug') < 1) {