diff --git a/htdocs/application/errors/error_404.php b/htdocs/application/errors/error_404.php
index f9d0816..b011505 100755
--- a/htdocs/application/errors/error_404.php
+++ b/htdocs/application/errors/error_404.php
@@ -1,8 +1,7 @@
-<?php header("HTTP/1.1 404 Not Found"); 
-	include("system/application/config/config.php"); 
-	include("system/application/config/stikked.php");
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<?php
+$CI =& get_instance();
+header("HTTP/1.1 404 Not Found");
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -10,21 +9,21 @@
 	<head>
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 		<title>Stikked</title>
-				<link rel="stylesheet" href="<?php echo $config['base_url']?>static/styles/reset.css" type="text/css" />
-		<link rel="stylesheet" href="<?php echo $config['base_url']?>static/styles/fonts.css" type="text/css" />
-		<link rel="stylesheet" href="<?php echo $config['base_url']?>static/styles/main.css" type="text/css" media="screen" title="main" charset="utf-8" />
+				<link rel="stylesheet" href="<?php echo base_url(); ?>static/styles/reset.css" type="text/css" />
+		<link rel="stylesheet" href="<?php echo base_url(); ?>static/styles/fonts.css" type="text/css" />
+		<link rel="stylesheet" href="<?php echo base_url(); ?>static/styles/main.css" type="text/css" media="screen" title="main" charset="utf-8" />
 	</head>
 
 	<body>
 		<div id="container">
 			<div class="container">
 				<div class="header">
-					<h1><a href="<?=$config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
+					<h1><a href="<? echo base_url(); ?>" class="title"><?php echo $CI->config->item('site_name'); ?></a></h1>
 					<div class="tabs">
 						<ul>
-							<li><a href="<?=$config['base_url']?>index.php">Paste</a></li>
-							<li><a href="<?=$config['base_url']?>index.php/lists">Recent</a></li>
-							<li><a href="<?=$config['base_url']?>index.php/about">About</a></li>
+							<li><a href="<?php echo site_url(''); ?>">Paste</a></li>
+							<li><a href="<?php echo site_url('lists'); ?>">Recent</a></li>
+							<li><a href="<?php echo site_url('about'); ?>">About</a></li>
 						</ul>
 					</div>
 				</div>
@@ -35,15 +34,15 @@
 							<h1><?=$heading?></h1>
 							<div class="about">
 								<?=$message?>
-								<p>Woops! We can't find that page, <a href="<?=$config['base_url']?>">Go Home</a></p>
+								<p>Woops! We can't find that page, <a href="<?php echo base_url(); ?>">Go Home</a></p>
 							</div>
 						</div>
 					</div>
 				</div>
 			
 			<div class="footer">
-				<?php include("system/application/views/defaults/footer_message.php"); ?>
-				<?php include("system/application/views/defaults/stats.php"); ?>
+				<?php $CI->load->view('defaults/footer_message'); ?>
+				<?php $CI->load->view('defaults/stats'); ?>
 			</div>
 			</div>
 		</div>
diff --git a/htdocs/application/errors/error_general.php b/htdocs/application/errors/error_general.php
index 9f26d99..38bbfc2 100755
--- a/htdocs/application/errors/error_general.php
+++ b/htdocs/application/errors/error_general.php
@@ -1,8 +1,7 @@
-<?php header("HTTP/1.1 404 Not Found"); 
-	include("system/application/config/config.php"); 
-	include("system/application/config/stikked.php");
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<?php
+$CI =& get_instance();
+header("HTTP/1.1 404 Not Found");
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -10,20 +9,21 @@
 	<head>
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 		<title>Stikked</title>
-				<link rel="stylesheet" href="<?php echo $config['base_url']?>static/styles/reset.css" type="text/css" />
-		<link rel="stylesheet" href="<?php echo $config['base_url']?>static/styles/fonts.css" type="text/css" />
-		<link rel="stylesheet" href="<?php echo $config['base_url']?>static/styles/main.css" type="text/css" media="screen" title="main" charset="utf-8" />
+				<link rel="stylesheet" href="<?php echo base_url(); ?>static/styles/reset.css" type="text/css" />
+		<link rel="stylesheet" href="<?php echo base_url(); ?>static/styles/fonts.css" type="text/css" />
+		<link rel="stylesheet" href="<?php echo base_url(); ?>static/styles/main.css" type="text/css" media="screen" title="main" charset="utf-8" />
 	</head>
 
 	<body>
 		<div id="container">
 			<div class="container">
 				<div class="header">
-					<h1><a href="<?=$config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
+					<h1><a href="<? echo base_url(); ?>" class="title"><?php echo $CI->config->item('site_name'); ?></a></h1>
 					<div class="tabs">
-						<li><a href="<?=$config['base_url']?>index.php">Paste</a></li>
-						<li><a href="<?=$config['base_url']?>index.php/lists">Recent</a></li>
-						<li><a href="<?=$config['base_url']?>index.php/about">About</a></li>
+						<ul>
+							<li><a href="<?php echo site_url(''); ?>">Paste</a></li>
+							<li><a href="<?php echo site_url('lists'); ?>">Recent</a></li>
+							<li><a href="<?php echo site_url('about'); ?>">About</a></li>
 						</ul>
 					</div>
 				</div>
@@ -34,17 +34,17 @@
 							<h1><?=$heading?></h1>
 							<div class="about">
 								<?=$message?>
-								<p><a href="<?=$config['base_url']?>">Go Home</a></p>
+								<p><a href="<?php echo base_url(); ?>">Go Home</a></p>
 							</div>
 						</div>
 					</div>
 				</div>
 			
 			<div class="footer">
-				<?php include("system/application/views/defaults/footer_message.php"); ?>
-				<?php include("system/application/views/defaults/stats.php"); ?>
+				<?php $CI->load->view('defaults/footer_message'); ?>
+				<?php $CI->load->view('defaults/stats'); ?>
 			</div>
 			</div>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
