From 893957c41481a0cd5eb624096337762ffa54ff28 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sun, 9 Aug 2009 09:14:58 -0400
Subject: Created layout 7

The following changes were also made in this revision:

* All HTML was changed to XHTML and a !DOCTYPE was included to reflect this
* Rewrote quotes tracking system to be much less complicated and actually working
* Changed quotes rendering to look more like Chirpy than Rash
* Fixed comment textarea bug
* Rewrote a ton of CSS so it's not as bloated
* Added a JavaScript confirmation when deleting a comment
* AJAXified voting on the POTW
* AJAXified voting and flagging quotes
* AJAXified commenting
* AJAXified voting on posts
* Added DateFinder back after it was accidentally deleted in Layout 4.5

The following database changes must be performed as soon as possible:

* Fix title of NO <!DOCTYPE> post (the &lt; is missing the semicolon)
* Restore post Frasty Tha Snaman from a backup
* Reset "flag" field of all rows in "rash_quotes" to 0
* Remove the "vote" and "flag" columns of "rash_tracking"
* Rename the "quote_id" column of "rash_tracking" to "vote"

The following external code changes must also be performed as soon as possible:

* Add the following line to the end of the // Four Island block in The Fourm's functions.php:
  require('/svr/www/hatkirby/fourisland/main/includes/specialdates.php');
---
 .hgignore                                |   1 +
 .htaccess                                |   2 +-
 includes/bbcode.php                      |  66 +++--
 includes/comments.php                    |   6 +-
 includes/footer.php                      | 322 ++++++++--------------
 includes/functions.php                   |  48 +++-
 includes/header.php                      |  47 ++--
 includes/smilies.php                     |   2 +-
 includes/specialdates.php                |  52 +++-
 index.php                                |   1 +
 pages/admin.php                          |  13 +-
 pages/blog.php                           |  23 +-
 pages/holidates.php                      |  35 ++-
 pages/poll-results.php                   |  54 ++++
 pages/poll.php                           |  29 +-
 pages/post.php                           | 103 ++++---
 pages/quotes.php                         | 261 +++++++++---------
 pages/vote.php                           |  42 +--
 pages/welcome.php                        |  22 +-
 theme/addresses.tpl                      |   8 +-
 theme/admin/deleteDraft.tpl              |   8 +-
 theme/admin/deletePending.tpl            |   8 +-
 theme/admin/deletePost.tpl               |   8 +-
 theme/admin/deletedDraft.tpl             |   8 +-
 theme/admin/deletedPending.tpl           |   8 +-
 theme/admin/deletedPost.tpl              |   8 +-
 theme/admin/draftSuccess.tpl             |  12 +-
 theme/admin/editDraft.tpl                |  26 +-
 theme/admin/editPending.tpl              |  14 +-
 theme/admin/editPost.tpl                 |  14 +-
 theme/admin/index.tpl                    |  46 ++--
 theme/admin/maintenanceMode.tpl          |  24 +-
 theme/admin/manageDrafts.tpl             |  36 +--
 theme/admin/managePending.tpl            |  40 +--
 theme/admin/managePendingQuotes.tpl      |  30 +-
 theme/admin/managePosts.tpl              |  36 +--
 theme/admin/moderateComments.tpl         |  36 +--
 theme/admin/newPoll.tpl                  |  18 +-
 theme/admin/pendingSuccess.tpl           |  12 +-
 theme/admin/pollrss.tpl                  |  10 +-
 theme/admin/postSuccess.tpl              |  12 +-
 theme/admin/viewComment.tpl              |  20 +-
 theme/admin/write.tpl                    |  26 +-
 theme/archive.tpl                        |   6 +-
 theme/comments.tpl                       | 130 +++++----
 theme/css.php                            |  32 +--
 theme/css/blog.php                       |  18 +-
 theme/css/bubbles.css                    |  91 +++---
 theme/css/day.css                        |   4 -
 theme/css/holiday.php                    |  43 ++-
 theme/css/ie.css                         |  44 ---
 theme/css/night.css                      |  25 --
 theme/css/print.css                      |  38 ++-
 theme/css/quotes.css                     |  61 ++++
 theme/css/website.css                    | 458 +++++++++++++++----------------
 theme/datefinder.tpl                     |   0
 theme/errors/404.tpl                     | 202 +++++++-------
 theme/footer.tpl                         |  91 +++---
 theme/fuhsdiufgsadiufgaisfioas.tpl       |   4 +-
 theme/header.tpl                         | 293 +++++++++++++-------
 theme/holidates.tpl                      |  15 +
 theme/images/fourisland_header.png       | Bin 24124 -> 0 bytes
 theme/images/fourisland_header_night.png | Bin 19678 -> 0 bytes
 theme/images/header-repeat.png           | Bin 0 -> 218 bytes
 theme/images/header.png                  | Bin 0 -> 16617 bytes
 theme/images/icons/xhtml_valid.png       | Bin 0 -> 718 bytes
 theme/images/no-ie6.png                  | Bin 18666 -> 0 bytes
 theme/login.tpl                          |  17 --
 theme/maintenance.tpl                    |   8 +-
 theme/msg.tpl                            |   2 +-
 theme/msg2.tpl                           |   2 +-
 theme/new-comment.tpl                    |   8 +
 theme/pingbacks.tpl                      |  21 +-
 theme/poll.tpl                           |  64 ++---
 theme/pollIndex.tpl                      |  43 ++-
 theme/polloftheweek.tpl                  |  86 +++---
 theme/post.tpl                           | 135 +++++----
 theme/postLogin.tpl                      |  16 --
 theme/quotes/add.tpl                     |  22 +-
 theme/quotes/browse.tpl                  |  92 ++++++-
 theme/quotes/pagenumbers.tpl             |  24 +-
 theme/quotes/search.tpl                  |  34 +--
 theme/related.tpl                        |  21 +-
 83 files changed, 2019 insertions(+), 1728 deletions(-)
 create mode 100644 pages/poll-results.php
 mode change 100755 => 100644 theme/css.php
 delete mode 100755 theme/css/day.css
 delete mode 100644 theme/css/ie.css
 delete mode 100755 theme/css/night.css
 create mode 100644 theme/css/quotes.css
 mode change 100755 => 100644 theme/css/website.css
 delete mode 100755 theme/datefinder.tpl
 mode change 100755 => 100644 theme/footer.tpl
 mode change 100755 => 100644 theme/header.tpl
 create mode 100644 theme/holidates.tpl
 delete mode 100755 theme/images/fourisland_header.png
 delete mode 100644 theme/images/fourisland_header_night.png
 create mode 100644 theme/images/header-repeat.png
 create mode 100644 theme/images/header.png
 create mode 100644 theme/images/icons/xhtml_valid.png
 delete mode 100755 theme/images/no-ie6.png
 delete mode 100755 theme/login.tpl
 create mode 100644 theme/new-comment.tpl
 delete mode 100755 theme/postLogin.tpl

diff --git a/.hgignore b/.hgignore
index 9747ba0..c55862b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1 +1,2 @@
 ^images
+~$
diff --git a/.htaccess b/.htaccess
index 3fd4fe2..bb11dba 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-ErrorDocument 404 http://fourisland.com/error/404.php
+ErrorDocument 404 /error/404.php
 
 RewriteEngine On
 
diff --git a/includes/bbcode.php b/includes/bbcode.php
index af0b1a4..b116e7a 100755
--- a/includes/bbcode.php
+++ b/includes/bbcode.php
@@ -30,30 +30,33 @@ class BBCode
 
 	function init()
 	{
-		$this->bbcodes['b'] = '<B>{CONTENT}</B>';
-		$this->bbcodes['i'] = '<I>{CONTENT}</I>';
-		$this->bbcodes['u'] = '<U>{CONTENT}</U>';
-		$this->bbcodes['url'] = '<A HREF="{CONTENT}">{CONTENT}</A>';
-		$this->bbcodes2['url'] = '<A HREF="{PARAM}">{CONTENT}</A>';
-		$this->bbcodes['img'] = '<IMG SRC="{CONTENT}" ALT="Image">';
-		$this->bbcodes2['img'] = '<IMG SRC="{CONTENT}" ALT="{PARAM}" TITLE="{PARAM}">';
-		$this->bbcodes['big'] = '<BIG>{CONTENT}</BIG>';
-		$this->bbcodes['small'] = '<SMALL>{CONTENT}</SMALL>';
-		$this->bbcodes['ul'] = '<UL>{CONTENT}</UL>';
-		$this->bbcodes['ol'] = '<OL>{CONTENT}</OL>';
-		$this->bbcodes['li'] = '<LI>{CONTENT}</LI>';
-		$this->bbcodes['code'] = '<CODE>{CONTENT}</CODE>';
-		$this->bbcodes['pre'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV><CODE>{CONTENT}</CODE></DIV></BLOCKQUOTE></DIV></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
-		$this->bbcodes2['blog'] = '<A HREF="/blog/{PARAM}/">{CONTENT}</A>';
-		$this->bbcodes2['quote'] = '<A HREF="/quotes/{PARAM}.php">{CONTENT}</A>';
-		$this->bbcodes['ins'] = '<INS>{CONTENT}</INS>';
-		$this->bbcodes['del'] = '<DEL>{CONTENT}</DEL>';
-		$this->bbcodes['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV>{CONTENT}</DIV></BLOCKQUOTE></DIV><CITE><STRONG>Anonymous</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
-		$this->bbcodes2['bquote'] = '<P><DIV CLASS="autosize"><DIV CLASS="bubble"><DIV CLASS="bquote"><BLOCKQUOTE><DIV>{CONTENT}</DIV></BLOCKQUOTE></DIV><CITE><STRONG>{PARAM}</STRONG></CITE></DIV></DIV><DIV CLASS="cleardiv"></DIV>';
-		$this->bbcodes2['abbr'] = '<ABBR TITLE="{PARAM}">{CONTENT}</ABBR>';
-		$this->bbcodes['hidden'] = '<SPAN STYLE="display: none">{CONTENT}</SPAN>';
-		$this->bbcodes['thumb'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=521&amp;side=0" ALT="Image"></A>';
-		$this->bbcodes['thumb2'] = '<A HREF="/images/{CONTENT}"><IMG SRC="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=260&amp;side=0" ALIGN="right" ALT="Image"></A>';
+		$this->bbcodes['b'] = '<strong>{CONTENT}</strong>';
+		$this->bbcodes['i'] = '<em>{CONTENT}</em>';
+		$this->bbcodes['u'] = '<u>{CONTENT}</u>';
+		$this->bbcodes['url'] = '<a href="{CONTENT}">{CONTENT}</a>';
+		$this->bbcodes2['url'] = '<a href="{PARAM}">{CONTENT}</a>';
+		$this->bbcodes['img'] = '<img src="{CONTENT}" alt="Image" />';
+		$this->bbcodes2['img'] = '<img src="{CONTENT}" alt="{PARAM}" title="{PARAM}" />';
+		$this->bbcodes['big'] = '<big>{CONTENT}</big>';
+		$this->bbcodes['small'] = '<small>{CONTENT}</small>';
+		$this->bbcodes['ul'] = '<ul>{CONTENT}</ul>';
+		$this->bbcodes['ol'] = '<ol>{CONTENT}</ol>';
+		$this->bbcodes['li'] = '<li>{CONTENT}</li>';
+		$this->bbcodes['code'] = '<code>{CONTENT}</code>';
+		$this->bbcodes['pre'] = '<pre><code>{CONTENT}</code></pre>';
+		$this->bbcodes['pref'] = '<pre>{CONTENT}</pre>';
+		$this->bbcodes2['blog'] = '<a href="/blog/{PARAM}/">{CONTENT}</a>';
+		$this->bbcodes['quote'] = '<a href="/quotes/{CONTENT}.php">#{CONTENT}</a>';
+		$this->bbcodes2['quote'] = '<a href="/quotes/{PARAM}.php">{CONTENT}</a>';
+		$this->bbcodes['ins'] = '<ins>{CONTENT}</ins>';
+		$this->bbcodes['del'] = '<del>{CONTENT}</del>';
+		$this->bbcodes['bquote'] = '<div class="bquote module unrounded"><blockquote>{CONTENT}</blockquote></div><cite><strong>Anonymous</strong></cite><div class="cleardiv"></div>';
+		$this->bbcodes2['bquote'] = '<div class="bquote module unrounded"><blockquote>{CONTENT}</blockquote></div><cite><strong>{PARAM}</strong></cite><div class="cleardiv"></div>';
+		$this->bbcodes2['abbr'] = '<abbr title="{PARAM}">{CONTENT}</abbr>';
+		$this->bbcodes['hidden'] = '<span style="display: none">{CONTENT}</span>';
+		$this->bbcodes['thumb'] = '<a href="/images/{CONTENT}"><img src="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=521&amp;side=0" alt="Image" /></a>';
+		$this->bbcodes['thumb2'] = '<a href="/images/{CONTENT}"><img src="http://fourisland.com/thumb.php?file=images/{CONTENT}&amp;mode=scale&amp;by=260&amp;side=0" align="right" alt="Image" /></a>';
+		$this->bbcodes['project'] = '<a href="http://projects.fourisland.com/projects/show/{CONTENT}">{CONTENT}</a>';
 
 		$this->init = true;
 	}
@@ -73,8 +76,15 @@ class BBCode
 			{
 				$bbcode_uid = unique_id();
 				$bbpos = strpos($to_parse, '[' . $name . ']');
-				$to_parse = substr_replace($to_parse, '[' . $name . ':' . $bbcode_uid . ']', $bbpos, strlen($name) + 2);
-				$to_parse = substr_replace($to_parse, '[/' . $name . ':' . $bbcode_uid . ']', strpos(substr($to_parse, $bbpos), '[/' . $name . ']') + $bbpos, strlen($name) + 3);
+				$otag = '[' . $name . ':' . $bbcode_uid . ']';
+				$ctag = '[/' . $name . ':' . $bbcode_uid . ']';
+				$to_parse = substr_replace($to_parse, $otag, $bbpos, strlen($name) + 2);
+				$to_parse = substr_replace($to_parse, $ctag, strpos(substr($to_parse, $bbpos), '[/' . $name . ']') + $bbpos, strlen($name) + 3);
+
+				if (strpos($this->bbcodes[$name], '<pre>') !== -1)
+				{
+					$to_parse = substr_replace($to_parse, str_replace('[br]', '', substr($to_parse, strpos($to_parse, $otag) + strlen($otag), strpos($to_parse, $ctag) - (strpos($to_parse, $otag) + strlen($otag)))), strpos($to_parse, $otag) + strlen($otag), strpos($to_parse, $ctag) - (strpos($to_parse, $otag) + strlen($otag)));
+				}
 
 				$value = str_replace('{CONTENT}', '\1', $value);
 				$to_parse = preg_replace('/\[' . $name . ':' . $bbcode_uid . '\](.*)\[\/' . $name . ':' . $bbcode_uid . '\]/', $value, $to_parse);
@@ -96,13 +106,13 @@ class BBCode
 			}
 		}
 
-		return str_replace('[br]','<BR>',$to_parse);
+		return str_replace('[br]','<br />',$to_parse);
 	}
 }
 
 function parseBBCode($text)
 {
-	global $bbcode;
+	static $bbcode;
 	if (!isset($bbcode))
 	{
 		$bbcode = new BBCode();
diff --git a/includes/comments.php b/includes/comments.php
index e050073..0f48444 100755
--- a/includes/comments.php
+++ b/includes/comments.php
@@ -69,8 +69,8 @@ while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
 	if (isset($username))
 	{
 		$template->add_ref($curID, 'COMMENTS', array(	'CODEDEMAIL' => md5(strtolower($email)),
-								'USERNAME' => (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username),
-								'DATE' => date("F dS Y \a\\t g:i:s a",strtotime($getcomments3[$i]['posttime'])),
+								'USERNAME' => (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username),
+								'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getcomments3[$i]['posttime'])),
 								'ID' => $getcomments3[$i]['id'],
 								'TEXT' => parseText($getcomments3[$i]['comment'])));
 
@@ -78,7 +78,7 @@ while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
 		{
 			if ((isAdmin()) || (($getcomments3[$i]['is_anon'] == 0) && (getSessionUserID() === $getcomments3[$i]['user_id'])))
 			{
-				$template->adds_ref_sub($curID, 'EDITOR', array('BEFORE' => $getcomments3[$i]['comment']));
+				$template->adds_ref_sub($curID, 'EDITOR', array('BEFORE' => htmlspecialchars($getcomments3[$i]['comment'])));
 			}
 		}
 	}
diff --git a/includes/footer.php b/includes/footer.php
index 6713db0..19cc341 100755
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -24,244 +24,156 @@ require('headerproc.php');
 
 $template = new FITemplate('footer');
 
-if (isset($extraSidebars))
-{
-	$template->adds_block('EXTRA', array('SIDEBARS' => $extraSidebars));
-}
-
 if (isset($onFourm))
 {
 	$template->adds_block('ONFOURM',array('exi'=>1));
 }
 
-if (!isset($noRightbar))
+$getcomments = "SELECT * FROM comments ORDER BY id DESC LIMIT 0,5";
+$getcomments2 = mysql_query($getcomments);
+$i=0;
+while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
 {
-	$template->adds_block('RIGHTBAR',array('exi'=>1));
-
-	if (!isset($noHatNav))
-	{
-		$cnthatnav = "SELECT COUNT(*) FROM hatnav WHERE category = \"" . $pageCategory . "\"";
-		$cnthatnav2 = mysql_query($cnthatnav);
-		$cnthatnav3 = mysql_fetch_array($cnthatnav2);
+	if ($getcomments3[$i]['is_anon'] == 0)
+		{
+				$getuser = "SELECT * FROM phpbb_users WHERE user_id = " . $getcomments3[$i]['user_id'];
+				$getuser2 = mysql_query($getuser);
+				$getuser3 = mysql_fetch_array($getuser2);
 
-		if ($cnthatnav3['COUNT(*)'] > 0)
+				$username = $getuser3['username'];
+				$website = $getuser3['user_website'];
+		} else if ($getcomments3[$i]['is_anon'] == 1) 
 		{
-			$template->adds_block('USEHATNAV', array('exi'=>1));
-			if (!isset($genHatNav))
-			{
-				$gethnis = 'SELECT * FROM hatnav WHERE category = "' . $pageCategory . '"';
-				$gethnis2 = mysql_query($gethnis);
-				$i=0;
-				while ($gethnis3[$i] = mysql_fetch_array($gethnis2))
-				{
-					$template->adds_block('HATNAV', array(	'AID' => 	$gethnis3[$i]['AID'],
-										'HREF' => $gethnis3[$i]['href'],
-										'IMAGE' => '/theme/images/icons/' . $gethnis3[$i]['image'] . '.png',
-										'TEXT' => $gethnis3[$i]['text'],
-										'NEW' => dispIfNotOld($gethnis3[$i]['lastEdit'])));
-					$i++;
-				}
-			} else {
-				$i=0;
-				while ($i < $genHatNavNum)
+				$getanon = "SELECT * FROM anon_commenters WHERE id = " . $getcomments3[$i]['user_id'];
+				$getanon2 = mysql_query($getanon);
+				$getanon3 = mysql_fetch_array($getanon2);
+
+				if ($getanon3['id'] == $getcomments3[$i]['user_id'])
 				{
-					$template->adds_block('HATNAV', array(	'AID' => 	'post',
-										'HREF' => $genHatNav[$i]['href'],
-										'IMAGE' => '/theme/images/blue.PNG',
-										'TEXT' => $genHatNav[$i]['text'],
-										'NEW' => ''));
-					$i++;
+						$username = $getanon3['username'] . ' (Guest)';
+						$website = $getanon3['website'];
 				}
-			}
 		}
-	}
 
-	include('pages/polloftheweek.php');
-
-	$getpopular = "SELECT * FROM updates ORDER BY popularity DESC LIMIT 0,5";
-	$getpopular2 = mysql_query($getpopular);
-	$i=0;
-	while ($getpopular3[$i] = mysql_fetch_array($getpopular2))
+	if (strpos($getcomments3[$i]['page_id'], 'updates') !== FALSE)
 	{
-		$template->adds_block('POPULAR', array(	'CODED' => $getpopular3[$i]['slug'],
-							'TITLE' => stripslashes($getpopular3[$i]['title'])));
+		$getpost = "SELECT * FROM updates WHERE id = " . substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
+		$getpost2 = mysql_query($getpost);
+		$getpost3 = mysql_fetch_array($getpost2);
+
+		$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
+								'AREA' => 'blog',
+								'CODED' => $getpost3['slug'],
+								'ENDING' => '/',
+								'TITLE' => stripslashes($getpost3['title']),
+								'AUTHOR' => (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username)));
 		$i++;
-	}
-
-	$getcomments = "SELECT * FROM comments ORDER BY id DESC LIMIT 0,5";
-	$getcomments2 = mysql_query($getcomments);
-	$i=0;
-	while ($getcomments3[$i] = mysql_fetch_array($getcomments2))
+	} else if (strpos($getcomments3[$i]['page_id'], 'quote') !== FALSE)
 	{
-		if ($getcomments3[$i]['is_anon'] == 0)
-	        {
-        	        $getuser = "SELECT * FROM phpbb_users WHERE user_id = " . $getcomments3[$i]['user_id'];
-	                $getuser2 = mysql_query($getuser);
-	                $getuser3 = mysql_fetch_array($getuser2);
-
-	                $username = $getuser3['username'];
-	                $website = $getuser3['user_website'];
-        	} else if ($getcomments3[$i]['is_anon'] == 1) 
-	        {
-	                $getanon = "SELECT * FROM anon_commenters WHERE id = " . $getcomments3[$i]['user_id'];
-	                $getanon2 = mysql_query($getanon);
-	                $getanon3 = mysql_fetch_array($getanon2);
-
-	                if ($getanon3['id'] == $getcomments3[$i]['user_id'])
-	                {
-	                        $username = $getanon3['username'] . ' (Guest)';
-	                        $website = $getanon3['website'];
-	                }
-	        }
-
-		if (strpos($getcomments3[$i]['page_id'], 'updates') !== FALSE)
-		{
-			$getpost = "SELECT * FROM updates WHERE id = " . substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
-			$getpost2 = mysql_query($getpost);
-			$getpost3 = mysql_fetch_array($getpost2);
-
-			$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
-									'AREA' => 'blog',
-									'CODED' => $getpost3['slug'],
-									'ENDING' => '/',
-									'TITLE' => stripslashes($getpost3['title']),
-									'AUTHOR' => (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username)));
-			$i++;
-		} else if (strpos($getcomments3[$i]['page_id'], 'quote') !== FALSE)
-		{
-			$num = substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
-
-			$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
-									'AREA' => 'quotes',
-									'CODED' => $num,
-									'ENDING' => '.php',
- 									'TITLE' => 'Quote #' . $num,
-									'AUTHOR' => (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username)));
-			$i++;			
-		} else if (strpos($getcomments3[$i]['page_id'], 'polloftheweek') !== FALSE)
-		{
-			$getpotw = "SELECT * FROM polloftheweek WHERE id = " . substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
-			$getpotw2 = mysql_query($getpotw);
-			$getpotw3 = mysql_fetch_array($getpotw2);
-
-			$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
-									'AREA' => 'poll',
-									'CODED' => $getpotw3['id'],
-									'ENDING' => '.php',
- 									'TITLE' => 'Poll "' . $getpotw3['question'] . '"',
-									'AUTHOR' => (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username)));
-			$i++;			
-		}
-	}
-
-	$users = array();
-	$getusers = "SELECT DISTINCT user_id FROM comments WHERE is_anon = 0";
-	$getusers2 = mysql_query($getusers);
-	$i=0;
-	while ($getusers3[$i] = mysql_fetch_array($getusers2))
+		$num = substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
+
+		$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
+								'AREA' => 'quotes',
+								'CODED' => $num,
+								'ENDING' => '.php',
+								'TITLE' => 'Quote #' . $num,
+								'AUTHOR' => (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username)));
+		$i++;			
+	} else if (strpos($getcomments3[$i]['page_id'], 'polloftheweek') !== FALSE)
 	{
-		$getcount = "SELECT COUNT(*) FROM comments WHERE user_id = " . $getusers3[$i]['user_id'];
-		$getcount2 = mysql_query($getcount);
-		$getcount3 = mysql_fetch_array($getcount2);
-
-                $getuser = "SELECT * FROM phpbb_users WHERE user_id = " . $getusers3[$i]['user_id'];
-                $getuser2 = mysql_query($getuser);
-                $getuser3 = mysql_fetch_array($getuser2);
-
-                $username = $getuser3['username'];
-                $website = $getuser3['user_website'];
-
-		$name = (($website != '') ? '<A HREF="' . $website . '">' . $username . '</A>' : $username);
-		$users[] = array('name' => $name, 'count' => $getcount3['COUNT(*)']);
-
-		$i++;
+		$getpotw = "SELECT * FROM polloftheweek WHERE id = " . substr($getcomments3[$i]['page_id'],strpos($getcomments3[$i]['page_id'],'-')+1);
+		$getpotw2 = mysql_query($getpotw);
+		$getpotw3 = mysql_fetch_array($getpotw2);
+
+		$template->adds_block('COMMENTS', array(	'ID' => $getcomments3[$i]['id'],
+								'AREA' => 'poll',
+								'CODED' => $getpotw3['id'],
+								'ENDING' => '.php',
+								'TITLE' => 'Poll "' . $getpotw3['question'] . '"',
+								'AUTHOR' => (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username)));
+		$i++;			
 	}
+}
 
-	function count_sort($a, $b)
-	{
-		$a = $a['count'];
-		$b = $b['count'];
+$users = array();
+$getusers = "SELECT DISTINCT user_id FROM comments WHERE is_anon = 0";
+$getusers2 = mysql_query($getusers);
+$i=0;
+while ($getusers3[$i] = mysql_fetch_array($getusers2))
+{
+	$getcount = "SELECT COUNT(*) FROM comments WHERE user_id = " . $getusers3[$i]['user_id'];
+	$getcount2 = mysql_query($getcount);
+	$getcount3 = mysql_fetch_array($getcount2);
 
-		if ($a > $b)
-		{
-			return -1;
-		} else if ($a < $b)
-		{
-			return 1;
-		} else {
-			return 0;
-		}
-	}
+			$getuser = "SELECT * FROM phpbb_users WHERE user_id = " . $getusers3[$i]['user_id'];
+			$getuser2 = mysql_query($getuser);
+			$getuser3 = mysql_fetch_array($getuser2);
 
-	usort($users, 'count_sort');
-	$i=0;
-	foreach ($users as $value)
-	{
-		if ($i == 5)
-		{
-			break;
-		}
+			$username = $getuser3['username'];
+			$website = $getuser3['user_website'];
 
-		$template->adds_block('TOP', array(	'USERNAME' => $value['name'],
-							'COUNT' => $value['count']));
-		$i++;
-	}
+	$name = (($website != '') ? '<a href="' . $website . '">' . $username . '</a>' : $username);
+	$users[] = array('name' => $name, 'count' => $getcount3['COUNT(*)']);
 
-	$gethits = "SELECT * FROM config WHERE name = \"hits\"";
-	$gethits2 = mysql_query($gethits);
-	$gethits3 = mysql_fetch_array($gethits2);
-	$template->add('HITS', $gethits3['value']);
+	$i++;
+}
 
