diff --git a/modules/extra/webcpanel/templates/default/chanserv/access.html b/modules/extra/webcpanel/templates/default/chanserv/access.html
deleted file mode 100644
index 13c0ba82b..000000000
--- a/modules/extra/webcpanel/templates/default/chanserv/access.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{INCLUDE header.html}
-		{FOR M IN MESSAGES}
-			{M}<br/>
-		{END FOR}
-		{IF EXISTS ACCESSES}
-			<b>Access List</b></br>
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Access</th>
-					<th>Creator</th>
-				</tr>
-				{FOR MASK,ACCESS,CREATOR,ACCESS_CHANGE IN MASKS,ACCESSES,CREATORS,ACCESS_CHANGES}
-					<tr>
-						<td>{MASK}</td>
-						<td>{ACCESS}</td>
-						<td>{CREATOR}</td>
-						{IF EQ ACCESS_CHANGE YES}
-							<td><a href="/chanserv/access?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1">Delete</a></td>
-						{END IF}
-					</tr>
-				{END FOR}
-			</table>
-		{ELSE}
-			<b>Access list is empty.</b>
-		{END IF}
-
-		<br/><br/>
-
-		<b>Add an access entry</b><br/>
-		<form method="post" action="/chanserv/access?channel={ESCAPED_CHANNEL}">
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Access</th>
-					<th>Provider</th>
-				</tr>
-				<tr>
-					<td><input type="text" name="mask"></td>
-					<td><input type="text" name="access"></td>
-					<td>
-						<select name="provider">
-							{FOR PROVIDER IN PROVIDERS}
-								<option value="{PROVIDER}">{PROVIDER}</option>
-							{END FOR}
-						</select>
-					</td>
-				</tr>
-			</table>
-			<input type="submit" value="Add">
-		</form>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/akick.html b/modules/extra/webcpanel/templates/default/chanserv/akick.html
deleted file mode 100644
index 23c1c1efd..000000000
--- a/modules/extra/webcpanel/templates/default/chanserv/akick.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{INCLUDE header.html}
-		{FOR M IN MESSAGES}
-			{M}<br/>
-		{END FOR}
-		{IF EXISTS MASKS}
-			<b>Akick List</b></br>
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Creator</th>
-					<th>Reason</th>
-				</tr>
-				{FOR MASK,CREATOR,REASON IN MASKS,CREATORS,REASONS}
-					<tr>
-						<td>{MASK}</td>
-						<td>{CREATOR}</td>
-						<td>{REASON}</td>
-						<td><a href="/chanserv/akick?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1">Delete</a></td>
-					</tr>
-				{END FOR}
-			</table>
-		{ELSE}
-			<b>Akick list is empty.</b>
-		{END IF}
-
-		<br/><br/>
-
-		<b>Add an akick entry</b><br/>
-		<form method="post" action="/chanserv/akick?channel={ESCAPED_CHANNEL}">
-			<table width="100%" height="100%">
-				<tr>
-					<th>Mask</th>
-					<th>Reason</th>
-				</tr>
-				<tr>
-					<td><input type="text" name="mask"></td>
-					<td><input type="text" name="access"></td>
-				</tr>
-			</table>
-			<input type="submit" value="Add">
-		</form>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/drop.html b/modules/extra/webcpanel/templates/default/chanserv/drop.html
deleted file mode 100644
index 35f0283f2..000000000
--- a/modules/extra/webcpanel/templates/default/chanserv/drop.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{INCLUDE header.html}
-	{IF EXISTS MESSAGES}
-		{FOR M IN MESSAGES}
-			{M}<br/>
-		{END FOR}
-	{END IF}
-	<h3>Channels you can drop:</h3>
-	<div class="scroll">
-	{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
-		<a href="/chanserv/drop?channel={ECH}">{CH}</a></br>
-	{END FOR}
-	</div>
-	{IF EXISTS CHANNEL_DROP} 
-		<h3>Drop Channel {CHANNEL_DROP}?</h3>
-		<form method="post" name="dropForm" action="/chanserv/drop">
-			<input type="hidden" value="{CHANNEL_DROP}" name="channel">
-			Enter Channel For Confirmation: <input type="text" name="confChan">
-			<input type="hidden" value="yes" name="drop">
-			<input type="submit" value="Drop">
-		</form>
-	{END IF}
-{INCLUDE footer.html}
\ No newline at end of file
diff --git a/modules/extra/webcpanel/templates/default/chanserv/main.html b/modules/extra/webcpanel/templates/default/chanserv/main.html
deleted file mode 100644
index dd9288f00..000000000
--- a/modules/extra/webcpanel/templates/default/chanserv/main.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{INCLUDE header.html}
-			<b>Channels you have access in:</b><br/>
-			<div class="cinfo">
-			{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
-				<a href="/chanserv/set?channel={ECH}">{CH}</a></br>
-			{END FOR}
-			</div>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/set.html b/modules/extra/webcpanel/templates/default/chanserv/set.html
deleted file mode 100644
index a97455717..000000000
--- a/modules/extra/webcpanel/templates/default/chanserv/set.html
+++ /dev/null
@@ -1,100 +0,0 @@
-{INCLUDE header.html}
-		{FOR M IN MESSAGES}
-			{M}<br/>
-		{END FOR}
-		<form method="post" action="/chanserv/set?channel={CHANNEL_ESCAPED}">
-			<table width="100%" height="100%">
-				<tr>
-					<td>Channel Name</td>
-					<td>{CHANNEL}</td>
-				</tr>
-				{IF EXISTS FOUNDER}
-				<tr>
-					<td>Founder</td>
-					<td>{FOUNDER}</td>
-				</tr>
-				{END IF}
-				{IF EXISTS SUCCESSOR}
-				<tr>
-					<td>Succsesor</td>
-					<td>{SUCCESSOR}</td>
-				</tr>
-				{END IF}
-				<tr>
-					<td>Time registered</td>
-					<td>{TIME_REGISTERED}</td>
-				</tr>
-				<tr>
-					<td>Last used</td>
-					<td>{LAST_USED}</td>
-				</tr>
-				{IF EXISTS LAST_TOPIC}
-				<tr>
-					<td>Last topic</td>
-					<td>{LAST_TOPIC}</td>
-				</tr>
-				<tr>
-					<td>Set by</td>
-					<td>{LAST_TOPIC_SETTER}</td>
-				</tr>
-				{END IF}
-				<tr>
-					<td>Keep topic</td>
-					{IF EXISTS KEEPTOPIC}
-					<td><input type="checkbox" name="keeptopic" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="keeptopic" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Peace</td>
-					{IF EXISTS PEACE}
-					<td><input type="checkbox" name="peace" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="peace" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Private</td>
-					{IF EXISTS PRIVATE}
-					<td><input type="checkbox" name="private" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="private" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Restricted</td>
-					{IF EXISTS RESTRICTED}
-					<td><input type="checkbox" name="restricted" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="restricted" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Secure</td>
-					{IF EXISTS SECURE}
-					<td><input type="checkbox" name="secure" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="secure" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Secure Ops</td>
-					{IF EXISTS SECUREOPS}
-					<td><input type="checkbox" name="secureops" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="secureops" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Topic Lock</td>
-					{IF EXISTS TOPICLOCK}
-					<td><input type="checkbox" name="topiclock" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="topiclock" value="on"></td>
-					{END IF}
-				</tr>
-		</table>
-	<input type="submit" value="Save">
-	</form>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/confirm.html b/modules/extra/webcpanel/templates/default/confirm.html
deleted file mode 100644
index 918ccd971..000000000
--- a/modules/extra/webcpanel/templates/default/confirm.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html> 
-<html>
-<head>
-	<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
-	<title>{TITLE}</title>
-</head>
-<body>
-	<div class="master">
-		<div class="header">
-			<div class="loggedinas"><a href="/">Home</a></div>
-		</div>
-		<table width="100%" height="100%">
-			<tr>
-				<td>
-					<center>
-						<img src="static/logo.png"/>
-						<br/>
-						{FOR M IN MESSAGES}
-							{M}<br/>
-						{END FOR}
-					</center>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="footer">
-		Anope IRC Services - &copy; 2012 Anope Team - <a href="http://anope.org">http://anope.org</a>
-	</div>
-</body>
-</html>
diff --git a/modules/extra/webcpanel/templates/default/favicon.ico b/modules/extra/webcpanel/templates/default/favicon.ico
deleted file mode 100644
index be735614a..000000000
Binary files a/modules/extra/webcpanel/templates/default/favicon.ico and /dev/null differ
diff --git a/modules/extra/webcpanel/templates/default/footer.html b/modules/extra/webcpanel/templates/default/footer.html
deleted file mode 100644
index 65d23402a..000000000
--- a/modules/extra/webcpanel/templates/default/footer.html
+++ /dev/null
@@ -1,7 +0,0 @@
-		</div>
-	</div>
-	<div class="footer">
-		Anope IRC Services - &copy; 2012 Anope Team - <a href="http://anope.org">http://anope.org</a>
-	</div>
-</body>
-</html>
diff --git a/modules/extra/webcpanel/templates/default/header.html b/modules/extra/webcpanel/templates/default/header.html
deleted file mode 100644
index 3cb1cf372..000000000
--- a/modules/extra/webcpanel/templates/default/header.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html> 
-<html>
-<head>
-	<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
-	<title>{TITLE}</title>
-	{IF EXISTS CMDR} 
-	<script type="text/javascript">
-	var tSec=5; //Time in seconds to keep the overlay open
-	var t=(tSec*1000); //Convert the time to ms so we can use it
-	
-	$(document).ready(function() \{
-	
-		/*Modal*/
-		var id = "#dialog";
-		
-		var mHeight;
-		var mWidth;
-		var oHeight = $(id).height();
-		var oWidth = $(id).height();
-		
-		var top;
-		var left;
-		
-		showModal();
-
-		$('.close').click(function (e) \{
-			e.preventDefault();	
-			hideModal();
-		\});
-	
-		$('#mask').click(function () \{
-			hideModal();
-		\});	
-		
-		function hideModal() \{
-			if ($('#mask').not(':hidden')) \{
-				$('.master').fadeTo('slow',1.0);	
-				$('#mask, .window').fadeOut(200);
-			\}					
-		\}
-		
-		function showModal() \{				
-			mHeight = $(document).height();	
-			mWidth = $(window).width();
-			
-			var alertMsg = '<br/>{CMDR}<br/>';
-
-			$('#mask').css(\{'width': mWidth, 'height': mHeight\});	
-			$('#mask').fadeIn(200);		
-			$('#mask').fadeTo('fast',0.75);
-		
-			$('#dialogMsg').html(alertMsg);
-			
-			top = mHeight/2-oHeight/2;
-			left = mWidth/2-oHeight/2;
-			
-			$(id).css('top', top);
-			$(id).css('left', left);
-			$('.master').fadeTo('fast',0.3);								
-			
-			$(id).fadeIn(500);
-			setTimeout(hideModal, t);		
-			
-		\}	
-		
-		$(window).resize(function() \{
-			if ($('#mask').not(':hidden')) \{
-				mHeight = $(document).height();
-				mWidth = $(window).width();
-
-				/* Might as well only change the postion of box if the window is large enough */
-				if ((mHeight > oHeight) && (mWidth > oWidth)) \{ 
-					top = mHeight/2-oHeight/2;
-					left = mWidth/2-oHeight/2;
-					$('#mask').css(\{'width': mWidth, 'height': mHeight\});
-					$(id).css('top', top);
-					$(id).css('left', left);
-				\}
-				
-			\}
-		\})
-						
-	\});
-	</script>
-	{END IF}
-</head>
-<body>
-	<div id="boxes">
-		<div id="dialog" class="window">
-			<h2>Status Message:</h2>
-			<div id="dialogMsg"></div>
-			<div id="dialogClose"><a href="#" class="close">Dismiss</a></div>
-		</div>
-		<div id="mask"></div>
-	</div>	
-	<div class="master">
-		<div class="header">
-			<ul id="button">
-				{FOR CATEGORY_URL,CATEGORY_NAME IN CATEGORY_URLS,CATEGORY_NAMES}
-				<li><a href="{CATEGORY_URL}">{CATEGORY_NAME}</a></li>
-				{END FOR}
-			</ul>
-			<div class="loggedinas">Logged in as {ACCOUNT} <a href="/logout">(Logout)</a></div>
-		</div>
-		<div class="sidebar">
-			<ul class="sidenav">
-				{FOR SUBCATEGORY_URL,SUBCATEGORY_GET,SUBCATEGORY_NAME IN SUBCATEGORY_URLS,SUBCATEGORY_GETS,SUBCATEGORY_NAMES}
-				<li><a href="{SUBCATEGORY_URL}{SUBCATEGORY_GET}">{SUBCATEGORY_NAME}</a></li>
-				{END FOR}
-			</ul>
-		</div>
-		<div class="content">
diff --git a/modules/extra/webcpanel/templates/default/hostserv/request.html b/modules/extra/webcpanel/templates/default/hostserv/request.html
deleted file mode 100644
index 158bed28f..000000000
--- a/modules/extra/webcpanel/templates/default/hostserv/request.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{INCLUDE header.html}
-	{FOR M IN MESSAGES}
-		{M}<br/>
-	{END FOR}
-	<table width="100%" height="100%">
-		<tr>
-			<td>Your <b>current</b> vHost:
-		{IF EXISTS VHOST}
-			{VHOST}
-		{ELSE}
-			<b>None</b>
-		{END IF}
-			</td>
-		</tr>
-	</table>
-	{IF EXISTS CAN_REQUEST}
-		{IF EXISTS VHOST}		
-			<b>Request a new vHost</b>
-		{ELSE}
-			<b>Request a vHost</b>
-		{END IF}
-		<form method="post" action="/hostserv/request">
-			<input name="req">
-			<input type="submit" value="Request">
-		</form>
-	{ELSE}
-		vHost requests are disabled on this network.
-	{END IF}
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/login.html b/modules/extra/webcpanel/templates/default/login.html
deleted file mode 100644
index 7aa54aa9c..000000000
--- a/modules/extra/webcpanel/templates/default/login.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html> 
-<html>
-<head>
-	<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
-	<title>{TITLE}</title>
-</head>
-<body>
-	<div class="master">
-		<div class="header">
-			<div class="loggedinas"><a href="/register">Register</a></div>
-		</div>
-		<table width="100%" height="100%">
-			<tr>
-				<td>
-					<center>
-						<img src="static/logo.png"/>
-						<br>
-						<h2>Login</h2>
-						{INVALID_LOGIN}<br>
-						Login to continue.
-						<br>
-						<form action="/" method="post">
-							<table>
-								<tr>
-									<td><div align="right">Username:</div></td>
-									<td><div align="left"><input name="username"/></div></td>
-								</tr>
-								<tr>
-									<td><div align="right">Password:</div></td>
-									<td><div align="left"><input name="password" type="password"/></div></td>
-								</tr>
-								<tr>
-									<td></td>
-									<td><div align="left"><input type="submit" value="Login"/></div></td>
-								</tr>
-							</table>
-						</form>
-					</center>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="footer">
-		Anope IRC Services - &copy; 2012 Anope Team - <a href="http://anope.org">http://anope.org</a>
-	</div>
-</body>
-</html>
diff --git a/modules/extra/webcpanel/templates/default/logo.png b/modules/extra/webcpanel/templates/default/logo.png
deleted file mode 100644
index 1ab5546c6..000000000
Binary files a/modules/extra/webcpanel/templates/default/logo.png and /dev/null differ
diff --git a/modules/extra/webcpanel/templates/default/memoserv/memos.html b/modules/extra/webcpanel/templates/default/memoserv/memos.html
deleted file mode 100644
index 4239a926f..000000000
--- a/modules/extra/webcpanel/templates/default/memoserv/memos.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{INCLUDE header.html}
-		<b>Channels you have access in:</b><br/>
-		{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
-			<a href="/memoserv/memos?channel={ECH}" class="channel">{CH}</a> 
-		{END FOR}
-		<br/><br/>
-		{FOR M IN MESSAGES}
-			{M}</br>
-		{END FOR}
-		<br/>
-		{IF EXISTS NUMBER}
-			<script type="text/javascript">
-				$("#memoTable").ready(function() \{
-					$(".reply").click(function(e) \{
-						e.preventDefault();
-						var recv = $(this).attr('href');
-						$("#receiver").val(recv);
-					\});
-				\});
-			</script>
-			<b>Memos List:</b>
-			<table width="100%" height="100%" id="memoTable">
-				<tr>
-					<th class="akillR1">Number</th>
-					<th class="akillR3">Sender</th>
-					<th class="akillR2">Time/Message</th>
-				</tr>
-				{FOR I,S,T,TXT,U IN NUMBER,SENDER,TIME,TEXT,UNREAD}
-				{IF EQ U YES}
-				<tr class="read">
-				{ELSE}
-				<tr class="unread">
-				{END IF}
-					<td class="akillR1">{I}</td>
-					<td class="akillR3">{S}</td>
-					<td class="akillR2"><abbr title="{T}">{TXT}</abbr></td>
-				</tr>
-				{IF EQ U YES}
-				<tr class="read">
-					<td></td>
-					<td></td>
-					<td class="right"><a href="/memoserv/memos?channel={ESCAPED_CHANNEL_NAME}&number={I}&read=1">Mark as Read</a> &nbsp;
-					<a href="{S}" class="reply" id="memo{I}">Reply</a>&nbsp;
-					<a href="/memoserv/memos?channel={ESCAPED_CHANNEL_NAME}&number={I}&del=1">Delete</a></td>
-				{ELSE}
-				<tr class="unread">
-					<td></td>
-					<td></td>
-					<td class="right"><a href="/memoserv/memos?channel={ESCAPED_CHANNEL_NAME}&number={I}&read=2">Mark as Unread</a> &nbsp;
-					<a href="{S}" class="reply" id="memo{I}">Reply</a> &nbsp;
-					<a href="/memoserv/memos?channel={ESCAPED_CHANNEL_NAME}&number={I}&del=1">Delete</a></td>
-				{END IF}
-
-				</tr>
-				{END FOR}
-			</table>
-		{ELSE}
-			<b>No memos to show.</b>
-		{END IF}
-
-		<br/><br/>
-
-		<b>Send a new Memo</b>
-		<form method="post" action="/memoserv/memos?channel={ESCAPED_CHANNEL}">
-		Receiver: <input type="text" name="receiver" id="receiver" value="">
-		Message: <input type="text" name="message">
-		<input type="submit" value="Send">
-		</form>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/nickserv/access.html b/modules/extra/webcpanel/templates/default/nickserv/access.html
deleted file mode 100644
index 9948c3694..000000000
--- a/modules/extra/webcpanel/templates/default/nickserv/access.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{INCLUDE header.html}
-		{FOR M IN MESSAGES}
-			{M}</br>
-		{END FOR}
-		{IF EXISTS ACCESS}
-			<b>Your access list:</b>
-			<table width="100%" height="100%">
-				{FOR A IN ACCESS}
-				<tr>
-					<td>{A}</td>
-					<td><a href="/nickserv/access?mask={A}&del=1">Delete</a></td>
-				</tr>
-				{END FOR}
-			</table>
-		{ELSE}
-			<b>Your access list is empty.</b>
-		{END IF}
-		<br/><br/>
-		<b>Add an access entry:</b>
-		<form method="post" action="/nickserv/access">
-		<input name="access">
-		<input type="submit" value="Add">
-		</form>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/nickserv/alist.html b/modules/extra/webcpanel/templates/default/nickserv/alist.html
deleted file mode 100644
index e36143458..000000000
--- a/modules/extra/webcpanel/templates/default/nickserv/alist.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{INCLUDE header.html}
-	<table>
-		<tr>
-			<th>Number</th>
-			<th>Channel</th>
-			<th>Access</th>
-		</tr>
-		{FOR N,C,A IN NUMBERS,CHANNELS,ACCESSES}
-			<tr>
-				<td>{N}</td>
-				<td>{C}</td>
-				<td>{A}</td>
-			</tr>
-		{END FOR}
-	</table>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/nickserv/cert.html b/modules/extra/webcpanel/templates/default/nickserv/cert.html
deleted file mode 100644
index 31f12b883..000000000
--- a/modules/extra/webcpanel/templates/default/nickserv/cert.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{INCLUDE header.html}
-		{FOR M IN MESSAGES}
-			{M}</br>
-		{END FOR}
-		<b>Your certificate finrgerprints:</b>
-		<table width="100%" height="100%">
-			{FOR CERT IN CERTS}
-			<tr>
-				<td>{CERT}</td>
-				<td><a href="/nickserv/cert?mask={CERT}&del=1">Delete</a></td>
-			</tr>
-			{END FOR}
-		</table>
-		<b>Add an certificate fingerprint</b>
-		<form method="post" action="/nickserv/cert">
-		<input name="certfp">
-		<input type="submit" value="Add">
-		</form>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/nickserv/info.html b/modules/extra/webcpanel/templates/default/nickserv/info.html
deleted file mode 100644
index 1dd051364..000000000
--- a/modules/extra/webcpanel/templates/default/nickserv/info.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{INCLUDE header.html}
-			{FOR M IN ERRORS}
-				{M}<br/>
-			{END FOR}
-			{FOR M IN MESSAGES}
-				{M}<br/>
-			{END FOR}
-			<b>Your account information:</b>
-			<form method="post" action="/nickserv/info">
-			<table width="100%" height="100%">
-				<tr>
-					<td>Account:</td>
-					<td>{DISPLAY}</td>
-				</tr>
-				{IF EXISTS EMAIL}
-				<tr>
-					<td>EMail</td>
-					<td>{EMAIL}</td>
-				</tr>
-				{END IF}
-				<tr>
-					<td>Time registered</td>
-					<td>{TIME_REGISTERED}</td>
-				</tr>
-				{IF EXISTS VHOST}
-				<tr>
-					<td>Vhost</td>
-					<td>{VHOST}</td>
-				</tr>
-				{END IF}
-				<tr>
-					<td>Greet</td>
-					<td><input name="greet" value="{GREET}"></td>
-				</tr>
-				<tr>
-					<td>Auto op</td>
-					{IF EXISTS AUTOOP}
-					<td><input type="checkbox" name="autoop" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="autoop" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Private</td>
-					{IF EXISTS PRIVATE}
-					<td><input type="checkbox" name="private" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="private" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Secure</td>
-					{IF EXISTS SECURE}
-					<td><input type="checkbox" name="secure" value="on" checked></td>
-					{ELSE}
-					<td><input type="checkbox" name="secure" value="on"></td>
-					{END IF}
-				</tr>
-				<tr>
-					<td>Kill</td>
-					<td><select name="kill">
-						{IF EXISTS KILL_ON}
-						<option value="on" selected>On</option>
-						{ELSE}
-						<option value="on">On</option>
-						{END IF}
-						{IF EXISTS KILL_QUICK}
-						<option value="quick" selected>Quick</option>
-						{ELSE}
-						<option value="quick">Quick</option>
-						{END IF}
-						{IF EXISTS KILL_OFF}
-						<option value="off" selected>Off</option>
-						{ELSE}
-						<option value="off">Off</option>
-						{END IF}
-					</select></td>
-				</tr>
-			</table>
-			<input type="submit" value="Save">
-			</form>
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/operserv/akill.html b/modules/extra/webcpanel/templates/default/operserv/akill.html
deleted file mode 100644
index dbe667938..000000000
--- a/modules/extra/webcpanel/templates/default/operserv/akill.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{INCLUDE header.html}
-	{IF EXISTS NOACCESS}
-		<b>Access denied.</b>
-	{ELSE}
-		{FOR M IN MESSAGES}
-			{M}</br>
-		{END FOR}
-		</br><b>AKILL List:</b>
-		<table width="100%" height="100%">
-			<tr>
-				<td class="akillR1">Number</td>
-				<td class="akillR2">Hostmask</td>
-				<td class="akillR2">Expires</td>
-				<td class="akillR2">Setter</td>
-				<td class="akillR3"/>
-			</tr>
-		</table>
-		<div class="scroll">
-			<table>
-				{FOR N,H,S,T,E,R IN NUMBER,HOST,SETTER,TIME,EXPIRE,REASON}
-				<tr>
-					<td class="akillR1">{N}</td>
-					<td class="akillR2"><abbr class="akillR2" title="{R}">{H}</abbr></td>
-					<td class="akillR2"><abbr class="akillR2" title="{T}">{E}</abbr></td>
-					<td class="akillR2">{S}</td>
-					<td class="akillR3"><a href="/operserv/akill?&number={N}&del=1">Delete</a></td>
-				</tr>
-				{END FOR}
-			</table></br>
-		</div>
-		<b>Add a new AKILL</b>
-		<form method="post" action="/operserv/akill">
-			<table width="100%" height="100%" align="left">
-				<tr>
-					<th align="left">HostMask</th>
-					<th align="left">Expiry</th>
-					<th align="left">Reason</th>
-				</tr>
-				<tr>
-					<td><input type="text" name="mask"></td>
-					<td><input type="text" name="expiry"></td>
-					<td><input type="text" name="reason"></td>
-				</tr>
-			</table>
-			<input type="submit" value="send">
-		</form>
-	{END IF}
-
-{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/register.html b/modules/extra/webcpanel/templates/default/register.html
deleted file mode 100644
index 8f6a5296a..000000000
--- a/modules/extra/webcpanel/templates/default/register.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html> 
-<html>
-<head>
-	<link href="/static/style.css" media="screen" rel="stylesheet" type="text/css" />
-	<title>{TITLE}</title>
-</head>
-<body>
-	<div class="master">
-		<div class="header">
-			<div class="loggedinas"><a href="/">Home</a></div>
-		</div>
-		<table width="100%" height="100%">
-			<tr>
-				<td>
-					<center>
-						<img src="static/logo.png"/>
-						{MESSAGES}
-						<br>
-						<h2>Register</h2>
-						<br>
-						Fill out the following form to register.
-						<form action="/confirm" method="post">
-							<table>
-								<tr>
-									<td><div align="right">Username:</div></td>
-									<td><div align="left"><input name="username"/></div></td>
-								</tr>
-								<tr>
-									<td><div align="right">Password:</div></td>
-									<td><div align="left"><input name="password" type="password"/></div></td>
-								</tr>
-								<tr>
-									<td><div align="right">Email</div></td>
-									<td><div align="left"><input type="{EMAIL_TYPE}" name="email"></div></td>
-								</tr>
-								<tr>
-									<td></td>
-									<td><div align="left"><input type="submit" value="Register"/></div></td>
-								</tr>
-							</table>
-						</form>
-					</center>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<div class="footer">
-		Anope IRC Services - &copy; 2012 Anope Team - <a href="http://anope.org">http://anope.org</a>
-	</div>
-</body>
-</html>
diff --git a/modules/extra/webcpanel/templates/default/style.css b/modules/extra/webcpanel/templates/default/style.css
deleted file mode 100644
index 13b4e4759..000000000
--- a/modules/extra/webcpanel/templates/default/style.css
+++ /dev/null
@@ -1,204 +0,0 @@
-html {
-font-family: 'Cabin', Helvetica, Arial, sans-serif;
-}
-body {
-	overflow:hidden;
-	z-index: 10;
-}
-.master {
-	margin-left:0px;
-	margin-right:0px;
-	height:100%;
-	background: #FFF;
-	border-width: 1px;
-	border-style: solid;
-	overflow: hidden;
-}
-.header {
-	height: 33px;
-	padding-left: 5px;
-	width: auto;
-	background: #EEE;
-	border-width: 1px;
-	border-bottom-style: solid;	
-}
-.sidebar {
-	width: 185px;
-	background: #EEE;
-	height: 500px;
-	border-width: 1px;
-	border-right-style: solid;	
-	padding-top:15px;
-	padding-left:15px;
-}
-
-.loggedinas {
-	right:15px;
-	top:15px;
-	position:absolute;
-}
-
-#button {
-	padding: 0;
-	height:30px;
-	margin: 0px;
-	padding-bottom: 2px;
-}
-#button li {
-	display: inline;
-}
-
-#button li a {
-	font-family: Arial;
-	font-size:11px;
-	text-decoration: none;
-	float:left;
-	padding: 10px;
-	background-color: #EEE;
-	height:13px;
-	color: #000;
-}
-#button li a:hover {
- background-color: #A8BEE3;
- padding-bottom:10px;
-}
-#a.current {
-	color:navy;
-}
-
-.content {
-	left:220px;
-	top:50px;
-	position:absolute;
-}
-
-.footer {
-	margin-left:auto;
-	margin-right:auto;
-	text-align:center;
-	height: 30px;
-	width:100%;
-	background: #FFF;
-	overflow: hidden;
-}
-
-.sidenav {
-	list-style-type: none;
-	background: #EEE
-}
-
-.sidenav a {
-	color:black;
-	text-decoration:none;
-}
-.sidenav a:hover{
-	color:black;
-	background:#FFF;
-	text-decoration:underline;
-}
-
-.scroll {
-	overflow-x: scroll;
-	height: 125px;
-}
-
-.cinfo {
-	overflow-x: scroll;
-	height: 450px;
-}
-
-.right { 
-	text-align: right; 
-}
-/* Table Stuff */
-.akillR1 { 
-	width: 80px;
-	text-align: left;
-}
-.akillR2 {
-	width: 250px;
-	text-align: left;
-}
-.akillR3 {
-	width: 100px;
-	text-align: left;
-}
-
-td.right a:link, td.right a:visited {
-	color: #000;
-	background-color: #FFF;
-	border: 1px solid #000;
-	padding: 0px 4px;
-	-webkit-border-radius: 5x;
-  	border-radius: 5px;
-	text-decoration: none;
-}
-
-td.right a:hover {
-	color: #00F;
-}
-
-table#memoTable {
-	border-spacing: 0px;
-	border-collapse: collapse;
-}
-
-table#memoTable tr {
-	padding: 1px;
-}
-
-tr.read  { 
-	background-color: #FFF;
-}
-
-tr.unread {
-	background-color: #EEE;
-}
- 
-tr.read td, tr.unread td {
-	padding: 2px;	
-}
-
-/* Modal Window */
-#mask {
-	position: absolute;
-	z-index: 9000;
-	background-color: #000;
-	height: 100%;
-	width: 100%;
-	display: none;
-}
-
-#boxes .window {
-  position:fixed;
-  width:440px;
-  height:200px;
-  display:none;
-  z-index:9999;
-  padding:20px;
-}
- 
-#boxes #dialog {
-	text-align: center;
-	background-color: #FFF;
-  	width:375px; 
-  	height:203px;
-  	padding: 20px;
-  	-webkit-border-radius: 15px;
-  	border-radius: 15px;
-  	display: none;
-}
-
-#dialogClose {
-	padding-top: 20px;
-}
-
-#dialogClose a:link, #dialogClose a:visited { 
-	color: #000;
-	text-decoration: none;
-}
-
-#dialogClose a:hover {
-	color: #000;
-	text-decoration: underline;
-}