diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php
index ae81df7..7897d15 100755
--- a/htdocs/application/controllers/main.php
+++ b/htdocs/application/controllers/main.php
@@ -239,6 +239,9 @@ class Main extends CI_Controller
 			$this->dbforge->add_key('hits_updated');
 			$this->dbforge->add_column('pastes', $fields);
 		}
+
+		//load theme
+		$this->load->theme('classic');
 	}
 	
 	function _form_prep($lang = false, $title = '', $paste = '', $reply = false) 
diff --git a/htdocs/application/core/MY_Loader.php b/htdocs/application/core/MY_Loader.php
new file mode 100644
index 0000000..7d4a9f8
--- /dev/null
+++ b/htdocs/application/core/MY_Loader.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Class and Function List:
+ * Function list:
+ * - __construct()
+ * - theme()
+ * - view()
+ * Classes list:
+ * - MY_Loader extends CI_Loader
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class MY_Loader extends CI_Loader
+{
+	var $template = '';
+	var $data = array();
+	var $return = FALSE;
+	
+	function __construct() 
+	{
+		parent::__construct();
+		log_message('debug', 'MY_Loader Class Initialized');
+	}
+	
+	function theme($template = '', $data = array() , $return = FALSE) 
+	{
+		
+		if ($template == '') 
+		{
+			return FALSE;
+		}
+		$this->template = $template;
+		$this->data = $this->_ci_object_to_array($data);
+		$this->return = $return;
+	}
+	
+	function view($view, $vars = array() , $return = FALSE) 
+	{
+		log_message('debug', 'Using view "themes/' . $this->template . '/views/' . $view . '.php"');
+		return $this->_ci_load(array(
+			'_ci_view' => '../themes/' . $this->template . '/views/' . $view . '.php',
+			'_ci_vars' => $this->_ci_object_to_array($vars) ,
+			'_ci_return' => $return
+		));
+	}
+}
diff --git a/htdocs/static/styles/codemirror.css b/htdocs/application/themes/classic/css/codemirror.css
similarity index 100%
rename from htdocs/static/styles/codemirror.css
rename to htdocs/application/themes/classic/css/codemirror.css
diff --git a/htdocs/static/styles/diff.css b/htdocs/application/themes/classic/css/diff.css
similarity index 100%
rename from htdocs/static/styles/diff.css
rename to htdocs/application/themes/classic/css/diff.css
diff --git a/htdocs/static/styles/embed.css b/htdocs/application/themes/classic/css/embed.css
similarity index 100%
rename from htdocs/static/styles/embed.css
rename to htdocs/application/themes/classic/css/embed.css
diff --git a/htdocs/static/styles/fonts.css b/htdocs/application/themes/classic/css/fonts.css
similarity index 100%
rename from htdocs/static/styles/fonts.css
rename to htdocs/application/themes/classic/css/fonts.css
diff --git a/htdocs/static/styles/iphone.css b/htdocs/application/themes/classic/css/iphone.css
similarity index 100%
rename from htdocs/static/styles/iphone.css
rename to htdocs/application/themes/classic/css/iphone.css
diff --git a/htdocs/static/styles/main.css b/htdocs/application/themes/classic/css/main.css
similarity index 100%
rename from htdocs/static/styles/main.css
rename to htdocs/application/themes/classic/css/main.css
diff --git a/htdocs/static/styles/print.css b/htdocs/application/themes/classic/css/print.css
similarity index 100%
rename from htdocs/static/styles/print.css
rename to htdocs/application/themes/classic/css/print.css
diff --git a/htdocs/static/styles/raw.css b/htdocs/application/themes/classic/css/raw.css
similarity index 100%
rename from htdocs/static/styles/raw.css
rename to htdocs/application/themes/classic/css/raw.css
diff --git a/htdocs/static/styles/reset.css b/htdocs/application/themes/classic/css/reset.css
similarity index 100%
rename from htdocs/static/styles/reset.css
rename to htdocs/application/themes/classic/css/reset.css
diff --git a/htdocs/static/images/bg-x.png b/htdocs/application/themes/classic/images/bg-x.png
similarity index 100%
rename from htdocs/static/images/bg-x.png
rename to htdocs/application/themes/classic/images/bg-x.png
diff --git a/htdocs/static/images/button.png b/htdocs/application/themes/classic/images/button.png
similarity index 100%
rename from htdocs/static/images/button.png
rename to htdocs/application/themes/classic/images/button.png
diff --git a/htdocs/application/themes/classic/theme.php b/htdocs/application/themes/classic/theme.php
new file mode 100644
index 0000000..011f7dd
--- /dev/null
+++ b/htdocs/application/themes/classic/theme.php
@@ -0,0 +1 @@
+<?php echo $content;
diff --git a/htdocs/application/views/about.php b/htdocs/application/themes/classic/views/about.php
similarity index 100%
rename from htdocs/application/views/about.php
rename to htdocs/application/themes/classic/views/about.php
diff --git a/htdocs/application/views/api_help.php b/htdocs/application/themes/classic/views/api_help.php
similarity index 100%
rename from htdocs/application/views/api_help.php
rename to htdocs/application/themes/classic/views/api_help.php
diff --git a/htdocs/application/views/auth/login_form.php b/htdocs/application/themes/classic/views/auth/login_form.php
similarity index 100%
rename from htdocs/application/views/auth/login_form.php
rename to htdocs/application/themes/classic/views/auth/login_form.php
diff --git a/htdocs/application/views/defaults/footer.php b/htdocs/application/themes/classic/views/defaults/footer.php
similarity index 100%
rename from htdocs/application/views/defaults/footer.php
rename to htdocs/application/themes/classic/views/defaults/footer.php
diff --git a/htdocs/application/views/defaults/footer_message.php b/htdocs/application/themes/classic/views/defaults/footer_message.php
similarity index 100%
rename from htdocs/application/views/defaults/footer_message.php
rename to htdocs/application/themes/classic/views/defaults/footer_message.php
diff --git a/htdocs/application/views/defaults/header.php b/htdocs/application/themes/classic/views/defaults/header.php
similarity index 100%
rename from htdocs/application/views/defaults/header.php
rename to htdocs/application/themes/classic/views/defaults/header.php
diff --git a/htdocs/application/views/defaults/paste_form.php b/htdocs/application/themes/classic/views/defaults/paste_form.php
similarity index 100%
rename from htdocs/application/views/defaults/paste_form.php
rename to htdocs/application/themes/classic/views/defaults/paste_form.php
diff --git a/htdocs/application/views/defaults/stats.php b/htdocs/application/themes/classic/views/defaults/stats.php
similarity index 100%
rename from htdocs/application/views/defaults/stats.php
rename to htdocs/application/themes/classic/views/defaults/stats.php
diff --git a/htdocs/application/views/home.php b/htdocs/application/themes/classic/views/home.php
similarity index 100%
rename from htdocs/application/views/home.php
rename to htdocs/application/themes/classic/views/home.php
diff --git a/htdocs/application/views/index.html b/htdocs/application/themes/classic/views/index.html
similarity index 100%
rename from htdocs/application/views/index.html
rename to htdocs/application/themes/classic/views/index.html
diff --git a/htdocs/application/views/iphone/footer.php b/htdocs/application/themes/classic/views/iphone/footer.php
similarity index 100%
rename from htdocs/application/views/iphone/footer.php
rename to htdocs/application/themes/classic/views/iphone/footer.php
diff --git a/htdocs/application/views/iphone/header.php b/htdocs/application/themes/classic/views/iphone/header.php
similarity index 100%
rename from htdocs/application/views/iphone/header.php
rename to htdocs/application/themes/classic/views/iphone/header.php
diff --git a/htdocs/application/views/iphone/recent.php b/htdocs/application/themes/classic/views/iphone/recent.php
similarity index 100%
rename from htdocs/application/views/iphone/recent.php
rename to htdocs/application/themes/classic/views/iphone/recent.php
diff --git a/htdocs/application/views/iphone/view.php b/htdocs/application/themes/classic/views/iphone/view.php
similarity index 100%
rename from htdocs/application/views/iphone/view.php
rename to htdocs/application/themes/classic/views/iphone/view.php
diff --git a/htdocs/application/views/list.php b/htdocs/application/themes/classic/views/list.php
similarity index 100%
rename from htdocs/application/views/list.php
rename to htdocs/application/themes/classic/views/list.php
diff --git a/htdocs/application/views/list_blocked_ips.php b/htdocs/application/themes/classic/views/list_blocked_ips.php
similarity index 100%
rename from htdocs/application/views/list_blocked_ips.php
rename to htdocs/application/themes/classic/views/list_blocked_ips.php
diff --git a/htdocs/application/views/list_ips.php b/htdocs/application/themes/classic/views/list_ips.php
similarity index 100%
rename from htdocs/application/views/list_ips.php
rename to htdocs/application/themes/classic/views/list_ips.php
diff --git a/htdocs/application/views/spam_detail.php b/htdocs/application/themes/classic/views/spam_detail.php
similarity index 100%
rename from htdocs/application/views/spam_detail.php
rename to htdocs/application/themes/classic/views/spam_detail.php
diff --git a/htdocs/application/views/trends.php b/htdocs/application/themes/classic/views/trends.php
similarity index 100%
rename from htdocs/application/views/trends.php
rename to htdocs/application/themes/classic/views/trends.php
diff --git a/htdocs/application/views/view/api.php b/htdocs/application/themes/classic/views/view/api.php
similarity index 100%
rename from htdocs/application/views/view/api.php
rename to htdocs/application/themes/classic/views/view/api.php
diff --git a/htdocs/application/views/view/captcha.php b/htdocs/application/themes/classic/views/view/captcha.php
similarity index 100%
rename from htdocs/application/views/view/captcha.php
rename to htdocs/application/themes/classic/views/view/captcha.php
diff --git a/htdocs/application/views/view/download.php b/htdocs/application/themes/classic/views/view/download.php
similarity index 100%
rename from htdocs/application/views/view/download.php
rename to htdocs/application/themes/classic/views/view/download.php
diff --git a/htdocs/application/views/view/embed.php b/htdocs/application/themes/classic/views/view/embed.php
similarity index 100%
rename from htdocs/application/views/view/embed.php
rename to htdocs/application/themes/classic/views/view/embed.php
diff --git a/htdocs/application/views/view/raw.php b/htdocs/application/themes/classic/views/view/raw.php
similarity index 100%
rename from htdocs/application/views/view/raw.php
rename to htdocs/application/themes/classic/views/view/raw.php
diff --git a/htdocs/application/views/view/rss.php b/htdocs/application/themes/classic/views/view/rss.php
similarity index 100%
rename from htdocs/application/views/view/rss.php
rename to htdocs/application/themes/classic/views/view/rss.php
diff --git a/htdocs/application/views/view/view.php b/htdocs/application/themes/classic/views/view/view.php
similarity index 100%
rename from htdocs/application/views/view/view.php
rename to htdocs/application/themes/classic/views/view/view.php
diff --git a/htdocs/application/views/view/view_footer.php b/htdocs/application/themes/classic/views/view/view_footer.php
similarity index 100%
rename from htdocs/application/views/view/view_footer.php
rename to htdocs/application/themes/classic/views/view/view_footer.php
diff --git a/htdocs/static/images/apple-touch-icon.psd b/htdocs/static/images/apple-touch-icon.psd
deleted file mode 100644
index 44c6bd4..0000000
Binary files a/htdocs/static/images/apple-touch-icon.psd and /dev/null differ