-	$gethits = "SELECT * FROM config WHERE name = \"todayHits\"";
-	$gethits2 = mysql_query($gethits);
-	$gethits3 = mysql_fetch_array($gethits2);
-	$template->add('TODAY', $gethits3['value']);
+function count_sort($a, $b)
+{
+	$a = $a['count'];
+	$b = $b['count'];
 
-	$getpost = "SELECT * FROM phpbb_posts ORDER BY post_id DESC LIMIT 0,5";
-	$getpost2 = mysql_query($getpost) or die($getpost);
-	$i=0;
-	while ($getpost3[$i] = mysql_fetch_array($getpost2))
+	if ($a > $b)
 	{
-		$getuser = "SELECT * FROM phpbb_users WHERE user_id = " . $getpost3[$i]['poster_id'];
-		$getuser2 = mysql_query($getuser) or die($getuser);
-		$getuser3 = mysql_fetch_array($getuser2);
-
-		$template->adds_block('FOURM', array(	'SUBJECT' => $getpost3[$i]['post_subject'],
-							'TOPIC' => $getpost3[$i]['topic_id'],
-							'POST' => $getpost3[$i]['post_id'],
-							'USERNAME' => $getuser3['username']));
+		return -1;
+	} else if ($a < $b)
+	{
+		return 1;
+	} else {
+		return 0;
 	}
+}
 
-	$gettags = "SELECT DISTINCT tag FROM tags WHERE post_type = \"published\"";
-	$gettags2 = mysql_query($gettags);
-	$i=0;
-	while ($gettags3[$i] = mysql_fetch_array($gettags2))
+usort($users, 'count_sort');
+$i=0;
+foreach ($users as $value)
+{
+	if ($i == 5)
 	{
-		$cnttag = "SELECT COUNT(*) FROM tags WHERE tag = \"" . $gettags3[$i]['tag'] . "\" AND post_type = \"published\"";
-		$cnttag2 = mysql_query($cnttag);
-		$cnttag3 = mysql_fetch_array($cnttag2);
+		break;
+	}
 
-		$counts[$gettags3[$i]['tag']] = $cnttag3[0];
+	$template->adds_block('TOP', array(	'USERNAME' => $value['name'],
+						'COUNT' => $value['count']));
+	$i++;
+}
 
-		$i++;
-	}
+$getpost = "SELECT * FROM phpbb_posts ORDER BY post_id DESC LIMIT 0,5";
+$getpost2 = mysql_query($getpost) or die($getpost);
+$i=0;
+while ($getpost3[$i] = mysql_fetch_array($getpost2))
+{
+	$getuser = "SELECT * FROM phpbb_users WHERE user_id = " . $getpost3[$i]['poster_id'];
+	$getuser2 = mysql_query($getuser) or die($getuser);
+	$getuser3 = mysql_fetch_array($getuser2);
+
+	$template->adds_block('FOURM', array(	'SUBJECT' => $getpost3[$i]['post_subject'],
+						'TOPIC' => $getpost3[$i]['topic_id'],
+						'POST' => $getpost3[$i]['post_id'],
+						'USERNAME' => $getuser3['username']));
+}
 
-	$min_count = min($counts);
-	$spread = max($counts) - $min_count;
-	$spread = ($spread <= 0) ? 1 : $spread;
-	$font_step = 8 / $spread;
-	foreach ($counts as $tag => $count)
-	{
-		if ($count != $min_count)
-		{
-			$template->adds_block('TAGCLOUD', array(	'TAG' => $tag,
-									'SIZE' => (8 + (($count - $min_count) * $font_step)),
-									'COUNT' => $count));
-		}
-	}
+$getpopular = "SELECT * FROM updates ORDER BY popularity DESC LIMIT 0,5";
+$getpopular2 = mysql_query($getpopular);
+$i=0;
+while ($getpopular3[$i] = mysql_fetch_array($getpopular2))
+{
+	$template->adds_block('POPULAR', array(	'CODED' => $getpopular3[$i]['slug'],
+						'TITLE' => stripslashes($getpopular3[$i]['title'])));
+	$i++;
 }
 
-$template->add('REVISION', exec('hg tip --template {rev}'));
+$template->add('REVISION', exec('hg -R "' . $_SERVER['DOCUMENT_ROOT'] . '" tip --template {rev}'));
 
 $template->display();
 
diff --git a/includes/functions.php b/includes/functions.php
index 9eb1634..090e9d0 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -272,7 +272,7 @@ function displayRelated($title, $avoid = 0)
 		$template->adds_block('POST', array(	'TITLE' => $getrelated3[$i]['title'],
 							'CODED' => $getrelated3[$i]['slug'],
 							'AUTHOR' => $getrelated3[$i]['author'],
-							'DATE' => date('F d<\S\U\P>S</\S\U\P> Y',strtotime($getrelated3[$i]['pubDate']))));
+							'DATE' => date('F jS Y',strtotime($getrelated3[$i]['pubDate']))));
 		$i++;
 	}
 
@@ -304,4 +304,50 @@ function getCommentUrl($getcomment3)
 	}
 }
 
+function getPollOfTheWeek($id = -1)
+{
+	static $showed_form = false;
+
+	$potw = new FITemplate('polloftheweek');
+	
+	if ($id == -1)
+	{
+		$getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
+	} else {
+		$getpoll = "SELECT * FROM polloftheweek WHERE id = " . $id;
+	}
+	$getpoll2 = mysql_query($getpoll);
+	$getpoll3 = mysql_fetch_array($getpoll2);
+
+	$potw->add('QUESTION', $getpoll3['question']);
+	$potw->add('OPTION1', $getpoll3['option1']);
+	$potw->add('OPTION2', $getpoll3['option2']);
+	$potw->add('OPTION3', $getpoll3['option3']);
+	$potw->add('OPTION4', $getpoll3['option4']);
+
+	$getip = "SELECT * FROM didpollalready WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+	$getip2 = mysql_query($getip);
+	$getip3 = mysql_fetch_array($getip2);
+
+	if (($getip3['ip'] != $_SERVER['REMOTE_ADDR']) && ($id == -1) && ($showed_form == false))
+	{
+		$potw->adds_block('FORM',array('exi'=>1));
+		$showed_form = true;
+	} else {
+		$potw->adds_block('DISPLAY',array('exi'=>1));
+
+		$potw->add('PERCENT1', getpercent($getpoll3,'1'));
+		$potw->add('PERCENT2', getpercent($getpoll3,'2'));
+		$potw->add('PERCENT3', getpercent($getpoll3,'3'));
+		$potw->add('PERCENT4', getpercent($getpoll3,'4'));
+	}
+	
+	ob_start();
+	$potw->display();
+	$result = ob_get_contents();
+	ob_end_clean();
+	
+	return $result;
+}
+
 ?>
diff --git a/includes/header.php b/includes/header.php
index 427ad93..5a6b8e2 100755
--- a/includes/header.php
+++ b/includes/header.php
@@ -24,31 +24,10 @@ require('headerproc.php');
 
 $headerTemp = new FITemplate('header');
 
-if (!isset($_GET['emulateTime']))
-{
-	if ((date('G') >= 20) || (date('G') <= 6))
-	{
-		$bodyID = 'night';
-	} else {
-		$bodyID = 'day';
-	}
-} else {
-	$bodyID = $_GET['emulateTime'];
-}
-
-$headerTemp->add('BODYID',$bodyID);
 $headerTemp->add('CATEGORY',(isset($pageCategory)) ? $pageCategory : 'none');
 $headerTemp->add('AID',(isset($pageAID)) ? $pageAID : 'none');
-$headerTemp->add('BODYTAGS',(isset($bodyTags)) ? $bodyTags : '');
-$headerTemp->add('HEADTAGS',isset($headtags) ? $headtags : '');
 $headerTemp->add('EXTRATITLE',isset($title) ? ($title . ' - ') : '');
-$headerTemp->add('PAGEID',(isset($pageID)) ? $pageID : 'none');
-$headerTemp->add(strtoupper($pageCategory) . 'ACTIVE', ' CLASS="active"');
-
-if (isset($_POST['message']))
-{
-	$headerTemp->adds_block('MESSAGE',array('MSG' => $_POST['message']));
-}
+$headerTemp->add(strtoupper($pageCategory) . 'ACTIVE', ' class="active"');
 
 if (($pageCategory != 'fourm') && ($pageCategory != 'wiki'))
 {
@@ -63,6 +42,30 @@ if (($pageCategory != 'fourm') && ($pageCategory != 'wiki'))
 	}
 }
 
+if (isset($hatNav) && is_array($hatNav))
+{
+	$headerTemp->adds_block('CREATE_HATNAV', array('exi'=>1));
+	
+	foreach ($hatNav as $item)
+	{
+		$headerTemp->adds_block('HATNAV',array('TITLE' => $item['title'], 'URL' => $item['url'], 'ICON' => $item['icon']));
+	}
+}
+
+$headerTemp->add('POTW', getPollOfTheWeek());
+
+$gethits = "SELECT * FROM config WHERE name = \"hits\"";
+$gethits2 = mysql_query($gethits);
+$gethits3 = mysql_fetch_array($gethits2);
+$headerTemp->add('HITS', $gethits3['value']);
+
+$gethits = "SELECT * FROM config WHERE name = \"todayHits\"";
+$gethits2 = mysql_query($gethits);
+$gethits3 = mysql_fetch_array($gethits2);
+$headerTemp->add('TODAY', $gethits3['value']);
+
+$headerTemp->add('DATEFINDER', sd_dateFinder());
+
 $headerTemp->display();
 
 ?>
diff --git a/includes/smilies.php b/includes/smilies.php
index e7579a6..fbadc57 100755
--- a/includes/smilies.php
+++ b/includes/smilies.php
@@ -45,7 +45,7 @@ class Smilies
 
 		foreach ($this->smilies as $name => $value)
 		{
-			$text = str_replace($name, '<IMG SRC="http://fourisland.com/theme/images/smilies/' . $value . '" ALT="' . $name . '">', $text);
+			$text = str_replace($name, '<img src="http://fourisland.com/theme/images/smilies/' . $value . '" alt="' . $name . '" />', $text);
 		}
 
 		return $text;
diff --git a/includes/specialdates.php b/includes/specialdates.php
index 4c774a7..067de6d 100755
--- a/includes/specialdates.php
+++ b/includes/specialdates.php
@@ -48,10 +48,10 @@ sd_solar_annual('WCA Day',5,5); //DateFinder
 sd_lunar_annual('Mothers Day',5,7,2); //BG Pic; DateFinder; Header Pic
 sd_lunar_annual('Memorial Day',5,1,4); //BG Pic; DateFinder; Header Pic
 sd_easter(); //BG Pic; DateFinder
-sd_solar_annual('Hatkirbys B-Day',6,7); //BG Pic; DateFinder; Header Pic
 sd_solar_annual('Flag Day',6,14); //BG Pic; DateFinder
+sd_solar_annual('Hatkirbys B-Day',6,17); //BG Pic; DateFinder; Header Pic
 sd_lunar_annual('Fathers Day',6,7,3); //BG Pic; DateFinder
-sd_solar_annual('CTNH',6,17); //Header Pic
+sd_solar_annual('CTNH',6,17); //Header Pic; DateFinder
 sd_solar_annual('Independance Day',7,4); //BG Pic; DateFinder
 sd_lunar_annual('SysAdminDay',7,5,4); //DateFinder
 sd_lunar_annual('Labor Day',9,1,1); //Yet to be implemented
@@ -308,4 +308,52 @@ function sd_addDateIn($id,$dateid)
 	$specialdates[$dateid] = $id;
 }
 
+function sd_dateFinder()
+{
+	if (sd_ifNoSpecialDay())
+	{
+		$did = sd_getMonthStart(date('n')-1);
+		$did += (date('j')-1);
+		$did = sd_findNextDay() - $did;
+		return ($did . ' more days until the next holiday!');
+	} else {
+		switch (sd_getCurrentDay())
+		{
+			case 'New Years Day': return 'Happy new years!';
+			case 'Martin Luther King Day': return 'Happy Martin Luther King Day!';
+			case 'Groundhog Day': return 'It\'s groundhog day? Will he see his shadow?';
+			case 'Presidents Day': return 'Happy President\'s Day!';
+			case 'Valentines Day': return 'Happy Valentines Day! Will you be mine?';
+			case 'St Patricks Day': return 'Happy St. Patrick\'s Day! If you\'re not wearing green, I\'ll pinch you!';
+			case 'Mothers Day': return 'Happy Mothers Day!';
+			case 'Memorial Day': return 'Remember...';
+			case 'Easter': return 'Happy Easter! Where are those eggs?';
+			case 'Mardi Gras': return 'Happy Mardi Gras! Time to get fat!';
+			case 'Ash Wednesday': return 'Happy Ash Wednesday! Did you get your ashes?';
+			case 'Palm Sunday': return 'Happy Palm Sunday!';
+			case 'Holy Thursday': return 'Happy Holy Thursday!';
+			case 'Hatkirbys B-Day': return 'Happy Birthday to me! Happy Birthday to me! Happy Birthday dear Hatkirby! Happy Birthday to me!';
+			case 'Flag Day': return 'Happy Flag Day!';
+			case 'Fathers Day': return 'Happy Fathers Day!';
+			case 'Independance Day': return 'Happy 4th of July!';
+			case 'Labor Day': return 'Happy Labor Day!';
+			case 'Four Island A': return ('Happy birthday Four Island! Four Island is ' . (date('Y')-2007) . ' years old!');
+			case 'Columbus Day': return 'Happy Columbus Day!';
+			case 'Halloween': return 'Happy Halloween!';
+			case 'Veterans Day': return 'Only 2 minutes of silence. Remember... remember...';
+			case 'Thanksgiving': return 'Happy Thanksgiving! Gobble gobble gobble gobble!';
+			case 'Kirby Week': return 'It\'s Kirby Week! Not only is it a time of celebreation and fun on Four Island, it\'s only a week before Christmas!';
+			case 'Christmas Eve': return '"1 Day Left" says Fourie!';
+			case 'Christmas Day': return 'Merry Christmas! Time for presents!';
+			case 'New Years Eve': return '5... 4... 3... 2...';
+			case 'SysAdminDay': return '<A HREF="http://www.sysadminday.com">If you can read this, thank your <I><B>sysadmin</B></I></A>';
+			case 'WCA Day': return '<A HREF="http://wca2001.keenspace.com">Webcomic Appreciation Day!</A> Stare in wonder at all of your favorite webcomics! Like Pillowcase, for instance!';
+			case 'Leap Day': return 'What day is it? LEAP DAY? This only happens once every four years! LET\'S LEAP IN JOY!';
+			case 'Tris CIEday': return 'This is the day that shei came.';
+			case 'Silence Day': return 'Support LGBT people by keeping the silence until 5 PM.';
+			case 'CTNH': return '<A HREF="/fuhsdiufgsadiufgaisfioas.php">It never happened.</A>';
+		}
+	}
+}
+
 ?>
diff --git a/index.php b/index.php
index 53edd33..58b66d2 100755
--- a/index.php
+++ b/index.php
@@ -20,6 +20,7 @@
 
 require('headerproc.php');
 
+header('Content-type: application/xhtml+xml');
 header('X-Pingback: http://fourisland.com/xmlrpc.php');
 
 include('../security/config.php');
diff --git a/pages/admin.php b/pages/admin.php
index 12a2d01..326cbdd 100755
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -233,7 +233,7 @@ if (isLoggedIn())
 				$template->adds_block('INTERNAL',array('exi'=>1));
 				$template->add_ref(0, 'POST', array(	'ID' => $getdraft3['id'],
 									'YEARID' => ((date('Y')-2006) % 4),
-									'DATE' => date('F dS Y \a\\t g:i:s a'),
+									'DATE' => date('F jS Y \a\\t g:i:s a'),
 									'MONTH' => date('M'),
 									'DAY' => date('d'),
 									'CODED' => $getdraft3['slug'],
@@ -335,7 +335,7 @@ if (isLoggedIn())
 				$template->adds_block('INTERNAL',array('exi'=>1));
 				$template->add_ref(0, 'POST', array(	'ID' => $getpending3['id'],
 									'YEARID' => ((date('Y')-2006) % 4),
-									'DATE' => date('F dS Y \a\\t g:i:s a'),
+									'DATE' => date('F jS Y \a\\t g:i:s a'),
 									'MONTH' => date('M'),
 									'DAY' => date('d'),
 									'CODED' => $getpending3['slug'],
@@ -544,7 +544,7 @@ if (isLoggedIn())
 				$template->add('USERNAME', $getcomment3['author']);
 				$template->add('CODEDEMAIL', md5(strtolower($getcomment3['email'])));
 				$template->add('TEXT', parseText($getcomment3['comment']));
-				$template->add('DATE', date("F dS Y \a\\t g:i:s a",strtotime($getcomment3['pubDate'])));
+				$template->add('DATE', date("F jS Y \a\\t g:i:s a",strtotime($getcomment3['pubDate'])));
 			} else {
 				$template = new FITemplate('msg');
 				$template->add('BACK', 'the previous page');
@@ -649,8 +649,7 @@ if (isLoggedIn())
 			{
 				if (isset($_GET['approve']))
 				{
-					$today = mktime(date('G'),date('i'),date('s'),date('m'),date('d'),date('Y'));
-					$insquote = "INSERT INTO rash_quotes (quote,date) VALUES (\"" . mysql_real_escape_string($getpending3['quote']) . "\",\"" . $today . "\")";
+					$insquote = "INSERT INTO rash_quotes (quote,date) VALUES (\"" . mysql_real_escape_string($getpending3['quote']) . "\",\"" . time() . "\")";
 					$insquote2 = mysql_query($insquote);
 
 					$delpending = "DELETE FROM rash_queue WHERE id = " . $_GET['id'];
@@ -721,9 +720,9 @@ if (isLoggedIn())
 				$getconfig3 = mysql_fetch_array($getconfig2);
 				if ($getconfig3['value'] == '1')
 				{
-					$template->add('ON', ' CHECKED="CHECKED"');
+					$template->add('ON', ' checked="checked"');
 				} else {
-					$template->add('OFF', ' CHECKED="CHECKED"');
+					$template->add('OFF', ' checked="checked"');
 				}
 			}
 		} else {
diff --git a/pages/blog.php b/pages/blog.php
index a03d3b1..c9781ee 100755
--- a/pages/blog.php
+++ b/pages/blog.php
@@ -27,7 +27,7 @@ if ((strpos($_SERVER['REQUEST_URI'],'index.php')) && (isset($_GET['post'])))
 	header('Location: /blog/' . $_GET['post'] . '/');
 }
 
-$pageCategory = 'home';
+$pageCategory = 'blog';
 $pageAID = 'archive';
 
 if (isset($_GET['post']))
@@ -65,7 +65,7 @@ if (isset($_GET['post']))
 
 		$template->add_ref(0, 'POST', array(	'ID' => $getpost3['id'],
 							'YEARID' => ((date('Y',strtotime($getpost3['pubDate']))-2006) % 4),
-							'DATE' => date('F dS Y \a\\t g:i:s a',strtotime($getpost3['pubDate'])),
+							'DATE' => date('F jS Y \a\\t g:i:s a',strtotime($getpost3['pubDate'])),
 							'MONTH' => date('M',strtotime($getpost3['pubDate'])),
 							'DAY' => date('d',strtotime($getpost3['pubDate'])),
 							'CODED' => $getpost3['slug'],
@@ -80,6 +80,19 @@ if (isset($_GET['post']))
 			$template->adds_ref_sub(0, 'TAGS', array('TAG' => $tag));
 		}
 
+		$gettrack = "SELECT * FROM tracking WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+		$gettrack2 = mysql_query($gettrack);
+		$gettrack3 = mysql_fetch_array($gettrack2);
+
+		$trackArr = explode(',',$gettrack3['rating']);
+
+		if (($gettrack3['ip'] != $_SERVER['REMOTE_ADDR']) || (array_search($getpost3['id'],$trackArr) === FALSE))
+		{
+			$template->adds_ref_sub(0, 'CANVOTE', array('exi'=>1));
+		} else {
+			$template->adds_ref_sub(0, 'NOVOTE', array('exi'=>1));
+		}
+
 		$template->display();
 
 		$getpings = "SELECT * FROM pingbacks WHERE post_id = " . $getpost3['id'];
@@ -93,8 +106,8 @@ if (isset($_GET['post']))
 			}
 
 			$template->adds_block('PINGBACK', array(	'TITLE' => $getpings3[$i]['title'],
-									'URL' => $getpings3[$i]['url'],
-									'DATE' => date('F d<\S\U\P>S</\S\U\P> Y', strtotime($getpings3[$i]['pubDate']))));
+									'URL' => htmlspecialchars($getpings3[$i]['url']),
+									'DATE' => date('F jS Y', strtotime($getpings3[$i]['pubDate']))));
 			$i++;
 		}
 
@@ -124,7 +137,7 @@ if (isset($_GET['post']))
 		{
 			$template->adds_block('BIO', array(	'TEXT' => $getbio3['text'],
 								'USERNAME' => $getbio3['username'],
-								'DATE' => date('F dS Y \a\\t g:i:s a',strtotime($getbio3['lastUpdated']))));
+								'DATE' => date('F jS Y \a\\t g:i:s a',strtotime($getbio3['lastUpdated']))));
 		}
 	} elseif (isset($_GET['tag']))
 	{
diff --git a/pages/holidates.php b/pages/holidates.php
index 29b0ca4..e5d8860 100755
--- a/pages/holidates.php
+++ b/pages/holidates.php
@@ -1,10 +1,39 @@
-<TABLE WIDTH="100%" CLASS="webmail"><TR><TH>ID</TH><TH>Date</TH><TH>Holidate</TH></TR><?php
+<?php
+/*
+       444444444  
+      4::::::::4  
+     4:::::::::4  
+    4::::44::::4  
+   4::::4 4::::4   Four Island
+  4::::4  4::::4  
+ 4::::4   4::::4   Written and maintained by Starla Insigna
+4::::444444::::444
+4::::::::::::::::4  header.inc
+4444444444:::::444
+          4::::4   Please do not use, reproduce or steal the
+          4::::4   contents of this file without explicit
+          4::::4   permission from Hatkirby.
+        44::::::44
+        4::::::::4
+        4444444444
+*/
+
+if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
+
+require('headerproc.php');
+
+$template = new FITemplate('holidates');
 
 foreach ($specialdates as $num => $val)
 {
 	$date = sd_clearDate();
 	$date += ($num*60*60*24);
-	echo('<TR' . (($num % 2 == 0) ? ' CLASS="even"' : '') . '><TD>' . $num . '</TD><TD>' . date('F jS',$date) . '</TD><TD>' . $val . '</TD></TR>');
+	$template->adds_block('DATE', array(	'EVEN' => (($num % 2 == 0) ? ' CLASS="even"' : ''),
+						'NUM' => $num,
+						'DATE' => date('F jS', $date),
+						'TEXT' => $val));
 }
 
-?></TABLE>
+$template->display();
+
+?>
diff --git a/pages/poll-results.php b/pages/poll-results.php
new file mode 100644
index 0000000..e829e53
--- /dev/null
+++ b/pages/poll-results.php
@@ -0,0 +1,54 @@
+<?php
+/*
+       444444444  
+      4::::::::4  
+     4:::::::::4  
+    4::::44::::4  
+   4::::4 4::::4   Four Island
+  4::::4  4::::4  
+ 4::::4   4::::4   Written and maintained by Starla Insigna
+4::::444444::::444
+4::::::::::::::::4  pages/poll-results.php
+4444444444:::::444
+          4::::4   Please do not use, reproduce or steal the
+          4::::4   contents of this file without explicit
+          4::::4   permission from Hatkirby.
+        44::::::44
+        4::::::::4
+        4444444444
+*/
+
+if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
+
+require('headerproc.php');
+
+if ((isset($_GET['id'])) && (is_numeric($_GET['id'])) && ($_GET['id'] >= 1) && ($_GET['id'] <= 4))
+{
+	if (isLoggedIn())
+	{
+		$getip = "SELECT * FROM didpollalready WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+		$getip2 = mysql_query($getip);
+		$getip3 = mysql_fetch_array($getip2);
+
+		if ($getip3['ip'] != $_SERVER['REMOTE_ADDR'])
+		{
+			$setip = "INSERT INTO didpollalready SET ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+			$setip2 = mysql_query($setip);
+			$getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
+			$getpoll2 = mysql_query($getpoll);
+			$getpoll3 = mysql_fetch_array($getpoll2);
+			$setpoll = "UPDATE polloftheweek SET clicks" . $_GET['id'] . " = " . ($getpoll3['clicks' . $_GET['id']]+1) . " WHERE id = " . $getpoll3['id'];
+			$setpoll2 = mysql_query($setpoll);
+
+			die(getPollOfTheWeek());
+		} else {
+			generateError('404');
+		}
+	} else {
+		generateError('404');
+	}
+} else {
+	generateError('404');
+}
+
+?>
diff --git a/pages/poll.php b/pages/poll.php
index d9cce70..6582d90 100755
--- a/pages/poll.php
+++ b/pages/poll.php
@@ -24,22 +24,7 @@ require('headerproc.php');
 
 $pageCategory = 'poll';
 
-if (isset($_GET['submit']))
-{
-	$setip = "INSERT INTO didpollalready SET ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-	$setip2 = mysql_query($setip);
-	$getpoll = "SELECT * FROM polloftheweek ORDER BY id DESC LIMIT 0,1";
-	$getpoll2 = mysql_query($getpoll);
-	$getpoll3 = mysql_fetch_array($getpoll2);
-	$setpoll = "UPDATE polloftheweek SET clicks" . $_POST['options'] . " = " . ($getpoll3['clicks' . $_POST['options']]+1) . " WHERE id = " . $getpoll3['id'];
-	$setpoll2 = mysql_query($setpoll);
-
-	$template = new FITemplate('msg');
-
-	$template->add('MSG','<H2>' . $getpoll3['question'] . '</H2><P>Thank you for voting on the Poll of the Week!<BR><A HREF="poll.php?id=' . $getpoll3['id'] . '">Click here to visit the page for this poll.');
-
-	$template->display();
-} else if (!isset($_GET['id']))
+if (!isset($_GET['id']))
 {
 	$template = new FITemplate('pollIndex');
 
@@ -70,7 +55,7 @@ if (isset($_GET['submit']))
 		$template->adds_block('POLL', array(	'ID' => $getpolls3[$i]['id'],
 							'QUESTION' => $question,
 							'WEEK' => date('F jS Y', strtotime($getpolls3[$i]['week'])),
-							'EVEN' => (($i % 2 == 1) ? ' CLASS="even"' : '')));
+							'EVEN' => (($i % 2 == 1) ? ' class="even"' : '')));
 		$i++;
 	}
 
