diff --git a/application/classes/Auth/LDAP.php b/application/classes/Auth/LDAP.php
index 6cb9cfe..f6eced6 100644
--- a/application/classes/Auth/LDAP.php
+++ b/application/classes/Auth/LDAP.php
@@ -1,4 +1,4 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
 
-class Auth_LDAP extends PLA_Auth_Ldap {}
+class Auth_LDAP extends PLA_Auth_LDAP {}
 ?>
diff --git a/application/classes/Config.php b/application/classes/Config.php
index 7d9f554..f10f07f 100644
--- a/application/classes/Config.php
+++ b/application/classes/Config.php
@@ -96,7 +96,7 @@ class Config extends Kohana_Config {
 	}
 
 	public static function theme() {
-		return Kohana::$config->load('config')->theme;
+		return 'theme/'.Kohana::$config->load('config')->theme;
 	}
 
 	public static function version() {
diff --git a/application/classes/Cookie.php b/application/classes/Cookie.php
new file mode 100644
index 0000000..179d6b1
--- /dev/null
+++ b/application/classes/Cookie.php
@@ -0,0 +1,15 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class overrides Kohana's Cookie
+ *
+ * @package    PLA/Modifications
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.phpldapadmin.org/license.html
+ */
+class Cookie extends Kohana_Cookie {
+	public static $salt = 'PLA';
+}
+?>
diff --git a/application/classes/PLA/Auth/Ldap.php b/application/classes/PLA/Auth/LDAP.php
similarity index 98%
rename from application/classes/PLA/Auth/Ldap.php
rename to application/classes/PLA/Auth/LDAP.php
index ff1eafb..246abce 100644
--- a/application/classes/PLA/Auth/Ldap.php
+++ b/application/classes/PLA/Auth/LDAP.php
@@ -1,4 +1,5 @@
 <?php defined('SYSPATH') or die('No direct access allowed.');
+
 /**
  * LDAP Auth driver.
  *
@@ -9,7 +10,7 @@
  * @copyright  (c) phpLDAPadmin Development Team
  * @license    http://dev.phpldapadmin.org/license.html
  */
-class PLA_Auth_Ldap extends Auth {
+class PLA_Auth_LDAP extends Auth {
 	// Unnused required abstract functions
 	public function password($username) {}
 	public function check_password($password) {}
diff --git a/application/classes/PLA/Controller/Template.php b/application/classes/PLA/Controller/Template.php
index 6c5f7f6..8ee52eb 100644
--- a/application/classes/PLA/Controller/Template.php
+++ b/application/classes/PLA/Controller/Template.php
@@ -15,7 +15,7 @@ abstract class PLA_Controller_Template extends Kohana_Controller_Template {
 	private $meta;
 
 	public function __construct(Request $request, Response $response) {
-		$this->template = Kohana::$config->load('config')->theme;
+		$this->template = Config::theme().'/page';
 
 		return parent::__construct($request,$response);
 	}
diff --git a/application/config/config.php b/application/config/config.php
index 136b4af..6e94933 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -18,6 +18,6 @@ return array(
 	'mode'            => Kohana::PRODUCTION,
 	// Our custom theme
 	'loginpage'       => 'welcome',
-	'theme'           => 'claro',
+	'theme'           => 'bootstrap',
 );
 ?>
diff --git a/includes/kohana b/includes/kohana
index f96694b..f5c623d 160000
--- a/includes/kohana
+++ b/includes/kohana
@@ -1 +1 @@
-Subproject commit f96694b18fdaa9bd6310debca71427068fe24046
+Subproject commit f5c623d89783fc9bf3c8dbea7699fcefa0015c3d