@@ -94,8 +79,7 @@ if (isset($_GET['submit']))
 		$template->adds_block('NEXT', array('ID' => ($start+1)));
 	}
 
-	include('pages/polloftheweek.php');
-
+	$template->add('POTW', getPollOfTheWeek());
 	$template->display();
 } else {
 	$template = new FITemplate('poll');
@@ -114,7 +98,7 @@ if (isset($_GET['submit']))
 	{
 		$template->adds_block('COMPLETE', array(	'RSS' => parseText($getrss3['rss']),
 								'AUTHOR' => $getrss3['author'],
-								'DATE' => date("F dS Y \a\\t g:i:s a",strtotime($getrss3['date'])),
+								'DATE' => date("F jS Y \a\\t g:i:s a",strtotime($getrss3['date'])),
 								'OPTION1' => $getpoll3['option1'],
 								'OPTION2' => $getpoll3['option2'],
 								'OPTION3' => $getpoll3['option3'],
@@ -127,10 +111,7 @@ if (isset($_GET['submit']))
 		$template->adds_block('INCOMPLETE', array('exi'=>1));
 	}
 
-	$forceDisplay = $_GET['id'];
-	include('pages/polloftheweek.php');
-	unset($forceDisplay);
-
+	$template->add('POTW', getPollOfTheWeek($_GET['id']));
 	$template->display();
 
 	$page_id = 'polloftheweek-' . $getpoll3['id'];
diff --git a/pages/post.php b/pages/post.php
index 87413e8..121435a 100755
--- a/pages/post.php
+++ b/pages/post.php
@@ -22,74 +22,79 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-$pageCategory = 'home';
-$pageAID = 'archive';
-
 include('includes/recaptchalib.php');
 $privatekey = "6LfgvgEAAAAAAD0_UVLp57MU7tqcypsbZPS9qTnr";
 
-$template = new FITemplate('msg');
-$template->add('BACK','the previous page');
-
-if (!isset($_GET['id']))
+if (!isset($_POST['id']))
 {
-	$template->add('MSG','I\'m sorry, but there\'s no page-id set here, so sadly you can\'t comment yet. Why not contact the administratior (link on the HatBar) and tell her that you saw this error?');
+	generateError('404');
 } else {
 	if ($_POST['comment'] == "")
 	{
-		$template->add('MSG','I\'m sorry, but you didn\'t enter a comment!');
+		die('I\'m sorry, but you didn\'t enter a comment!');
 	} else {
 		if (!isLoggedIn())
 		{
-			$resp = recaptcha_check_answer ($privatekey, $_SERVER["REMOTE_ADDR"], $_POST["recaptcha_challenge_field"], $_POST["recaptcha_response_field"]);
-			if (!$resp->is_valid)
+			if ($_POST['username'] == "")
 			{
-				$template->add('MSG',"The reCAPTCHA wasn't entered correctly. Go back and try it again. (reCAPTCHA said: " . $resp->error . ")");
+				die('You forgot to enter a username.');
 			} else {
 				if (preg_match('/^[A-Za-z0-9!#$&\'*+-\/=?^_`{|}~]+@[-A-Za-z0-9]+(\.[-A-Za-z0-9]+)+[A-Za-z]$/', $_POST['email']))
 				{
-					$getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $_POST['username'] . "\"";
-					$getanon2 = mysql_query($getanon);
-					$getanon3 = mysql_fetch_array($getanon2);
-
-					if ($getanon3['username'] == $_POST['username'])
+					$resp = recaptcha_check_answer ($privatekey, $_SERVER["REMOTE_ADDR"], $_POST["recaptcha_challenge_field"], $_POST["recaptcha_response_field"]);
+					if (!$resp->is_valid)
 					{
-						if ($getanon3['email'] == $_POST['email'])
-						{
-							$setcomment = "INSERT INTO comments SET page_id = \"" . $_GET['id'] . "\", user_id = " . $getanon3['id'] . ", comment = \"" . $_POST['comment'] . "\", is_anon = 1";
-							$setcomment2 = mysql_query($setcomment);
+						die('The reCAPTCHA wasn\'t entered correctly. Go back and try it again.');
+					} else {
+						$getanon = "SELECT * FROM anon_commenters WHERE username = \"" . $_POST['username'] . "\"";
+						$getanon2 = mysql_query($getanon);
+						$getanon3 = mysql_fetch_array($getanon2);
 
-							$page_id = $_GET['id'];
-							$comType = substr($page_id,0,strpos($page_id,'-'));
-							$comID = substr($page_id,strpos($page_id,'-')+1);
-							if ($comType == 'updates')
+						if ($getanon3['username'] == $_POST['username'])
+						{
+							if ($getanon3['email'] == $_POST['email'])
 							{
-								recalcPop($comID);
+								$setcomment = "INSERT INTO comments SET page_id = \"" . $_POST['id'] . "\", user_id = " . $getanon3['id'] . ", comment = \"" . $_POST['comment'] . "\", is_anon = 1";
+								$setcomment2 = mysql_query($setcomment);
+								$cid = mysql_insert_id();
+
+								$page_id = $_POST['id'];
+								$comType = substr($page_id,0,strpos($page_id,'-'));
+								$comID = substr($page_id,strpos($page_id,'-')+1);
+								if ($comType == 'updates')
+								{
+									recalcPop($comID);
+								}
+
+								$template = new FITemplate('new-comment');
+								$template->add('ID', $cid);
+								$template->add('CODEDEMAIL', md5(strtolower($getanon3['email'])));
+								$template->add('TEXT', stripslashes($_POST['comment']));
+								$template->add('USERNAME', $getanon3['username']);
+								$template->add('DATE', date("F jS Y \a\\t g:i:s a"));
+								$template->display();
+
+								exit;
+							} else {
+								die('I\'m sorry, but this anonymous username is already in use. If this is in fact you, please verify that you have entered the same email address that you entered the first time you commented here.');
 							}
-
-							$template->add('MSG',"Thank you, " . $getanon3['username'] . ", for posting your valuable comment!");
 						} else {
-							$template->add('MSG',"I'm sorry, but this anonymous username is already in use. If this is in fact you, please verify that you have entered the same email address that you entered the first time you commented here.");
-						}
-					} else {
-						$setcomment = "INSERT INTO moderation SET page_id = \"" . $_GET['id'] . "\", author = \"" . $_POST['username'] . "\", email = \"" . $_POST['email'] . "\", comment = \"" . $_POST['comment'] . "\", website = \"" . $_POST['website'] . "\"";
-						$setcomment2 = mysql_query($setcomment);
-
-						mail('hatkirby@fourisland.com', 'New comment to moderate on Four Island', 'Some one has anonymously left a comment on Four Island and it will require moderation.');
+							$setcomment = "INSERT INTO moderation SET page_id = \"" . $_POST['id'] . "\", author = \"" . $_POST['username'] . "\", email = \"" . $_POST['email'] . "\", comment = \"" . $_POST['comment'] . "\", website = \"" . $_POST['website'] . "\"";
+							$setcomment2 = mysql_query($setcomment);
 
-						$template->add('MSG',"Thank you for posting your valuable comment!<P>However, as you aren't logged in, your comment will have to be verified by a moderator before it appears. Sorry!");
+							die('Thank you for posting your valuable comment!<br />However, as you aren\'t logged in, your comment will have to be verified by a moderator before it appears. Sorry!');
+						}
 					}
 				} else {
-					$template->add('MSG',"I'm sorry, but you've entered an invalid email address.");
+					die('I\'m sorry, but you\'ve entered an invalid email address.');
 				}
 			}
 		} else {
-			$setcomment = "INSERT INTO comments SET page_id = \"" . $_GET['id'] . "\", user_id = " . getSessionUserID() . ", comment = \"" . $_POST['comment'] . "\", is_anon = 0";
+			$setcomment = "INSERT INTO comments SET page_id = \"" . $_POST['id'] . "\", user_id = " . getSessionUserID() . ", comment = \"" . $_POST['comment'] . "\", is_anon = 0";
 			$setcomment2 = mysql_query($setcomment);
+			$cid = mysql_insert_id();
 
-			mail('hatkirby@fourisland.com', 'New comment on Four Island!', getSessionUsername() . ' has posted a comment on Four Island under the "page id" ' . $_GET['id']);
-
-			$page_id = $_GET['id'];
+			$page_id = $_POST['id'];
 			$comType = substr($page_id,0,strpos($page_id,'-'));
 			$comID = substr($page_id,strpos($page_id,'-')+1);
 			if ($comType == 'updates')
@@ -97,11 +102,21 @@ if (!isset($_GET['id']))
 				recalcPop($comID);
 			}
 
-			$template->add('MSG',"Thank you, " . getSessionUsername() . ", for posting your valuable comment!");
+			$getuser = "SELECT * FROM phpbb_users WHERE user_id = " . getSessionUserID();
+			$getuser2 = mysql_query($getuser);
+			$getuser3 = mysql_fetch_array($getuser2);
+
+			$template = new FITemplate('new-comment');
+			$template->add('ID', $cid);
+			$template->add('CODEDEMAIL', md5(strtolower($getuser3['user_email'])));
+			$template->add('TEXT', stripslashes($_POST['comment']));
+			$template->add('USERNAME', getSessionUsername());
+			$template->add('DATE', date("F jS Y \a\\t g:i:s a"));
+			$template->display();
+
+			exit;
 		}
 	}
 }
 
-$template->display();
-
 ?>
diff --git a/pages/quotes.php b/pages/quotes.php
index 6db3cb0..4e0332f 100755
--- a/pages/quotes.php
+++ b/pages/quotes.php
@@ -24,70 +24,92 @@ require('headerproc.php');
 
 $pageCategory = 'quotes';
 
-if (isset($_GET['id']))
+$hatNav = array(	array(	'title' => 'Latest',
+							'url' => 'http://fourisland.com/quotes/latest.php',
+							'icon' => '16-star-hot'
+					),
+					array(	'title' => 'Best',
+							'url' => 'http://fourisland.com/quotes/top.php',
+							'icon' => 'medal_gold_1'
+					),
+					array(	'title' => 'Worst',
+							'url' => 'http://fourisland.com/quotes/bottom.php',
+							'icon' => '16-message-warn'
+					),
+					array(	'title' => 'Browse All',
+							'url' => 'http://fourisland.com/quotes/browse.php',
+							'icon' => '16-file-archive'
+					),
+					array(	'title' => 'Random',
+							'url' => 'http://fourisland.com/quotes/random.php',
+							'icon' => '16-clock'
+					),
+					array(	'title' => 'Add',
+							'url' => 'http://fourisland.com/quotes/add.php',
+							'icon' => '16-em-pencil'
+					),
+					array(	'title' => 'Search',
+							'url' => 'http://fourisland.com/quotes/search.php',
+							'icon' => 'book_open'
+					));
+
+if (isset($_GET['id']) && is_numeric($_GET['id']))
 {
 	$quote_num = $_GET['id'];
 }
 
-if ((!isset($_GET['act'])) || ($_GET['act'] == 'latest'))
+if (isset($_GET['id']) && !(is_numeric($_GET['id'])))
+{
+	generateError('404');
+} else if ((!isset($_GET['act'])) || ($_GET['act'] == 'latest'))
 {
-	$query = "SELECT id, quote, rating, flag FROM rash_quotes ORDER BY id DESC LIMIT 50";
+	$query = "SELECT * FROM rash_quotes ORDER BY id DESC LIMIT 50";
 	quote_generation($query, "Latest", -1);
 } else if ($_GET['act'] == 'add')
 {
 	$template = new FITemplate('quotes/add');
 	if (isset($_GET['submit']))
 	{
-		$template->adds_block('SUBMITTED',array('QUOTE' => (nl2br(htmlspecialchars($_POST['rash_quote'])) . "\n")));
+		$template->adds_block('SUBMITTED',array('QUOTE' => str_replace("\n","<br />",htmlentities($_POST['rash_quote']))));
 		if (!isLoggedIn())
 		{
 			$insquote = "INSERT INTO rash_queue (quote) VALUES(\"" . mysql_real_escape_string(htmlspecialchars($_POST['rash_quote'])) . "\")";
 		} else {
-			$today = mktime(date('G'),date('i'),date('s'),date('m'),date('d'),date('Y'));
-			$insquote = "INSERT INTO rash_quotes (quote, rating, flag, date) VALUES (\"" . mysql_real_escape_string($_POST['rash_quote']) . "\", 0, 0, \"" . $today . "\")";
+			$insquote = "INSERT INTO rash_quotes (quote, rating, flag, date) VALUES (\"" . mysql_real_escape_string($_POST['rash_quote']) . "\", 0, 0, \"" . time() . "\")";
 		}
 		$insquote2 = mysql_query($insquote);
 	}
 	$template->display();
 } elseif ($_GET['act'] == 'bottom')
 {
-	$query = "SELECT id, quote, rating, flag FROM rash_quotes WHERE rating < 0 ORDER BY rating ASC LIMIT 50";
+	$query = "SELECT * FROM rash_quotes WHERE rating < 0 ORDER BY rating ASC LIMIT 50";
 	quote_generation($query, "Bottom", -1);
 } elseif ($_GET['act'] == 'browse')
 {
-	$query = "SELECT id, quote, rating, flag FROM rash_quotes ORDER BY id ASC ";
+	$query = "SELECT * FROM rash_quotes ORDER BY id ASC ";
 	quote_generation($query, "Browse", (isset($_GET['page']) ? $_GET['page'] : 1), 10, 5);
 } elseif ($_GET['act'] == 'flag')
 {
-	$template = new FITemplate('msg');
-	$tracking_verdict = user_quote_status('flag', $quote_num, $template);
-	if ($tracking_verdict < 3)
+	$getfla = "SELECT * FROM rash_quotes WHERE id = " . $quote_num . " LIMIT 0,1";
+	$getfla2 = mysql_query($getfla);
+	$getfla3 = mysql_fetch_array($getfla2);
+
+	if ($getfla3['flag'] == 2)
 	{
-		$getfla = "SELECT flag FROM rash_quotes WHERE id = " . $quote_num . " LIMIT 0,1";
-		$getfla2 = mysql_query($getfla);
-		$getfla3 = mysql_fetch_array($getfla2);
+		die('0');
+	} else {
+		$setfla = "UPDATE rash_quotes SET flag = 1 WHERE id = " . $quote_num;
+		$setfla2 = mysql_query($setfla);
 
-		if ($getfla3['flag'] == 2)
-		{
-			$template->add('MSG',"This quote has been flagged and rechecked by a moderator already.");
-		} elseif ($getfla3['flag'] == 1)
-		{
-			$template->add('MSG',"This quote is currently pending deletion.");
-		} else {
-			$template->add('MSG',"You have marked this quote for deletion.");
-			$setfla = "UPDATE rash_quotes SET flag = 1 WHERE id = " . $quote_num;
-			$setfla2 = mysql_query($setfla);
-		}
+		die('1');
 	}
-	$template->add('BACK','Quote #' . $quote_num);
-	$template->display();
 } elseif ($_GET['act'] == 'random')
 {
-	$query = "SELECT id, quote, rating, flag FROM rash_quotes ORDER BY rand() LIMIT 50";
+	$query = "SELECT * FROM rash_quotes ORDER BY rand() LIMIT 50";
 	quote_generation($query, "Random", -1);
 } elseif ($_GET['act'] == 'random2')
 {
-	$query = "SELECT id, quote, rating, flag FROM rash_quotes WHERE rating > 1 ORDER BY rand() LIMIT 50";
+	$query = "SELECT * FROM rash_quotes WHERE rating > 1 ORDER BY rand() LIMIT 50";
 	quote_generation($query, "Random2", -1);
 } elseif ($_GET['act'] == 'search')
 {
@@ -99,22 +121,24 @@ if ((!isset($_GET['act'])) || ($_GET['act'] == 'latest'))
 		} else {
 			$how = 'asc';
 		}
-		$getquotes = "SELECT id, quote, rating, flag FROM rash_quotes WHERE quote LIKE \"%" . $_POST['search'] . "%\" ORDER BY " . $_POST['sortby'] . " " . $how . " LIMIT 0," . $_POST['number'];
+		$getquotes = "SELECT * FROM rash_quotes WHERE quote LIKE \"%" . $_POST['search'] . "%\" ORDER BY " . $_POST['sortby'] . " " . $how . " LIMIT 0," . $_POST['number'];
 		quote_generation($getquotes, "Query Results", -1);
 	}
 	$template = new FITemplate('quotes/search');
 	$template->display();
 } elseif ($_GET['act'] == 'top')
 {
-	$query = "SELECT id, quote, rating, flag FROM rash_quotes WHERE rating > 0 ORDER BY rating DESC LIMIT 50";
+	$query = "SELECT * FROM rash_quotes WHERE rating > 0 ORDER BY rating DESC LIMIT 50";
 	quote_generation($query, "Top", -1);
 } elseif ($_GET['act'] == 'vote')
 {
-	$template = new FITemplate('msg');
-	$tracking_verdict = user_quote_status('vote', $quote_num,$template);
-	$template->add('BACK','Quote #' . $quote_num);
-	$template->display();
-	if ($tracking_verdict < 3)
+	$gettrack = "SELECT * FROM rash_tracking WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+	$gettrack2 = mysql_query($gettrack);
+	$gettrack3 = mysql_fetch_array($gettrack2);
+
+	$trackArr = explode(',',$gettrack3['vote']);
+
+	if (($gettrack3['ip'] != $_SERVER['REMOTE_ADDR']) || (array_search($quote_num,$trackArr) === FALSE))
 	{
 		if ($_GET['dir'] == "plus")
 		{
@@ -125,18 +149,32 @@ if ((!isset($_GET['act'])) || ($_GET['act'] == 'latest'))
 			$setquote = "UPDATE rash_quotes SET rating = rating-1 WHERE id = " . $quote_num;
 			$setquote2 = mysql_query($setquote);
 		}
-	}
-} else {
-	if ((is_int($_GET['act']) || ($_GET['act'] != false)) && (verify_int($_GET['act'])))
-	{
-		$query = "SELECT id, quote, rating, flag FROM rash_quotes WHERE id = " . $_GET['act'];
-		quote_generation($query, "#" . $_GET['act'], -1);
 
-		$page_id = 'quote-' . $_GET['act'];
-		include('includes/comments.php');
+		if ($gettrack3['ip'] == $_SERVER['REMOTE_ADDR'])
+		{
+			$settrack = "UPDATE rash_tracking SET vote = \"" . $gettrack3['vote'] . "," . $quote_num . "\" WHERE id = " . $gettrack3['id'];
+		} else {
+			$settrack = "INSERT INTO tracking (ip,vote) VALUES (\"" . $_SERVER['REMOTE_ADDR'] . "\",\"" . $quote_num . "\")";
+		}
+		$settrack2 = mysql_query($settrack) or die($settrack);
+
+		$getquote = "SELECT * FROM rash_quotes WHERE id = " . $quote_num;
+		$getquote2 = mysql_query($getquote);
+		$getquote3 = mysql_fetch_array($getquote2);
+
+		die($getquote3['rating']);
 	} else {
-		generateError('404');
+		die;
 	}
+} else if (is_numeric($_GET['act']))
+{
+	$query = "SELECT * FROM rash_quotes WHERE id = " . $_GET['act'];
+	quote_generation($query, "#" . $_GET['act'], -1);
+
+	$page_id = 'quote-' . $_GET['act'];
+	include('includes/comments.php');
+} else {
+	generateError('404');
 }
 
 function quote_generation($query, $origin, $page = 1, $quote_limit = 50, $page_limit = 10)
@@ -152,13 +190,56 @@ function quote_generation($query, $origin, $page = 1, $quote_limit = 50, $page_l
 	}
 	$template->add('ORIGIN',$origin);
 
+	$gettrack = "SELECT * FROM rash_tracking WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+	$gettrack2 = mysql_query($gettrack);
+	$gettrack3 = mysql_fetch_array($gettrack2);
+
+	$trackArr = explode(',',$gettrack3['vote']);
+
 	$getquotes2 = mysql_query($query);
 	$i=0;
 	while ($getquotes3[$i] = mysql_fetch_array($getquotes2))
 	{
-		$template->adds_block('QUOTES',array(	'NUMBER' => $getquotes3[$i]['id'],
-							'RATING' => $getquotes3[$i]['rating'],
-							'QUOTE' => parseSmilies(str_replace("\n","<BR>",stripslashes($getquotes3[$i]['quote'])))));
+		if (!isset($curID))
+		{
+			$curID = 0;
+		} else {
+			$curID++;
+		}
+
+		$cntcomments = "SELECT COUNT(*) FROM comments WHERE page_id = \"quote-" . $getquotes3[$i]['id'] . "\"";
+		$cntcomments2 = mysql_query($cntcomments);
+		$cntcomments3 = mysql_fetch_array($cntcomments2);
+
+		if ($cntcomments3['COUNT(*)'] == 0)
+		{
+			$comments = '';
+		} else if ($cntcomments3['COUNT(*)'] == 1)
+		{
+			$comments = '1 Comment';
+		} else {
+			$comments = $cntcomments3['COUNT(*)'] . ' Comments';
+		}
+
+		$template->add_ref($curID,'QUOTES',array(	'NUMBER' => $getquotes3[$i]['id'],
+								'RATING' => $getquotes3[$i]['rating'],
+								'DATE' => ($getquotes3[$i]['date'] != 0 ? date('F jS Y \a\\t g:i:s a', $getquotes3[$i]['date']) : ''),
+								'QUOTE' => str_replace("\n","<br />",htmlentities(stripslashes($getquotes3[$i]['quote']))),
+								'COMMENTS' => $comments));
+
+		if (($gettrack3['ip'] != $_SERVER['REMOTE_ADDR']) || (array_search($getquotes3[$i]['id'],$trackArr) === FALSE))
+		{
+			$template->adds_ref_sub($curID, 'CANVOTE', array('exi'=>1));
+		} else {
+			$template->adds_ref_sub($curID, 'NOVOTE', array('exi'=>1));
+		}
+
+		if ($getquotes3[$i]['flag'] == 0)
+		{
+			$template->adds_ref_sub($curID, 'CANFLAG', array('exi'=>1));
+		} else {
+			$template->adds_ref_sub($curID, 'NOFLAG', array('exi'=>1));
+		}
 		
 		$i++;
 	}
@@ -170,7 +251,7 @@ function page_numbers($template, $origin, $quote_limit, $page_default, $page_lim
 {
 	$numrows = countRows('rash_quotes');
 	$testrows = $numrows;
-	$pagenum = (($testrows + 1) / ($quote_limit > 0 ? $quote_limit : 1));
+	$pagenum = floor(($testrows + 1) / ($quote_limit > 0 ? $quote_limit : 1));
 
 	if (($page_limit % 2))
 	{
@@ -227,86 +308,4 @@ function page_numbers($template, $origin, $quote_limit, $page_default, $page_lim
 	$template->add('LASTPAGE',$pagenum);
 }
 
-function user_quote_status($where, $quote_num, $template)
-{
-	$tracking_verdict = ip_track($where, $quote_num);
-	if ($where != 'flag')
-	{
-		switch ($tracking_verdict)
-		{
-			case 1:
-				$template->add('TRACKING',"Quote has been modified, and data of your action has been recorded in the database.");
-				break;
-			case 2:
-				$template->add('TRACKING',"Quote has been modified, your IP has been logged, and data of your action has been recorded in the database.");
-				break;
-			case 3:
-				$template->add('TRACKING',"You have already voted on this quote, please try again later.");
-				break;
-		}
-	}
-	return $tracking_verdict;
-}
-
-function ip_track($where, $quote_num)
-{
-	switch ($where)
-	{
-		case 'flag':
-			$where2 = 'vote';
-			break;
-		case 'vote':
-			$where2 = 'flag';
-			break;
-	}
-	
-	$getip = "SELECT * FROM rash_tracking WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-	$getip2 = mysql_query($getip);
-	$getip3 = mysql_fetch_array($getip2);
-
-	if ($getip3['ip'] == $_SERVER['REMOTE_ADDR'])
-	{
-		$quote_array = explode(",", $getip3['quote_id']);
-		$quote_place = array_search($quote_num, $quote_array);
-		if (in_array($quote_num, $quote_array))
-		{
-			$where_result = explode(",", $getip3[$where]);
-			if (!isset($where_result[$quote_place]))
-			{
-				$where_result[$quote_place] = 1;
-				$where_result = implode(",", $where_result);
-				$setip = "UPDATE rash_tracking SET " . $where . " = \"" . $where_result . "\" WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-				$setip2 = mysql_query($getip);
-				return 1;
-			} else {
-				return 3;
-			}
-		} else {
-			$setip = "UPDATE rash_tracking SET " . $where . " = CONCAT(" . $where . ",\",1\"), " . $where2 . " = CONCAT(" . $where2 . ",\",0\"), quote_id = CONCAT(quote_id,\"," . $quote_num . "\") WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
-			$setip2 = mysql_query($setip);
-			return 1;
-		}
-	} else {
-		$insip = "INSERT INTO rash_tracking (ip, quote_id, " . $where . ", " . $where2 . ") VALUES (\"" . $_SERVER['REMOTE_ADDR'] . "\", \"" . $quote_num . "\", 1, 0)";
-		$insip2 = mysql_query($insip);
-		return 2;
-	}
-}
-
-function verify_int($subject)
-{
-	$ymax = strlen($subject);
-	$y = 0;
-	while($y < $ymax)
-	{
-		if ((is_int((int)($subject{$y})) && (int)($subject{$y})) || (int)($subject{$y}) === 0 )
-		{
-			$y++;
-		} else {
-			return false;
-		}
-	}
-	return true;
-}
-
 ?>
diff --git a/pages/vote.php b/pages/vote.php
index 667b5c9..339bbf9 100755
--- a/pages/vote.php
+++ b/pages/vote.php
@@ -22,46 +22,34 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-$pageCategory = 'home';
-$pageAID = 'archive';
-
 $getpost = "SELECT * FROM updates WHERE id = " . $_GET['id'];
 $getpost2 = mysql_query($getpost);
 $getpost3 = mysql_fetch_array($getpost2);
 
 if ($getpost3['id'] == $_GET['id'])
 {
-	$template = new FITemplate('msg2');
-	$template->add('BACK','Back to ' . stripslashes($getpost3['title']));
-	$template->add('LINK','/blog/' . $getpost3['slug'] . '/');
-
 	if ($_GET['dir'] == 'plus')
 	{
-		if (updatePop($_GET['id'],'rating'))
-		{
-			$template->add('MSG','Thank you for voting!');
-		} else {
-			$template->add('MSG','I\'m sorry, but you\'ve already voted on this post.');
-		}
+		$add = 1;
 	} else if ($_GET['dir'] == 'minus')
 	{
-		if (updatePop($_GET['id'],'rating',-1))
-		{
-			$template->add('MSG','Thank you for voting!');
-		} else {
-			$template->add('MSG','I\'m sorry, but you\'ve already voted on this post.');
-		}
+		$add = -1;
+	} else {
+		die;
+	}
+
+	if (updatePop($_GET['id'],'rating',$add))
+	{
+		$getpost = "SELECT * FROM updates WHERE id = " . $_GET['id'];
+		$getpost2 = mysql_query($getpost);
+		$getpost3 = mysql_fetch_array($getpost2);
+
+		die($getpost3['rating']);
 	} else {
-		$template = new FITemplate('msg');
-		$template->add('BACK','the previous page');
-		$template->add('MSG','Um, what on earth are you doing?');
+		die;
 	}
 } else {
-	$template = new FITemplate('msg');
-	$template->add('BACK','the previous page');
-	$template->add('MSG','Um, what on earth are you doing?');
+	generateError('404');
 }
 
-$template->display();
-
 ?>
diff --git a/pages/welcome.php b/pages/welcome.php
index e224c8e..26f9938 100755
--- a/pages/welcome.php
+++ b/pages/welcome.php
@@ -22,13 +22,24 @@ if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
 
-$pageCategory = 'home';
+$pageCategory = 'blog';
+
+$hatNav = array(        array(  'title' => 'Archive',
+                                'url' => 'http://fourisland.com/blog/',
+                                'icon' => '16-file-archive'));
+
 
 $template = new FITemplate('post');
 $template->adds_block('EXTERNAL',array('exi'=>1));
 
 $curID = 0;
 
+$gettrack = "SELECT * FROM tracking WHERE ip = \"" . $_SERVER['REMOTE_ADDR'] . "\"";
+$gettrack2 = mysql_query($gettrack);
+$gettrack3 = mysql_fetch_array($gettrack2);
+
+$trackArr = explode(',',$gettrack3['rating']);
+
 $getpost = "SELECT * FROM updates ORDER BY id DESC LIMIT 0,4";
 $getpost2 = mysql_query($getpost);
 while ($getpost3 = mysql_fetch_array($getpost2))
@@ -59,7 +70,7 @@ while ($getpost3 = mysql_fetch_array($getpost2))
 
 	$template->add_ref($curID, 'POST', array(	'ID' => $getpost3['id'],
 							'YEARID' => ((date('Y',strtotime($getpost3['pubDate']))-2006) % 4),
-							'DATE' => date('F dS Y \a\\t g:i:s a',strtotime($getpost3['pubDate'])),
+							'DATE' => date('F jS Y \a\\t g:i:s a',strtotime($getpost3['pubDate'])),
 							'MONTH' => date('M',strtotime($getpost3['pubDate'])),
 							'DAY' => date('d',strtotime($getpost3['pubDate'])),
 							'CODED' => $getpost3['slug'],
@@ -76,6 +87,13 @@ while ($getpost3 = mysql_fetch_array($getpost2))
 		$template->adds_ref_sub($curID, 'TAGS', array('TAG' => $tag));
 	}
 
+	if (($gettrack3['ip'] != $_SERVER['REMOTE_ADDR']) || (array_search($getpost3['id'],$trackArr) === FALSE))
+	{
+		$template->adds_ref_sub($curID, 'CANVOTE', array('exi'=>1));
+	} else {
+		$template->adds_ref_sub($curID, 'NOVOTE', array('exi'=>1));
+	}
+
 	$curID++;
 }
 
diff --git a/theme/addresses.tpl b/theme/addresses.tpl
index 5b06a7a..6912405 100755
--- a/theme/addresses.tpl
+++ b/theme/addresses.tpl
@@ -1,9 +1,9 @@
-<P>Click <A HREF="http://hackles.org/spam">here</A> for information about this page.</P>
+<p class="light-at-night">Click <a href="http://hackles.org/spam">here</a> for information about this page.</p>
 
-<H2>Calling all email-harvesting robots!</H2>
+<h2 class="light-at-night">Calling all email-harvesting robots!</h2>
 
-<P>Come fetch 1000 juicy email addresses here:</P>
+<p class="light-at-night">Come fetch 1000 juicy email addresses here:</p>
 
 <!--BEGIN ADDRESS-->
-<A HREF="mailto:<!--ADDRESS.ADDY-->"><!--ADDRESS.ADDY--></A><BR>
+<a href="mailto:<!--ADDRESS.ADDY-->"><!--ADDRESS.ADDY--></a><br />
 <!--END ADDRESS-->
diff --git a/theme/admin/deleteDraft.tpl b/theme/admin/deleteDraft.tpl
index 346604e..0b37a97 100755
--- a/theme/admin/deleteDraft.tpl
+++ b/theme/admin/deleteDraft.tpl
@@ -1,6 +1,6 @@
-<H2>Delete a Draft</H2><P>
+<h2>Delete a Draft</h2>
 
-Are you ABSOLUTELY SURE that you want to delete this draft?<P>
+<p>Are you ABSOLUTELY SURE that you want to delete this draft?</p>
 
-<A HREF="/admin/deleteDraft.php?id=<!--ID-->&submit=">Yes</A><BR>
-<A HREF="javascript:history.back();window.refresh();">Ummm.... actually I'd rather not</A>
+<p><a href="/admin/deleteDraft.php?id=<!--ID-->&amp;submit=">Yes</a><br />
+<a href="javascript:history.back();window.refresh();">Ummm.... actually I'd rather not</a></p>
diff --git a/theme/admin/deletePending.tpl b/theme/admin/deletePending.tpl
index 03541f2..6a365c1 100755
--- a/theme/admin/deletePending.tpl
+++ b/theme/admin/deletePending.tpl
@@ -1,6 +1,6 @@
-<H2>Delete a Pending Post</H2><P>
+<h2>Delete a Pending Post</h2>
 
-Are you ABSOLUTELY SURE that you want to delete this pending post?<P>
+<p>Are you ABSOLUTELY SURE that you want to delete this pending post?</p>
 
-<A HREF="/admin/deletePending.php?id=<!--ID-->&submit=">Yes</A><BR>
-<A HREF="javascript:history.back();window.refresh();">Ummm.... actually I'd rather not</A>
+<p><a href="/admin/deletePending.php?id=<!--ID-->&amp;submit=">Yes</a><br />
+<a href="javascript:history.back();window.refresh();">Ummm.... actually I'd rather not</a></p>
diff --git a/theme/admin/deletePost.tpl b/theme/admin/deletePost.tpl
index 8c08112..c3ef82b 100755
--- a/theme/admin/deletePost.tpl
+++ b/theme/admin/deletePost.tpl
@@ -1,6 +1,6 @@
-<H2>Delete a Post</H2><P>
+<h2>Delete a Post</h2>
 
-Are you ABSOLUTELY SURE that you want to delete this post?<P>
+<p>Are you ABSOLUTELY SURE that you want to delete this post?</p>
 
-<A HREF="/admin/deletePost.php?id=<!--ID-->&submit=">Yes</A><BR>
-<A HREF="javascript:history.back();window.refresh();">Ummm.... actually I'd rather not</A>
+<p><a href="/admin/deletePost.php?id=<!--ID-->&amp;submit=">Yes</a><br />
+<a href="javascript:history.back();window.refresh();">Ummm.... actually I'd rather not</a></p>
diff --git a/theme/admin/deletedDraft.tpl b/theme/admin/deletedDraft.tpl
index dd449f6..edd0b55 100755
--- a/theme/admin/deletedDraft.tpl
+++ b/theme/admin/deletedDraft.tpl
@@ -1,6 +1,6 @@
 You've just deleted a draft!
 
-<UL>
-	<LI><A HREF="/admin/manageDrafts.php">Manage Drafts</A></LI>
-	<LI><A HREF="/admin/">Return to the Admin Panel</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/manageDrafts.php">Manage Drafts</a></li>
+	<li><a href="/admin/">Return to the Admin Panel</a></li>
+</ul>
diff --git a/theme/admin/deletedPending.tpl b/theme/admin/deletedPending.tpl
index 220aa11..71100d6 100755
--- a/theme/admin/deletedPending.tpl
+++ b/theme/admin/deletedPending.tpl
@@ -1,6 +1,6 @@
 You've just deleted a pending post!
 
-<UL>
-	<LI><A HREF="/admin/managePending.php">Manage Pending Posts</A></LI>
-	<LI><A HREF="/admin/">Return to the Admin Panel</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/managePending.php">Manage Pending Posts</a></li>
+	<li><a href="/admin/">Return to the Admin Panel</a></li>
+</ul>
diff --git a/theme/admin/deletedPost.tpl b/theme/admin/deletedPost.tpl
index 12cc68a..a1e77ef 100755
--- a/theme/admin/deletedPost.tpl
+++ b/theme/admin/deletedPost.tpl
@@ -1,6 +1,6 @@
 You've just deleted a post!
 
-<UL>
-	<LI><A HREF="/admin/managePosts.php">Manage Posts</A></LI>
-	<LI><A HREF="/admin/">Return to the Admin Panel</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/managePosts.php">Manage Posts</a></li>
+	<li><a href="/admin/">Return to the Admin Panel</a></li>
+</ul>
diff --git a/theme/admin/draftSuccess.tpl b/theme/admin/draftSuccess.tpl
index 7d76d2a..aa0616e 100755
--- a/theme/admin/draftSuccess.tpl
+++ b/theme/admin/draftSuccess.tpl
@@ -1,8 +1,8 @@
 Congradulations, you've just made/edited a draft!
 
-<UL>
-	<LI><A HREF="/admin/editDraft.php?id=<!--ID-->">Edit this draft</A></LI>
-	<LI><A HREF="/admin/viewDraft.php?id=<!--ID-->">View this draft</A></LI>
-	<LI><A HREF="/admin/manageDrafts.php">Manage Drafts</A></LI>
-	<LI><A HREF="/admin/">Return to the Admin Panel</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/editDraft.php?id=<!--ID-->">Edit this draft</a></li>
+	<li><a href="/admin/viewDraft.php?id=<!--ID-->">View this draft</a></li>
+	<li><a href="/admin/manageDrafts.php">Manage Drafts</a></li>
+	<li><a href="/admin/">Return to the Admin Panel</a></li>
+</ul>
diff --git a/theme/admin/editDraft.tpl b/theme/admin/editDraft.tpl
index 29c1fea..1431e79 100755
--- a/theme/admin/editDraft.tpl
+++ b/theme/admin/editDraft.tpl
@@ -1,14 +1,14 @@
-<H2>Edit a draft</H2><P>
+<h2>Edit a draft</h2>
 
-<FORM ACTION="/admin/editDraft.php?id=<!--ID-->&submit=" METHOD="POST">
-	Draft Title: <INPUT TYPE="text" NAME="title" VALUE="<!--TITLE-->"><BR>
-	<TEXTAREA NAME="text" COLS="80" ROWS="20"><!--TEXT--></TEXTAREA><P>
-	Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="<!--TAGS-->"><BR>
-	Post Type: <SELECT NAME="type" SIZE="4">
-		<OPTION VALUE="draft" SELECTED>Draft</OPTION>
-		<OPTION VALUE="normal">Normal (Article-style) Post</OPTION>
-		<OPTION VALUE="priority">High-Priority Post</OPTION>
-		<OPTION VALUE="instant">Instant Post</OPTION>
-	</SELECT><BR>
-	<INPUT TYPE="submit" VALUE="Edit draft">
-</FORM>
+<p><form action="/admin/editDraft.php?id=<!--ID-->&amp;submit=" method="post">
+	Draft Title: <input type="text" name="title" value="<!--TITLE-->" /><br />
+	<textarea name="text" cols="80" rows="20"><!--TEXT--></textarea><br />
+	Tags (comma-seperated): <input type="text" name="tags" value="<!--TAGS-->" /><br />
+	Post Type: <select name="type" size="4">
+		<option value="draft" selected="selected">Draft</option>
+		<option value="normal">Normal (Article-style) Post</option>
+		<option value="priority">High-Priority Post</option>
+		<option value="instant">Instant Post</option>
+	</select><br />
+	<input type="submit" value="Edit draft" />
+</form></p>
diff --git a/theme/admin/editPending.tpl b/theme/admin/editPending.tpl
index 355e156..47859a5 100755
--- a/theme/admin/editPending.tpl
+++ b/theme/admin/editPending.tpl
@@ -1,8 +1,8 @@
-<H2>Edit a pending post</H2><P>
+<h2>Edit a pending post</h2>
 
-<FORM ACTION="/admin/editPending.php?id=<!--ID-->&submit=" METHOD="POST">
-	Post Title: <INPUT TYPE="text" NAME="title" VALUE="<!--TITLE-->"><BR>
-	<TEXTAREA NAME="text" COLS="80" ROWS="20"><!--TEXT--></TEXTAREA><P>
-	Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="<!--TAGS-->"><BR>
-	<INPUT TYPE="submit" VALUE="Edit post">
-</FORM>
+<form action="/admin/editPending.php?id=<!--ID-->&amp;submit=" method="post">
+	Post Title: <input type="text" name="title" value="<!--TITLE-->" /><br />
+	<textarea name="text" cols="80" rows="20"><!--TEXT--></textarea><br />
+	Tags (comma-seperated): <input type="text" name="tags" value="<!--TAGS-->" /><br />
+	<input type="submit" value="Edit post" />
+</form>
diff --git a/theme/admin/editPost.tpl b/theme/admin/editPost.tpl
index f7e44e3..99e90a4 100755
--- a/theme/admin/editPost.tpl
+++ b/theme/admin/editPost.tpl
@@ -1,8 +1,8 @@
-<H2>Edit a post</H2><P>
+<h2>Edit a post</h2>
 
-<FORM ACTION="/admin/editPost.php?id=<!--ID-->&submit=" METHOD="POST">
-	Post Title: <INPUT TYPE="text" NAME="title" VALUE="<!--TITLE-->"><BR>
-	<TEXTAREA NAME="text" COLS="80" ROWS="20"><!--TEXT--></TEXTAREA><P>
-	Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="<!--TAGS-->"><BR>
-	<INPUT TYPE="submit" VALUE="Edit post">
-</FORM>
+<form action="/admin/editPost.php?id=<!--ID-->&amp;submit=" method="post">
+	Post Title: <input type="text" name="title" value="<!--TITLE-->" /><br />
+	<textarea name="text" cols="80" rows="20"><!--TEXT--></textarea><br />
+	Tags (comma-seperated): <input type="text" name="tags" value="<!--TAGS-->" /><br />
+	<input type="submit" value="Edit post" />
+</form>
diff --git a/theme/admin/index.tpl b/theme/admin/index.tpl
index 866c900..4e57dd9 100755
--- a/theme/admin/index.tpl
+++ b/theme/admin/index.tpl
@@ -1,32 +1,32 @@
-<H2>Admin Panel</H2><P>
+<h2>Admin Panel</h2><p>
 
-Welcome to the ubiquitous administration panel!<P>
+Welcome to the ubiquitous administration panel!</p>
 
-<H3>Blog</H3>
+<h3>Blog</h3>
 
-<UL>
-	<LI><A HREF="/admin/writePost.php">Write a post</A></LI>
-	<LI><A HREF="/admin/manageDrafts.php">Manage Drafts</A></LI>
-	<LI><A HREF="/admin/managePending.php">Manage Pending Posts</A></LI>
-	<LI><A HREF="/admin/managePosts.php">Manage Published Posts</A></LI>
-	<LI><A HREF="/admin/moderateComments.php">Moderate Comments</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/writePost.php">Write a post</a></li>
+	<li><a href="/admin/manageDrafts.php">Manage Drafts</a></li>
+	<li><a href="/admin/managePending.php">Manage Pending Posts</a></li>
+	<li><a href="/admin/managePosts.php">Manage Published Posts</a></li>
+	<li><a href="/admin/moderateComments.php">Moderate Comments</a></li>
+</ul>
 
-<H3>Poll</H3>
+<h3>Poll</h3>
 
-<UL>
-	<LI><A HREF="/admin/pollProcess.php">Weekly Poll Process</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/pollProcess.php">Weekly Poll Process</a></li>
+</ul>
 
-<H3>Quotes</H3>
+<h3>Quotes</h3>
 
-<UL>
-	<LI><A HREF="/admin/managePendingQuotes.php">Manage Pending Quotes</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/managePendingQuotes.php">Manage Pending Quotes</a></li>
+</ul>
 
-<H3>Administration</H3>
+<h3>Administration</h3>
 
-<UL>
-	<LI><A HREF="/admin/hgUpdate.php">HG Update</A></LI>
-	<LI><A HREF="/admin/maintenanceMode.php">Maintenance Mode</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/hgUpdate.php">HG Update</a></li>
+	<li><a href="/admin/maintenanceMode.php">Maintenance Mode</a></li>
+</ul>
diff --git a/theme/admin/maintenanceMode.tpl b/theme/admin/maintenanceMode.tpl
index 401d0ab..4247a62 100644
--- a/theme/admin/maintenanceMode.tpl
+++ b/theme/admin/maintenanceMode.tpl
@@ -1,15 +1,15 @@
-<H2>Maintenance Mode</H2>
+<h2>Maintenance Mode</h2>
 
-<P>Here you can enable/disable Maintenance Mode. When Maintenance Mode is enabled, no one can access Four Island except localhost.</P>
+<p>Here you can enable/disable Maintenance Mode. When Maintenance Mode is enabled, no one can access Four Island except localhost.</p>
 
-<FORM ACTION="/admin/maintenanceMode.php?submit=" METHOD="POST">
-	<CENTER>
-		<INPUT TYPE="radio" NAME="mode" VALUE="on"<!--ON-->>On</INPUT><BR />
-		<INPUT TYPE="radio" NAME="mode" VALUE="off"<!--OFF-->>Off</INPUT><BR />
-		<INPUT TYPE="submit" />
-	</CENTER>
-</FORM>
+<form action="/admin/maintenanceMode.php?submit=" method="post">
+	<center>
+		<input type="radio" name="mode" value="on"<!--ON--> />On<br />
+		<input type="radio" name="mode" value="off"<!--OFF--> />Off<br />
+		<input type="submit" />
+	</center>
+</form>
 
-<P>
-	<A HREF="/admin/">Back to Admin Panel</A>
-</P>
+<p>
+	<a href="/admin/">Back to Admin Panel</a>
+</p>
diff --git a/theme/admin/manageDrafts.tpl b/theme/admin/manageDrafts.tpl
index 8a498ac..142033a 100755
--- a/theme/admin/manageDrafts.tpl
+++ b/theme/admin/manageDrafts.tpl
@@ -1,24 +1,24 @@
-<H2>Manage Drafts</H2>
+<h2>Manage Drafts</h2>
 
-<TABLE WIDTH="100%" CLASS="webmail">
-	<TR>
-		<TH>Draft Title</TH>
-		<TH>Draft Author</TH>
-		<TH>Actions</TH>
-	</TR>
+<table width="100%" class="webmail">
+	<tr>
+		<th>Draft Title</th>
+		<th>Draft Author</th>
+		<th>Actions</th>
+	</tr>
 
 	<!--BEGIN DRAFT-->
-	<TR>
-		<TD><!--DRAFT.TITLE--></TD>
-		<TD><!--DRAFT.AUTHOR--></TD>
+	<tr>
+		<td><!--DRAFT.TITLE--></td>
+		<td><!--DRAFT.AUTHOR--></td>
 
-		<TD>
-			<A HREF="/admin/editDraft.php?id=<!--DRAFT.ID-->"><IMG SRC="/theme/images/icons/page_edit.png" ALT="Edit"></A>
-			<A HREF="/admin/deleteDraft.php?id=<!--DRAFT.ID-->"><IMG SRC="/theme/images/icons/page_delete.png" ALT="Delete"></A>
-			<A HREF="/admin/viewDraft.php?id=<!--DRAFT.ID-->"><IMG SRC="/theme/images/icons/page_go.png" ALT="View"></A>
-		</TD>
-	</TR>
+		<td>
+			<a href="/admin/editDraft.php?id=<!--DRAFT.ID-->"><img src="/theme/images/icons/page_edit.png" alt="Edit" /></a>
+			<a href="/admin/deleteDraft.php?id=<!--DRAFT.ID-->"><img src="/theme/images/icons/page_delete.png" alt="Delete" /></a>
+			<a href="/admin/viewDraft.php?id=<!--DRAFT.ID-->"><img src="/theme/images/icons/page_go.png" alt="View" /></a>
+		</td>
+	</tr>
 	<!--END DRAFT-->
-</TABLE>
+</table>
 
-<A HREF="/admin/">Back to Admin Panel</A>
+<a href="/admin/">Back to Admin Panel</a>
diff --git a/theme/admin/managePending.tpl b/theme/admin/managePending.tpl
index 8cce14c..6c98bf8 100755
--- a/theme/admin/managePending.tpl
+++ b/theme/admin/managePending.tpl
@@ -1,26 +1,26 @@
-<H2>Manage Pending</H2>
+<h2>Manage Pending</h2>
 
-<TABLE WIDTH="100%" CLASS="webmail">
-	<TR>
-		<TH>Pending Post Title</TH>
-		<TH>Pending Post Author</TH>
-		<TH>Actions</TH>
-	</TR>
+<table width="100%" class="webmail">
+	<tr>
+		<th>Pending Post Title</th>
+		<th>Pending Post Author</th>
+		<th>Actions</th>
+	</tr>
 
 	<!--BEGIN PENDING-->
-	<TR>
-		<TD><!--PENDING.TITLE--></TD>
-		<TD><!--PENDING.AUTHOR--></TD>
+	<tr>
+		<td><!--PENDING.TITLE--></td>
+		<td><!--PENDING.AUTHOR--></td>
 
-		<TD>
-			<A HREF="/admin/editPending.php?id=<!--PENDING.ID-->"><IMG SRC="/theme/images/icons/page_edit.png" ALT="Edit"></A>
-			<A HREF="/admin/deletePending.php?id=<!--PENDING.ID-->"><IMG SRC="/theme/images/icons/page_delete.png" ALT="Delete"></A>
-			<A HREF="/admin/viewPending.php?id=<!--PENDING.ID-->"><IMG SRC="/theme/images/icons/page_go.png" ALT="View"></A>
-			<A HREF="/admin/movePending.php?id=<!--PENDING.ID-->&amp;dir=up"><IMG SRC="/theme/images/icons/thumb_up.png" ALT="Move Up"></A>
-			<A HREF="/admin/movePending.php?id=<!--PENDING.ID-->&amp;dir=down"><IMG SRC="/theme/images/icons/thumb_down.png" ALT="Move Down"></A>
-		</TD>
-	</TR>
+		<td>
+			<a href="/admin/editPending.php?id=<!--PENDING.ID-->"><img src="/theme/images/icons/page_edit.png" alt="Edit" /></a>
+			<a href="/admin/deletePending.php?id=<!--PENDING.ID-->"><img src="/theme/images/icons/page_delete.png" alt="Delete" /></a>
+			<a href="/admin/viewPending.php?id=<!--PENDING.ID-->"><img src="/theme/images/icons/page_go.png" alt="View" /></a>
+			<a href="/admin/movePending.php?id=<!--PENDING.ID-->&amp;dir=up"><img src="/theme/images/icons/thumb_up.png" alt="Move Up" /></a>
+			<a href="/admin/movePending.php?id=<!--PENDING.ID-->&amp;dir=down"><img src="/theme/images/icons/thumb_down.png" alt="Move Down" /></a>
+		</td>
+	</tr>
 	<!--END PENDING-->
-</TABLE>
+</table>
 
-<A HREF="/admin/">Back to Admin Panel</A>
+<a href="/admin/">Back to Admin Panel</a>
diff --git a/theme/admin/managePendingQuotes.tpl b/theme/admin/managePendingQuotes.tpl
index 2d4a108..e993aae 100755
--- a/theme/admin/managePendingQuotes.tpl
+++ b/theme/admin/managePendingQuotes.tpl
@@ -1,21 +1,21 @@
-<H2>Manage Pending Quotes</H2>
+<h2>Manage Pending Quotes</h2>
 
-<TABLE WIDTH="100%" CLASS="webmail">
-	<TR>
-		<TH>Quote</TH>
-		<TH>Actions</TH>
-	</TR>
+<table width="100%" class="webmail">
+	<tr>
+		<th>Quote</th>
+		<th>Actions</th>
+	</tr>
 
 	<!--BEGIN QUOTE-->
-	<TR CLASS="<!--QUOTE.EVEN-->">
-		<TD><!--QUOTE.TEXT--></TD>
+	<tr class="<!--QUOTE.EVEN-->">
+		<td><!--QUOTE.TEXT--></td>
 
-		<TD>
-			<A HREF="/admin/actionPendingQuotes.php?id=<!--QUOTE.ID-->&approve"><IMG SRC="/theme/images/icons/page_attach.png" ALT="Approve"></A>
-			<A HREF="/admin/actionPendingQuotes.php?id=<!--QUOTE.ID-->&deny"><IMG SRC="/theme/images/icons/page_delete.png" ALT="Deny"></A>
-		</TD>
-	</TR>
+		<td>
+			<a href="/admin/actionPendingQuotes.php?id=<!--QUOTE.ID-->&amp;approve"><img src="/theme/images/icons/page_attach.png" alt="Approve" /></a>
+			<a href="/admin/actionPendingQuotes.php?id=<!--QUOTE.ID-->&amp;deny"><img src="/theme/images/icons/page_delete.png" alt="Deny" /></a>
+		</td>
+	</tr>
 	<!--END QUOTE-->
-</TABLE>
+</table>
 
-<A HREF="/admin/">Back to Admin Panel</A>
+<a href="/admin/">Back to Admin Panel</a>
diff --git a/theme/admin/managePosts.tpl b/theme/admin/managePosts.tpl
index 7e37b1f..41a2456 100755
--- a/theme/admin/managePosts.tpl
+++ b/theme/admin/managePosts.tpl
@@ -1,24 +1,24 @@
-<H2>Manage Posts</H2>
+<h2>Manage Posts</h2>
 
-<TABLE WIDTH="100%" CLASS="webmail">
-	<TR>
-		<TH>Post Title</TH>
-		<TH>Post Author</TH>
-		<TH>Actions</TH>
-	</TR>
+<table width="100%" class="webmail">
+	<tr>
+		<th>Post Title</th>
+		<th>Post Author</th>
+		<th>Actions</th>
+	</tr>
 
 	<!--BEGIN POST-->
-	<TR>
-		<TD><!--POST.TITLE--></TD>
-		<TD><!--POST.AUTHOR--></TD>
+	<tr>
+		<td><!--POST.TITLE--></td>
+		<td><!--POST.AUTHOR--></td>
 
-		<TD>
-			<A HREF="/admin/editPost.php?id=<!--POST.ID-->"><IMG SRC="/theme/images/icons/page_edit.png" ALT="Edit"></A>
-			<A HREF="/admin/deletePost.php?id=<!--POST.ID-->"><IMG SRC="/theme/images/icons/page_delete.png" ALT="Delete"></A>
-			<A HREF="/blog/<!--POST.CODED-->/"><IMG SRC="/theme/images/icons/page_go.png" ALT="View"></A>
-		</TD>
-	</TR>
+		<td>
+			<a href="/admin/editPost.php?id=<!--POST.ID-->"><img src="/theme/images/icons/page_edit.png" alt="Edit" /></a>
+			<a href="/admin/deletePost.php?id=<!--POST.ID-->"><img src="/theme/images/icons/page_delete.png" alt="Delete" /></a>
+			<a href="/blog/<!--POST.CODED-->/"><img src="/theme/images/icons/page_go.png" alt="View" /></a>
+		</td>
+	</tr>
 	<!--END POST-->
-</TABLE>
+</table>
 
-<A HREF="/admin/">Back to Admin Panel</A>
+<a href="/admin/">Back to Admin Panel</a>
diff --git a/theme/admin/moderateComments.tpl b/theme/admin/moderateComments.tpl
index f3da51c..7b41016 100755
--- a/theme/admin/moderateComments.tpl
+++ b/theme/admin/moderateComments.tpl
@@ -1,24 +1,24 @@
-<H2>Moderate Comments</H2>
+<h2>Moderate Comments</h2>
 
-<TABLE WIDTH="100%" CLASS="webmail">
-	<TR>
-		<TH>Title of Article Commented Upon</TH>
-		<TH>Comment Author</TH>
-		<TH>Actions</TH>
-	</TR>
+<table width="100%" class="webmail">
+	<tr>
+		<th>Title of Article Commented Upon</th>
+		<th>Comment Author</th>
+		<th>Actions</th>
+	</tr>
 
 	<!--BEGIN COMMENT-->
-	<TR>
-		<TD><!--COMMENT.TITLE--></TD>
-		<TD><!--COMMENT.AUTHOR--></TD>
+	<tr>
+		<td><!--COMMENT.TITLE--></td>
+		<td><!--COMMENT.AUTHOR--></td>
 
-		<TD>
-			<A HREF="/admin/viewComment.php?id=<!--COMMENT.ID-->"><IMG SRC="/theme/images/icons/page_go.png" ALT="View"></A>
-			<A HREF="/admin/actionComment.php?id=<!--COMMENT.ID-->&approve"><IMG SRC="/theme/images/icons/page_attach.png" ALT="Approve"></A>
-			<A HREF="/admin/actionComment.php?id=<!--COMMENT.ID-->&deny"><IMG SRC="/theme/images/icons/page_delete.png" ALT="Deny"></A>
-		</TD>
-	</TR>
+		<td>
+			<a href="/admin/viewComment.php?id=<!--COMMENT.ID-->"><img src="/theme/images/icons/page_go.png" alt="View" /></a>
+			<a href="/admin/actionComment.php?id=<!--COMMENT.ID-->&amp;approve"><img src="/theme/images/icons/page_attach.png" alt="Approve" /></a>
+			<a href="/admin/actionComment.php?id=<!--COMMENT.ID-->&amp;deny"><img src="/theme/images/icons/page_delete.png" alt="Deny" /></a>
+		</td>
+	</tr>
 	<!--END COMMENT-->
-</TABLE>
+</table>
 
-<A HREF="/admin/">Back to Admin Panel</A>
+<a href="/admin/">Back to Admin Panel</a>
diff --git a/theme/admin/newPoll.tpl b/theme/admin/newPoll.tpl
index 5f1d2a4..debc8f1 100755
--- a/theme/admin/newPoll.tpl
+++ b/theme/admin/newPoll.tpl
@@ -1,10 +1,10 @@
-Congradulations! You've successfully added a Poll RSS. Now it's time to add the new Poll Of The Week:<P>
+Congradulations! You've successfully added a Poll RSS. Now it's time to add the new Poll Of The Week:
 
-<FORM ACTION="/admin/pollProcess.php?step=3" METHOD="POST">
-	Question: <INPUT TYPE="text" NAME="question"><BR>
-	Option 1: <INPUT TYPE="text" NAME="option1"><BR>
-	Option 2: <INPUT TYPE="text" NAME="option2"><BR>
-	Option 3: <INPUT TYPE="text" NAME="option3"><BR>
-	Option 4: <INPUT TYPE="text" NAME="option4"><BR>
-	<INPUT TYPE="submit" VALUE="Create poll">
-</FORM>
+<form action="/admin/pollProcess.php?step=3" method="post">
+	Question: <input type="text" name="question" /><br />
+	Option 1: <input type="text" name="option1" /><br />
+	Option 2: <input type="text" name="option2" /><br />
+	Option 3: <input type="text" name="option3" /><br />
+	Option 4: <input type="text" name="option4" /><br />
+	<input type="submit" value="Create poll" />
+</form>
diff --git a/theme/admin/pendingSuccess.tpl b/theme/admin/pendingSuccess.tpl
index 64adbe6..51b115f 100755
--- a/theme/admin/pendingSuccess.tpl
+++ b/theme/admin/pendingSuccess.tpl
@@ -1,8 +1,8 @@
 Congradulations, you've just made/edited a pending post!
 
-<UL>
-	<LI><A HREF="/admin/editPending.php?id=<!--ID-->">Edit this pending post</A></LI>
-	<LI><A HREF="/admin/viewPending.php?id=<!--ID-->">View this pending post</A></LI>
-	<LI><A HREF="/admin/managePending.php">Manage Pending Posts</A></LI>
-	<LI><A HREF="/admin/">Return to the Admin Panel</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/editPending.php?id=<!--ID-->">Edit this pending post</a></li>
+	<li><a href="/admin/viewPending.php?id=<!--ID-->">View this pending post</a></li>
+	<li><a href="/admin/managePending.php">Manage Pending Posts</a></li>
+	<li><a href="/admin/">Return to the Admin Panel</a></li>
+</ul>
diff --git a/theme/admin/pollrss.tpl b/theme/admin/pollrss.tpl
index 5ea628f..b58ebbb 100755
--- a/theme/admin/pollrss.tpl
+++ b/theme/admin/pollrss.tpl
@@ -1,6 +1,6 @@
-<H2>Write a Poll RSS</H2><P>
+<h2>Write a Poll RSS</h2>
 
-<FORM ACTION="/admin/pollProcess.php?step=2" METHOD="POST">
-	<TEXTAREA NAME="text" COLS="80" ROWS="20"></TEXTAREA><P>
-	<INPUT TYPE="submit" VALUE="Write RSS">
-</FORM>
+<form action="/admin/pollProcess.php?step=2" method="POST">
+	<textarea name="text" cols="80" rows="20"></textarea><br />
+	<input type="submit" value="Write RSS" />
+</form>
diff --git a/theme/admin/postSuccess.tpl b/theme/admin/postSuccess.tpl
index 12920fe..0f27964 100755
--- a/theme/admin/postSuccess.tpl
+++ b/theme/admin/postSuccess.tpl
@@ -1,8 +1,8 @@
 Congradulations, you've just made/edited a post!
 
-<UL>
-	<LI><A HREF="/admin/editPost.php?id=<!--ID-->">Edit this post</A></LI>
-	<LI><A HREF="/blog/<!--CODED-->/">View this post</A></LI>
-	<LI><A HREF="/admin/managePosts.php">Manage Posts</A></LI>
-	<LI><A HREF="/admin/">Return to the Admin Panel</A></LI>
-</UL>
+<ul>
+	<li><a href="/admin/editPost.php?id=<!--ID-->">Edit this post</a></li>
+	<li><a href="/blog/<!--CODED-->/">View this post</a></li>
+	<li><a href="/admin/managePosts.php">Manage Posts</a></li>
+	<li><a href="/admin/">Return to the Admin Panel</a></li>
+</ul>
diff --git a/theme/admin/viewComment.tpl b/theme/admin/viewComment.tpl
index ae2ee46..8b52fa0 100755
--- a/theme/admin/viewComment.tpl
+++ b/theme/admin/viewComment.tpl
@@ -1,12 +1,12 @@
-<DIV CLASS="bubble">
-	<BLOCKQUOTE>
-		<DIV>
-			<IMG SRC="http://www.gravatar.com/avatar/<!--CODEDEMAIL-->?s=32&amp;d=identicon&amp;r=G">
+<div class="bubble">
+	<blockquote>
+		<div>
+			<img src="http://www.gravatar.com/avatar/<!--CODEDEMAIL-->?s=32&amp;d=identicon&amp;r=G" />
 			<!--TEXT-->
-		</DIV>
-	</BLOCKQUOTE>
-	<CITE><STRONG><!--USERNAME--></STRONG> on <!--DATE--></CITE>
-</DIV><P>
+		</div>
+	</blockquote>
+	<cite><strong><!--USERNAME--></strong> on <!--DATE--></cite>
+</div>
 
-<A HREF="/admin/moderateComments.php">Back to Comment Moderation</A><BR>
-<A HREF="/admin/">Back to Admin Panel</A>
+<p><a href="/admin/moderateComments.php">Back to Comment Moderation</a><br />
+<a href="/admin/">Back to Admin Panel</a></p>
diff --git a/theme/admin/write.tpl b/theme/admin/write.tpl
index 0d8fb24..0371ace 100755
--- a/theme/admin/write.tpl
+++ b/theme/admin/write.tpl
@@ -1,14 +1,14 @@
-<H2>Write a post</H2><P>
+<h2>Write a post</h2>
 
-<FORM ACTION="/admin/writePost.php?submit=" METHOD="POST">
-	Post Title: <INPUT TYPE="text" NAME="title"><BR>
-	<TEXTAREA NAME="text" COLS="80" ROWS="20"></TEXTAREA><P>
-	Tags (comma-seperated): <INPUT TYPE="text" NAME="tags" VALUE="update"><BR>
-	Post Type: <SELECT NAME="type" SIZE="4">
-		<OPTION VALUE="draft">Draft</OPTION>
-		<OPTION VALUE="normal" SELECTED>Normal (Article-style) Post</OPTION>
-		<OPTION VALUE="priority">High-Priority Post</OPTION>
-		<OPTION VALUE="instant">Instant Post</OPTION>
-	</SELECT><BR>
-	<INPUT TYPE="submit" VALUE="Write post">
-</FORM>
+<form action="/admin/writePost.php?submit=" method="post">
+	Post Title: <input type="text" name="title" /><br />
+	<textarea name="text" cols="80" rows="20"></textarea><br />
+	Tags (comma-seperated): <input type="text" name="tags" value="update" /><br />
+	Post Type: <select name="type" size="4">
+		<option value="draft">Draft</option>
+		<option value="normal" selected="selected">Normal (Article-style) Post</option>
+		<option value="priority">High-Priority Post</option>
+		<option value="instant">Instant Post</option>
+	</select><br />
+	<input type="submit" value="Write post" />
+</form>
diff --git a/theme/archive.tpl b/theme/archive.tpl
index f08c0f2..21cc567 100755
--- a/theme/archive.tpl
+++ b/theme/archive.tpl
@@ -1,8 +1,8 @@
-<CENTER><H2><!--HEADER--></H2></CENTER>
+<center><h2 class="light-at-night"><!--HEADER--></h2></center>
 
 <!--BEGIN MONTH-->
-<H3 STYLE="clear: both; display: block; margin-bottom: 0"><!--MONTH.TITLE--></H3>
+<h3 style="clear: both; display: block; margin-bottom: 0" class="light-at-night"><!--MONTH.TITLE--></h3>
 	<!--BEGIN MONTH.SMALL-->
-		<SMALL><SPAN STYLE="margin-left: 50"><!--MONTH.SMALL.DATE--> | <A HREF="/blog/<!--MONTH.SMALL.CODED-->/"><!--MONTH.SMALL.TITLE--></A></SPAN></SMALL><BR>
+		<small><span style="margin-left: 50" class="light-at-night"><!--MONTH.SMALL.DATE--> | <a href="/blog/<!--MONTH.SMALL.CODED-->/"><!--MONTH.SMALL.TITLE--></a></span></small><br />
 	<!--END MONTH.SMALL-->
 <!--END MONTH-->
diff --git a/theme/comments.tpl b/theme/comments.tpl
index 1ca7ab2..5e1c564 100755
--- a/theme/comments.tpl
+++ b/theme/comments.tpl
@@ -1,51 +1,48 @@
-<A NAME="comments"></A>
+<a name="comments" />
 
 <!--BEGIN COMMENTS-->
-<A NAME="comment-<!--COMMENTS.ID-->"></A>
+<a name="comment-<!--COMMENTS.ID-->" />
 
 <!--BEGIN COMMENTS.EDITOR-->
-<FORM ACTION="/edit-comment.php?id=<!--COMMENTS.ID-->" METHOD="POST">
+<form action="/edit-comment.php?id=<!--COMMENTS.ID-->" method="post">
 <!--END COMMENTS.EDITOR-->
 
-<DIV CLASS="bubble" ID="comment-<!--COMMENTS.ID-->">
-	<BLOCKQUOTE>
-		<DIV ID="textBubble-<!--COMMENTS.ID-->">
-			<IMG SRC="http://www.gravatar.com/avatar/<!--COMMENTS.CODEDEMAIL-->?s=32&amp;d=identicon&amp;r=G">
-			<!--COMMENTS.TEXT-->
-		</DIV>
-
-		<!--BEGIN COMMENTS.EDITOR-->
-
-		<DIV ID="postBubble-<!--COMMENTS.ID-->" CLASS="invisible">
-	                <TEXTAREA ROWS="4" CLASS="comments_field" NAME="comment" COLS="73"><!--COMMENTS.EDITOR.BEFORE--></TEXTAREA>
-                </DIV>
-
-		<!--END COMMENTS.EDITOR-->
-	</BLOCKQUOTE>
-	<CITE><STRONG><!--COMMENTS.USERNAME--></STRONG> on <!--COMMENTS.DATE--></CITE>
+<div class="module unrounded" id="comment-<!--COMMENTS.ID-->">
+	<div id="textBubble-<!--COMMENTS.ID-->" class="comment">
+		<img src="http://www.gravatar.com/avatar/<!--COMMENTS.CODEDEMAIL-->?s=32&amp;d=identicon&amp;r=G" alt="" />
+		<!--COMMENTS.TEXT-->
+	</div>
 
 	<!--BEGIN COMMENTS.EDITOR-->
 
-	<SPAN CLASS="post-vote">
-		<A HREF="#comment-<!--COMMENTS.ID-->" ONCLICK="openEditor('<!--COMMENTS.ID-->');"><IMG SRC="/theme/images/icons/note_edit.png" ALT="Edit"></A>
-		<A HREF="/delete-comment.php?id=<!--COMMENTS.ID-->"><IMG SRC="/theme/images/icons/note_delete.png" ALT="Delete"></A>
-	</SPAN>
+	<div id="postBubble-<!--COMMENTS.ID-->" class="invisible">
+		<textarea rows="4" class="comments_field" name="comment" cols="100"><!--COMMENTS.EDITOR.BEFORE--></textarea>
+	</div>
 
 	<!--END COMMENTS.EDITOR-->
-</DIV>
+</div>
+
+<cite class="light-at-night"><strong><!--COMMENTS.USERNAME--></strong> on <!--COMMENTS.DATE--></cite>
 
 <!--BEGIN COMMENTS.EDITOR-->
-	<DIV ID="editComment-<!--COMMENTS.ID-->" CLASS="invisible" STYLE="text-align: center">
-		<INPUT TYPE="submit" VALUE="Edit">
-		<BUTTON TYPE="button" ONCLICK="closeEditor(<!--COMMENTS.ID-->);">Cancel</BUTTON>
-	</DIV>
 
-</FORM>
+	<span class="post-vote">
+		<a href="#comment-<!--COMMENTS.ID-->" onclick="openEditor('<!--COMMENTS.ID-->');"><img src="/theme/images/icons/note_edit.png" alt="Edit" /></a>
+		<a href="#comment-<!--COMMENTS.ID-->" onclick="if (confirm('Are you sure you would like to delete this comment?')) {window.location='/delete-comment.php?id=<!--COMMENTS.ID-->';}"><img src="/theme/images/icons/note_delete.png" alt="Delete" /></a>
+	</span>
+
+	<div id="editComment-<!--COMMENTS.ID-->" class="invisible" style="text-align: center">
+		<input type="submit" value="Edit" />
+		<button type="button" onclick="closeEditor(<!--COMMENTS.ID-->);">Cancel</button>
+	</div>
+</form>
 <!--END COMMENTS.EDITOR-->
 
 <!--END COMMENTS-->
 
-<SCRIPT TYPE="text/javascript">
+<div class="cleardiv"></div>
+
+<script type="text/javascript">
 
 function openEditor(id)
 {
@@ -65,29 +62,60 @@ function closeEditor(id)
 	jQuery("#editComment-" + id).addClass("invisible");
 }
 
-</SCRIPT>
+function postComment()
+{
+	jQuery("#newComment textarea, #newComment input, #newComment button").attr("disabled", "disabled");
+	jQuery("#flash").text("Processing....").slideDown();
+	jQuery.ajax({
+		type: "POST",
+		url: "/post.php",
+		data: ({
+			id: "<!--PAGEID-->",
+			comment: jQuery("#newComment textarea").val(),
+			username: jQuery("#newComment input:text[name=username]").val(),
+			email: jQuery("#newComment input:text[name=email]").val(),
+			website: jQuery("#newComment input:text[name=website]").val(),
+			recaptcha_challenge_field: jQuery("#newComment input[name=recaptcha_challenge_field]").val(),
+			recaptcha_response_field: jQuery("#newComment input[name=recaptcha_response_field]").val()
+		}),
+		dataType: "text",
+		success: function(msg) {
+			if (msg.indexOf("textBubble") != -1)
+			{
+				jQuery("#flash").text("Your comment has been posted.");
+				jQuery("#newComment").html(msg);
+			} else {
+				jQuery("#newComment textarea, #newComment input, #newComment button").removeAttr("disabled");
+				jQuery("#flash").text(msg);
+			}
+		},
+		error: function() {
+			jQuery("#newComment textarea, #newComment input, #newComment button").removeAttr("disabled");
+			jQuery("#flash").text("There was an error posting your comment.");
+		}
+	});
+}
+
+</script>
 
-<DIV ID="newComment">
-	<FORM ACTION="/post.php?id=<!--PAGEID-->" METHOD="POST">
-		<DIV CLASS="bubble">
-			<BLOCKQUOTE>
-				<DIV ID="postBubble">
-					<TEXTAREA ROWS="4" CLASS="comments_field" NAME="comment" COLS="73"></TEXTAREA>
-				</DIV>
-			</BLOCKQUOTE>
-			<CITE><STRONG><!--USERNAME--></STRONG>, feel free to post a comment</CITE>
-		</DIV>
+<div id="newComment">
+	<form action="/post.php?id=<!--PAGEID-->" method="post">
+		<div class="module unrounded" id="postBubble">
+			<textarea rows="4" class="comments_field" name="comment" cols="100"></textarea>
+		</div>
+		
+		<cite class="light-at-night"><strong><!--USERNAME--></strong>, feel free to post a comment</cite>
 
-		<CENTER>
+		<center class="light-at-night">
 			<!--BEGIN NOLOG-->
 			<!--RECAPTCHA-->
-			<P>
-			Name: <INPUT TYPE="text" NAME="username"><BR>
-			Email: <INPUT TYPE="text" NAME="email"><BR>
-			Website (Optional): <INPUT TYPE="text" NAME="website">
-			<P>
+			<p>
+			Name: <input type="text" name="username" /><br />
+			Email: <input type="text" name="email" /><br />
+			Website (Optional): <input type="text" name="website" />
+			</p>
 			<!--END NOLOG-->
-			<INPUT TYPE="submit" VALUE="Post">
-		</CENTER>
-	</FORM>
-</DIV>
+			<button type="button" onclick="postComment();">Post</button>
+		</center>
+	</form>
+</div>
diff --git a/theme/css.php b/theme/css.php
old mode 100755
new mode 100644
index 352caaa..8c8b7ec
--- a/theme/css.php
+++ b/theme/css.php
@@ -22,32 +22,10 @@ require('../headerproc.php');
 
 header('Content-type: text/css');
 
-include('../../security/config.php');
-include('../includes/db.php');
-include('../includes/specialdates.php');
-
-include("css/website.css");
-include("css/bubbles.css");
-
-if (sd_ifNoSpecialDay())
-{
-	if ($_GET['id'] == 'day')
-	{
-		include("css/day.css");
-	} else if ($_GET['id'] == 'night')
-	{
-		include("css/night.css");
-	}
-} else {
-	include("css/holiday.php");
-}
-
-if ($_GET['cat'] == 'home')
-{
-	include('css/blog.php');
-} else if ($_GET['cat'] == 'panel')
-{
-	include('css/blog.php');
-}
+include('css/website.css');
+include('css/blog.php');
+include('css/bubbles.css');
+include('css/quotes.css');
+include('css/holiday.php');
 
 ?>
diff --git a/theme/css/blog.php b/theme/css/blog.php
index bef21dd..4c69e57 100644
--- a/theme/css/blog.php
+++ b/theme/css/blog.php
@@ -21,6 +21,8 @@
 if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
+include_once('../../security/config.php');
+include_once('../includes/db.php');
 
 ?>
 
@@ -82,13 +84,14 @@ span.post-day {
 div.post-title {
  float: left;
  margin-left: 10px;
- width: 500px; /* 430px */
+ width: 90%; /* 500px */
 }
 
 div.entry {
  clear: both;
  padding-top: 10px;
- font: 75%/150% Arial, "Trebuchet MS", Tahoma;
+ /*font-size: 75%;
+ line-height: 150%;*/
 }
 
 div.entry ol,
@@ -218,5 +221,14 @@ div.post-date-4 {
 span.post-vote {
  float: right;
  position: relative;
- top: -10px;
+ top: -2em;
+ right: 1em;
+}
+
+span.post-rating {
+ font-size: big;
+}
+
+span.post-action-done {
+        opacity: 0.2;
 }
diff --git a/theme/css/bubbles.css b/theme/css/bubbles.css
index 920b917..fb2c6d0 100755
--- a/theme/css/bubbles.css
+++ b/theme/css/bubbles.css
@@ -1,27 +1,14 @@
-/* Normal Bubble */
-
-div.bubble {
-	width: auto;
-	font-size: 0.75em;
-	margin-bottom: 14px;
-	font: 1em "Lucida Grande", Lucida, Verdana, sans-serif;
-}
-
-div.bubble blockquote {
-	margin: 0px;
-	padding: 0px;
-	border: 1px solid #c9c2c1;
-	background-color: #fff;
-}
-
-div.bubble blockquote div {
-	margin: 10px;
-	padding: 0px;
+.rounded {
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-khtml-border-radius: 10px;
+	border-radius: 10px;
+	padding: 4px;
 }
 
-div.bubble cite {
+div.module + cite {
 	position: relative;
-	top: 6px;
+	top: -1em;
 	margin: 0;
 	padding: 7px 0px 0px 15px;
 	background: transparent url(/theme/images/tip.gif) no-repeat 20px 0;
@@ -29,56 +16,46 @@ div.bubble cite {
 	font-size: small;
 }
 
-/* Rounded Bubble */
-div.bubble div.rounded {
-	margin-bottom: 10px;
-	border: 3px solid #fff;
-	background-color: #b7e0ff;
-}
-
-div.bubble div.rounded blockquote,
-div.bubble div.navbar-rounded blockquote {
-	border: 0;
-	background-color: transparent;
+div.module.unrounded + cite {
+	top: -0.9em;
 }
 
-div.bubble div.rounded blockquote div {
-	margin: 0px 10px;
+div.module.bquote + cite {
+	top: -0.8em;
 }
 
-div.bubble cite.rounded {
+div.module.rounded + cite {
 	margin: 0px;
-	padding: 19px 0 0 15px;
 	background: transparent url(/theme/images/tip-rounded.gif) no-repeat 15px 0;
 }
 
-/* Pimped Bubble */
-
-div.pimped {
-	font-size: 0.9em;
-}
-
-div.pimped div.rounded {
+div.module.pimped {
 	color: #fff;
 	border: 3px solid #fff;
-	background-color: #111;
+	background-color: #111 !important;
+	padding-top: 5px;
+	padding-bottom: 5px;
 }
 
-div.pimped cite.rounded {
-	background: transparent url(/theme/images/tip-pimped.gif) no-repeat 15px 0;
+div.module.pimped + cite {
+	background: transparent url(/theme/images/tip-pimped.gif) no-repeat 20px 0;
 }
 
-div.bubble div.bquote blockquote {
-	margin: 0;
-	padding: 4px 0;
-	border: 1px solid #c9c2c1;
-	background-color: #fff;
+div.module {
+	margin: auto 10px 14px 10px;
+	margin-left: 10px;
+	margin-right: 10px;
+	font-size: 0.9em;
+	background-color: #B7E0FF !important;
+	border: 3px solid #FFFFFF;
 }
 
-.rounded {
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-	-khtml-border-radius: 10px;
-	border-radius: 10px;
-	padding: 4px;
+div.module.unrounded {
+	background-color: white !important;
+	border: 1px solid #c9c2c1 !important;
+	padding: 5px;
+}
+
+div.module.sidebar {
+	width: 250px;
 }
diff --git a/theme/css/day.css b/theme/css/day.css
deleted file mode 100755
index 16fc9a6..0000000
--- a/theme/css/day.css
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
- background-color: aqua;
- background-image: url(/theme/images/backgrounds/island6.PNG);
-}
diff --git a/theme/css/holiday.php b/theme/css/holiday.php
index 65c1826..a1639c7 100755
--- a/theme/css/holiday.php
+++ b/theme/css/holiday.php
@@ -21,6 +21,9 @@
 if (!defined('S_INCLUDE_FILE')) {define('S_INCLUDE_FILE',1);}
 
 require('headerproc.php');
+include('../includes/specialdates.php');
+
+$bgcolor='aqua';
 
 if (sd_isSpecialDay('Four Island A'))
 {
@@ -93,20 +96,44 @@ if (sd_isSpecialDay('Four Island A'))
 } elseif (sd_isSpecialDay('Valentines Day'))
 {
 	$bgimgm = 'valentines';
+} else {
+	$bgimgm = 'island6';
+}
+
+?>
+
+div#window {
+ background-color: <?php echo($bgcolor); ?>;
+ background-image: url(/theme/images/backgrounds/<?php echo($bgimgm); ?>.PNG);
+ background-position: bottom left;
+ background-repeat: repeat-x;
+ background-attachment: fixed;
+ padding: 0 !important;
 }
 
-$bodyID = $_GET['id'];
-if (!isset($bgcolor))
+<?php
+
+if ($bgcolor == 'aqua')
 {
-	$bgcolor='aqua';
+?>
 
-	include("css/day.css");
-} else {
-	include("css/night.css");
+div#content div#actual-content {
+	background-color: rgba(255, 255, 255, 0.5);
 }
 
+<?php
+} else {
 ?>
 
-body {
- background-image: url(/theme/images/backgrounds/<?php echo($bgimgm); ?>.PNG) !important;
+div#content div#actual-content {
+	background-color: rgba(0, 0, 0, 0.75);
 }
+
+.light-at-night {
+	color: #536482;
+}
+
+<?php
+}
+
+?>
diff --git a/theme/css/ie.css b/theme/css/ie.css
deleted file mode 100644
index ad0ebcc..0000000
--- a/theme/css/ie.css
+++ /dev/null
@@ -1,44 +0,0 @@
-body * {
- overflow: hidden;
-}
-
-dl.icon {
- height: 50px;
-}
-
-#wrap {
- text-align: center;
- background:transparent;
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99FFFFFF,endColorstr=#99FFFFFF);
- zoom: 1;
-}
-
-#wrap #page-body {
- text-align: left;
-}
-
-body#night #wrap {
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);
-}
-
-div#fi-navbar ul li a {
- position: relative;
- top: -0.4em;
-}
-
-div.bubble cite {
- position: static;
- padding-top: 4px;
-}
-
-div.bubble cite.rounded {
- padding-top: 13px;
-}
-
-div.pimped cite.rounded {
- padding-top: 14px;
-}
-
-span.post-vote {
- position: static;
-}
diff --git a/theme/css/night.css b/theme/css/night.css
deleted file mode 100755
index 222b1d4..0000000
--- a/theme/css/night.css
+++ /dev/null
@@ -1,25 +0,0 @@
-body {
- background-color: black;
- background-image: url(/theme/images/backgrounds/island6night.PNG);
-}
-
-div#wrap {
- background-color: rgba(0, 0, 0, 0.75);
-}
-
-div#banner {
- background-color: black;
- background-image: url(/theme/images/fourisland_header_night.png);
-}
-
-div#fi-navbar ul li.active img {
- background-color: black;
- outline: black solid .5em;
-}
-
-#rightbar .sidebar  .pimped cite,
-.post .entry .bubble cite,
-#footer,
-body.quotes #content {
- color: #555555;
-}
diff --git a/theme/css/print.css b/theme/css/print.css
index ce872e0..ef7959a 100755
--- a/theme/css/print.css
+++ b/theme/css/print.css
@@ -1,36 +1,34 @@
-body {
- width: 100% !important;
-}
-
-div#footer, div#rightbar, div#push {
+div#sidebar, div#footer .foot-module, div#newComment {
  display: none;
 }
 
-div#banner {
- background-image: none;
- height: auto !important;
+div#content div#window, div#content div#actual-content {
+ background-color: white;
+ padding: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ -khtml-border-radius: 0;
+ border-radius: 0;
+ margin: 0;
 }
 
-div#banner h1 a {
- text-indent: 0 !important;
- color: black;
- text-align: center;
- height: auto !important;
-}
-
-span.print {
- display: inline;
-}
- 
 div#cleardiv {
  clear: none;
 }
 
 div#content {
- width: 100%;
+ width: 95%;
 }
 
 div.post-title {
  width: 90%;
 }
 
+div#banner a {
+ text-indent: 0 !important;
+ color: black;
+ text-align: center;
+ height: auto !important;
+ font-size: 4em;
+ padding-top: 1em;
+}
diff --git a/theme/css/quotes.css b/theme/css/quotes.css
new file mode 100644
index 0000000..72d5189
--- /dev/null
+++ b/theme/css/quotes.css
@@ -0,0 +1,61 @@
+ul.quote-list {
+	list-style-type: none;
+}
+
+li.quote {
+	margin: 0 0 1em;
+	padding-bottom: 0.1em;
+	background-color: #FCFCFC;
+}
+
+h3.quote-header {
+	background-color: #F7F7F7;
+	border: 1px solid #F4F4F4;
+	margin: 0;
+	padding: 0.25em 0.75em;
+}
+
+li.quote, h3.quote-header {
+        -moz-border-radius-topleft: 0.5em;
+        -moz-border-radius-topright: 0.5em;
+        -webkit-border-top-left-radius: 0.5em;
+        -webkit-border-top-right-radius: 0.5em;
+        -khtml-border-top-left-radius: 0.5em;
+        -khtml-border-top-right-radius: 0.5em;
+        border-top-left-radius: 0.5em;
+        border-top-right-radius: 0.5em;
+}
+
+span.quote-date {
+	font-size: 70%;
+}
+
+blockquote.quote-body {
+	font-family: Consolas, Monaco, Courier New, monospace;
+	font-size: 12px;
+	margin: 0.5em 0.75em;
+	padding: 0;
+	position: static;
+	width: 100%;
+}
+
+ul.quote-list li:hover {
+	background: #FFFCEC;
+}
+
+ul.quote-list li:hover h3.quote-header {
+	background: #FEC;
+	border-color: #FFE9C9;
+}
+
+span.quote-action-done {
+	opacity: 0.2;
+}
+
+span.quote-update-result {
+	float: right;
+	text-transform: uppercase;
+	font-size: 70%;
+	position: relative;
+	top: -1.2em;
+}
diff --git a/theme/css/website.css b/theme/css/website.css
old mode 100755
new mode 100644
index f0f2a0e..145bcdf
--- a/theme/css/website.css
+++ b/theme/css/website.css
@@ -1,14 +1,6 @@
-/* Four Island CSS */
-
-body {
- background: repeat-x bottom left fixed;
- font-family: Arial, FreeSans;
- margin: 0px;
- padding: 0px 0px 30px !important;
-}
-
-body.fourm {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+* {
+	margin: 0;
+	padding: 0;
 }
 
 /* Effects */
@@ -27,349 +19,345 @@ body.fourm {
 }
 
 form textarea:focus, form input:focus {
- border: 2px solid #900;
- background-color: #FEFFB2;
+	border: 2px solid #900;
+	background-color: #FEFFB2;
 }
 
 /* Links */
 
 a:link {
- color: blue;
- font-weight: bold;
- text-decoration: none;
+	color: blue;
+	font-weight: bold;
+	text-decoration: none;
 }
 
 a:visited, a:active {
- color: blue;
- text-decoration: none;
+	color: blue;
+	text-decoration: none;
 }
 
 a:hover, a:focus {
- color: blue;
- font-weight: bold;
- text-decoration: none;
- font-variant: small-caps;
- text-transform: capitalize;
+	color: blue;
+	font-weight: bold;
+	text-decoration: none;
+	font-variant: small-caps;
+	text-transform: capitalize;
 }
 
 a img {
- border: 0;
+	border: 0;
 }
 
-/* Random Elements */
+/* Body */
 
-* {
- margin:0pt;
- padding:0pt;
+body {
+	font-family: "Lucida Grande", "Arial", sans;
+	background-color: #111;
 }
 
-p {margin-top: 1em;}
-ul, ol {margin-top: 1em; margin-bottom: 1em}
-
-img.center, img[align="center"] {
- display: block;
- margin-left: auto;
- margin-right: auto;
+div#header {
+	width: 100%;
+	height: 200px;
+	background-image: url(http://fourisland.com/theme/images/header-repeat.png);
+	background-repeat: repeat-x;
 }
 
-acronym, abbr, span.caps {
- cursor: help;
+div#banner {
+	width: 800px;
+	height: 200px;
+	margin: 0 auto;
+	background-image: url(http://fourisland.com/theme/images/header.png);
+	background-position: bottom right;
 }
 
-acronym, abbr {
- border-bottom: 1px dashed #999;
+div#header a {
+	width: 800px;
+	height: 200px;
+	text-indent: -5000px;
+	display: block;
 }
 
-blockquote {
- padding-left: 10px;
- border-left: 3px solid #CCC;
- font-family: Helvetica, sans-serif;
- font-size: 14px;
- margin: 10px 0 10px 50px;
+div#sidebar {
+	width: 21%;
+	float: left;
 }
 
-pre {
- line-height: 12px;
+div#content {
+	width: 69%;
+	float: right;
+	padding-left: 5%;
+	padding-right: 5%;
+	padding-top: 20px;
 }
 
-/* Banner */
-		
-div#banner, div#fi-banner {
- background-repeat: no-repeat;
- width: 900px; /*728*/
- height: 200px;
- float: left;
-/* margin-top: 21px; */
+div#content div.rounded {
+	padding: 10px;
 }
 
-div#banner {
- background: white url("/theme/images/fourisland_header.png") center no-repeat;
- width: 100%;
+div#footer {
+	width: 100%;
+	padding-top: 20px;
+	padding-bottom: 20px;
 }
 
-body div#banner h1, body div#fi-banner h1 {
- margin: 0;
+div#footer div.foot-module {
+	margin: 0 auto;
+	float: left;
+	width: 20%;
+	margin-left: 4%;
+	color: white;
+	font-size: 0.9em;
 }
 
-body div#banner h1 a, body div#fi-banner h1 a {
- display: block;
- width: 900px;
- height: 200px;
- text-indent: -5000px;
- text-decoration: none;
- margin: 0;
+div#footer a {
+	color: white;
+	border-bottom: 1px dotted white;
 }
 
-div#banner h1, div#fi-banner h1 {
- margin: 0;
- font-size: 3.0em;
- font-weight: normal;
+div#footer div.foot-module ul {
+	list-style-type: square;
 }
 
-/* NavBar */
-
-div#fi-navbar {
- position: relative;
- background-color: #b7e0ff;
- width: auto;
- margin-bottom: 14px;
- font: 0.9em "Lucida Grande", Lucida, Verdana, sans-serif;
- height: 1.9em;
- clear: both;
+div#footer p {
+	font-size: 0.5em;
+	color: white;
+	text-align: center;
 }
 
-div#fi-navbar div {
- padding: .001em 0;
- margin: 10px;
+div#page-content {
+	background-color: #00ff00; /*#8B4513;*/
+	padding-bottom: 10px;
 }
 
-div#fi-navbar ul {
- margin: .25em 0;
- padding-left: 1em;
- text-align: center;
+body[id^=fourm] div#page div#content code {
+	display: block;
+	border: solid black 1px;
+	background-color: #FFFF64;
+	width: 485px;
+	overflow: visible;
 }
 
-div#fi-navbar ul li {
- display: inline;
- font-family: Verdana, sans-serif;
- font-size: 1.1em;
+body[id^=fourm] div#content h2 {
+	color: #59770e;
+	margin: 0px 0px 2px;
+	border-bottom: 1px dotted #CCCCCC;
+	letter-spacing: -1px;
+	font-size: 140%;
+	padding-bottom: 3px;
 }
 
-div#fi-navbar ul li+li:before {
- content: " - ";
+body#fourm div#actual-content {
+	font-size: 60%;
 }
 
-div#fi-navbar ul li img,
-div#fi-navbar ul li.active span {
- display: none;
+ul#navbar {
+	text-align: center;
+	margin-top: 0;
 }
 
-div#fi-navbar ul li.active img {
- display: inline;
- background-color: white;
- outline: white solid .5em;
- margin: 0 .5em;
+ul#navbar li {
+	display: inline;
+	font-family: Verdana, sans-serif;
+	font-size: 1.1em;
 }
 
-div#fi-navbar div.bubble blockquote {
- background: none;
- font-size: 0.9em;
+ul#navbar li+li:before {
+	content: " - ";
 }
 
-div#fi-navbar div.bubble blockquote a {
- color: blue;
+ul#navbar li img, ul#navbar li.active span {
+	display: none;
 }
 
-/* Sidebar */
-
-div#rightbar {
- float: left;
- width: 270px; /*210*/
+ul#navbar li.active img {
+	display: inline;
+	background-color: white;
+	outline: white solid .5em;
+	margin: 0 .5em;
 }
 
-div.sidebar {
- width: 250px; /*250*/ /*240*/ /*210*/
- padding: 0 10px;
- margin-bottom: 5px;
+.invisible {
+	display: none;
 }
 
-div.sidebar h3 {
- font-family: Verdana, Helvetica, Arial, sans-serif;
- margin: 5px 0 0 0;
- font-weight: bold;
- color: #333333;
+a img {
+	border: 0;
 }
 
-div.sidebar p {
- font-size: 0.8em;
- margin: 3px 0;
+p {
+	margin-top: 1em;
 }
 
-div.sidebar ul {
- list-style-type: none;
- padding: 0;
- margin: 0;
- line-height: normal !important;
- list-style-image: none !important;
-}
-							
-div#sidebar ul li {
- margin-top: 4px;
+ul, ol {
+	margin-top: 1em;
+	margin-bottom: 1em;
 }
-				
-div#sidebar ul li a {
- display: block;
- width: 230px;
+
+.center, img[align="center"] {
+	display: block;
+	margin: 0 auto !important;
 }
 
-div#sidebar li img {
- border: 0;
- height: 16px;
- width: 16px;
+acronym, abbr, span.caps {
+ cursor: help;
 }
 
-/* Layout */
+acronym, abbr {
+ border-bottom: 1px dashed #999;
+}
 
-#wrap {
- width: 910px;
- margin: 10px auto;
- padding: 0;
- background-color: white;
- background-color: rgba(255, 255, 255, 0.5);
- border: 4px solid gray;
+pre {
+	background: #eee; 
+	padding: 10px; 
+	border: 2px solid #c94a29; 
+	overflow: auto;
+	margin: 15px 0;
+	font-family: Courier, Monospace;
 }
 
-#page-body {
- margin: 0 30px;
- clear: both;
- position: relative;
+ul pre, ol pre {
+	margin-left: -3em;
 }
 
-body.fourm #page-body {
- margin: 0 10px 0 25px;
- width: 95%;
- font-size: 62.5%;
+div.autosize {
+	margin-bottom: 6px !important;
 }
 
-#phpBB3-page-body {
- margin: 4px 0 !important;
- clear: both;
+ul blockquote, ol blockquote {
+	position: relative;
+	left: -3em;
+	width: 110%;
 }
 
-/* Content */
-															
-div#content {
- float: right;
- width: 555px; /*465*/ /*555*/
+.comment ul, .comment ol {
+	margin-left: 3em;
 }
 
-body#day div#page div#content code {
- display: block;
- border: solid black 1px;
- background-color: #FFFF64;
- width: 485px;
- overflow: visible;
+ul div.bquote blockquote, ol div.bquote blockquote {
+	left: 0;
 }
 
-div#content h2 {
- color: #59770e;
- margin: 0px 0px 2px;
- border-bottom: 1px dotted #CCCCCC;
- letter-spacing: -1px;
- font: normal 140%/100% "Trebuchet MS", Tahoma, Arial;
- padding-bottom: 3px;
+li+br {
+	display: none;
 }
 
-/* Random Divs/Spans */
+/* Tables */
 
-div.cleardiv {
- clear: both;
-}
-				
-div#footer {
- clear: both;
- padding: .5em 0 1em 0;
- margin-top: .5em;
- text-align: center;
- font-size: .68em;
- border-top: 1px black solid;
+table.webmail {
+	border: 0;
+	width: 100%;
 }
 
-div#footer ul.rows li {
- display: list-item;
+table.webmail, table.webmail td {
+	border-spacing: 0;
 }
 
-div#footer ul {
- padding: 0;
- margin: 0;
- list-style-type: none;
+table.webmail tr {
+	background-color: #3CE4ED;
 }
 
-div#footer ul li {
- display: inline;
- margin-right: 1em;
+table.webmail tr.even {
+	background-color: #39B7CD;
 }
 
-div#footer ul li img {
- width: 20px;
- height: 20px;
- vertical-align: top;
+table.webmail th {
+	background-color: #FF9912;
+	text-align: left;
 }
 
-div#content ul {
- list-style: url(/theme/images/bullet_disk_big.png);
+/* Sidebar */
+
+div#rightbar {
+	float: left;
+	width: 270px; /*210*/
 }
 
-div#content a img {
- border: solid transparent 1px;
+div.sidebar {
+	width: 250px; /*250*/ /*240*/ /*210*/
+	padding: 0 10px;
+	margin-bottom: 5px;
 }
 
-div#content a:hover img {
- border: dashed gray 1px;
+div.sidebar h3 {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	margin: 5px 0 0 0;
+	font-weight: bold;
+	color: #333333;
 }
 
-div#hatbar.quotes-options ul {
- list-style: none;
+div.sidebar p {
+	font-size: 0.8em;
+	margin: 3px 0;
 }
 
-div.autosize {
- margin-bottom: 6px !important;
+div#sidebar ul.hatnav {
+	list-style-type: none;
+	padding-left: 24px;
+	margin-top: 0 !important;
+	line-height: normal !important;
+	list-style-image: none !important;
 }
 
-ul blockquote, ol blockquote {
- position: relative;
- left: -3em;
- width: 110%;
+div#sidebar ul {
+	list-style-type: none;
+}
+							
+div#sidebar ul.hatnav li {
+	text-align: right;
+	border: 1px gray solid;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	background-color: #111;
+	color: white;
+}
+				
+div#sidebar ul.hatnav li a {
+	display: block;
+	width: 230px;
+	color: white;
 }
 
-li+br {
- display: none;
+div#sidebar li img {
+	border: 0;
+	height: 16px;
+	width: 16px;
 }
 
-.invisible {
- display: none;
+div#sidebar ul.hatnav li.active {
+	background-color:#00FF00;
+	border: none;
 }
 
-/* Tables */
+div#sidebar ul.hatnav li:hover {
+	background-color:yellow;
+	border: none;
+}
 
-table.webmail {
- border: 0;
- width: 100%;
+div#sidebar ul li.active a, div#sidebar ul li a:hover {
+	color: black;
 }
 
-table.webmail, table.webmail td {
- border-spacing: 0;
+div.cleardiv {
+	clear: both;
 }
 
-table.webmail tr {
- background-color: #3CE4ED;
+.nobr {
+	white-space: nowrap;
 }
 
-table.webmail tr.even {
- background-color: #39B7CD;
+textarea {
+	width: 99%;
 }
 
-table.webmail th {
- background-color: #FF9912;
- text-align: left;
+div#flash {
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	background-color: yellow;
+	padding: 10px 0;
+	text-align: center;
+	border-bottom: 1px solid black;
+	display: none;
+	z-index: 9999;
 }
diff --git a/theme/datefinder.tpl b/theme/datefinder.tpl
deleted file mode 100755
index e69de29..0000000
diff --git a/theme/errors/404.tpl b/theme/errors/404.tpl
index 3010548..1474b42 100755
--- a/theme/errors/404.tpl
+++ b/theme/errors/404.tpl
@@ -1,100 +1,102 @@
-<H2>Hello, my name is Waddle Dee</H2>
-
-<P>
-	Aaaa.... well... I'm really sorry, but I can't find the page you're looking for. Really, I'm so sorry! Please don't tell Hat Kirby! This is 
-	the 17'th page I lost this week!
-</P>
-
-<P>
-	Oh wait. Here we go. We can't find your page because... hmmm... oh not again... It seems Kirby ate the page you are looking for.
-	Yes, I'm really sorry! He gets really hungry sometimes (all of the time) but we try to keep him fed.
-</P>
-
-<!--BEGIN NOREFERER-->
-	<P>
-		Anyway, instead of talking to me, you can:
-	</P>
-
-	<UL>
-		<LI>Swim over to <A HREF="http://fourisland.com/">Fourever Island</A></LI>
-		<LI>Try <A HREF="http://fourisland.com/fourm/">The Fourm</A>!</LI>
-		<LI>Or maybe you could go to the <A HREF="http://code.fourisland.com">Mercurial Respository</A>!</LI>
-	</UL>
-
-	<P>
-		I'm sure you'll have fun.
-	</P>
-
-	<P>
-		<STRONG>Oh, oh! More info has come in! You may not be able to find the page because of:</STRONG>
-	</P>
-
-	<OL TYPE="A">
-		<LI>An <STRONG>out-of-date bookmark/favourite</STRONG></LI>
-		<LI>A search engine that has an <STRONG>out-of-date listing for us</STRONG></LI>
-		<LI>A <STRONG>mis-typed address</STRONG></LI>
-	</OL>
-<!--END NOREFERER-->
-
-<!--BEGIN SEARCHREF-->
-	<P>
-		<STRONG>Oh, oh! More info has come in!</STRONG>
-	</P>
-
-	<P>
-		You did a search on <STRONG><A HREF="<!--SEARCHREF.REF-->" TARGET="_blank"><!--SEARCHREF.SITE--></A></STRONG>
-		for "<STRONG><!--SEARCHREF.TERMS--></STRONG>". However, their index appears to be out of date. Because Kirby ate the page, no doubt.
-	</P>
-
-	<P>
-		All is not lost! Why not try one of these links?
-	</P>
-
-	<UL>
-		<LI>Swim over to <A HREF="http://fourisland.com/">Fourever Island</A></LI>
-		<LI>Try <A HREF="http://fourisland.com/fourm/">The Fourm</A>!</LI>
-		<LI>Or maybe you could go to the <A HREF="http://code.fourisland.com">Mercurial Respository</A>!</LI>
-	</UL>
-
-	<P>
-		I'm sure you'll have fun.
-	</P>
-<!--END SEARCHREF-->
-
-<!--BEGIN NORMALREF-->
-	<P>
-		<STRONG>Oh, oh! More info has come in!</STRONG>
-	</P>
-
-	<P>
-		You were referred to this page by:
-		<STRONG><A HREF="<!--NORMALREF.REF-->" TARGET="_blank"><!--NORMALREF.SITE--></A></STRONG><BR />
-		I guess they didn't know that Kirby ate the page.
-	</P>
-
-	<!--BEGIN OURBAD-->
-		<P>
-			Wait a minute! That's us! Uh oh! It looks like one of our own links is broken!
-			I'm really sorry about this, and I'll try to fix it before Hatkirby notices.
-			Please PM "hatkirby" on The Fourm, or post a topic about it in "Fourscore Improvements". Thanks!
-		</P>
-	<!--END OURBAD-->
-
-	<P>
-		Why not try one of these links?
-	</P>
-
-	<UL>
-		<LI>Swim over to <A HREF="http://fourisland.com/">Fourever Island</A></LI>
-		<LI>Try <A HREF="http://fourisland.com/fourm/">The Fourm</A>!</LI>
-		<LI>Or maybe you could go to the <A HREF="http://code.fourisland.com">Mercurial Respository</A>!</LI>
-	</UL>
-
-	<P>
-		I'm sure you'll have fun.
-	</P>
-<!--END NORMALREF-->
-
-<P>
-	Oh wait, I have to go. Hatkirby's coming and I better have an explation for her this time!
-</P>
+<div class="light-at-night">
+	<h2>Hello, my name is Waddle Dee</h2>
+
+	<p>
+		Aaaa.... well... I'm really sorry, but I can't find the page you're looking for. Really, I'm so sorry! Please don't tell Hat Kirby! This is 
+		the 17'th page I lost this week!
+	</p>
+
+	<p>
+		Oh wait. Here we go. We can't find your page because... hmmm... oh not again... It seems Kirby ate the page you are looking for.
+		Yes, I'm really sorry! He gets really hungry sometimes (all of the time) but we try to keep him fed.
+	</p>
+
+	<!--BEGIN NOREFERER-->
+		<p>
+			Anyway, instead of talking to me, you can:
+		</p>
+
+		<ul>
+			<li>Swim over to <a href="http://fourisland.com/">Fourever Island</a></li>
+			<li>Try <a href="http://fourisland.com/fourm/">The Fourm</a>!</li>
+			<li>Or maybe you could go to the <a href="http://code.fourisland.com">Mercurial Respository</a>!</li>
+		</ul>
+
+		<p>
+			I'm sure you'll have fun.
+		</p>
+
+		<p>
+			<strong>Oh, oh! More info has come in! You may not be able to find the page because of:</strong>
+		</p>
+
+		<ol type="A">
+			<li>An <strong>out-of-date bookmark/favourite</strong></li>
+			<li>A search engine that has an <strong>out-of-date listing for us</strong></li>
+			<li>A <strong>mis-typed address</strong></li>
+		</ol>
+	<!--END NOREFERER-->
+
+	<!--BEGIN SEARCHREF-->
+		<p>
+			<strong>Oh, oh! More info has come in!</strong>
+		</p>
+
+		<p>
+			You did a search on <strong><a href="<!--SEARCHREF.REF-->" target="_blank"><!--SEARCHREF.SITE--></a></strong>
+			for "<strong><!--SEARCHREF.TERMS--></strong>". However, their index appears to be out of date. Because Kirby ate the page, no doubt.
+		</p>
+
+		<p>
+			All is not lost! Why not try one of these links?
+		</p>
+
+		<ul>
+			<li>Swim over to <a href="http://fourisland.com/">Fourever Island</a></li>
+			<li>Try <a href="http://fourisland.com/fourm/">The Fourm</a>!</li>
+			<li>Or maybe you could go to the <a href="http://code.fourisland.com">Mercurial Respository</a>!</li>
+		</ul>
+
+		<p>
+			I'm sure you'll have fun.
+		</p>
+	<!--END SEARCHREF-->
+
+	<!--BEGIN NORMALREF-->
+		<p>
+			<strong>Oh, oh! More info has come in!</strong>
+		</p>
+
+		<p>
+			You were referred to this page by:
+			<strong><a href="<!--NORMALREF.REF-->" target="_blank"><!--NORMALREF.SITE--></a></strong><br />
+			I guess they didn't know that Kirby ate the page.
+		</p>
+
+		<!--BEGIN OURBAD-->
+			<p>
+				Wait a minute! That's us! Uh oh! It looks like one of our own links is broken!
+				I'm really sorry about this, and I'll try to fix it before Hatkirby notices.
+				Please PM "hatkirby" on The Fourm, or post a topic about it in "Fourscore Improvements". Thanks!
+			</p>
+		<!--END OURBAD-->
+
+		<p>
+			Why not try one of these links?
+		</p>
+
+		<ul>
+			<li>Swim over to <a href="http://fourisland.com/">Fourever Island</a></li>
+			<li>Try <a href="http://fourisland.com/fourm/">The Fourm</a>!</li>
+			<li>Or maybe you could go to the <a href="http://code.fourisland.com">Mercurial Respository</a>!</li>
+		</ul>
+
+		<p>
+			I'm sure you'll have fun.
+		</p>
+	<!--END NORMALREF-->
+
+	<p>
+		Oh wait, I have to go. Hatkirby's coming and I better have an explation for her this time!
+	</p>
+</div>
diff --git a/theme/footer.tpl b/theme/footer.tpl
old mode 100755
new mode 100644
index eecbdcf..950b16e
--- a/theme/footer.tpl
+++ b/theme/footer.tpl
@@ -1,45 +1,60 @@
-				<!-- End content --></DIV>
+					</div>
+				</div>
+			</div>
+			
+			<div class="cleardiv"></div>
+		</div>
+		
+		<div id="footer">
+			<div class="foot-module">
+				<h3>Recent Comments</h3>
 
-				<!--BEGIN RIGHTBAR-->
-					<!--INCLUDE sidebar-->
-				<!--END RIGHTBAR-->
+				<ul>
+					<!--BEGIN COMMENTS-->
+					<li style="font-size: 0.9em"><!--COMMENTS.AUTHOR--> on <a href="/<!--COMMENTS.AREA-->/<!--COMMENTS.CODED--><!--COMMENTS.ENDING-->#comment-<!--COMMENTS.ID-->"><!--COMMENTS.TITLE--></a></li>
+					<!--END COMMENTS-->
+				</ul>
+			</div>
 
-				<!--BEGIN EXTRA-->
-					<!--EXTRA.SIDEBARS-->
-				<!--END EXTRA-->
+			<div class="foot-module">
+				<h3>Recent Fourm Posts</h3>
 
-				<DIV CLASS="cleardiv"></DIV>
+				<ul>
+					<!--BEGIN FOURM-->
+					<li style="font-size: 0.9em"><!--FOURM.USERNAME--> on <a href="/fourm/viewtopic.php?t=<!--FOURM.TOPIC-->&amp;p=<!--FOURM.POST-->#p<!--FOURM.POST-->"><!--FOURM.SUBJECT--></a></li>
+					<!--END FOURM-->
+				</ul>
+			</div>
 
-				<!--BEGIN ONFOURM-->
-				<DIV>
-				<!--END ONFOURM-->
-			</DIV>
+			<div class="foot-module">
+				<h3>Top Commenters</h3>
 
-			<DIV ID="footer">
-				<UL CLASS="rows">
-					<LI>Four Island (r<!--REVISION-->) is by <a href="http://fourisland.com">Starla Insigna</a></LI>
-					<LI>Licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License</a>.</LI>
-					<LI><A HREF="/wiki/privacy-policy/">Privacy Policy</A></LI>
-				</UL>
+				<ul>
+					<!--BEGIN TOP-->
+					<li style="font-size: 0.9em"><!--TOP.USERNAME--> (<!--TOP.COUNT-->)</li>
+					<!--END TOP-->
+				</ul>
+			</div>
 
-				<UL CLASS="together">
-					<LI><A HREF="http://jigsaw.w3.org/css-validator/"><IMG SRC="/theme/images/icons/css_valid.png" ALT="Valid CSS"></A></LI>
-					<LI><A HREF="/blog/sortof-valid-html-no-lt-doctype-gt/"><IMG SRC="/theme/images/icons/html_valid.png" ALT="Sortof Valid HTML"></A></LI>
-					<LI><A class="noVisit" HREF="/rss.php"><IMG SRC="/theme/images/icons/feed.png" ALT="RSS Feed"></A></LI>
-				</UL>
-			</DIV>
-		</DIV>
+			<div class="foot-module">
+				<h3>Popular Posts</h3>
 
-		<!--Google Analytics-->
-		<script type="text/javascript">
-			var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-			document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-		</script>
-		<script type="text/javascript">
-			var pageTracker = _gat._getTracker("UA-2895652-1");
-			pageTracker._initData();
-			pageTracker._trackPageview();
-		</script>
-		<!--Google Analytics-->
-	</BODY>
-</HTML>
+				<ul>
+					<!--BEGIN POPULAR-->
+					<li style="font-size: 0.9em"><a href="/blog/<!--POPULAR.CODED-->/"><!--POPULAR.TITLE--></a></li>
+					<!--END POPULAR-->
+				</ul>
+			</div>
+			
+			<div class="cleardiv"></div>
+			
+			<p>
+				Four Island (<a href="http://code.fourisland.com/fourisland/">r<!--REVISION--></a>) is by <a href="http://fourisland.com">Starla Insigna</a>.
+				Licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License</a>.
+				<a href="http://jigsaw.w3.org/css-validator/"><img src="/theme/images/icons/css_valid.png" alt="Valid CSS" /></a>
+				<a href="http://validator.w3.org/check/referer"><img src="/theme/images/icons/xhtml_valid.png" alt="Valid XHTML" /></a>
+				<a class="noVisit" href="/rss.php"><img src="/theme/images/icons/feed.png" alt="RSS Feed" /></a>
+			</p>
+		</div>
+	</body>
+</html>
diff --git a/theme/fuhsdiufgsadiufgaisfioas.tpl b/theme/fuhsdiufgsadiufgaisfioas.tpl
index 9829589..4217c5a 100644
--- a/theme/fuhsdiufgsadiufgaisfioas.tpl
+++ b/theme/fuhsdiufgsadiufgaisfioas.tpl
@@ -1,2 +1,2 @@
-I know you're waiting. So are we.<BR>
-<!--NUMBER-->
+<span class="light-at-night">I know you're waiting. So are we.<br />
+<!--NUMBER--></span>
diff --git a/theme/header.tpl b/theme/header.tpl
old mode 100755
new mode 100644
index 2117d3d..64cc902
--- a/theme/header.tpl
+++ b/theme/header.tpl
@@ -1,95 +1,198 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<HTML>
-	<HEAD>
-		<TITLE><!--EXTRATITLE-->Four Island</TITLE>
-
-		<LINK REL="stylesheet" TYPE="text/css" HREF="http://fourisland.com/theme/css.php?id=<!--BODYID-->&amp;cat=<!--CATEGORY-->">
-		<!--[if IE]><LINK REL="stylesheet" TYPE="text/css" HREF="http://fourisland.com/theme/css/ie.css"><![endif]-->
-		<LINK REL="stylesheet" TYPE="text/css" HREF="http://fourisland.com/theme/css/print.css" MEDIA="print">
-		<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-		<META HTTP-EQUIV="Content-Language" CONTENT="en">
-		<LINK REL="alternate" TYPE="application/rss+xml" HREF="http://feeds.feedburner.com/FourIsland?format=xml" TITLE="Four Island">
-		<LINK REL="shortcut" HREF="/images/kirbyfolder.ico">
-		<LINK REL="icon" HREF="/images/kirbyfolder.ico">
-		<LINK REL="pingback" HREF="http://fourisland.com/xmlrpc.php">
-		<SCRIPT TYPE="text/javascript" SRC="/theme/js/jquery.js"></SCRIPT>
-
-		<!--HEADTAGS-->
-	</HEAD>
-
-	<BODY ID="<!--BODYID-->" CLASS="<!--CATEGORY--> <!--AID--> <!--CATEGORY-->-<!--AID-->"<!--BODYTAGS-->>
-		<DIV ID="wrap">
-			<DIV ID="page-header">
-				<DIV ID="banner" STYLE="position: relative;">
-					<H1 ID="logo-banner">
-						<A HREF="/" TITLE="Four Island">Four Island</A>
-					</H1>
-				</DIV>				
-			</DIV>
-
-			<DIV ID="fi-navbar">
-				<DIV>
-					<UL>
-						<LI<!--HOMEACTIVE-->>
-							<A HREF="http://fourisland.com/">
-								<IMG SRC="/theme/images/icons/newspaper.png" ALT="Blog">
-								<SPAN>Blog</SPAN>
-							</A>
-						</LI>
-
-						<LI>
-							<A HREF="http://projects.fourisland.com/">Projects</A>
-						</LI>
-
-						<LI<!--FOURMACTIVE-->>
-							<A HREF="http://fourisland.com/fourm/">
-								<IMG SRC="/theme/images/icons/comment.png" ALT="The Fourm">
-								<SPAN>The Fourm</SPAN>
-							</A>
-						</LI>
-
-						<LI<!--WIKIACTIVE-->>
-							<A HREF="http://fourisland.com/wiki/">
-								<IMG SRC="/theme/images/icons/page_edit.png" ALT="Fouripedia">
-								<SPAN>Fouripedia</SPAN>
-							</A>
-						</LI>
-
-						<LI<!--POLLACTIVE-->>
-							<A HREF="http://fourisland.com/poll/">
-								<IMG SRC="/theme/images/icons/overlays.png" ALT="Polls">
-								<SPAN>Polls</SPAN>
-							</A>
-						</LI>
-
-						<LI<!--QUOTESACTIVE-->>
-							<A HREF="http://fourisland.com/quotes/">
-								<IMG SRC="/theme/images/icons/16-file-page.png" ALT="Quotes">
-								<SPAN>Quotes</SPAN>
-							</A>
-						</LI>
-
-						<!--BEGIN MEMBERS-->
-						<LI<!--LOGACTIVE-->>
-							<A HREF="http://fourisland.com/fourm/ucp.php?mode=log<!--LOGDATA-->&amp;redirect=<!--REDIRPAGE-->&amp;sid=<!--SID-->">
-								<IMG SRC="/theme/images/icons/door_in.png" ALT="Log<!--LOGDATA-->">
-								<SPAN>Log<!--LOGDATA--></SPAN>
-							</A>
-						</LI>
-						<!--END MEMBERS-->
-
-						<!--BEGIN ADMIN-->
-						<LI<!--PANELACTIVE-->>
-							<A HREF="http://fourisland.com/admin/">
-								<IMG SRC="/theme/images/icons/rainbow.png" ALT="Admin">
-								<SPAN>Admin</SPAN>
-							</A>
-						</LI>
-						<!--END ADMIN-->
-					</UL>
-				</DIV>
-			</DIV>
-
-			<DIV id="page-body">
-				<DIV id="content">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<title><!--EXTRATITLE-->Four Island</title>
+		<link rel="stylesheet" type="text/css" href="http://fourisland.com/theme/css.php" />
+		<!--[if IE]><link rel="stylesheet" type="text/css" href="http://fourisland.com/theme/css/ie.css" /><![endif]-->
+		<link rel="stylesheet" type="text/css" href="http://fourisland.com/theme/css/print.css" media="print" />
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Language" content="en" />
+		<link rel="alternate" type="application/rss+xml" href="http://feeds.feedburner.com/FourIsland?format=xml" title="Four Island" />
+		<link rel="shortcut" href="/images/kirbyfolder.ico" />
+		<link rel="icon" href="/images/kirbyfolder.ico" />
+		<link rel="pingback" href="http://fourisland.com/xmlrpc.php" />
+		<script type="text/javascript" src="/theme/js/jquery.js"></script>
+	</head>
+
+	<body id="<!--CATEGORY-->">
+		<div id="flash"></div>
+
+		<div id="header">
+			<div id="banner"><a href="http://fourisland.com/">Four Island</a></div>
+		</div>
+		
+		<div id="page-content">
+			<div id="sidebar">
+				<div class="module rounded pimped sidebar">
+					Hi! My name is Hatkirby, and I run Four Island.
+
+					<p>
+						Four Island is a fun place with a blog,
+						a fourm, a wiki, many projects and a quotes database!<br />
+
+						I hope you enjoy your time on Four Island!
+					</p>
+				</div>
+					
+				<cite class="rounded"><strong>Hatkirby</strong> on Four Island</cite>
+				
+				<!--BEGIN CREATE_HATNAV-->
+				<ul class="hatnav">
+				<!--END CREATE_HATNAV-->
+				
+				<!--BEGIN HATNAV-->
+					<li>
+						<a href="<!--HATNAV.URL-->">
+							<img src="/theme/images/icons/<!--HATNAV.ICON-->.png" alt="<!--HATNAV.TITLE-->" />
+							<span><!--HATNAV.TITLE--></span>
+						</a>
+					</li>
+				<!--END HATNAV-->
+				
+				<!--BEGIN CREATE_HATNAV-->
+				</ul>
+				<!--END CREATE_HATNAV-->
+				
+				<div class="module rounded sidebar">
+					<h3>Poll of the Week</h3>
+					
+					<!--POTW-->
+				</div>
+
+				<div class="module rounded sidebar">
+					<h3>Affiliates</h3>
+
+					<ul>
+						<li>
+							<img src="/theme/images/icons/tag_blue.png" alt="The S Site" />
+							<a href="http://ssite.fourisland.com/">The S Site</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_green.png" alt="Wikipinia" />
+							<a href="http://nablecak.fourisland.com/">Wikipinia</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_orange.png" alt="Color Pencils" />
+							<a href="http://gryph.fourisland.com/">Color Pencils</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_pink.png" alt="Dream Weaver" />
+							<a href="http://timbo94.fourisland.com/">Dream Weaver</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_purple.png" alt="Randomness" />
+							<a href="http://pyro.fourisland.com/">Randomness</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_red.png" alt="Bubble Blog" />
+							<a href="http://sammi9494.fourisland.com/">Bubble Blog</a>
+						</li>
+					</ul>
+				</div>
+
+				<div class="module rounded sidebar">
+					<h3>Website Projects</h3>
+
+					<ul>
+						<li>
+							<img src="/theme/images/icons/tag_blue.png" alt="The Sabrina FanWiki" />
+							<a href="http://sabrina.fourisland.com/">The Sabrina FanWiki</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_green.png" alt="True Falsities" />
+							<a href="http://false.fourisland.com/">True Falsities</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_orange.png" alt="Pillowcase" />
+							<a href="http://pillowcase.fourisland.com/">Pillowcase</a>
+						</li>
+
+						<li>
+							<img src="/theme/images/icons/tag_pink.png" alt="Endlenge" />
+							<a href="http://endlenge.fourisland.com/">Endlenge</a>
+						</li>
+					</ul>
+				</div>
+
+				<div class="module rounded sidebar">
+					<h3>HatBar</h3>
+
+					<p>
+						Hits: <!--HITS--><br />
+						Today: <!--TODAY--><br />
+						<!--DATEFINDER-->
+					</p>
+
+					<p align="center">
+						<a href="/addresses.php" title="goodemail@happybobby.com"><img src="/images/btn_bot.png" alt="Addresses galore!" /></a>
+						<a href="http://www.prchecker.info/" target="_blank"><img src="http://pr.prchecker.info/getpr.php?codex=aHR0cDovL2ZvdXJpc2xhbmQuY29t&amp;tag=3" alt="Page Rank Check" border="0" /></a>
+						<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/80x15.png" /></a>
+						<a href="http://whos.amung.us/show/t1sj4g2u"><img src="http://whos.amung.us/swidget/t1sj4g2u.gif" alt="website stats" width="80" height="15" border="0" /></a>
+						<a href="http://feeds2.feedburner.com/FourIsland"><img src="http://feeds2.feedburner.com/~fc/FourIsland?bg=99CCFF&amp;fg=444444&amp;anim=0" height="26" width="88" style="border:0" alt="" /></a>
+					</p>
+				</div>
+			</div>
+			
+			<div id="content">
+				<ul id="navbar">
+					<li<!--BLOGACTIVE-->>
+						<a href="http://fourisland.com/">
+							<img src="/theme/images/icons/newspaper.png" alt="Blog" />
+							<span>Blog</span>
+						</a>
+					</li>
+
+					<li>
+						<a href="http://projects.fourisland.com/">Projects</a>
+					</li>
+
+					<li<!--FOURMACTIVE-->>
+						<a href="http://fourisland.com/fourm/">
+							<img src="/theme/images/icons/comment.png" alt="The Fourm" />
+							<span>The Fourm</span>
+						</a>
+					</li>
+
+					<li<!--POLLACTIVE-->>
+						<a href="http://fourisland.com/poll/">
+							<img src="/theme/images/icons/overlays.png" alt="Polls" />
+							<span>Polls</span>
+						</a>
+					</li>
+
+					<li<!--QUOTESACTIVE-->>
+						<a href="http://fourisland.com/quotes/">
+							<img src="/theme/images/icons/16-file-page.png" alt="Quotes" />
+							<span>Quotes</span>
+						</a>
+					</li>
+
+					<!--BEGIN MEMBERS-->
+					<li<!--LOGACTIVE-->>
+						<a href="http://fourisland.com/fourm/ucp.php?mode=log<!--LOGDATA-->&amp;redirect=<!--REDIRPAGE-->&amp;sid=<!--SID-->">
+							<img src="/theme/images/icons/door_in.png" alt="Log<!--LOGDATA-->" />
+							<span>Log<!--LOGDATA--></span>
+						</a>
+					</li>
+					<!--END MEMBERS-->
+
+					<!--BEGIN ADMIN-->
+					<li<!--PANELACTIVE-->>
+						<a href="http://fourisland.com/admin/">
+							<img src="/theme/images/icons/rainbow.png" alt="Admin" />
+							<span>Admin</span>
+						</a>
+					</li>
+					<!--END ADMIN-->
+				</ul>
+
+				<div id="window" class="rounded">
+					<div id="actual-content" class="rounded">
diff --git a/theme/holidates.tpl b/theme/holidates.tpl
new file mode 100644
index 0000000..583d5cd
--- /dev/null
+++ b/theme/holidates.tpl
@@ -0,0 +1,15 @@
+<table width="100%" class="webmail">
+	<tr>
+		<th>ID</th>
+		<th>Date</th>
+		<th>Holidate</th>
+	</tr>
+
+	<!--BEGIN DATE-->
+	<tr<!--DATE.EVEN-->>
+		<td><!--DATE.NUM--></td>
+		<td><!--DATE.DATE--></td>
+		<td><!--DATE.TEXT--></td>
+	</tr>
+	<!--END DATE-->
+</table>
diff --git a/theme/images/fourisland_header.png b/theme/images/fourisland_header.png
deleted file mode 100755
index 35f7886..0000000
Binary files a/theme/images/fourisland_header.png and /dev/null differ
diff --git a/theme/images/fourisland_header_night.png b/theme/images/fourisland_header_night.png
deleted file mode 100644
index 25502a0..0000000
Binary files a/theme/images/fourisland_header_night.png and /dev/null differ
diff --git a/theme/images/header-repeat.png b/theme/images/header-repeat.png
new file mode 100644
index 0000000..9de2db8
Binary files /dev/null and b/theme/images/header-repeat.png differ
diff --git a/theme/images/header.png b/theme/images/header.png
new file mode 100644
index 0000000..835e28d
Binary files /dev/null and b/theme/images/header.png differ
diff --git a/theme/images/icons/xhtml_valid.png b/theme/images/icons/xhtml_valid.png
new file mode 100644
index 0000000..d2e1cfb
Binary files /dev/null and b/theme/images/icons/xhtml_valid.png differ
diff --git a/theme/images/no-ie6.png b/theme/images/no-ie6.png
deleted file mode 100755
index fef317c..0000000
Binary files a/theme/images/no-ie6.png and /dev/null differ
diff --git a/theme/login.tpl b/theme/login.tpl
deleted file mode 100755
index 7f83045..0000000
--- a/theme/login.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<H1>Four Island Login Page</H1>
-
-<P><CENTER>
-<!--BEGIN ERROR-->
-<FONT COLOR="RED" SIZE="5">ERROR: <!--ERROR.MSG--></FONT><P>
-<!--END ERROR-->
-Welcome to the Four Island Login page!<BR>
-To post feedback on this site, and also to post on the forums, you must be a member.<BR>
-Sadly, currently membership is invitation-only. But hopefully that will change in the near future.<BR>
-HOWEVER, you may request membership by email hatkirby@fourisland.com (link on the right).<BR>
-A NOTICE TO ALL MEMBERS! Do NOT share your password with anyone! If you misplace your password send an email to hatkirby@fourisland.com (link on the right).<P>
-<FORM ACTION="login.php?submit=" METHOD="POST">
-	<LABEL FOR="username">Username:</LABEL><INPUT TYPE="text" NAME="username" ID="username"><BR>
-	<LABEL FOR="password">Password:</LABEL><INPUT TYPE="password" NAME="password" ID="password"><BR>
-	<INPUT TYPE="hidden" NAME="redirect" VALUE="<!--REDIRECT-->">
-	<INPUT TYPE="submit">
-</FORM></CENTER>
diff --git a/theme/maintenance.tpl b/theme/maintenance.tpl
index 0a50a51..349c6d1 100755
--- a/theme/maintenance.tpl
+++ b/theme/maintenance.tpl
@@ -1,6 +1,6 @@
-<CENTER><H1>Four Island is under maintenance</H1></CENTER>
+<center><h1>Four Island is under maintenance</h1></center>
 
-<P>I'm sorry, but you've caught Four Island off guard. We're currently upgrading the website to accomidate for some fun new features we've thrown in, 
-so Four Island'll be down for a few minutes. Please try again soon and thanks for your interest in Four Island!</P>
+<p>I'm sorry, but you've caught Four Island off guard. We're currently upgrading the website to accomidate for some fun new features we've thrown in, 
+so Four Island'll be down for a few minutes. Please try again soon and thanks for your interest in Four Island!</p>
 
-<P STYLE="text-align: right"><I>--Starla Insigna</I></P>
+<p style="text-align: right"><em>--Starla Insigna</em></p>
diff --git a/theme/msg.tpl b/theme/msg.tpl
index 25a4f36..82353fe 100755
--- a/theme/msg.tpl
+++ b/theme/msg.tpl
@@ -1 +1 @@
-<!--TRACKING--><P><!--MSG--><P><A HREF="javascript:history.back();window.reload();">Back to <!--BACK--></A>
+<p><!--MSG--></p><p><a href="javascript:history.back();window.reload();">Back to <!--BACK--></a></p>
diff --git a/theme/msg2.tpl b/theme/msg2.tpl
index 59c723e..2010226 100755
--- a/theme/msg2.tpl
+++ b/theme/msg2.tpl
@@ -1 +1 @@
-<!--MSG--><P><A HREF="<!--LINK-->"><!--BACK--></A>
+<p><!--MSG--></p><p><a href="<!--LINK-->"><!--BACK--></a></p>
diff --git a/theme/new-comment.tpl b/theme/new-comment.tpl
new file mode 100644
index 0000000..0967ed4
--- /dev/null
+++ b/theme/new-comment.tpl
@@ -0,0 +1,8 @@
+<div class="module unrounded" id="comment-<!--ID-->">
+	<div id="textBubble-<!--ID-->" class="comment">
+		<img src="http://www.gravatar.com/avatar/<!--CODEDEMAIL-->?s=32&amp;d=identicon&amp;r=G" alt="" />
+		<!--TEXT-->
+	</div>
+</div>
+
+<cite class="light-at-night"><strong><!--USERNAME--></strong> on <!--DATE--></cite>
diff --git a/theme/pingbacks.tpl b/theme/pingbacks.tpl
index ced853c..ff4531f 100755
--- a/theme/pingbacks.tpl
+++ b/theme/pingbacks.tpl
@@ -1,14 +1,9 @@
-<DIV CLASS="cleardiv"></DIV>
+<div class="cleardiv"></div>
 
-<DIV CLASS="bubble">
-	<DIV CLASS="rounded">
-		<BLOCKQUOTE>
-			<DIV>
-				<!--BEGIN PINGBACK-->
-				<A HREF="<!--PINGBACK.URL-->"><!--PINGBACK.TITLE--></A> on <!--PINGBACK.DATE--><BR>
-				<!--END PINGBACK-->
-			</DIV>
-		</BLOCKQUOTE>
-	</DIV>
-	<CITE CLASS="rounded"><STRONG>Pingbacks</STRONG></CITE>
-</DIV>
+<div class="module rounded">
+	<!--BEGIN PINGBACK-->
+	<a href="<!--PINGBACK.URL-->"><!--PINGBACK.TITLE--></a> on <!--PINGBACK.DATE--><br />
+	<!--END PINGBACK-->
+</div>
+
+<cite class="rounded light-at-night"><strong>Pingbacks</strong></cite>
diff --git a/theme/poll.tpl b/theme/poll.tpl
index c5b08fb..b906f40 100755
--- a/theme/poll.tpl
+++ b/theme/poll.tpl
@@ -1,40 +1,24 @@
-<H2><!--QUESTION--></H2>
-<P>
-<DIV CLASS="sidebar" STYLE="margin: auto">
-	<DIV CLASS="bubble">
-        	<DIV CLASS="rounded">
-	                <BLOCKQUOTE>
-        	                <DIV ID="hatbar">
-                	                <P>
-                        	                <!--INCLUDE polloftheweek-->
-                                        </P>
-                                </DIV>
-                        </BLOCKQUOTE>
-                </DIV>
-	</DIV>
-</DIV>
-<P>
-<DIV CLASS="bubble">
-	<DIV CLASS="rounded">
-		<BLOCKQUOTE>
-			<DIV>
-				<!--BEGIN COMPLETE-->
-				<!--COMPLETE.RSS-->
-				<P>
-				<!--COMPLETE.OPTION1--> - <!--COMPLETE.CLICKS1--> vote(s)!<BR>
-				<!--COMPLETE.OPTION2--> - <!--COMPLETE.CLICKS2--> vote(s)!<BR>
-				<!--COMPLETE.OPTION3--> - <!--COMPLETE.CLICKS3--> vote(s)!<BR>
-				<!--COMPLETE.OPTION4--> - <!--COMPLETE.CLICKS4--> vote(s)!
-			</DIV>
-		</BLOCKQUOTE>
-	</DIV>
-	<CITE CLASS="rounded"><STRONG><!--COMPLETE.AUTHOR--></STRONG> on <!--COMPLETE.DATE--></CITE>
-			<!--END COMPLETE-->
-			<!--BEGIN INCOMPLETE-->
-				The results of this poll of the week are pending. Meanwhile, if you haven't voted yet, why not do so?
-			</DIV>
-		</BLOCKQUOTE>
-	</DIV>
-			<!--END INCOMPLETE-->
-</DIV>
-</CENTER>
+<h2 class="light-at-night"><!--QUESTION--></h2>
+
+<div class="module rounded center sidebar">
+	<!--POTW-->
+</div>
+
+<div class="module rounded">
+	<!--BEGIN COMPLETE-->
+	<!--COMPLETE.RSS-->
+
+	<p>
+		<!--COMPLETE.OPTION1--> - <!--COMPLETE.CLICKS1--> vote(s)!<br />
+		<!--COMPLETE.OPTION2--> - <!--COMPLETE.CLICKS2--> vote(s)!<br />
+		<!--COMPLETE.OPTION3--> - <!--COMPLETE.CLICKS3--> vote(s)!<br />
+		<!--COMPLETE.OPTION4--> - <!--COMPLETE.CLICKS4--> vote(s)!
+	</p>
+</div>
+
+<cite class="rounded"><strong><!--COMPLETE.AUTHOR--></strong> on <!--COMPLETE.DATE--></cite>
+<!--END COMPLETE-->
+<!--BEGIN INCOMPLETE-->
+	The results of this poll of the week are pending. Meanwhile, if you haven't voted yet, why not do so?
+</div>
+<!--END INCOMPLETE-->
diff --git a/theme/pollIndex.tpl b/theme/pollIndex.tpl
index ced43cf..35e7fe2 100755
--- a/theme/pollIndex.tpl
+++ b/theme/pollIndex.tpl
@@ -1,35 +1,24 @@
-<H2>Poll of the Week</H2>
-<P>
-<DIV CLASS="sidebar" STYLE="margin: auto">
-        <DIV CLASS="bubble">
-                <DIV CLASS="rounded">
-                        <BLOCKQUOTE>
-                                <DIV ID="hatbar">
-                                        <P>
-                                                <!--INCLUDE polloftheweek-->
-                                        </P>
-                                </DIV>
-                        </BLOCKQUOTE>
-                </DIV>
-        </DIV>
-</DIV>
-<P>
-Welcome to the Poll of the Week! Feel free to vote on these! You can review old ones and also comment on them if
-you're logged in using the links below!
-<P>
-<TABLE CLASS="webmail">
-	<TR><TH>Question</TH><TH>Week</TH></TR>
+<h2 class="light-at-night">Poll of the Week</h2>
+
+<div class="module rounded sidebar center">
+	<!--POTW-->
+</div>
+
+<p class="light-at-night">Welcome to the Poll of the Week! Feel free to vote on these! You can review old ones and also comment on them if you're logged in using the links below!</p>
+
+<table class="webmail">
+	<tr><th>Question</th><th>Week</th></tr>
 	<!--BEGIN POLL-->
-	<TR<!--POLL.EVEN-->><TD><A HREF="/poll/<!--POLL.ID-->.php"><!--POLL.QUESTION--></A></TD><TD><NOBR><!--POLL.WEEK--></NOBR></TD></TR>
+	<tr<!--POLL.EVEN-->><td><a href="/poll/<!--POLL.ID-->.php"><!--POLL.QUESTION--></a></td><td class="nobr"><!--POLL.WEEK--></td></tr>
 	<!--END POLL-->
-</TABLE>
+</table>
 
-<P>
+<p>
 	<!--BEGIN PREVIOUS-->
-	<A HREF="/poll/?start=<!--PREVIOUS.ID-->" STYLE="float: left">Previous</A>
+	<a href="/poll/?start=<!--PREVIOUS.ID-->" style="float: left">Previous</a>
 	<!--END PREVIOUS-->
 
 	<!--BEGIN NEXT-->
-	<A HREF="/poll/?start=<!--NEXT.ID-->" STYLE="float: right">Next</A>
+	<a href="/poll/?start=<!--NEXT.ID-->" style="float: right">Next</a>
 	<!--END NEXT-->
-</P>
+</p>
diff --git a/theme/polloftheweek.tpl b/theme/polloftheweek.tpl
index d23e92f..2969487 100755
--- a/theme/polloftheweek.tpl
+++ b/theme/polloftheweek.tpl
@@ -1,59 +1,59 @@
 <!--BEGIN FORM-->
-<FORM ACTION="/poll/?submit=" METHOD="POST">
-	<SPAN STYLE="font-size: 16px; text-align: center">
+<div id="potw-ajax">
+	<span style="font-size: 16px; text-align: center">
 		<!--QUESTION-->
-	</SPAN>
+	</span>
 
-	<BR>
+	<br />
 
-	<INPUT TYPE="radio" NAME="options" VALUE="1" ID="option1">
-	<LABEL FOR="option1"><!--OPTION1--></LABEL>
+	<input type="radio" name="options" value="1" class="option1" />
+	<!--OPTION1-->
 
-	<BR>
+	<br />
 
-	<INPUT TYPE="radio" NAME="options" VALUE="2" ID="option2">
-	<LABEL FOR="option2"><!--OPTION2--></LABEL>
+	<input type="radio" name="options" value="2" class="option2" />
+	<!--OPTION2-->
 
-	<BR>
+	<br />
 
-	<INPUT TYPE="radio" NAME="options" VALUE="3" ID="option3">
-	<LABEL FOR="option3"><!--OPTION3--></LABEL>
+	<input type="radio" name="options" value="3" class="option3" />
+	<!--OPTION3-->
 
-	<BR>
+	<br />
 
-	<INPUT TYPE="radio" NAME="options" VALUE="4" ID="option4">
-	<LABEL FOR="option4"><!--OPTION4--></LABEL>
+	<input type="radio" name="options" value="4" class="option4" />
+	<!--OPTION4-->
 
-	<P ALIGN="center">
-		<INPUT TYPE="submit" VALUE="Vote!">
-	</P>
-</FORM>
+	<p align="center">
+		<button type="button" onclick="jQuery('#potw-ajax').slideUp().load('/poll-results.php?id='+jQuery('#potw-ajax input:radio[name=options]:checked').val()).slideDown();">Vote!</button>
+	</p>
+</div>
 <!--END FORM-->
 
 <!--BEGIN DISPLAY-->
-<SPAN STYLE="font-size: 16px; text-align: center">
+<span style="font-size: 16px; text-align: center">
 	<!--QUESTION-->
-</SPAN>
-
-<TABLE WIDTH="100%" BORDER="0" STYLE="font-size: 12px">
-	<TR>
-		<TD>%<!--PERCENT1--></TD>
-		<TD><!--OPTION1--></TD>
-	</TR>
-
-	<TR>
-		<TD>%<!--PERCENT2--></TD>
-		<TD><!--OPTION2--></TD>
-	</TR>
-
-	<TR>
-		<TD>%<!--PERCENT3--></TD>
-		<TD><!--OPTION3--></TD>
-	</TR>
-
-	<TR>
-		<TD>%<!--PERCENT4--></TD>
-		<TD><!--OPTION4--></TD>
-	</TR>
-</TABLE>
+</span>
+
+<table width="100%" border="0" style="font-size: 12px">
+	<tr>
+		<td>%<!--PERCENT1--></td>
+		<td><!--OPTION1--></td>
+	</tr>
+
+	<tr>
+		<td>%<!--PERCENT2--></td>
+		<td><!--OPTION2--></td>
+	</tr>
+
+	<tr>
+		<td>%<!--PERCENT3--></td>
+		<td><!--OPTION3--></td>
+	</tr>
+
+	<tr>
+		<td>%<!--PERCENT4--></td>
+		<td><!--OPTION4--></td>
+	</tr>
+</table>
 <!--END DISPLAY-->
diff --git a/theme/post.tpl b/theme/post.tpl
index 7f29ff2..2c65e51 100755
--- a/theme/post.tpl
+++ b/theme/post.tpl
@@ -1,66 +1,103 @@
 <!--BEGIN INTERNAL-->
-<!--BEGIN BACK--><SPAN CLASS="back-post">&laquo; <A HREF="/blog/<!--BACK.CODED-->/"><!--BACK.TITLE--></A></SPAN><!--END BACK-->
-<!--BEGIN NEXT--><SPAN CLASS="next-post"><A HREF="/blog/<!--NEXT.CODED-->/"><!--NEXT.TITLE--></A> &raquo;</SPAN><!--END NEXT-->
+<!--BEGIN BACK--><span class="back-post">&laquo; <a href="/blog/<!--BACK.CODED-->/"><!--BACK.TITLE--></a></span><!--END BACK-->
+<!--BEGIN NEXT--><span class="next-post"><a href="/blog/<!--NEXT.CODED-->/"><!--NEXT.TITLE--></a> &raquo;</span><!--END NEXT-->
 <!--END INTERNAL-->
 
+<script type="text/javascript">
+
+function ratePost(id, dir)
+{
+	jQuery("#post-"+id+" .post-rating-up").addClass("post-action-done").html("&lt;img src='/theme/images/icons/thumb_up.png' alt='+1' /&gt;");
+	jQuery("#post-"+id+" .post-rating-down").addClass("post-action-done").html("&lt;img src='/theme/images/icons/thumb_down.png' alt='-1' /&gt;");
+	jQuery("#flash").text("Processing....").slideDown();
+	jQuery.ajax({
+		type: "GET",
+		url: "/vote.php",
+		data: "id="+id+"&amp;dir="+dir,
+		dataType: "text",
+		success: function(msg) {
+			if (msg != "")
+			{
+				jQuery("#post-"+id+" .post-rating").text(msg);
+				jQuery("#flash").text("Your vote has been sucessfully placed.");
+			} else {
+				jQuery("#flash").text("There was an error in placing your vote.");
+			}
+		},
+		error: function() {
+			jQuery("#flash").text("There was an error in placing your vote.");
+		}
+	});
+}
+
+</script>
+
 <!--BEGIN POST-->
-<DIV CLASS="post vevent" ID="post-<!--POST.ID-->">
-	<DIV CLASS="post-date-<!--POST.YEARID-->">
-		<ABBR CLASS="dtstart" TITLE="<!--POST.DATE-->">
-			<SPAN CLASS="post-month"><!--POST.MONTH--></SPAN>
-			<SPAN CLASS="post-day"><!--POST.DAY--></SPAN>
-		</ABBR>
-	</DIV>
+<div class="post vevent" id="post-<!--POST.ID-->">
+	<div class="post-date-<!--POST.YEARID-->">
+		<abbr class="dtstart" title="<!--POST.DATE-->">
+			<span class="post-month"><!--POST.MONTH--></span>
+			<span class="post-day"><!--POST.DAY--></span>
+		</abbr>
+	</div>
 
-	<DIV CLASS="post-title">
-		<H2>
-			<!--BEGIN EXTERNAL--><A CLASS="url" HREF="/blog/<!--POST.CODED-->/" REL="bookmark" TITLE="Permalink for <!--POST.TITLE-->"><!--END EXTERNAL-->
-			<SPAN CLASS="summary"><!--POST.TITLE--></SPAN>
-			<!--BEGIN EXTERNAL--></A><!--END EXTERNAL-->
-		</H2>
+	<div class="post-title">
+		<h2>
+			<!--BEGIN EXTERNAL-->
+			<a class="url" href="/blog/<!--POST.CODED-->/" rel="bookmark" title="Permalink for <!--POST.TITLE-->"><span class="summary"><!--POST.TITLE--></span></a>
+			<!--END EXTERNAL-->
+			<!--BEGIN INTERNAL-->
+			<span class="summary light-at-night"><!--POST.TITLE--></span>
+			<!--END INTERNAL-->
+		</h2>
 
-		<SPAN CLASS="post-cat-<!--POST.AUTHOR--> category">
-			<A HREF="/blog/author/<!--POST.AUTHOR-->.php"><!--POST.AUTHOR--></A>
-		</SPAN>
+		<span class="post-cat-<!--POST.AUTHOR--> category">
+			<a href="/blog/author/<!--POST.AUTHOR-->.php"><!--POST.AUTHOR--></a>
+		</span>
 
-		<SPAN CLASS="post-tag-3 category">
+		<span class="post-tag-3 category">
 			<!--BEGIN POST.TAGS-->
-			<A CLASS="noVisit" HREF="/blog/tag/<!--POST.TAGS.TAG-->.php" REL="tag" TITLE="<!--POST.TAGS.TAG-->"><!--POST.TAGS.TAG--></A>
+			<a class="noVisit" href="/blog/tag/<!--POST.TAGS.TAG-->.php" rel="tag" title="<!--POST.TAGS.TAG-->"><!--POST.TAGS.TAG--></a>
 			<!--END POST.TAGS-->
-		</SPAN>
+		</span>
 
 		<!--BEGIN EXTERNAL-->
-		<SPAN CLASS="post-comment<!--POST.PLURALCOMMENT-->">
-			<A CLASS="noVisit" HREF="/blog/<!--POST.CODED-->/#comments"><!--POST.COMMENTS-->&nbsp;&#187;</A>
-		</SPAN>
+		<span class="post-comment<!--POST.PLURALCOMMENT-->">
+			<a class="noVisit" href="/blog/<!--POST.CODED-->/#comments"><!--POST.COMMENTS-->&nbsp;&#187;</a>
+		</span>
 		<!--END EXTERNAL--><!--BEGIN INTERNAL-->
-		<SPAN CLASS="mini-add-comment">
-			<A CLASS="noVisit" HREF="/blog/<!--POST.CODED-->/#comments">Add Comment&nbsp;&#187;</A>
-		</SPAN>
+		<span class="mini-add-comment">
+			<a class="noVisit" href="/blog/<!--POST.CODED-->/#comments">Add Comment&nbsp;&#187;</a>
+		</span>
 		<!--END INTERNAL-->
-	</DIV>
+	</div>
 
-	<DIV CLASS="entry description">
-		<DIV CLASS="bubble">
-			<DIV CLASS="rounded">
-				<BLOCKQUOTE>
-					<DIV>
-						<!--POST.TEXT-->
+	<div class="entry description">
+		<div class="module rounded">
+			<!--POST.TEXT-->
 
-						<!--BEGIN POST.EXCERPT-->
-						<P>[....] <A HREF="/blog/<!--POST.CODED-->/">Click here to read the rest of this post</A>.</P>
-						<!--END POST.EXCERPT-->
-					</DIV>
-				</BLOCKQUOTE>
-			</DIV>
-			<CITE CLASS="rounded"><STRONG><!--POST.AUTHOR--></STRONG> on <!--POST.DATE--></CITE>
+			<!--BEGIN POST.EXCERPT-->
+			<p>[....] <a href="/blog/<!--POST.CODED-->/">Click here to read the rest of this post</a>.</p>
+			<!--END POST.EXCERPT-->
+		</div>
+			
+		<cite class="rounded light-at-night"><strong><!--POST.AUTHOR--></strong> on <!--POST.DATE--></cite>
 
-			<SPAN CLASS="post-vote">
-				<A HREF="/vote.php?id=<!--POST.ID-->&amp;dir=plus" REL="nofollow"><IMG SRC="/theme/images/icons/thumb_up.png" ALT="+1"></A>
-				<BIG><!--POST.RATING--></BIG>
-				<A HREF="/vote.php?id=<!--POST.ID-->&amp;dir=minus" REL="nofollow"><IMG SRC="/theme/images/icons/thumb_down.png" ALT="-1"></A>
-			</SPAN>
-		</DIV>
-	</DIV>
-</DIV>
+		<span class="post-vote">
+			<!--BEGIN POST.CANVOTE-->
+			<span class="post-rating-up"><a href="javascript:ratePost('<!--POST.ID-->','plus');" rel="nofollow"><img src="/theme/images/icons/thumb_up.png" alt="+1" /></a></span>
+			<!--END POST.CANVOTE-->
+			<!--BEGIN POST.NOVOTE-->
+			<span class="post-rating-up post-action-done"><img src="/theme/images/icons/thumb_up.png" alt="-1" /></span>
+			<!--END POST.NOVOTE-->
+			<span class="post-rating light-at-night"><!--POST.RATING--></span>
+			<!--BEGIN POST.CANVOTE-->
+			<span class="post-rating-down"><a href="javascript:ratePost('<!--POST.ID-->','minus');" rel="nofollow"><img src="/theme/images/icons/thumb_down.png" alt="-1" /></a></span>
+			<!--END POST.CANVOTE-->
+			<!--BEGIN POST.NOVOTE-->
+			<span class="post-rating-down post-action-done"><img src="/theme/images/icons/thumb_down.png" alt="-1" /></span>
+			<!--END POST.NOVOTE-->
+		</span>
+	</div>
+</div>
 <!--END POST-->
diff --git a/theme/postLogin.tpl b/theme/postLogin.tpl
deleted file mode 100755
index 31dce48..0000000
--- a/theme/postLogin.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<H1>Four Island Login Page</H1>
-
-<P>
-	<CENTER>Congradulations, you've logged in!<BR>
-		You can now:
-		<UL>
-			<LI>Comment on the blog posts</LI>
-			<LI>Comment on Projects</LI>
-			<LI>Comment on Flash Games</LI>
-			<LI>Comment on a whole lot of other things I can't remember right now</LI>
-			<LI>Update your userpage</LI>
-			<LI>More soon...</LI>
-		</UL>
-		<A HREF="<!--REDIRECT-->">Click here to return to the page you were on.</A>
-	</CENTER>
-</P>
diff --git a/theme/quotes/add.tpl b/theme/quotes/add.tpl
index 3ae8d3b..6c45876 100755
--- a/theme/quotes/add.tpl
+++ b/theme/quotes/add.tpl
@@ -1,16 +1,16 @@
-<DIV CLASS="cleardiv"></DIV>
+<div class="cleardiv"></div>
 
-<H1>Contribute</H1>
+<h1 class="light-at-night">Contribute</h1>
 
 <!--BEGIN SUBMITTED-->
-	<P>The quote you have submitted is:</P>
-	<P><CODE><!--SUBMITTED.QUOTE--></CODE></P>
-	<P>If this is not the quote you have entered, please contact the administrator and explain your problem. 
-	   Also, there is no need to press the submit button again. You're quote has already been sent.</P>
+	<p class="light-at-night">The quote you have submitted is:</p>
+	<p class="light-at-night"><code><!--SUBMITTED.QUOTE--></code></p>
+	<p class="light-at-night">If this is not the quote you have entered, please contact the administrator and explain your problem. 
+	   Also, there is no need to press the submit button again. You're quote has already been sent.</p>
 <!--END SUBMITTED-->
 
-<FORM ACTION="/quotes/add.php?submit=" METHOD="POST">
-	<TEXTAREA COLS="80" ROWS="5" NAME="rash_quote"></TEXTAREA><BR>
-	<INPUT TYPE="submit" VALUE="Add Quote!">
-	<INPUT TYPE="reset" VALUE="Reset">
-</FORM>
+<form action="/quotes/add.php?submit=" method="POST">
+	<textarea cols="80" rows="5" name="rash_quote"></textarea><br />
+	<input type="submit" value="Add Quote!" />
+	<input type="reset" value="Reset" />
+</form>
diff --git a/theme/quotes/browse.tpl b/theme/quotes/browse.tpl
index 8726802..d710d3f 100755
--- a/theme/quotes/browse.tpl
+++ b/theme/quotes/browse.tpl
@@ -1,24 +1,92 @@
-<DIV CLASS="cleardiv"></DIV>
+<div class="cleardiv"></div>
+
+<script type="text/javascript">
+
+function voteQuote(id, dir)
+{
+	jQuery("#quote-"+id+" .quote-rating-up").addClass("quote-action-done").text("+");
+	jQuery("#quote-"+id+" .quote-rating-down").addClass("quote-action-done").text("-");
+	jQuery("#quote-"+id+" .quote-update-result").text("Processing....");
+	jQuery.ajax({
+		type: "GET",
+		url: "/quotes/vote.php",
+		data: "id="+id+"&amp;dir="+dir,
+		dataType: "text",
+		success: function(msg) {
+			if (msg != "")
+			{
+				jQuery("#quote-"+id+" .quote-vote-count").text(msg);
+				jQuery("#quote-"+id+" .quote-update-result").text("Done");
+			} else {
+				jQuery("#quote-"+id+" .quote-update-result").text("Error");
+			}
+		},
+		error: function() {
+			jQuery("#quote-"+id+" .quote-update-result").text("Error");
+		}
+	});
+}
+
+function flagQuote(id)
+{
+	jQuery("#quote-"+id+" .quote-report").addClass("quote-action-done").text("[X]");
+	jQuery("#quote-"+id+" .quote-update-result").text("Processing....");
+	jQuery.ajax({
+		type: "GET",
+		url: "/quotes/flag.php",
+		data: "id="+id,
+		dataType: "text",
+		success: function(msg) {
+			if (msg == "1")
+			{
+				jQuery("#quote-"+id+" .quote-update-result").text("Done");
+			} else {
+				jQuery("#quote-"+id+" .quote-update-result").text("Error");
+			}
+		},
+		error: function() {
+			jQuery("#quote-"+id+" .quote-update-result").text("Error");
+		}
+	});
+}
+
+</script>
 
 <!--BEGIN PAGENUMBERS-->
 <!--INCLUDE quotes/pagenumbers-->
 <!--END PAGENUMBERS-->
 
-<H2><!--ORIGIN--></H2>
+<h2 class="light-at-night"><!--ORIGIN--></h2>
 
+<ul class="quote-list">
 <!--BEGIN QUOTES-->
-<P>
-	<A HREF="/quotes/<!--QUOTES.NUMBER-->.php">#<!--QUOTES.NUMBER--></A>
-	<A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&amp;dir=plus">+</A>
-	<SPAN>(<!--QUOTES.RATING-->)</SPAN>
-	<A HREF="/quotes/vote.php?id=<!--QUOTES.NUMBER-->&amp;dir=minus">-</A>
-	<A HREF="/quotes/flag.php?id=<!--QUOTES.NUMBER-->">[X]</A>
-
-	<BR>
+	<li id="quote-<!--QUOTES.NUMBER-->" class="quote">
+		<h3 class="quote-header">
+			<a class="quote-permalink" href="/quotes/<!--QUOTES.NUMBER-->.php">#<!--QUOTES.NUMBER--></a>
+			<!--BEGIN QUOTES.CANVOTE-->
+			<span class="quote-rating-up"><a href="javascript:voteQuote('<!--QUOTES.NUMBER-->','plus');" rel="nofollow">+</a></span>
+			(<span class="quote-vote-count"><!--QUOTES.RATING--></span>)
+			<span class="quote-rating-down"><a href="javascript:voteQuote('<!--QUOTES.NUMBER-->','minus');" rel="nofollow">-</a></span>
+			<!--END QUOTES.CANVOTE-->
+			<!--BEGIN QUOTES.NOVOTE-->
+			<span class="quote-rating-up quote-action-done">+</span>
+			(<span class="quote-vote-count"><!--QUOTES.RATING--></span>)
+			<span class="quote-rating-down quote-action-done">-</span>
+			<!--END QUOTES.NOVOTE-->
+			<!--BEGIN QUOTES.CANFLAG-->
+			<span class="quote-report"><a href="javascript:flagQuote('<!--QUOTES.NUMBER-->');" rel="nofollow">[X]</a></span>
+			<!--END QUOTES.CANFLAG-->
+			<!--BEGIN QUOTES.NOFLAG-->
+			<span class="quote-report quote-action-done">[X]</span>
+			<!--END QUOTES.NOFLAG-->
+			<span class="quote-date"><!--QUOTES.DATE--></span>
+			<span class="quote-update-result"><!--QUOTES.COMMENTS--></span>
+		</h3>
 
-	<!--QUOTES.QUOTE-->
-</P>
+		<blockquote class="quote-body"><!--QUOTES.QUOTE--></blockquote>
+	</li>
 <!--END QUOTES-->
+</ul>
 
 <!--BEGIN PAGENUMBERS-->
 <!--INCLUDE quotes/pagenumbers-->
diff --git a/theme/quotes/pagenumbers.tpl b/theme/quotes/pagenumbers.tpl
index 56bedef..57533be 100755
--- a/theme/quotes/pagenumbers.tpl
+++ b/theme/quotes/pagenumbers.tpl
@@ -1,17 +1,17 @@
-<DIV CLASS="cleardiv"></DIV>
+<div class="cleardiv"></div>
 
-<CENTER>
-	<A HREF="/quotes/<!--LORIGIN-->.php">First</A>&nbsp;&nbsp;
-	<A HREF="/quotes/<!--LORIGIN-->.php?page=<!--MINUSTEN-->">-10</A>&nbsp;&nbsp;
-	<!--BDDD-->
+<center>
+	<a href="/quotes/<!--LORIGIN-->.php">First</a>&nbsp;&nbsp;
+	<a href="/quotes/<!--LORIGIN-->.php?page=<!--MINUSTEN-->">-10</a>&nbsp;&nbsp;
+	<span class="light-at-night"><!--BDDD--></span>
 	<!--BEGIN BPAGES-->
-	<A HREF="/quotes/<!--LORIGIN-->.php?page=<!--BPAGES.PAGENUM-->"><!--BPAGES.PAGENUM--></A>&nbsp;&nbsp;
+	<a href="/quotes/<!--LORIGIN-->.php?page=<!--BPAGES.PAGENUM-->"><!--BPAGES.PAGENUM--></a>&nbsp;&nbsp;
 	<!--END BPAGES-->
-	<!--CURPAGE-->&nbsp;&nbsp;
+	<span class="light-at-night"><!--CURPAGE--></span>&nbsp;&nbsp;
 	<!--BEGIN APAGES-->
-	<A HREF="/quotes/<!--LORIGIN-->.php?page=<!--APAGES.PAGENUM-->"><!--APAGES.PAGENUM--></A>&nbsp;&nbsp;
+	<a href="/quotes/<!--LORIGIN-->.php?page=<!--APAGES.PAGENUM-->"><!--APAGES.PAGENUM--></a>&nbsp;&nbsp;
 	<!--END APAGES-->
-	<!--ADDD-->
-	<A HREF="/quotes/<!--LORIGIN-->.php?page=<!--PLUSTEN-->">+10</A>&nbsp;&nbsp;
-	<A HREF="/quotes/<!--LORIGIN-->.php?page=<!--LASTPAGE-->">Last</A>&nbsp;&nbsp;
-</CENTER>
+	<span class="light-at-night"><!--ADDD--></span>
+	<a href="/quotes/<!--LORIGIN-->.php?page=<!--PLUSTEN-->">+10</a>&nbsp;&nbsp;
+	<a href="/quotes/<!--LORIGIN-->.php?page=<!--LASTPAGE-->">Last</a>&nbsp;&nbsp;
+</center>
diff --git a/theme/quotes/search.tpl b/theme/quotes/search.tpl
index 60c0afc..6b123f4 100755
--- a/theme/quotes/search.tpl
+++ b/theme/quotes/search.tpl
@@ -1,19 +1,19 @@
-<DIV CLASS="cleardiv"></DIV>
+<div class="cleardiv"></div>
 
-<H1>Search</H1>
+<h1 class="light-at-night">Search</h1>
 
-<FORM METHOD="POST" ACTION="/quotes/search.php?fetch=">
-	<INPUT TYPE="text" NAME="search" SIZE="28">&nbsp;
-	<INPUT TYPE="submit" NAME="submit"><BR>
-	Sort: <SELECT NAME="sortby" SIZE="1">
-		<OPTION SELECTED>Rating</OPTION>
-		<OPTION>ID</OPTION>
-	</SELECT>&nbsp;
-	How many: <SELECT NAME="number" SIZE="1">
-		<OPTION SELECTED>10</OPTION>
-		<OPTION>25</OPTION>
-		<OPTION>50</OPTION>
-		<OPTION>75</OPTION>
-		<OPTION>100</OPTION>
-	</SELECT>
-</FORM>
+<form method="POST" action="/quotes/search.php?fetch=">
+	<input type="text" name="search" size="28" />&nbsp;
+	<input type="submit" name="submit" /><br />
+	<span class="light-at-night">Sort:</span> <select name="sortby" size="1">
+		<option selected="selected">Rating</option>
+		<option>ID</option>
+	</select>&nbsp;
+	<span class="light-at-night">How many:</span> <select name="number" size="1">
+		<option selected="selected">10</option>
+		<option>25</option>
+		<option>50</option>
+		<option>75</option>
+		<option>100</option>
+	</select>
+</form>
diff --git a/theme/related.tpl b/theme/related.tpl
index abba96e..783b253 100755
--- a/theme/related.tpl
+++ b/theme/related.tpl
@@ -1,14 +1,9 @@
-<DIV CLASS="cleardiv"></DIV>
+<div class="cleardiv"></div>
 
-<DIV CLASS="bubble">
-	<DIV CLASS="rounded">
-		<BLOCKQUOTE>
-			<DIV>
-				<!--BEGIN POST-->
-				<A HREF="/blog/<!--POST.CODED-->/"><!--POST.TITLE--></A> by <A HREF="/blog/author/<!--POST.AUTHOR-->.php"><!--POST.AUTHOR--></A> on <!--POST.DATE--><BR>
-				<!--END POST-->
-			</DIV>
-		</BLOCKQUOTE>
-	</DIV>
-	<CITE CLASS="rounded"><STRONG>Theoretically Related Posts</STRONG></CITE>
-</DIV>
+<div class="module rounded">
+	<!--BEGIN POST-->
+	<a href="/blog/<!--POST.CODED-->/"><!--POST.TITLE--></a> by <a href="/blog/author/<!--POST.AUTHOR-->.php"><!--POST.AUTHOR--></a> on <!--POST.DATE--><br />
+	<!--END POST-->
+</div>
+
+<cite class="rounded light-at-night"><strong>Theoretically Related Posts</strong></cite>
-- 
cgit 1.4.1