From f36d3298f0401e4fb1ca131d18d51d3d47e39818 Mon Sep 17 00:00:00 2001
From: Jason Oster <parasytic@users.sourceforge.net>
Date: Tue, 7 Jul 2009 14:48:28 +0000
Subject: HTML/CSS template rewrites, nice-title integration, XSS fixes,
 version bump

---
 README                             |  22 ++-
 default_config.php                 |   4 +-
 functions/calendar_functions.php   |   1 -
 functions/date_functions.php       |   6 +-
 functions/event.js                 |   4 +-
 functions/template.php             |  42 ++++-
 month.php                          |   8 +-
 nicetitle/nicetitle.css            |  32 ++++
 nicetitle/nicetitle.js             | 362 +++++++++++++++++++++++++++++++++++++
 nicetitle/ntbg.png                 | Bin 0 -> 914 bytes
 print.php                          |   2 +-
 templates/default/calendar_nav.tpl | 265 ++++++++++++++-------------
 templates/default/day.tpl          |  20 +-
 templates/default/default.css      |  26 ++-
 templates/default/event.tpl        |   4 +-
 templates/default/footer.tpl       |   2 +-
 templates/default/header.tpl       |   4 +-
 templates/default/month.tpl        | 153 +++++++++-------
 templates/default/month_large.tpl  |   4 +-
 templates/default/month_medium.tpl |   4 +-
 templates/default/print.tpl        |  10 +-
 templates/default/week.tpl         |  12 +-
 templates/default/year.tpl         |  87 +++------
 templates/green/calendar_nav.tpl   | 151 ----------------
 templates/green/day.tpl            | 104 -----------
 templates/green/default.css        |  16 ++
 templates/green/header.tpl         |   4 +-
 templates/green/month.tpl          |  88 ---------
 templates/green/month_large.tpl    |  42 -----
 templates/green/month_medium.tpl   |  45 -----
 templates/green/sidebar.tpl        | 225 -----------------------
 templates/green/year.tpl           | 140 --------------
 templates/grey/calendar_nav.tpl    | 151 ----------------
 templates/grey/day.tpl             | 104 -----------
 templates/grey/default.css         |  18 ++
 templates/grey/header.tpl          |   4 +-
 templates/grey/month.tpl           |  88 ---------
 templates/grey/month_large.tpl     |  42 -----
 templates/grey/month_medium.tpl    |  45 -----
 templates/grey/sidebar.tpl         | 225 -----------------------
 templates/grey/year.tpl            | 140 --------------
 templates/red/calendar_nav.tpl     | 151 ----------------
 templates/red/day.tpl              | 104 -----------
 templates/red/default.css          |  18 ++
 templates/red/header.tpl           |   4 +-
 templates/red/month.tpl            |  88 ---------
 templates/red/month_large.tpl      |  42 -----
 templates/red/month_medium.tpl     |  45 -----
 templates/red/sidebar.tpl          | 225 -----------------------
 templates/red/sidebar_year.tpl     | 196 --------------------
 templates/red/year.tpl             | 140 --------------
 templates/tan/calendar_nav.tpl     | 151 ----------------
 templates/tan/day.tpl              | 104 -----------
 templates/tan/default.css          |  16 ++
 templates/tan/header.tpl           |   4 +-
 templates/tan/month.tpl            |  88 ---------
 templates/tan/month_large.tpl      |  42 -----
 templates/tan/month_medium.tpl     |  45 -----
 templates/tan/sidebar.tpl          | 225 -----------------------
 templates/tan/year.tpl             | 140 --------------
 year.php                           |   5 +-
 61 files changed, 849 insertions(+), 3690 deletions(-)
 create mode 100644 nicetitle/nicetitle.css
 create mode 100644 nicetitle/nicetitle.js
 create mode 100644 nicetitle/ntbg.png
 delete mode 100644 templates/green/calendar_nav.tpl
 delete mode 100644 templates/green/day.tpl
 delete mode 100644 templates/green/month.tpl
 delete mode 100644 templates/green/month_large.tpl
 delete mode 100644 templates/green/month_medium.tpl
 delete mode 100644 templates/green/sidebar.tpl
 delete mode 100644 templates/green/year.tpl
 delete mode 100644 templates/grey/calendar_nav.tpl
 delete mode 100644 templates/grey/day.tpl
 delete mode 100644 templates/grey/month.tpl
 delete mode 100644 templates/grey/month_large.tpl
 delete mode 100644 templates/grey/month_medium.tpl
 delete mode 100644 templates/grey/sidebar.tpl
 delete mode 100644 templates/grey/year.tpl
 delete mode 100644 templates/red/calendar_nav.tpl
 delete mode 100644 templates/red/day.tpl
 delete mode 100644 templates/red/month.tpl
 delete mode 100644 templates/red/month_large.tpl
 delete mode 100644 templates/red/month_medium.tpl
 delete mode 100644 templates/red/sidebar.tpl
 delete mode 100644 templates/red/sidebar_year.tpl
 delete mode 100644 templates/red/year.tpl
 delete mode 100644 templates/tan/calendar_nav.tpl
 delete mode 100644 templates/tan/day.tpl
 delete mode 100644 templates/tan/month.tpl
 delete mode 100644 templates/tan/month_large.tpl
 delete mode 100644 templates/tan/month_medium.tpl
 delete mode 100644 templates/tan/sidebar.tpl
 delete mode 100644 templates/tan/year.tpl

diff --git a/README b/README
index e9e88cc..b809640 100644
--- a/README
+++ b/README
@@ -88,14 +88,32 @@ COPYING for more information about our license.
 
 Changes:
 --------
-2.31 Fix events ending at midnight bug in day view
+2.4
+	Event information displayed with Nice Titles
+	More ICS input sanitizing
+	Better display of tabs/line breaks in calendar events
+	Many updates to included templates; HTML fixes, better CSS support
+	Webcal caching now works like local calendar caching (with save_parsed_cals enabled)
+	Updates to Czech and French translations
+	Fixes for attendee/organizer parsing and email address hyperlinking
+	Fixes for Print View
+	Fix setting time format in preferences page
+	Fix default calendar selections in listbox picker
+	Fix timezone DST calculation with all-day events
+	Fix dates before 1970
+	Fixed bugs with ALL_CALENDARS_COMBINED and saving parsed calendars (using wrong file name)
+	Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers)
+
+2.31
+	Fix events ending at midnight bug in day view
 	Fix publish.php for 2.3 config system
 	add option to hide location in month view
 	add option to make individual events downloadable from event view
 	Fix calendar showing modified events twice
 	Make multiline descriptions display with line breaks in event popup
 	Fix German language file
-2.3 Major changes to recurrence handling
+2.3
+	Major changes to recurrence handling
 	Added more languages
 	Added login to month view
 	Consolidated common rss functions
diff --git a/default_config.php b/default_config.php
index 9aac854..5fa5c1f 100644
--- a/default_config.php
+++ b/default_config.php
@@ -2,8 +2,8 @@
 class Configs{
 	private static $instance;
 	private function __construct(){
-		$this->phpicalendar_version = '2.32alpha';
-	// Configuration file for PHP iCalendar 2.32
+		$this->phpicalendar_version = '2.4alpha';
+	// Configuration file for PHP iCalendar 2.4
 	//
 	// To set values, change the text between the single quotes
 	// Follow instructions to the right for detailed information
diff --git a/functions/calendar_functions.php b/functions/calendar_functions.php
index 80bab71..3cd17e4 100644
--- a/functions/calendar_functions.php
+++ b/functions/calendar_functions.php
@@ -264,7 +264,6 @@ function display_ical_list($cals, $pick=FALSE) {
 				$return .= "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp</option>\n";
 			}
 		} else {
-			$cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp);
 			if ($cal_encoded_tmp == $cal || $cal_encoded_tmp == urldecode($cal)) {
 				$return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&amp;getdate=$getdate\" selected=\"selected\">$cal_displayname_tmp</option>";
 			} else {
diff --git a/functions/date_functions.php b/functions/date_functions.php
index 4751ad2..0aeef60 100644
--- a/functions/date_functions.php
+++ b/functions/date_functions.php
@@ -234,6 +234,8 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin
 		$full_event_text = $event_text;
 		$event_text      = strip_tags($event_text, '<b><i><u><img>');
 	}
+	
+	if (!empty($link_class)) $link_class = ' class="'.$link_class.'"';
 
 	if (!empty($event_text)) {
 		$title = strip_tags(str_replace("<br />","\n",$title));
@@ -254,10 +256,10 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin
 				document.popup_data[$popup_data_index] = eventData;
 				// --></script>";
 
-			$return .= '<a class="'.$link_class.'" title="'.$title.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">';
+			$return .= '<a'.$link_class.' title="'.$title.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">';
 			$popup_data_index++;
 		} else {
-			$return .= '<a class="'.$link_class.'" title="'.$title.'" href="'.$res[1].'">';
+			$return .= '<a'.$link_class.' title="'.$title.'" href="'.$res[1].'">';
 		}
 		$return .= $pre_text.$event_text.$post_text.'</a>'."\n";
 	}
diff --git a/functions/event.js b/functions/event.js
index 9020de9..13aa609 100644
--- a/functions/event.js
+++ b/functions/event.js
@@ -11,7 +11,7 @@ function openEventWindow(num) {
 	form.elements.event_data.value = data.event_data;
 	
 	// open a new window
-	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
+	var w = window.open('', 'Popup', 'scrollbars=yes,width=550,height=350');
 	form.target = 'Popup';
 	form.submit();
 }
@@ -36,7 +36,7 @@ function openTodoInfo(num) {
 	form.elements.todo_data.value = data.todo_data;
 
 	// open a new window
-	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
+	var w = window.open('', 'Popup', 'scrollbars=yes,width=550,height=350');
 	form.target = 'Popup';
 	form.submit();
 }
diff --git a/functions/template.php b/functions/template.php
index cc80925..9ce5124 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -253,7 +253,7 @@ class Page {
 	}#end draw_search
 	
 	function draw_week($template_p) {
-		global $phpiCal_config, $start_week_time, $getdate, $cal, $master_array, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $timeFormat_small;
+		global $phpiCal_config, $start_week_time, $getdate, $cal, $master_array, $dateFormat_week_list, $current_view, $day_array, $timeFormat;
 		
 		// Figure out colspans and initialize weekarray
 		$thisdate  	= $start_week_time;
@@ -306,6 +306,10 @@ class Page {
 			while ($day < $phpiCal_config->week_length){
 				$colspan  = 0;
 				$replace  .= $loop_begin; # <td>
+
+				if ($weekarray[$day] == $getdate) $replace = str_replace('{TODAY}', "rowToday", $replace);
+				$replace 	= str_replace('{TODAY}', "rowOff", $replace);
+
 				if(array_search($weekarray[$day], $allday_uids)){ 
 					$uid = array_search($weekarray[$day], $allday_uids);
 					unset($allday_uids[$uid]);
@@ -464,9 +468,14 @@ class Page {
 					} else {
 						$class = '';
 						$dayborder = 0;
-					}					
+					}
+					$tclass = $class;
+					if ($thisday == $getdate) {
+						if ($tclass) $tclass = ' class="weekborder weektoday"';
+						else $tclass = ' class="weektoday"';
+					}
 					$drawWidth = 1;
-					$weekdisplay .= '<td colspan="' . $nbrGridCols[$thisday] . '" ' . $class . '>&nbsp;</td>'."\n";					
+					$weekdisplay .= '<td colspan="' . $nbrGridCols[$thisday] . '"' . $tclass . '>&nbsp;</td>'."\n";
 				} else {
 					# have events
 					$emptyWidth = $nbrGridCols[$thisday];
@@ -478,13 +487,18 @@ class Page {
 						switch ($el["state"]) {
 							case "begin":
 								if ($ended_counter) {
-									$weekdisplay .= '<td colspan="' . $ended_counter . '" '.$class.'>&nbsp;</td>';
+									$tclass = $class;
+									if ($thisday == $getdate) {
+										if ($tclass) $tclass = ' class="weekborder weektoday"';
+										else $tclass = ' class="weektoday"';
+									}
+									$weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '>&nbsp;</td>';
 									$ended_counter = 0;
 								}
 								$event_length[$thisday][$i]["state"] = "started";
  								$uid = $event_length[$thisday][$i]["key"];
  								$event_start 	= $this_time_arr[$uid]['start_unixtime'];
-								$event_start 	= date ($timeFormat_small, $event_start);
+								$event_start 	= date ($timeFormat, $event_start);
  								$event_calno  	= $this_time_arr[$uid]['calnumber'];
  								$event_status	= strtolower($this_time_arr[$uid]['status']);
  								$event_recur = $this_time_arr[$uid]['recur'];
@@ -510,7 +524,12 @@ class Page {
 								break;
 							case "started":
 								if ($ended_counter) {
-									$weekdisplay .= '<td colspan="' . $ended_counter . '" '.$class.'>&nbsp;</td>';
+									$tclass = $class;
+									if ($thisday == $getdate) {
+										if ($tclass) $tclass = ' class="weekborder weektoday"';
+										else $tclass = ' class="weektoday"';
+									}
+									$weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '>&nbsp;</td>';
 									$ended_counter = 0;
 								}
 								break;
@@ -528,7 +547,12 @@ class Page {
 					$emptyWidth += $ended_counter;
 					//fill empty space on the right
 					if ($emptyWidth > 0) {
-						$weekdisplay .= "<td colspan=\"" . $emptyWidth . "\" $class>&nbsp;</td>\n";
+						$tclass = $class;
+						if ($thisday == $getdate) {
+							if ($tclass) $tclass = ' class="weekborder weektoday"';
+							else $tclass = ' class="weektoday"';
+						}
+						$weekdisplay .= "<td colspan=\"" . $emptyWidth . "\"$tclass>&nbsp;</td>\n";
 					}
 					while (isset($event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"]) && $event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"] == "ended") {
 						array_pop($event_length[$thisday]);
@@ -981,7 +1005,7 @@ class Page {
 								$start2		 = date($timeFormat_small, $val['start_unixtime']);
 								if ($type == 'large') {
 									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
- 									$switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 10, 'ps3', "$start2 ").'';
+ 									$switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 10, 'ps3', "<span style=\"font-weight: bold;\">$start2</span> ");
  									$switch['EVENT'] .= (isset($val['location']) && $val['location'] != '' && $phpiCal_config->month_locations == 'yes') ? "<br />".$val['location']."<br />" : '';
 									$switch['EVENT'] .= '</div>';
 								} else {
@@ -1033,7 +1057,7 @@ class Page {
 	}
 	
 	function monthbottom() {
-		global $phpiCal_config, $getdate, $master_array, $this_year, $this_month, $cal, $timeFormat, $timeFormat_small, $dateFormat_week_list, $lang;
+		global $phpiCal_config, $getdate, $master_array, $this_year, $this_month, $cal, $timeFormat, $dateFormat_week_list, $lang;
 		preg_match("!<\!-- loop showbottomevents_odd on -->(.*)<\!-- loop showbottomevents_odd off -->!Uis", $this->page, $match1);
 		preg_match("!<\!-- loop showbottomevents_even on -->(.*)<\!-- loop showbottomevents_even off -->!Uis", $this->page, $match2);
 		
diff --git a/month.php b/month.php
index 04516bd..9c2953b 100644
--- a/month.php
+++ b/month.php
@@ -84,7 +84,9 @@ $page->replace_tags(array(
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
 	'show_search' 		=> $phpiCal_config->show_search,
+	'next_day' 			=> $tomorrows_date,
 	'next_month' 		=> $next_month,
+	'prev_day'	 		=> $yesterdays_date,
 	'prev_month'	 	=> $prev_month,
 	'show_goto' 		=> '',
 	'show_user_login'	=> $show_user_login,
@@ -110,6 +112,8 @@ $page->replace_tags(array(
 	'l_tomorrows'		=> $lang['l_tomorrows'],
 	'l_jump'			=> $lang['l_jump'],
 	'l_todo'			=> $lang['l_todo'],
+	'l_prev'			=> $lang['l_prev'],
+	'l_next'			=> $lang['l_next'],
 	'l_day'				=> $lang['l_day'],
 	'l_week'			=> $lang['l_week'],
 	'l_month'			=> $lang['l_month'],
@@ -148,10 +152,8 @@ if ($phpiCal_config->this_months_events == 'yes') {
 } else {
 	$page->nomonthbottom($page);
 }
-$page->draw_subscribe($page);
 
+$page->draw_subscribe($page);
 $page->output();
 
-
-
 ?>
diff --git a/nicetitle/nicetitle.css b/nicetitle/nicetitle.css
new file mode 100644
index 0000000..8c981c5
--- /dev/null
+++ b/nicetitle/nicetitle.css
@@ -0,0 +1,32 @@
+div.nicetitle {
+    position: absolute;
+    padding: 4px;
+    top: 0px;
+    left: 0px;
+    color: white;
+    font-size: 12px;
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    width: 25em;
+    background: url(ntbg.png);
+
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    text-shadow: black 1px 1px 1px;
+}
+div.nicetitle p {
+    margin: 0;
+    padding: 0 3px;
+}
+div.nicetitle p.destination {
+    font-size: 9px;
+    text-align: left;
+    padding-top: 3px;
+}
+
+@media print {
+    div.nicetitle {
+        display: none;
+    }
+}
diff --git a/nicetitle/nicetitle.js b/nicetitle/nicetitle.js
new file mode 100644
index 0000000..62e3229
--- /dev/null
+++ b/nicetitle/nicetitle.js
@@ -0,0 +1,362 @@
+/*
+ * Based on NiceTitle, by Stuart Langridge
+ * http://www.kryogenix.org/code/browser/nicetitle/
+ */
+
+addEvent(window, "load", makeNiceTitles);
+
+
+// Get script self directory
+var src = document.getElementById("nicetitle").src.split("/");
+src.pop();
+src = src.join("/");
+
+// Pre-load background PNG
+(new Image()).src = src + "/ntbg.png";
+
+// Start configuration
+var SHOW_LINKS = false; // Set to false to disable showing link URLs
+var FOLLOW_MOUSE = true; // Set to false to disable title follows mouse
+
+var MIN_WIDTH = 100; // Min/Max width/height of title
+var MAX_WIDTH = 600;
+var MIN_HEIGHT = 25;
+
+var SNAP_LENGTH = 25; // Define the length from the edge of the window to snap to
+var MOUSE_OFFSET = 15; // Define the distance to place the title from the mouse
+// End configuration
+
+
+var XHTMLNS = "http://www.w3.org/1999/xhtml";
+var CURRENT_NICE_TITLE;
+var browser = new Browser();
+
+function makeNiceTitles() {
+    if (!document.createElement || !document.getElementsByTagName) return;
+    // add namespace methods to HTML DOM; this makes the script work in both
+    // HTML and XML contexts.
+    if (!document.createElementNS) {
+        document.createElementNS = function(ns,elt) {
+            return document.createElement(elt);
+        }
+    }
+
+    if (!document.links) {
+        document.links = document.getElementsByTagName("a");
+    }
+    for (var ti = 0; ti < document.links.length; ti++) {
+        var lnk = document.links[ti];
+        if (lnk.title) {
+            lnk.setAttribute("nicetitle", lnk.title);
+            lnk.removeAttribute("title");
+            addEvent(lnk, "mouseover", showNiceTitle);
+            addEvent(lnk, "mouseover", moveNiceTitle);
+            addEvent(lnk, "mouseout", hideNiceTitle);
+            addEvent(lnk, "mousemove", moveNiceTitle);
+            addEvent(lnk, "mousedown", hideNiceTitle);
+            /*
+             * Focus and blur events are not quite right. In Mozilla, titles do not show on keyboard focus.
+             * This may present an accessibility issue, but it doesn't currently play nice
+             * with FOLLOW_MOUSE=true, or mousedown events.
+             */
+//            addEvent(lnk, "focus", showNiceTitle);
+//            addEvent(lnk, "blur", hideNiceTitle);
+        }
+    }
+    var instags = document.getElementsByTagName("ins");
+    if (instags) {
+        for (var ti = 0; ti < instags.length; ti++) {
+            var instag = instags[ti];
+            if (instag.dateTime) {
+                var strDate = instag.dateTime;
+                var dtIns = new Date(
+                    strDate.substring(0, 4),
+                    parseInt(strDate.substring(4, 6) - 1),
+                    strDate.substring(6, 8),
+                    strDate.substring(9, 11),
+                    strDate.substring(11, 13),
+                    strDate.substring(13, 15)
+                );
+                instag.setAttribute("nicetitle", "Added on " + dtIns.toString());
+                addEvent(instag, "mouseover", showNiceTitle);
+                addEvent(instag, "mouseover", moveNiceTitle);
+                addEvent(instag, "mouseout", hideNiceTitle);
+                addEvent(instag, "mousemove", moveNiceTitle);
+                addEvent(instag, "mousedown", hideNiceTitle);
+//                addEvent(instag, "focus", showNiceTitle);
+//                addEvent(instag, "blur", hideNiceTitle);
+            }
+        }
+    }
+}
+
+function findPosition(oLink) {
+    if (oLink.offsetParent) {
+        for (var posX = 0, posY = 0; oLink.offsetParent; oLink = oLink.offsetParent) {
+            posX += oLink.offsetLeft;
+            posY += oLink.offsetTop;
+        }
+        return [posX, posY];
+    } else {
+        return [oLink.x, oLink.y];
+    }
+}
+
+function get_longest(ary) {
+    var l = 0;
+    ary.forEach(function(el) {
+        if (el.length > l) l = el.length;
+    });
+    
+    return l;
+}
+
+function moveNiceTitle(e) {
+    if (!CURRENT_NICE_TITLE) return;
+    var d = CURRENT_NICE_TITLE;
+    if (window.event && window.event.srcElement) {
+        var el = window.event.srcElement
+    } else if (e && e.currentTarget) {
+        var el = e.currentTarget
+    }
+
+    // Browser size
+    var xy = getWindowSize();
+    var ww = xy[0];
+    var wh = xy[1];
+
+    // Title width and height
+    var w = (d.offsetWidth || MIN_WIDTH);
+    var h = (d.offsetHeight || MIN_HEIGHT);
+
+    if (FOLLOW_MOUSE) {
+        // Mouse position within document (not window)
+        var xy = getMousePosition(e);
+        var mx = xy[0];
+        var my = xy[1];
+
+        // Document scroll position within window
+        var xy = getScrollPosition();
+        var sx = xy[0];
+        var sy = xy[1];
+
+        // Title element position within document
+        var x = mx + MOUSE_OFFSET;
+        var y = my + MOUSE_OFFSET;
+    }
+    else {
+        // Document scroll position within window
+        // Unused
+        var sx = 0;
+        var sy = 0;
+        
+        // Title element position within document
+        var elPos = findPosition(el);
+        var x = elPos[0];
+        var y = elPos[1] + el.offsetHeight + MOUSE_OFFSET;
+    }
+
+    // Find out if we've already snapped
+    var SNAP_RIGHT = false;
+    var SNAP_BOTTOM = false;
+
+    // Snap title to the right side of the window
+    if ((x + w + SNAP_LENGTH) >= (ww + sx)) {
+        x = ((ww + sx) - w - SNAP_LENGTH);
+        SNAP_RIGHT = true;
+    }
+
+    // Snap title to the bottom of the window
+    if ((y + h + SNAP_LENGTH) >= (wh + sy)) {
+        y = ((wh + sy) - h - SNAP_LENGTH);
+        SNAP_BOTTOM = true;
+    }
+    
+    // Ensure mouse can never enter the title in the lower right corner of the window
+    if (FOLLOW_MOUSE && SNAP_RIGHT && SNAP_BOTTOM) {
+        y = (my - MOUSE_OFFSET - h);
+    }
+    else if (!FOLLOW_MOUSE && SNAP_BOTTOM) {
+        y = elPos[1] - h - MOUSE_OFFSET;
+    }
+
+    d.style.left = x + 'px';
+    d.style.top = y + 'px';
+}
+
+function showNiceTitle(e) {
+    if (CURRENT_NICE_TITLE) hideNiceTitle(CURRENT_NICE_TITLE);
+    if (!document.getElementsByTagName) return;
+    if (window.event && window.event.srcElement) {
+        var lnk = window.event.srcElement
+    } else if (e && e.currentTarget) {
+        var lnk = e.currentTarget
+    }
+    if (!lnk) return;
+    if (lnk.nodeName.toUpperCase() != 'A') {
+        // lnk is not actually the link -- ascend parents until we hit a link
+        lnk = getParent(lnk,"A");
+    }
+    if (!lnk) return;
+    var nicetitle = lnk.getAttribute("nicetitle");
+    
+    var d = document.createElementNS(XHTMLNS,"div");
+    if (browser.isIE) {
+        /*
+         * IE likes to display the element as soon as it is created.
+         * So let's hide it now and show it after it's been appended to the body
+         */
+        d.style.display = 'none';
+    }
+    d.className = "nicetitle";
+
+    var nicetitle_parts = nicetitle.split('\n');
+    nicetitle_parts.forEach(function(textpart) {
+        var pat = document.createElementNS(XHTMLNS, "p");
+        pat.className = "titletext";
+        var tnt = document.createTextNode(textpart);
+        pat.appendChild(tnt);
+        var brk = document.createElementNS(XHTMLNS, "br");
+        pat.appendChild(brk);
+        d.appendChild(pat);
+    });
+
+    if (lnk.href && SHOW_LINKS) {
+        var tnd = document.createTextNode(lnk.href);
+        pad = document.createElementNS(XHTMLNS, "p");
+        pad.className = "destination";
+        pad.appendChild(tnd);
+        d.appendChild(pad);
+    }
+    
+    var l = get_longest(nicetitle_parts);
+    
+    // Approximate pixel width of longest line in the title
+    var w = ((lnk.href && SHOW_LINKS) ? lnk.href.length : 0) * 6;
+    var t = (l ? l : 0) * 8;
+    
+    // Use the greatest width: title text, link URL, or MIN_WIDTH. Limited to MAX_WIDTH
+    w = ((w > MIN_WIDTH) ? w : MIN_WIDTH);
+    w = ((w > t) ? w : t);
+    w = ((w > MAX_WIDTH) ? MAX_WIDTH : w);
+    d.style.width = w + 'px';
+
+    document.getElementsByTagName("body")[0].appendChild(d);
+    if (browser.isIE) {
+        d.style.display = 'block';
+    }
+ 
+    CURRENT_NICE_TITLE = d;
+    moveNiceTitle(e);
+}
+
+function hideNiceTitle(e) {
+    if (!document.getElementsByTagName) return;
+    if (CURRENT_NICE_TITLE) {
+        document.getElementsByTagName("body")[0].removeChild(CURRENT_NICE_TITLE);
+        CURRENT_NICE_TITLE = null;
+    }
+}
+
+// Add an eventListener to browsers that can do it somehow.
+// Originally by the amazing Scott Andrew.
+function addEvent(obj, evType, fn) {
+    if (obj.addEventListener) {
+        obj.addEventListener(evType, fn, false);
+        return true;
+    } else if (obj.attachEvent) {
+        return obj.attachEvent("on"+evType, fn);
+    } else {
+        return false;
+    }
+}
+
+function getParent(el, pTagName) {
+	if (el == null) return null;
+	else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase())	// Gecko bug, supposed to be uppercase
+		return el;
+	else
+		return getParent(el.parentNode, pTagName);
+}
+
+function getMousePosition(event) {
+    if (browser.isIE) {
+        var x = window.event.clientX + document.documentElement.scrollLeft;// + document.body.scrollLeft;
+        var y = window.event.clientY + document.documentElement.scrollTop;// + document.body.scrollTop;
+    }
+    if (browser.isNS) {
+        var x = event.clientX + window.scrollX;// window.pageXOffset;
+        var y = event.clientY + window.scrollY;// window.pageYOffset;
+    }
+    return [x,y];
+}
+
+function getScrollPosition() {
+    if (browser.isIE) {
+        var x = document.documentElement.scrollLeft;// + document.body.scrollLeft;
+        var y = document.documentElement.scrollTop;// + document.body.scrollTop;
+    }
+    if (browser.isNS) {
+        var x = window.scrollX;// window.pageXOffset;
+        var y = window.scrollY;// window.pageYOffset;
+    }
+    return [x,y];
+}
+
+function getWindowSize() {
+    if (browser.isIE) {
+        var x = document.documentElement.clientWidth;
+        var y = document.documentElement.clientHeight;
+    }
+    if (browser.isNS) {
+        var x = window.innerWidth;
+        var y = window.innerHeight;
+    }
+    return [x,y];
+}
+
+// Determine browser and version.
+
+function Browser() {
+// blah, browser detect, but mouse-position stuff doesn't work any other way
+  var ua, s, i;
+
+  this.isIE    = false;
+  this.isNS    = false;
+  this.version = null;
+
+  ua = navigator.userAgent;
+
+  s = "MSIE";
+  if ((i = ua.indexOf(s)) >= 0) {
+    this.isIE = true;
+    this.version = parseFloat(ua.substr(i + s.length));
+    return;
+  }
+
+  s = "Netscape6/";
+  if ((i = ua.indexOf(s)) >= 0) {
+    this.isNS = true;
+    this.version = parseFloat(ua.substr(i + s.length));
+    return;
+  }
+
+  // Treat any other "Gecko" browser as NS 6.1.
+
+  s = "Gecko";
+  if ((i = ua.indexOf(s)) >= 0) {
+    this.isNS = true;
+    this.version = 6.1;
+    return;
+  }
+}
+
+// IE does not support the Array.forEach() method... Try to approximate it
+if (!Array.prototype.forEach) {
+    Array.prototype.forEach = function(action, context) {
+        var len = this.length;
+        for (var i = 0; i < len; i++) {
+            if (this[i] != undefined) action(this[i], context);
+        }
+    };
+}
diff --git a/nicetitle/ntbg.png b/nicetitle/ntbg.png
new file mode 100644
index 0000000..2dbe77e
Binary files /dev/null and b/nicetitle/ntbg.png differ
diff --git a/print.php b/print.php
index aee8f39..3a2e36f 100644
--- a/print.php
+++ b/print.php
@@ -1,5 +1,5 @@
 <?php
-define('BASE', './');
+if (!defined('BASE')) define('BASE', './');
 $current_view 		='print';
 require_once(BASE.'functions/date_functions.php');
 require_once(BASE.'functions/init.inc.php');
diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl
index a48cfbe..82c43ff 100644
--- a/templates/default/calendar_nav.tpl
+++ b/templates/default/calendar_nav.tpl
@@ -1,7 +1,74 @@
-<table border="0" width="737" cellspacing="0" cellpadding="0">
+<table border="0" width="170" cellspacing="0" cellpadding="0">
+	<!-- switch show_user_login on -->
 	<tr>
-		<td width="1%" valign="top" align="right">
-			{MONTH_SMALL|-1}
+		<td>
+		<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
+		<input type="hidden" name="action" value="login" />
+		<table width="100%" border="0" cellpadding="0" cellspacing="0" class="calborder">
+			<tr>
+				<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
+			</tr>
+			<!-- switch invalid_login on -->
+			<tr>
+				<td colspan="2" bgcolor="#FFFFFF" align="left">
+					<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
+						<font color="red">{L_INVALID_LOGIN}</font>
+					</div>
+				</td>
+			</tr>
+			<!-- switch invalid_login off -->
+			<tr>
+				<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
+				<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
+			</tr>
+			<tr>
+				<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
+				<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
+			</tr>
+			<tr>
+				<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
+			</tr>
+		</table>
+		</form>
+		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+				<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+				<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+			</tr>
+		</table>
+	</tr>
+	<tr>
+		<td><img src="images/spacer.gif" alt=" " width="1" height="10" /></td>
+	</tr>
+	<!-- switch show_user_login off -->
+	<tr>
+		<td>
+			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="calborder">
+				<tr>
+					<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
+					<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
+					<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
+				</tr>
+				<tr>
+					<td colspan="3" bgcolor="#FFFFFF" align="left">
+						<div style="padding: 5px;">
+							<b>{L_LEGEND}:</b><br />
+							{LEGEND}
+							<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
+							<!-- switch allow_preferences on -->
+							<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
+							<!-- switch allow_preferences off -->
+							<!-- switch display_download on -->
+							<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
+							<!-- switch display_download off -->
+							<!-- switch is_logged_in on -->
+							<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
+							<!-- switch is_logged_in off -->
+						</div>
+					</td>
+				</tr>
+			</table>
 			<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
 					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
@@ -10,136 +77,82 @@
 				</tr>
 			</table>
 		</td>
-		<td width="98%" valign="top" align="center">
-			<table border="0" width="330" cellspacing="0" cellpadding="0">
+	</tr>
+	<tr>
+		<td><img src="images/spacer.gif" alt=" " width="1" height="10" /></td>
+	</tr>
+	<tr>
+		<td>
+			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="calborder">
+				<tr>
+					<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD"><b>{L_JUMP}</b></div></td>
+				</tr>
 				<tr>
-					<td width="160" valign="top">
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{L_JUMP}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding: 5px;">
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-										<input type="hidden" name="cpath" value="{CPATH}"/>
+					<td bgcolor="#FFFFFF" align="left">
+						<div style="padding: 5px;">
+							<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
+								<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
+								<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
+								<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
+								<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
+								<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
+							<input type="hidden" name="cpath" value="{CPATH}"/>
 
-										</form>
-										<!-- switch show_search on -->
-										{SEARCH_BOX}
-										<!-- switch show_search off -->
-										<!-- switch show_goto on -->
-										<form style="margin-bottom:0;" action="day.php" method="get"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<input type="hidden" name="cal" value="{URL_CAL}"/>
-											<input type="text" style="width:160px; font-size:10px" name="jumpto_day"/>
-											<input type="submit" value="Go"/>
-										</form>
-										<!-- switch show_goto off -->
-										<hr />
-										<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<input type="hidden" name="getdate" value="{GETDATE}"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-											<input type="submit" value="Go"/>
-										</form>
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-					<td>
-						<img src="images/spacer.gif" width="20" height="1" alt=" " />
-					</td>
-					<td width="160" valign="top">
-					<!-- switch show_user_login on -->
-					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-					<input type="hidden" name="action" value="login" />
-					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-						<tr>
-							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-						</tr>
-						<!-- switch invalid_login on -->
-						<tr>
-							<td colspan="2" bgcolor="#FFFFFF" align="left">
-								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-									<font color="red">{L_INVALID_LOGIN}</font>
-								</div>
-							</td>
-						</tr>
-						<!-- switch invalid_login off -->
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-						</tr>
-					</table>
-					</form>
-					<table width="100%" border="0" cellpadding="0" cellspacing="0">
-						<tr>
-							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-						</tr>
-					</table>
-					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-					<!-- switch show_user_login off -->
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding-left: 5px;">
-										<b>{L_LEGEND}:</b><br />
-										{LEGEND}
-										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-										<!-- switch allow_preferences on -->
-										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-										<!-- switch allow_preferences off -->
-										<!-- switch display_download on -->
-										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-										<!-- switch display_download off -->
-										<!-- switch is_logged_in on -->
-										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-										<!-- switch is_logged_in off -->
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
+							</form>
+							<!-- switch show_search on -->
+							{SEARCH_BOX}
+							<!-- switch show_search off -->
+							<!-- switch show_goto on -->
+							<form style="margin-bottom:0;" action="day.php" method="get"/>
+								<input type="hidden" name="cpath" value="{CPATH}"/>
+								<input type="hidden" name="cal" value="{URL_CAL}"/>
+								<input type="text" style="width:160px; font-size:10px" name="jumpto_day"/>
+								<input type="submit" value="Go"/>
+							</form>
+							<!-- switch show_goto off -->
+							<hr />
+							<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
+							<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
+								<input type="hidden" name="getdate" value="{GETDATE}"/>
+								<input type="hidden" name="cpath" value="{CPATH}"/>
+								<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
+								<input type="submit" value="Go"/>
+							</form>
+						</div>
 					</td>
 				</tr>
 			</table>
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tr>
+					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td><img src="images/spacer.gif" alt=" " width="1" height="10" /></td>
+	</tr>
+	<tr>
+		<td>
+			{MONTH_SMALL|-1}
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tr>
+					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+				</tr>
+			</table>
 		</td>
-		<td width="1%" valign="top" align="left">
+	</tr>
+	<tr>
+		<td><img src="images/spacer.gif" alt=" " width="1" height="10" /></td>
+	</tr>
+	<tr>
+		<td>
 			{MONTH_SMALL|+1}
-			<table width="170" border="0" cellpadding="0" cellspacing="0">
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
 					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
 					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
diff --git a/templates/default/day.tpl b/templates/default/day.tpl
index c66d40f..b9cbf10 100644
--- a/templates/default/day.tpl
+++ b/templates/default/day.tpl
@@ -1,19 +1,19 @@
 {HEADER}
 <center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
+<table border="0" cellspacing="0" cellpadding="0" class="maintable">
 	<tr>
-		<td width="520" valign="top">
-			<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
+		<td valign="top">
+			<table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder">
 				<tr>
 					<td align="center" valign="middle">
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
 							<tr valign="top">
-								<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
+								<td align="left" width="100%" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME}</span></td>
 								<td align="right" width="120" class="navback">	
 									<div style="padding-top: 3px;">
 									<table width="120" border="0" cellpadding="0" cellspacing="0">
 										<tr valign="top">
-											<td><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></td>
+											<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
 											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
 											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
 											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
@@ -30,7 +30,7 @@
 												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}">&laquo;</a></span>
 											</td>
 											<!-- loop daysofweek on -->
-											<td width="14%" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
+											<td align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
 												<span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></span>
 											</td>
 											<!-- loop daysofweek off -->
@@ -55,7 +55,7 @@
 				</tr>
       			<tr>
 					<td align="center" valign="top" colspan="3">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
+						<table width="100%" border="0" cellspacing="0" cellpadding="0" class="tfixed">
 							<!-- loop row on -->
 							<tr>
 								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td>
@@ -93,8 +93,10 @@
 				</tr>
 			</table>
     	</td>
-		<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" " /></td>
-		<td width="170" valign="top">
+		<td width="10">
+			<img src="images/spacer.gif" width="10" height="1" alt=" " />
+		</td>
+		<td width="170" valign="top" class="sidebar">
 			{SIDEBAR}
 		</td>
 	</tr>
diff --git a/templates/default/default.css b/templates/default/default.css
index 65ac720..bfff9f1 100644
--- a/templates/default/default.css
+++ b/templates/default/default.css
@@ -48,12 +48,18 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
 .title h1 		{ font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;}
 
+/* Main class used for all page wrapper tables */
+.maintable		{ width: 990px; }
+
+/* Week view */
+.weektoday		{ background-color: #eff; }
+
 /* Month View */
 
 .monthback		{ background-color: #A1A5A9; }
-.monthreg		{ background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; }
-.monthoff		{ background-color: #F2F2F2; height: 105px; width: 105px; text-align: left;  vertical-align: top; }
-.monthon		{ background-color: #F2F9FF; height: 105px; width: 105px; text-align: left;  vertical-align: top; }
+.monthreg		{ background-color: #fff; height: 105px; text-align: left; vertical-align: top; }
+.monthoff		{ background-color: #F2F2F2; height: 105px; text-align: left;  vertical-align: top; }
+.monthon		{ background-color: #F2F9FF; height: 105px; text-align: left;  vertical-align: top; }
 .montheventtop	{ background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; }
 .montheventline	{ border-right: 1px dotted #A1A5A9; }
 
@@ -65,7 +71,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .yearon			{ background-color: #F2F9FF; height: 30px; width: 30px; text-align: right;  vertical-align: top; font-size: 9px; }
 .yearmonth		{ background-color: #ccc; }
 .yearweek		{ background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; }
-
+.yearleft		{ padding-right: 5px; padding-top: 5px; padding-bottom: 5px; }
+.yearmiddle		{ padding: 5px; }
+.yearright		{ padding-left: 5px; padding-top: 5px; padding-bottom: 5px; }
 
 /* older styles */
 
@@ -139,3 +147,13 @@ body			{ background-color: #E5E5E5; }
 .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
 .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
 .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }
+
+
+/* Make printed pages look nice */
+@media print {
+	.sidebar		{ width: 0px; display: none; }
+	.footer			{ display: none; }
+	.monthback		{ border-spacing: 0; }
+	.monthback td	{ border: 1px solid #606060; }
+	.calborder		{ border: 1px solid #606060; }
+}
diff --git a/templates/default/event.tpl b/templates/default/event.tpl
index 0ac7e24..43a5d7c 100644
--- a/templates/default/event.tpl
+++ b/templates/default/event.tpl
@@ -8,13 +8,13 @@
 </head>
 <body>
 <center>
-	<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
+	<table border="0" width="100%" cellspacing="0" cellpadding="0" class="calborder">
 		<tr>
 			<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{CAL_TITLE_FULL}</div></td>
 		</tr>
 		<tr>
 			<td align="left" class="V12">
-				<div style="margin-left: 10px; margin-bottom:10px;">
+				<div style="margin-left: 10px; margin-right: 10px; margin-bottom: 10px;">
 					<p><b>{L_SUMMARY}</b>: {EVENT_TEXT} - <span class="V9">(<i>{EVENT_TIMES}</i>)</span></p>
 					<!-- switch description on -->
 					<p><b>{L_DESCRIPTION}</b>: {DESCRIPTION}</p>
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 7d2ccab..5af1c40 100644
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -1,4 +1,4 @@
-<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar {VERSION}</a><br />
+<center class="V9 footer"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar {VERSION}</a><br />
 <!-- switch rss_valid on -->
 <p>
 <a style="color:gray" href="http://feeds.archive.org/validator/check?url={FOOTER_CHECK}">
diff --git a/templates/default/header.tpl b/templates/default/header.tpl
index d8e07dc..cd2a631 100644
--- a/templates/default/header.tpl
+++ b/templates/default/header.tpl
@@ -4,7 +4,9 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
 	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
-  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<script id="nicetitle" type="text/javascript" src="{DEFAULT_PATH}/nicetitle/nicetitle.js"></script>
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/nicetitle/nicetitle.css" />
 	<!-- switch rss_available on -->
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
diff --git a/templates/default/month.tpl b/templates/default/month.tpl
index 8258228..4c22f48 100644
--- a/templates/default/month.tpl
+++ b/templates/default/month.tpl
@@ -1,88 +1,107 @@
 {HEADER}
 <center>
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
+	<table border="0" cellpadding="0" cellspacing="0" class="maintable">
 		<tr>
-			<td align="center" valign="middle">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr valign="top">
-						<td align="left" width="615" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-						<td align="right" width="120" class="navback">	
-							<div style="padding-top: 3px;">
-							<table width="120" border="0" cellpadding="0" cellspacing="0">
+			<td valign="top">
+				<table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder">
+					<tr>
+						<td align="center" valign="middle">
+							<table width="100%" border="0" cellspacing="0" cellpadding="0">
 								<tr valign="top">
-									<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-									<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-									<td><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></td>
-									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-								</tr>
+									<td align="left" width="100%" class="title">
+										<table border="0" cellspacing="0" cellpadding="0">
+											<tr valign="top">
+												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" /></a></td>
+												<td><h1>{DISPLAY_DATE}</h1></td>
+												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" /></a></td>
+											</tr>
+										</table>
+										<span class="V9G">{CALENDAR_NAME}</span>
+									</td>
+									<td align="right" width="120" class="navback">	
+										<div style="padding-top: 3px;">
+										<table width="120" border="0" cellpadding="0" cellspacing="0">
+											<tr valign="top">
+												<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
+												<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
+												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
+												<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
+											</tr>
+										</table>
+										</div>
+									</td>
+								</tr>  			
 							</table>
-							</div>
 						</td>
-					</tr>  			
+					</tr>	
 				</table>
-			</td>
-		</tr>	
-	</table>
-	{MONTH_LARGE|+0}
-	<table width="735" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<br />
-	{CALENDAR_NAV}
-	<!-- switch showbottom on -->
-	<br />
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle" bgcolor="white">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
+				{MONTH_LARGE|+0}
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 					<tr>
-						<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
-						<td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td>
-						<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
+						<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
 					</tr>
 				</table>
-			</td>
-		</tr>	
-		<tr>
-			<td>
-				<table width="100%" cellspacing="1" cellpadding="4" border="0">
-					<!-- loop showbottomevents_odd on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
+				<!-- switch showbottom on -->
+				<br />
+				<table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder">
+					<tr>
+						<td align="center" valign="middle" bgcolor="white">
+							<table width="100%" border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
+									<td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td>
+									<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
+								</tr>
+							</table>
 						</td>
+					</tr>	
+					<tr>
 						<td>
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
+							<table width="100%" cellspacing="1" cellpadding="4" border="0">
+								<!-- loop showbottomevents_odd on -->
+								<tr align="left" valign="top">
+									<td width="170" nowrap="nowrap">
+										<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
+										<span class="V9G">{START_TIME}</span>
+									</td>
+									<td>
+										{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
+									</td>
+								</tr>
+								<!-- loop showbottomevents_odd off -->
+								<!-- loop showbottomevents_even on -->
+								<tr align="left" valign="top">
+									<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
+										<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
+										<span class="V9G">{START_TIME}</span>
+									</td>
+									<td bgcolor="#EEEEEE">
+										{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
+									</td>
+								</tr>
+								<!-- loop showbottomevents_even off -->
+							</table>
 						</td>
 					</tr>
-					<!-- loop showbottomevents_odd off -->
-					<!-- loop showbottomevents_even on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td bgcolor="#EEEEEE">
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
+				</table>
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
 					</tr>
-					<!-- loop showbottomevents_even off -->
 				</table>
+				<!-- switch showbottom off -->
+			</td>
+			<td width="10">
+				<img src="images/spacer.gif" width="10" height="1" alt=" " />
+			</td>
+			<td width="170" valign="top" class="sidebar">
+				{CALENDAR_NAV}
 			</td>
 		</tr>
 	</table>
-	<table width="737" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<!-- switch showbottom off -->
 </center>
 {FOOTER}
\ No newline at end of file
diff --git a/templates/default/month_large.tpl b/templates/default/month_large.tpl
index ca3d3d3..1d74ff0 100644
--- a/templates/default/month_large.tpl
+++ b/templates/default/month_large.tpl
@@ -1,7 +1,7 @@
-<table width="735" border="0" cellspacing="1" cellpadding="2" class="monthback">
+<table width="100%" border="0" cellspacing="1" cellpadding="2" class="monthback tfixed">
 	<tr>
 		<!-- loop weekday on -->
-		<td valign="top" width="105" height="12" class="dateback">
+		<td valign="top" height="12" class="dateback">
 			<center class="V9BOLD">{LOOP_WEEKDAY}</center>
 		</td>
 		<!-- loop weekday off -->
diff --git a/templates/default/month_medium.tpl b/templates/default/month_medium.tpl
index 8088a0e..62940f6 100644
--- a/templates/default/month_medium.tpl
+++ b/templates/default/month_medium.tpl
@@ -1,10 +1,10 @@
-<table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder">
+<table border="0" width="100%" cellspacing="0" cellpadding="0" class="calborder">
 	<tr>
 		<td align="center" class="medtitle">{MONTH_TITLE}</td>
 	</tr>
 	<tr>
 		<td>
-			<table border="0" width="210" cellspacing="1" cellpadding="0" class="yearmonth">
+			<table border="0" width="100%" cellspacing="1" cellpadding="0" class="yearmonth tfixed">
 				<tr>
 					<!-- loop weekday on -->
 					<td class="yearweek">{LOOP_WEEKDAY}</td>
diff --git a/templates/default/print.tpl b/templates/default/print.tpl
index 16b566a..fadce1b 100644
--- a/templates/default/print.tpl
+++ b/templates/default/print.tpl
@@ -1,12 +1,12 @@
 {HEADER}
 <center>
-<table border="0" width="650" cellspacing="0" cellpadding="0" class="calborder">
+<table border="0" cellspacing="0" cellpadding="0" class="calborder maintable">
 	<tr>
 		<td>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr valign="top">
-					<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span><br />
-					<a class="psf" href="{DEFAULT_VIEW}.php?cal={CAL}&amp;getdate={GETDATE}">{L_VIEW_CALENDARS}</a></td>
+					<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME}</span><br />
+					<a class="psf" href="{PRINTVIEW}.php?cal={CAL}&amp;getdate={GETDATE}">{L_VIEW_CALENDARS}</a></td>
 					<td valign="top" align="right" width="120" class="navback">	
 						<div style="padding-top: 3px;">
 						<table width="90" border="0" cellpadding="0" cellspacing="0">
@@ -32,7 +32,7 @@
 				<tr>
 					<td align="left" valign="top">
 						<!-- switch some_events on -->
-						<div class="V12"><b>{DAYOFMONTH}</b></div>
+						<div class="V12" style="border-top: 1px solid #A1A5A9"><b>{DAYOFMONTH}</b></div>
 						<!-- loop events on -->
 						<div style="padding: 6px;">
 							<table width="100%" border="0" cellspacing="1" cellpadding="1">
@@ -70,7 +70,7 @@
 		</td>
 	</tr>
 </table>
-<table width="650" border="0" cellpadding="0" cellspacing="0">
+<table border="0" cellpadding="0" cellspacing="0" class="maintable">
 	<tr>
 		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
 		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
diff --git a/templates/default/week.tpl b/templates/default/week.tpl
index e84632c..4f18b2a 100644
--- a/templates/default/week.tpl
+++ b/templates/default/week.tpl
@@ -1,20 +1,20 @@
 {HEADER}
 <center>
-	<table border="0" width="770" cellspacing="0" cellpadding="0">
+	<table border="0" cellspacing="0" cellpadding="0" class="maintable">
 		<tr>
 			<td valign="top">
-				<table border="0" cellspacing="0" cellpadding="0" class="calborder">
+				<table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder">
 					<tr>
 						<td align="center" valign="middle">
 							<table width="100%" border="0" cellspacing="0" cellpadding="0">
 							<tr valign="top">
-								<td align="left" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
+								<td align="left" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME}</span></td>
 								<td valign="top" align="right" width="120" class="navback">	
 									<div style="padding-top: 3px;">
 									<table width="120" border="0" cellpadding="0" cellspacing="0">
 										<tr valign="top">
 											<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-											<td><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></td>
+											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
 											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
 											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
 										</tr>
@@ -56,7 +56,7 @@
 												<td width="60" class="rowOff2" colspan="4"><img src="images/spacer.gif" width="60" height="1" alt=" " /></td>
 												<td width="1"></td>
 												<!-- loop alldaysofweek on -->
-												<td {COLSPAN} class="rowOff">
+												<td {COLSPAN} class="{TODAY}">
 													<!-- loop allday on -->
 													<div class="alldaybg_{CALNO}">
 														{ALLDAY}
@@ -110,7 +110,7 @@
 			<td width="10">
 				<img src="images/spacer.gif" width="10" height="1" alt=" " />
 			</td>
-			<td width="170" valign="top">
+			<td width="170" valign="top" class="sidebar">
 				{SIDEBAR}
 			</td>
 		</tr>
diff --git a/templates/default/year.tpl b/templates/default/year.tpl
index f15fd79..e830e9e 100644
--- a/templates/default/year.tpl
+++ b/templates/default/year.tpl
@@ -1,9 +1,9 @@
 {HEADER}
 <center>
-	<table width="770" border="0" cellspacing="0" cellpadding="0">
+	<table border="0" cellspacing="0" cellpadding="0" class="maintable">
 		<tr>
-			<td width="676">
-				<table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder">
+			<td>
+				<table width="100%" border="0" cellspacing="0" cellpadding="0" class="calborder">
 					<tr>
 						<td align="center" valign="middle" bgcolor="white">
 							<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -32,7 +32,7 @@
 												<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
 												<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
 												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-												<td><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></td>
+												<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
 											</tr>
 										</table>
 									</td>
@@ -41,97 +41,62 @@
 						</td>
 					</tr>
 				</table>
-				<br />
-				<table border="0" width="670" cellspacing="0" cellpadding="0">
+				<table width="100%" border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|01}
+						<td colspan="3">
+							<img src="images/spacer.gif" height="5" height="1" alt=" " />
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
+					</tr>
+					<tr>
+						<td class="yearleft" valign="top" align="left">
+							{MONTH_MEDIUM|01}
 						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearmiddle" valign="top" align="left">
 							{MONTH_MEDIUM|02}
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearright" valign="top" align="left">
 							{MONTH_MEDIUM|03}
 						</td>
-						<td width="20" rowspan='8'>
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
 					</tr>
 					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
+						<td class="yearleft" valign="top" align="left">
 							{MONTH_MEDIUM|04}
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearmiddle" valign="top" align="left">
 							{MONTH_MEDIUM|05}
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearright" valign="top" align="left">
 							{MONTH_MEDIUM|06}
 						</td>
 					</tr>
 					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
+						<td class="yearleft" valign="top" align="left">
 							{MONTH_MEDIUM|07}
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearmiddle" valign="top" align="left">
 							{MONTH_MEDIUM|08}
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearright" valign="top" align="left">
 							{MONTH_MEDIUM|09}
 						</td>
 					</tr>
 					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
+						<td class="yearleft" valign="top" align="left">
 							{MONTH_MEDIUM|10}
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearmiddle" valign="top" align="left">
 							{MONTH_MEDIUM|11}
 						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
+						<td class="yearright" valign="top" align="left">
 							{MONTH_MEDIUM|12}
 						</td>
 					</tr>
 				</table>
 			</td>
-			<td valign="top">
+			<td width="10">
+				<img src="images/spacer.gif" width="10" height="1" alt=" " />
+			</td>
+			<td width="170" valign="top" class="sidebar">
 				{SIDEBAR}
 			</td>
 		</tr>
diff --git a/templates/green/calendar_nav.tpl b/templates/green/calendar_nav.tpl
deleted file mode 100644
index a48cfbe..0000000
--- a/templates/green/calendar_nav.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-<table border="0" width="737" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="1%" valign="top" align="right">
-			{MONTH_SMALL|-1}
-			<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-		<td width="98%" valign="top" align="center">
-			<table border="0" width="330" cellspacing="0" cellpadding="0">
-				<tr>
-					<td width="160" valign="top">
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{L_JUMP}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding: 5px;">
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-										<input type="hidden" name="cpath" value="{CPATH}"/>
-
-										</form>
-										<!-- switch show_search on -->
-										{SEARCH_BOX}
-										<!-- switch show_search off -->
-										<!-- switch show_goto on -->
-										<form style="margin-bottom:0;" action="day.php" method="get"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<input type="hidden" name="cal" value="{URL_CAL}"/>
-											<input type="text" style="width:160px; font-size:10px" name="jumpto_day"/>
-											<input type="submit" value="Go"/>
-										</form>
-										<!-- switch show_goto off -->
-										<hr />
-										<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<input type="hidden" name="getdate" value="{GETDATE}"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-											<input type="submit" value="Go"/>
-										</form>
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-					<td>
-						<img src="images/spacer.gif" width="20" height="1" alt=" " />
-					</td>
-					<td width="160" valign="top">
-					<!-- switch show_user_login on -->
-					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-					<input type="hidden" name="action" value="login" />
-					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-						<tr>
-							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-						</tr>
-						<!-- switch invalid_login on -->
-						<tr>
-							<td colspan="2" bgcolor="#FFFFFF" align="left">
-								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-									<font color="red">{L_INVALID_LOGIN}</font>
-								</div>
-							</td>
-						</tr>
-						<!-- switch invalid_login off -->
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-						</tr>
-					</table>
-					</form>
-					<table width="100%" border="0" cellpadding="0" cellspacing="0">
-						<tr>
-							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-						</tr>
-					</table>
-					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-					<!-- switch show_user_login off -->
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding-left: 5px;">
-										<b>{L_LEGEND}:</b><br />
-										{LEGEND}
-										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-										<!-- switch allow_preferences on -->
-										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-										<!-- switch allow_preferences off -->
-										<!-- switch display_download on -->
-										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-										<!-- switch display_download off -->
-										<!-- switch is_logged_in on -->
-										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-										<!-- switch is_logged_in off -->
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td width="1%" valign="top" align="left">
-			{MONTH_SMALL|+1}
-			<table width="170" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/green/day.tpl b/templates/green/day.tpl
deleted file mode 100644
index c66d40f..0000000
--- a/templates/green/day.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{HEADER}
-<center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="520" valign="top">
-			<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
-				<tr>
-					<td align="center" valign="middle">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr valign="top">
-								<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-								<td align="right" width="120" class="navback">	
-									<div style="padding-top: 3px;">
-									<table width="120" border="0" cellpadding="0" cellspacing="0">
-										<tr valign="top">
-											<td><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></td>
-											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-										</tr>
-									</table>
-									</div>
-								</td>
-							</tr>
-							<tr>	
-								<td colspan="2">
-									<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tfixed">
-										<tr>
-											<td align="left" valign="top" width="20" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={PREV_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}">&laquo;</a></span>
-											</td>
-											<!-- loop daysofweek on -->
-											<td width="14%" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
-												<span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></span>
-											</td>
-											<!-- loop daysofweek off -->
-											<td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={NEXT_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}">&raquo;</a></span>
-											</td>
-										</tr>	
-									</table>
-								</td>
-							</tr>      			
-						</table>
-					</td>
-				</tr>
-				<tr id="allday">
-					<td>
-						<!-- loop allday on -->
-						<div class="alldaybg_{CALNO}">
-							{ALLDAY}
-						</div>
-						<!-- loop allday off -->
-					</td>
-				</tr>
-      			<tr>
-					<td align="center" valign="top" colspan="3">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<!-- loop row on -->
-							<tr>
-								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<!-- loop row off -->
-							<!-- loop event on -->
-							<div class="eventfont">
-								<div class="eventbg_{EVENT_CALNO}">{CONFIRMED}<b>{EVENT_START}</b> - {EVENT_END}</div>
-								<div class="padd">{EVENT}</div>
-							</div>
-							<!-- loop event off -->
-						</table>
-					</td>
-				</tr>
-        	</table>
-        	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-    	</td>
-		<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" " /></td>
-		<td width="170" valign="top">
-			{SIDEBAR}
-		</td>
-	</tr>
-</table>
-</center>
-{FOOTER}
-
diff --git a/templates/green/default.css b/templates/green/default.css
index 96c47f0..4b9ef4b 100644
--- a/templates/green/default.css
+++ b/templates/green/default.css
@@ -66,6 +66,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
 .title h1 		{ font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;}
 
+/* Main class used for all page wrapper tables */
+.maintable		{ width: 990px; }
+
 /* Month View */
 
 .monthback		{ background-color: #A1A5A9; }
@@ -83,6 +86,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .yearon			{ background-color: #F2F9FF; height: 30px; width: 30px; text-align: right;  vertical-align: top; font-size: 9px; }
 .yearmonth		{ background-color: #ccc; }
 .yearweek		{ background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; }
+.yearleft		{ padding-right: 5px; padding-top: 5px; padding-bottom: 5px; }
+.yearmiddle		{ padding: 5px; }
+.yearright		{ padding-left: 5px; padding-top: 5px; padding-bottom: 5px; }
 
 
 /* older styles */
@@ -160,3 +166,13 @@ body			{ background-image: url(images/background.gif); }
 .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
 .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
 .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }
+
+
+/* Make printed pages look nice */
+@media print {
+	.sidebar		{ width: 0px; display: none; }
+	.footer			{ display: none; }
+	.monthback		{ border-spacing: 0; }
+	.monthback td	{ border: 1px solid #606060; }
+	.calborder		{ border: 1px solid #606060; }
+}
diff --git a/templates/green/header.tpl b/templates/green/header.tpl
index d8e07dc..cd2a631 100644
--- a/templates/green/header.tpl
+++ b/templates/green/header.tpl
@@ -4,7 +4,9 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
 	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
-  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<script id="nicetitle" type="text/javascript" src="{DEFAULT_PATH}/nicetitle/nicetitle.js"></script>
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/nicetitle/nicetitle.css" />
 	<!-- switch rss_available on -->
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
diff --git a/templates/green/month.tpl b/templates/green/month.tpl
deleted file mode 100644
index 7dcff53..0000000
--- a/templates/green/month.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-{HEADER}
-<center>
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr valign="top">
-						<td align="left" width="615" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-						<td align="right" width="120" class="navback">	
-							<div style="padding-top: 3px;">
-							<table width="120" border="0" cellpadding="0" cellspacing="0">
-								<tr valign="top">
-									<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-									<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-									<td><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></td>
-									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-								</tr>
-							</table>
-							</div>
-						</td>
-					</tr>  			
-				</table>
-			</td>
-		</tr>	
-	</table>
-	{MONTH_LARGE|+0}
-	<table width="735" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<br />
-	{CALENDAR_NAV}
-	<!-- switch showbottom on -->
-	<br />
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle" bgcolor="white">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
-						<td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td>
-						<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
-					</tr>
-				</table>
-			</td>
-		</tr>	
-		<tr>
-			<td>
-				<table width="100%" cellspacing="1" cellpadding="4" border="0">
-					<!-- loop showbottomevents_odd on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td>
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_odd off -->
-					<!-- loop showbottomevents_even on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td bgcolor="#EEEEEE">
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_even off -->
-				</table>
-			</td>
-		</tr>
-	</table>
-	<table width="737" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<!-- switch showbottom off -->
-</center>
-{FOOTER}
diff --git a/templates/green/month_large.tpl b/templates/green/month_large.tpl
deleted file mode 100644
index ca3d3d3..0000000
--- a/templates/green/month_large.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<table width="735" border="0" cellspacing="1" cellpadding="2" class="monthback">
-	<tr>
-		<!-- loop weekday on -->
-		<td valign="top" width="105" height="12" class="dateback">
-			<center class="V9BOLD">{LOOP_WEEKDAY}</center>
-		</td>
-		<!-- loop weekday off -->
-	</tr>
-	<!-- loop monthweeks on -->
-	<tr>
-		<!-- loop monthdays on -->
-		<!-- switch notthismonth on -->
-		<td class="monthoff">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch notthismonth off -->
-		<!-- switch istoday on -->
-		<td class="monthon">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch istoday off -->
-		<!-- switch ismonth on -->
-		<td class="monthreg">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch ismonth off -->
-		<!-- loop monthdays off -->
-	</tr>
-	<!-- loop monthweeks off -->
-</table>
diff --git a/templates/green/month_medium.tpl b/templates/green/month_medium.tpl
deleted file mode 100644
index 96e8e6b..0000000
--- a/templates/green/month_medium.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder">
-	<tr>
-		<td align="center" class="medtitle">{MONTH_TITLE}</td>
-	</tr>
-	<tr>
-		<td>
-			<table border="0" width="210" cellspacing="1" cellpadding="0" class="yearmonth">
-				<tr>
-					<!-- loop weekday on -->
-					<td class="yearweek">{LOOP_WEEKDAY}</td>
-					<!-- loop weekday off -->
-				</tr>
-				<!-- loop monthweeks on -->
-				<tr>
-					<!-- loop monthdays on -->
-					<!-- switch notthismonth on -->
-					<td class="yearoff">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-					</td>
-					<!-- switch notthismonth off -->
-					<!-- switch istoday on -->
-					<td class="yearon">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch istoday off -->
-					<!-- switch ismonth on -->
-					<td class="yearreg">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch ismonth off -->
-					<!-- loop monthdays off -->
-				</tr>
-				<!-- loop monthweeks off -->	
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/green/sidebar.tpl b/templates/green/sidebar.tpl
deleted file mode 100644
index 8a96ae6..0000000
--- a/templates/green/sidebar.tpl
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- switch show_user_login on -->
-<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-<input type="hidden" name="action" value="login" />
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-	</tr>
-	<!-- switch invalid_login on -->
-	<tr>
-		<td colspan="2" bgcolor="#FFFFFF" align="left">
-			<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-				<font color="red">{L_INVALID_LOGIN}</font>
-			</div>
-		</td>
-	</tr>
-	<!-- switch invalid_login off -->
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-	</tr>
-</table>
-</form>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-<!-- switch show_user_login off -->
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
-		<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
-		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
-	</tr>
-	<tr>
-		<td colspan="3" bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<b>{L_LEGEND}:</b><br />
-				{LEGEND}
-				<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-				<!-- switch allow_preferences on -->
-				<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-				<!-- switch allow_preferences off -->
-				<!-- switch display_download on -->
-				<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-				<!-- switch display_download off -->
-				<!-- switch is_logged_in on -->
-				<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-				<!-- switch is_logged_in off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-
-				</form>
-				<!-- switch show_search on -->
-				{SEARCH_BOX}
-				<!-- switch show_search off -->
-				<!-- switch show_goto on -->
-				<form style="margin-bottom:0;" action="day.php" method="get">
-					<input type="hidden" name="cal" value="{URL_CAL}">
-					<input type="text" style="width:160px; font-size:10px" name="jumpto_day">
-					<input type="submit" value="Go"/>
-				</form>
-				<!-- switch show_goto off -->
-				<hr />
-				<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-					<input type="hidden" name="getdate" value="{GETDATE}"/>
-					<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-					<input type="submit" value="Go"/>
-				</form>
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<!-- switch t_allday on -->
-				{T_ALLDAY}<br />
-				<!-- switch t_allday off -->
-				<!-- switch t_event on -->
-				&bull; {T_EVENT}<br />
-				<!-- switch t_event off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events off -->
-
-<!-- switch vtodo on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<table cellpadding="0" cellspacing="0" border="0">
-					<!-- switch show_completed on -->
-					<tr>
-						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td><s>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></s></td>
-					</tr>
-					<!-- switch show_completed off -->
-					<!-- switch show_important on -->
-					<tr>
-						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_important off -->
-					<!-- switch show_normal on -->
-					<tr>
-						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_normal off -->
-				</table>
-			</div>
-		</td>
-	</tr>			
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-
-<!-- switch vtodo off -->
-
-{MONTH_SMALL|-1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+0}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
diff --git a/templates/green/year.tpl b/templates/green/year.tpl
deleted file mode 100644
index adb9eb4..0000000
--- a/templates/green/year.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-{HEADER}
-<center>
-	<table width="770" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td width="676">
-				<table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder">
-					<tr>
-						<td align="center" valign="middle" bgcolor="white">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td align="left" width="120" class="navback">
-										&nbsp;
-									</td>
-									<td class="navback">
-										<table width="100%" border="0" cellspacing="0" cellpadding="0">
-											<tr>
-												<td align="right" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={PREV_YEAR}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a>
-												</td>
-												<td align="center" width="10%" class="title" nowrap="nowrap" valign="middle">
-													<h1>{THIS_YEAR}</h1>
-												</td>
-												<td align="left" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={NEXT_YEAR}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="[Next Year]" border="0" align="left" /></a>
-												</td>
-											</tr>
-										</table>
-									</td>
-									<td align="right" width="120" class="navback">
-										<table width="120" border="0" cellpadding="0" cellspacing="0">
-											<tr valign="top">
-												<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-												<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-												<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<br />
-				<table border="0" width="670" cellspacing="0" cellpadding="0">
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|01}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|02}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|03}
-						</td>
-						<td width="20" rowspan='8'>
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|04}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|05}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|06}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|07}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|08}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|09}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|10}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|11}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|12}
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td valign="top">
-				{SIDEBAR}
-			</td>
-		</tr>
-	</table>
-</center>
-{FOOTER}
diff --git a/templates/grey/calendar_nav.tpl b/templates/grey/calendar_nav.tpl
deleted file mode 100644
index a48cfbe..0000000
--- a/templates/grey/calendar_nav.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-<table border="0" width="737" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="1%" valign="top" align="right">
-			{MONTH_SMALL|-1}
-			<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-		<td width="98%" valign="top" align="center">
-			<table border="0" width="330" cellspacing="0" cellpadding="0">
-				<tr>
-					<td width="160" valign="top">
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{L_JUMP}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding: 5px;">
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-										<input type="hidden" name="cpath" value="{CPATH}"/>
-
-										</form>
-										<!-- switch show_search on -->
-										{SEARCH_BOX}
-										<!-- switch show_search off -->
-										<!-- switch show_goto on -->
-										<form style="margin-bottom:0;" action="day.php" method="get"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<input type="hidden" name="cal" value="{URL_CAL}"/>
-											<input type="text" style="width:160px; font-size:10px" name="jumpto_day"/>
-											<input type="submit" value="Go"/>
-										</form>
-										<!-- switch show_goto off -->
-										<hr />
-										<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<input type="hidden" name="getdate" value="{GETDATE}"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-											<input type="submit" value="Go"/>
-										</form>
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-					<td>
-						<img src="images/spacer.gif" width="20" height="1" alt=" " />
-					</td>
-					<td width="160" valign="top">
-					<!-- switch show_user_login on -->
-					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-					<input type="hidden" name="action" value="login" />
-					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-						<tr>
-							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-						</tr>
-						<!-- switch invalid_login on -->
-						<tr>
-							<td colspan="2" bgcolor="#FFFFFF" align="left">
-								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-									<font color="red">{L_INVALID_LOGIN}</font>
-								</div>
-							</td>
-						</tr>
-						<!-- switch invalid_login off -->
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-						</tr>
-					</table>
-					</form>
-					<table width="100%" border="0" cellpadding="0" cellspacing="0">
-						<tr>
-							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-						</tr>
-					</table>
-					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-					<!-- switch show_user_login off -->
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding-left: 5px;">
-										<b>{L_LEGEND}:</b><br />
-										{LEGEND}
-										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-										<!-- switch allow_preferences on -->
-										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-										<!-- switch allow_preferences off -->
-										<!-- switch display_download on -->
-										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-										<!-- switch display_download off -->
-										<!-- switch is_logged_in on -->
-										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-										<!-- switch is_logged_in off -->
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td width="1%" valign="top" align="left">
-			{MONTH_SMALL|+1}
-			<table width="170" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/grey/day.tpl b/templates/grey/day.tpl
deleted file mode 100644
index c66d40f..0000000
--- a/templates/grey/day.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{HEADER}
-<center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="520" valign="top">
-			<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
-				<tr>
-					<td align="center" valign="middle">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr valign="top">
-								<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-								<td align="right" width="120" class="navback">	
-									<div style="padding-top: 3px;">
-									<table width="120" border="0" cellpadding="0" cellspacing="0">
-										<tr valign="top">
-											<td><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></td>
-											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-										</tr>
-									</table>
-									</div>
-								</td>
-							</tr>
-							<tr>	
-								<td colspan="2">
-									<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tfixed">
-										<tr>
-											<td align="left" valign="top" width="20" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={PREV_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}">&laquo;</a></span>
-											</td>
-											<!-- loop daysofweek on -->
-											<td width="14%" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
-												<span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></span>
-											</td>
-											<!-- loop daysofweek off -->
-											<td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={NEXT_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}">&raquo;</a></span>
-											</td>
-										</tr>	
-									</table>
-								</td>
-							</tr>      			
-						</table>
-					</td>
-				</tr>
-				<tr id="allday">
-					<td>
-						<!-- loop allday on -->
-						<div class="alldaybg_{CALNO}">
-							{ALLDAY}
-						</div>
-						<!-- loop allday off -->
-					</td>
-				</tr>
-      			<tr>
-					<td align="center" valign="top" colspan="3">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<!-- loop row on -->
-							<tr>
-								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<!-- loop row off -->
-							<!-- loop event on -->
-							<div class="eventfont">
-								<div class="eventbg_{EVENT_CALNO}">{CONFIRMED}<b>{EVENT_START}</b> - {EVENT_END}</div>
-								<div class="padd">{EVENT}</div>
-							</div>
-							<!-- loop event off -->
-						</table>
-					</td>
-				</tr>
-        	</table>
-        	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-    	</td>
-		<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" " /></td>
-		<td width="170" valign="top">
-			{SIDEBAR}
-		</td>
-	</tr>
-</table>
-</center>
-{FOOTER}
-
diff --git a/templates/grey/default.css b/templates/grey/default.css
index af09e5c..4c77b7f 100644
--- a/templates/grey/default.css
+++ b/templates/grey/default.css
@@ -31,6 +31,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .eventbg_5	 	{ background-color: #705f60; padding: 2px;}
 .eventbg_6	 	{ background-color: #608060; padding: 2px;}
 .eventbg_7	 	{ background-color: #a0a090; padding: 2px;}
+#allday a		{ font-size: 9px; color: #fff; font-weight: 900; text-decoration:none;}
+#allday a:hover	{ text-decoration:underline;}
 
 
 .eventbg2_1	 		{ background-color: #505050; border: 1px solid #303030; }
@@ -47,6 +49,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
 .title h1 		{ font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;}
 
+/* Main class used for all page wrapper tables */
+.maintable		{ width: 990px; }
+
 /* Month View */
 
 .monthback		{ background-color: #A1A5A9; }
@@ -64,6 +69,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .yearon			{ background-color: #F2F9FF; height: 30px; width: 30px; text-align: right;  vertical-align: top; font-size: 9px; }
 .yearmonth		{ background-color: #ccc; }
 .yearweek		{ background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; }
+.yearleft		{ padding-right: 5px; padding-top: 5px; padding-bottom: 5px; }
+.yearmiddle		{ padding: 5px; }
+.yearright		{ padding-left: 5px; padding-top: 5px; padding-bottom: 5px; }
 
 
 /* older styles */
@@ -138,3 +146,13 @@ body			{ background-image: url(images/background.gif); }
 .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
 .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
 .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }
+
+
+/* Make printed pages look nice */
+@media print {
+	.sidebar		{ width: 0px; display: none; }
+	.footer			{ display: none; }
+	.monthback		{ border-spacing: 0; }
+	.monthback td	{ border: 1px solid #606060; }
+	.calborder		{ border: 1px solid #606060; }
+}
diff --git a/templates/grey/header.tpl b/templates/grey/header.tpl
index d8e07dc..cd2a631 100644
--- a/templates/grey/header.tpl
+++ b/templates/grey/header.tpl
@@ -4,7 +4,9 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
 	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
-  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<script id="nicetitle" type="text/javascript" src="{DEFAULT_PATH}/nicetitle/nicetitle.js"></script>
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/nicetitle/nicetitle.css" />
 	<!-- switch rss_available on -->
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
diff --git a/templates/grey/month.tpl b/templates/grey/month.tpl
deleted file mode 100644
index 7dcff53..0000000
--- a/templates/grey/month.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-{HEADER}
-<center>
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr valign="top">
-						<td align="left" width="615" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-						<td align="right" width="120" class="navback">	
-							<div style="padding-top: 3px;">
-							<table width="120" border="0" cellpadding="0" cellspacing="0">
-								<tr valign="top">
-									<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-									<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-									<td><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></td>
-									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-								</tr>
-							</table>
-							</div>
-						</td>
-					</tr>  			
-				</table>
-			</td>
-		</tr>	
-	</table>
-	{MONTH_LARGE|+0}
-	<table width="735" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<br />
-	{CALENDAR_NAV}
-	<!-- switch showbottom on -->
-	<br />
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle" bgcolor="white">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
-						<td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td>
-						<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
-					</tr>
-				</table>
-			</td>
-		</tr>	
-		<tr>
-			<td>
-				<table width="100%" cellspacing="1" cellpadding="4" border="0">
-					<!-- loop showbottomevents_odd on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td>
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_odd off -->
-					<!-- loop showbottomevents_even on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td bgcolor="#EEEEEE">
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_even off -->
-				</table>
-			</td>
-		</tr>
-	</table>
-	<table width="737" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<!-- switch showbottom off -->
-</center>
-{FOOTER}
diff --git a/templates/grey/month_large.tpl b/templates/grey/month_large.tpl
deleted file mode 100644
index ca3d3d3..0000000
--- a/templates/grey/month_large.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<table width="735" border="0" cellspacing="1" cellpadding="2" class="monthback">
-	<tr>
-		<!-- loop weekday on -->
-		<td valign="top" width="105" height="12" class="dateback">
-			<center class="V9BOLD">{LOOP_WEEKDAY}</center>
-		</td>
-		<!-- loop weekday off -->
-	</tr>
-	<!-- loop monthweeks on -->
-	<tr>
-		<!-- loop monthdays on -->
-		<!-- switch notthismonth on -->
-		<td class="monthoff">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch notthismonth off -->
-		<!-- switch istoday on -->
-		<td class="monthon">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch istoday off -->
-		<!-- switch ismonth on -->
-		<td class="monthreg">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch ismonth off -->
-		<!-- loop monthdays off -->
-	</tr>
-	<!-- loop monthweeks off -->
-</table>
diff --git a/templates/grey/month_medium.tpl b/templates/grey/month_medium.tpl
deleted file mode 100644
index 96e8e6b..0000000
--- a/templates/grey/month_medium.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder">
-	<tr>
-		<td align="center" class="medtitle">{MONTH_TITLE}</td>
-	</tr>
-	<tr>
-		<td>
-			<table border="0" width="210" cellspacing="1" cellpadding="0" class="yearmonth">
-				<tr>
-					<!-- loop weekday on -->
-					<td class="yearweek">{LOOP_WEEKDAY}</td>
-					<!-- loop weekday off -->
-				</tr>
-				<!-- loop monthweeks on -->
-				<tr>
-					<!-- loop monthdays on -->
-					<!-- switch notthismonth on -->
-					<td class="yearoff">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-					</td>
-					<!-- switch notthismonth off -->
-					<!-- switch istoday on -->
-					<td class="yearon">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch istoday off -->
-					<!-- switch ismonth on -->
-					<td class="yearreg">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch ismonth off -->
-					<!-- loop monthdays off -->
-				</tr>
-				<!-- loop monthweeks off -->	
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/grey/sidebar.tpl b/templates/grey/sidebar.tpl
deleted file mode 100644
index 8a96ae6..0000000
--- a/templates/grey/sidebar.tpl
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- switch show_user_login on -->
-<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-<input type="hidden" name="action" value="login" />
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-	</tr>
-	<!-- switch invalid_login on -->
-	<tr>
-		<td colspan="2" bgcolor="#FFFFFF" align="left">
-			<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-				<font color="red">{L_INVALID_LOGIN}</font>
-			</div>
-		</td>
-	</tr>
-	<!-- switch invalid_login off -->
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-	</tr>
-</table>
-</form>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-<!-- switch show_user_login off -->
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
-		<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
-		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
-	</tr>
-	<tr>
-		<td colspan="3" bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<b>{L_LEGEND}:</b><br />
-				{LEGEND}
-				<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-				<!-- switch allow_preferences on -->
-				<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-				<!-- switch allow_preferences off -->
-				<!-- switch display_download on -->
-				<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-				<!-- switch display_download off -->
-				<!-- switch is_logged_in on -->
-				<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-				<!-- switch is_logged_in off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-
-				</form>
-				<!-- switch show_search on -->
-				{SEARCH_BOX}
-				<!-- switch show_search off -->
-				<!-- switch show_goto on -->
-				<form style="margin-bottom:0;" action="day.php" method="get">
-					<input type="hidden" name="cal" value="{URL_CAL}">
-					<input type="text" style="width:160px; font-size:10px" name="jumpto_day">
-					<input type="submit" value="Go"/>
-				</form>
-				<!-- switch show_goto off -->
-				<hr />
-				<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-					<input type="hidden" name="getdate" value="{GETDATE}"/>
-					<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-					<input type="submit" value="Go"/>
-				</form>
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<!-- switch t_allday on -->
-				{T_ALLDAY}<br />
-				<!-- switch t_allday off -->
-				<!-- switch t_event on -->
-				&bull; {T_EVENT}<br />
-				<!-- switch t_event off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events off -->
-
-<!-- switch vtodo on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<table cellpadding="0" cellspacing="0" border="0">
-					<!-- switch show_completed on -->
-					<tr>
-						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td><s>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></s></td>
-					</tr>
-					<!-- switch show_completed off -->
-					<!-- switch show_important on -->
-					<tr>
-						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_important off -->
-					<!-- switch show_normal on -->
-					<tr>
-						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_normal off -->
-				</table>
-			</div>
-		</td>
-	</tr>			
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-
-<!-- switch vtodo off -->
-
-{MONTH_SMALL|-1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+0}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
diff --git a/templates/grey/year.tpl b/templates/grey/year.tpl
deleted file mode 100644
index adb9eb4..0000000
--- a/templates/grey/year.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-{HEADER}
-<center>
-	<table width="770" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td width="676">
-				<table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder">
-					<tr>
-						<td align="center" valign="middle" bgcolor="white">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td align="left" width="120" class="navback">
-										&nbsp;
-									</td>
-									<td class="navback">
-										<table width="100%" border="0" cellspacing="0" cellpadding="0">
-											<tr>
-												<td align="right" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={PREV_YEAR}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a>
-												</td>
-												<td align="center" width="10%" class="title" nowrap="nowrap" valign="middle">
-													<h1>{THIS_YEAR}</h1>
-												</td>
-												<td align="left" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={NEXT_YEAR}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="[Next Year]" border="0" align="left" /></a>
-												</td>
-											</tr>
-										</table>
-									</td>
-									<td align="right" width="120" class="navback">
-										<table width="120" border="0" cellpadding="0" cellspacing="0">
-											<tr valign="top">
-												<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-												<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-												<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<br />
-				<table border="0" width="670" cellspacing="0" cellpadding="0">
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|01}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|02}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|03}
-						</td>
-						<td width="20" rowspan='8'>
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|04}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|05}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|06}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|07}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|08}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|09}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|10}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|11}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|12}
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td valign="top">
-				{SIDEBAR}
-			</td>
-		</tr>
-	</table>
-</center>
-{FOOTER}
diff --git a/templates/red/calendar_nav.tpl b/templates/red/calendar_nav.tpl
deleted file mode 100644
index a48cfbe..0000000
--- a/templates/red/calendar_nav.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-<table border="0" width="737" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="1%" valign="top" align="right">
-			{MONTH_SMALL|-1}
-			<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-		<td width="98%" valign="top" align="center">
-			<table border="0" width="330" cellspacing="0" cellpadding="0">
-				<tr>
-					<td width="160" valign="top">
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{L_JUMP}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding: 5px;">
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-										<input type="hidden" name="cpath" value="{CPATH}"/>
-
-										</form>
-										<!-- switch show_search on -->
-										{SEARCH_BOX}
-										<!-- switch show_search off -->
-										<!-- switch show_goto on -->
-										<form style="margin-bottom:0;" action="day.php" method="get"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<input type="hidden" name="cal" value="{URL_CAL}"/>
-											<input type="text" style="width:160px; font-size:10px" name="jumpto_day"/>
-											<input type="submit" value="Go"/>
-										</form>
-										<!-- switch show_goto off -->
-										<hr />
-										<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<input type="hidden" name="getdate" value="{GETDATE}"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-											<input type="submit" value="Go"/>
-										</form>
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-					<td>
-						<img src="images/spacer.gif" width="20" height="1" alt=" " />
-					</td>
-					<td width="160" valign="top">
-					<!-- switch show_user_login on -->
-					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-					<input type="hidden" name="action" value="login" />
-					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-						<tr>
-							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-						</tr>
-						<!-- switch invalid_login on -->
-						<tr>
-							<td colspan="2" bgcolor="#FFFFFF" align="left">
-								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-									<font color="red">{L_INVALID_LOGIN}</font>
-								</div>
-							</td>
-						</tr>
-						<!-- switch invalid_login off -->
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-						</tr>
-					</table>
-					</form>
-					<table width="100%" border="0" cellpadding="0" cellspacing="0">
-						<tr>
-							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-						</tr>
-					</table>
-					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-					<!-- switch show_user_login off -->
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding-left: 5px;">
-										<b>{L_LEGEND}:</b><br />
-										{LEGEND}
-										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-										<!-- switch allow_preferences on -->
-										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-										<!-- switch allow_preferences off -->
-										<!-- switch display_download on -->
-										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-										<!-- switch display_download off -->
-										<!-- switch is_logged_in on -->
-										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-										<!-- switch is_logged_in off -->
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td width="1%" valign="top" align="left">
-			{MONTH_SMALL|+1}
-			<table width="170" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/red/day.tpl b/templates/red/day.tpl
deleted file mode 100644
index c66d40f..0000000
--- a/templates/red/day.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{HEADER}
-<center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="520" valign="top">
-			<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
-				<tr>
-					<td align="center" valign="middle">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr valign="top">
-								<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-								<td align="right" width="120" class="navback">	
-									<div style="padding-top: 3px;">
-									<table width="120" border="0" cellpadding="0" cellspacing="0">
-										<tr valign="top">
-											<td><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></td>
-											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-										</tr>
-									</table>
-									</div>
-								</td>
-							</tr>
-							<tr>	
-								<td colspan="2">
-									<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tfixed">
-										<tr>
-											<td align="left" valign="top" width="20" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={PREV_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}">&laquo;</a></span>
-											</td>
-											<!-- loop daysofweek on -->
-											<td width="14%" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
-												<span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></span>
-											</td>
-											<!-- loop daysofweek off -->
-											<td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={NEXT_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}">&raquo;</a></span>
-											</td>
-										</tr>	
-									</table>
-								</td>
-							</tr>      			
-						</table>
-					</td>
-				</tr>
-				<tr id="allday">
-					<td>
-						<!-- loop allday on -->
-						<div class="alldaybg_{CALNO}">
-							{ALLDAY}
-						</div>
-						<!-- loop allday off -->
-					</td>
-				</tr>
-      			<tr>
-					<td align="center" valign="top" colspan="3">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<!-- loop row on -->
-							<tr>
-								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<!-- loop row off -->
-							<!-- loop event on -->
-							<div class="eventfont">
-								<div class="eventbg_{EVENT_CALNO}">{CONFIRMED}<b>{EVENT_START}</b> - {EVENT_END}</div>
-								<div class="padd">{EVENT}</div>
-							</div>
-							<!-- loop event off -->
-						</table>
-					</td>
-				</tr>
-        	</table>
-        	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-    	</td>
-		<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" " /></td>
-		<td width="170" valign="top">
-			{SIDEBAR}
-		</td>
-	</tr>
-</table>
-</center>
-{FOOTER}
-
diff --git a/templates/red/default.css b/templates/red/default.css
index a7af46d..532eb71 100644
--- a/templates/red/default.css
+++ b/templates/red/default.css
@@ -31,6 +31,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .eventbg_5	 	{ background-color: #bc4700; padding: 2px;}
 .eventbg_6	 	{ background-color: #df2c6c; padding: 2px;}
 .eventbg_7	 	{ background-color: #ac4848; padding: 2px;}
+#allday a		{ font-size: 9px; color: #fff; font-weight: 900; text-decoration:none;}
+#allday a:hover	{ text-decoration:underline;}
 
 
 .eventbg2_1	 		{ background-color: #c03030; border: 1px solid #a01010; }
@@ -46,6 +48,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
 .title h1 		{ font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;}
 
+/* Main class used for all page wrapper tables */
+.maintable		{ width: 990px; }
+
 /* Month View */
 
 .monthback		{ background-color: #A1A5A9; }
@@ -63,6 +68,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .yearon			{ background-color: #F2F9FF; height: 30px; width: 30px; text-align: right;  vertical-align: top; font-size: 9px; }
 .yearmonth		{ background-color: #ccc; }
 .yearweek		{ background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; }
+.yearleft		{ padding-right: 5px; padding-top: 5px; padding-bottom: 5px; }
+.yearmiddle		{ padding: 5px; }
+.yearright		{ padding-left: 5px; padding-top: 5px; padding-bottom: 5px; }
 
 
 /* older styles */
@@ -137,3 +145,13 @@ body			{ background-color: #ffd0e0; }
 .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
 .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
 .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }
+
+
+/* Make printed pages look nice */
+@media print {
+	.sidebar		{ width: 0px; display: none; }
+	.footer			{ display: none; }
+	.monthback		{ border-spacing: 0; }
+	.monthback td	{ border: 1px solid #606060; }
+	.calborder		{ border: 1px solid #606060; }
+}
diff --git a/templates/red/header.tpl b/templates/red/header.tpl
index d8e07dc..cd2a631 100644
--- a/templates/red/header.tpl
+++ b/templates/red/header.tpl
@@ -4,7 +4,9 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
 	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
-  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<script id="nicetitle" type="text/javascript" src="{DEFAULT_PATH}/nicetitle/nicetitle.js"></script>
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/nicetitle/nicetitle.css" />
 	<!-- switch rss_available on -->
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
diff --git a/templates/red/month.tpl b/templates/red/month.tpl
deleted file mode 100644
index 7dcff53..0000000
--- a/templates/red/month.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-{HEADER}
-<center>
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr valign="top">
-						<td align="left" width="615" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-						<td align="right" width="120" class="navback">	
-							<div style="padding-top: 3px;">
-							<table width="120" border="0" cellpadding="0" cellspacing="0">
-								<tr valign="top">
-									<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-									<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-									<td><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></td>
-									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-								</tr>
-							</table>
-							</div>
-						</td>
-					</tr>  			
-				</table>
-			</td>
-		</tr>	
-	</table>
-	{MONTH_LARGE|+0}
-	<table width="735" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<br />
-	{CALENDAR_NAV}
-	<!-- switch showbottom on -->
-	<br />
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle" bgcolor="white">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
-						<td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td>
-						<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
-					</tr>
-				</table>
-			</td>
-		</tr>	
-		<tr>
-			<td>
-				<table width="100%" cellspacing="1" cellpadding="4" border="0">
-					<!-- loop showbottomevents_odd on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td>
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_odd off -->
-					<!-- loop showbottomevents_even on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td bgcolor="#EEEEEE">
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_even off -->
-				</table>
-			</td>
-		</tr>
-	</table>
-	<table width="737" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<!-- switch showbottom off -->
-</center>
-{FOOTER}
diff --git a/templates/red/month_large.tpl b/templates/red/month_large.tpl
deleted file mode 100644
index ca3d3d3..0000000
--- a/templates/red/month_large.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<table width="735" border="0" cellspacing="1" cellpadding="2" class="monthback">
-	<tr>
-		<!-- loop weekday on -->
-		<td valign="top" width="105" height="12" class="dateback">
-			<center class="V9BOLD">{LOOP_WEEKDAY}</center>
-		</td>
-		<!-- loop weekday off -->
-	</tr>
-	<!-- loop monthweeks on -->
-	<tr>
-		<!-- loop monthdays on -->
-		<!-- switch notthismonth on -->
-		<td class="monthoff">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch notthismonth off -->
-		<!-- switch istoday on -->
-		<td class="monthon">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch istoday off -->
-		<!-- switch ismonth on -->
-		<td class="monthreg">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch ismonth off -->
-		<!-- loop monthdays off -->
-	</tr>
-	<!-- loop monthweeks off -->
-</table>
diff --git a/templates/red/month_medium.tpl b/templates/red/month_medium.tpl
deleted file mode 100644
index 96e8e6b..0000000
--- a/templates/red/month_medium.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder">
-	<tr>
-		<td align="center" class="medtitle">{MONTH_TITLE}</td>
-	</tr>
-	<tr>
-		<td>
-			<table border="0" width="210" cellspacing="1" cellpadding="0" class="yearmonth">
-				<tr>
-					<!-- loop weekday on -->
-					<td class="yearweek">{LOOP_WEEKDAY}</td>
-					<!-- loop weekday off -->
-				</tr>
-				<!-- loop monthweeks on -->
-				<tr>
-					<!-- loop monthdays on -->
-					<!-- switch notthismonth on -->
-					<td class="yearoff">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-					</td>
-					<!-- switch notthismonth off -->
-					<!-- switch istoday on -->
-					<td class="yearon">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch istoday off -->
-					<!-- switch ismonth on -->
-					<td class="yearreg">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch ismonth off -->
-					<!-- loop monthdays off -->
-				</tr>
-				<!-- loop monthweeks off -->	
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/red/sidebar.tpl b/templates/red/sidebar.tpl
deleted file mode 100644
index 8a96ae6..0000000
--- a/templates/red/sidebar.tpl
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- switch show_user_login on -->
-<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-<input type="hidden" name="action" value="login" />
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-	</tr>
-	<!-- switch invalid_login on -->
-	<tr>
-		<td colspan="2" bgcolor="#FFFFFF" align="left">
-			<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-				<font color="red">{L_INVALID_LOGIN}</font>
-			</div>
-		</td>
-	</tr>
-	<!-- switch invalid_login off -->
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-	</tr>
-</table>
-</form>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-<!-- switch show_user_login off -->
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
-		<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
-		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
-	</tr>
-	<tr>
-		<td colspan="3" bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<b>{L_LEGEND}:</b><br />
-				{LEGEND}
-				<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-				<!-- switch allow_preferences on -->
-				<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-				<!-- switch allow_preferences off -->
-				<!-- switch display_download on -->
-				<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-				<!-- switch display_download off -->
-				<!-- switch is_logged_in on -->
-				<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-				<!-- switch is_logged_in off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-
-				</form>
-				<!-- switch show_search on -->
-				{SEARCH_BOX}
-				<!-- switch show_search off -->
-				<!-- switch show_goto on -->
-				<form style="margin-bottom:0;" action="day.php" method="get">
-					<input type="hidden" name="cal" value="{URL_CAL}">
-					<input type="text" style="width:160px; font-size:10px" name="jumpto_day">
-					<input type="submit" value="Go"/>
-				</form>
-				<!-- switch show_goto off -->
-				<hr />
-				<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-					<input type="hidden" name="getdate" value="{GETDATE}"/>
-					<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-					<input type="submit" value="Go"/>
-				</form>
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<!-- switch t_allday on -->
-				{T_ALLDAY}<br />
-				<!-- switch t_allday off -->
-				<!-- switch t_event on -->
-				&bull; {T_EVENT}<br />
-				<!-- switch t_event off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events off -->
-
-<!-- switch vtodo on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<table cellpadding="0" cellspacing="0" border="0">
-					<!-- switch show_completed on -->
-					<tr>
-						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td><s>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></s></td>
-					</tr>
-					<!-- switch show_completed off -->
-					<!-- switch show_important on -->
-					<tr>
-						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_important off -->
-					<!-- switch show_normal on -->
-					<tr>
-						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_normal off -->
-				</table>
-			</div>
-		</td>
-	</tr>			
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-
-<!-- switch vtodo off -->
-
-{MONTH_SMALL|-1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+0}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
diff --git a/templates/red/sidebar_year.tpl b/templates/red/sidebar_year.tpl
deleted file mode 100644
index bdbb2d3..0000000
--- a/templates/red/sidebar_year.tpl
+++ /dev/null
@@ -1,196 +0,0 @@
-<!-- switch show_user_login on -->
-<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-<input type="hidden" name="action" value="login" />
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-	</tr>
-	<!-- switch invalid_login on -->
-	<tr>
-		<td colspan="2" bgcolor="#FFFFFF" align="left">
-			<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-				<font color="red">{L_INVALID_LOGIN}</font>
-			</div>
-		</td>
-	</tr>
-	<!-- switch invalid_login off -->
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-	</tr>
-</table>
-</form>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-<!-- switch show_user_login off -->
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
-		<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
-		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
-	</tr>
-	<tr>
-		<td colspan="3" bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<b>{L_LEGEND}:</b><br />
-				{LEGEND}
-				<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-				<!-- switch allow_preferences on -->
-				<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-				<!-- switch allow_preferences off -->
-				<!-- switch display_download on -->
-				<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-				<!-- switch display_download off -->
-				<!-- switch is_logged_in on -->
-				<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-				<!-- switch is_logged_in off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-
-				</form>
-				<!-- switch show_search on -->
-				{SEARCH_BOX}
-				<!-- switch show_search off -->
-				<!-- switch show_goto on -->
-				<form style="margin-bottom:0;" action="day.php" method="get">
-					<input type="hidden" name="cal" value="{URL_CAL}">
-					<input type="text" style="width:160px; font-size:10px" name="jumpto_day">
-					<input type="submit" value="Go"/>
-				</form>
-				<!-- switch show_goto off -->
-				<hr />
-				<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-					<input type="hidden" name="getdate" value="{GETDATE}"/>
-					<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-					<input type="submit" value="Go"/>
-				</form>
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<!-- switch t_allday on -->
-				{T_ALLDAY}<br />
-				<!-- switch t_allday off -->
-				<!-- switch t_event on -->
-				&bull; {T_EVENT}<br />
-				<!-- switch t_event off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events off -->
-
-<!-- switch vtodo on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<table cellpadding="0" cellspacing="0" border="0">
-					<!-- switch show_completed on -->
-					<tr>
-						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td><s>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></s></td>
-					</tr>
-					<!-- switch show_completed off -->
-					<!-- switch show_important on -->
-					<tr>
-						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_important off -->
-					<!-- switch show_normal on -->
-					<tr>
-						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_normal off -->
-				</table>
-			</div>
-		</td>
-	</tr>			
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-
-<!-- switch vtodo off -->
diff --git a/templates/red/year.tpl b/templates/red/year.tpl
deleted file mode 100644
index adb9eb4..0000000
--- a/templates/red/year.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-{HEADER}
-<center>
-	<table width="770" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td width="676">
-				<table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder">
-					<tr>
-						<td align="center" valign="middle" bgcolor="white">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td align="left" width="120" class="navback">
-										&nbsp;
-									</td>
-									<td class="navback">
-										<table width="100%" border="0" cellspacing="0" cellpadding="0">
-											<tr>
-												<td align="right" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={PREV_YEAR}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a>
-												</td>
-												<td align="center" width="10%" class="title" nowrap="nowrap" valign="middle">
-													<h1>{THIS_YEAR}</h1>
-												</td>
-												<td align="left" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={NEXT_YEAR}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="[Next Year]" border="0" align="left" /></a>
-												</td>
-											</tr>
-										</table>
-									</td>
-									<td align="right" width="120" class="navback">
-										<table width="120" border="0" cellpadding="0" cellspacing="0">
-											<tr valign="top">
-												<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-												<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-												<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<br />
-				<table border="0" width="670" cellspacing="0" cellpadding="0">
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|01}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|02}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|03}
-						</td>
-						<td width="20" rowspan='8'>
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|04}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|05}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|06}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|07}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|08}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|09}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|10}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|11}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|12}
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td valign="top">
-				{SIDEBAR}
-			</td>
-		</tr>
-	</table>
-</center>
-{FOOTER}
diff --git a/templates/tan/calendar_nav.tpl b/templates/tan/calendar_nav.tpl
deleted file mode 100644
index a48cfbe..0000000
--- a/templates/tan/calendar_nav.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-<table border="0" width="737" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="1%" valign="top" align="right">
-			{MONTH_SMALL|-1}
-			<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-		<td width="98%" valign="top" align="center">
-			<table border="0" width="330" cellspacing="0" cellpadding="0">
-				<tr>
-					<td width="160" valign="top">
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{L_JUMP}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding: 5px;">
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-										<input type="hidden" name="cpath" value="{CPATH}"/>
-
-										</form>
-										<!-- switch show_search on -->
-										{SEARCH_BOX}
-										<!-- switch show_search off -->
-										<!-- switch show_goto on -->
-										<form style="margin-bottom:0;" action="day.php" method="get"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<input type="hidden" name="cal" value="{URL_CAL}"/>
-											<input type="text" style="width:160px; font-size:10px" name="jumpto_day"/>
-											<input type="submit" value="Go"/>
-										</form>
-										<!-- switch show_goto off -->
-										<hr />
-										<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<input type="hidden" name="getdate" value="{GETDATE}"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-											<input type="submit" value="Go"/>
-										</form>
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-					<td>
-						<img src="images/spacer.gif" width="20" height="1" alt=" " />
-					</td>
-					<td width="160" valign="top">
-					<!-- switch show_user_login on -->
-					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-					<input type="hidden" name="action" value="login" />
-					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-						<tr>
-							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-						</tr>
-						<!-- switch invalid_login on -->
-						<tr>
-							<td colspan="2" bgcolor="#FFFFFF" align="left">
-								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-									<font color="red">{L_INVALID_LOGIN}</font>
-								</div>
-							</td>
-						</tr>
-						<!-- switch invalid_login off -->
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-						</tr>
-					</table>
-					</form>
-					<table width="100%" border="0" cellpadding="0" cellspacing="0">
-						<tr>
-							<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-						</tr>
-					</table>
-					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-					<!-- switch show_user_login off -->
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding-left: 5px;">
-										<b>{L_LEGEND}:</b><br />
-										{LEGEND}
-										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-										<!-- switch allow_preferences on -->
-										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-										<!-- switch allow_preferences off -->
-										<!-- switch display_download on -->
-										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-										<!-- switch display_download off -->
-										<!-- switch is_logged_in on -->
-										<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-										<!-- switch is_logged_in off -->
-									</div>
-								</td>
-							</tr>
-						</table>
-						<table width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-								<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-		<td width="1%" valign="top" align="left">
-			{MONTH_SMALL|+1}
-			<table width="170" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/tan/day.tpl b/templates/tan/day.tpl
deleted file mode 100644
index c66d40f..0000000
--- a/templates/tan/day.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{HEADER}
-<center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="520" valign="top">
-			<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
-				<tr>
-					<td align="center" valign="middle">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr valign="top">
-								<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-								<td align="right" width="120" class="navback">	
-									<div style="padding-top: 3px;">
-									<table width="120" border="0" cellpadding="0" cellspacing="0">
-										<tr valign="top">
-											<td><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></td>
-											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-										</tr>
-									</table>
-									</div>
-								</td>
-							</tr>
-							<tr>	
-								<td colspan="2">
-									<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tfixed">
-										<tr>
-											<td align="left" valign="top" width="20" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={PREV_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}">&laquo;</a></span>
-											</td>
-											<!-- loop daysofweek on -->
-											<td width="14%" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
-												<span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></span>
-											</td>
-											<!-- loop daysofweek off -->
-											<td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={NEXT_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}">&raquo;</a></span>
-											</td>
-										</tr>	
-									</table>
-								</td>
-							</tr>      			
-						</table>
-					</td>
-				</tr>
-				<tr id="allday">
-					<td>
-						<!-- loop allday on -->
-						<div class="alldaybg_{CALNO}">
-							{ALLDAY}
-						</div>
-						<!-- loop allday off -->
-					</td>
-				</tr>
-      			<tr>
-					<td align="center" valign="top" colspan="3">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<!-- loop row on -->
-							<tr>
-								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<!-- loop row off -->
-							<!-- loop event on -->
-							<div class="eventfont">
-								<div class="eventbg_{EVENT_CALNO}">{CONFIRMED}<b>{EVENT_START}</b> - {EVENT_END}</div>
-								<div class="padd">{EVENT}</div>
-							</div>
-							<!-- loop event off -->
-						</table>
-					</td>
-				</tr>
-        	</table>
-        	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-					<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-				</tr>
-			</table>
-    	</td>
-		<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" " /></td>
-		<td width="170" valign="top">
-			{SIDEBAR}
-		</td>
-	</tr>
-</table>
-</center>
-{FOOTER}
-
diff --git a/templates/tan/default.css b/templates/tan/default.css
index 3f5b303..5317b0d 100644
--- a/templates/tan/default.css
+++ b/templates/tan/default.css
@@ -66,6 +66,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }
 .title h1 		{ font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;}
 
+/* Main class used for all page wrapper tables */
+.maintable		{ width: 990px; }
+
 /* Month View */
 
 .monthback		{ background-color: #A1A5A9; }
@@ -83,6 +86,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .yearon			{ background-color: #F2F9FF; height: 30px; width: 30px; text-align: right;  vertical-align: top; font-size: 9px; }
 .yearmonth		{ background-color: #ccc; }
 .yearweek		{ background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; }
+.yearleft		{ padding-right: 5px; padding-top: 5px; padding-bottom: 5px; }
+.yearmiddle		{ padding: 5px; }
+.yearright		{ padding-left: 5px; padding-top: 5px; padding-bottom: 5px; }
 
 
 /* older styles */
@@ -157,3 +163,13 @@ body			{ background-image: url(images/background.gif); }
 .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }
 .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }
 .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }
+
+
+/* Make printed pages look nice */
+@media print {
+	.sidebar		{ width: 0px; display: none; }
+	.footer			{ display: none; }
+	.monthback		{ border-spacing: 0; }
+	.monthback td	{ border: 1px solid #606060; }
+	.calborder		{ border: 1px solid #606060; }
+}
diff --git a/templates/tan/header.tpl b/templates/tan/header.tpl
index d8e07dc..cd2a631 100644
--- a/templates/tan/header.tpl
+++ b/templates/tan/header.tpl
@@ -4,7 +4,9 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
 	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
-  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<script id="nicetitle" type="text/javascript" src="{DEFAULT_PATH}/nicetitle/nicetitle.js"></script>
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/nicetitle/nicetitle.css" />
 	<!-- switch rss_available on -->
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
diff --git a/templates/tan/month.tpl b/templates/tan/month.tpl
deleted file mode 100644
index 7dcff53..0000000
--- a/templates/tan/month.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-{HEADER}
-<center>
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr valign="top">
-						<td align="left" width="615" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-						<td align="right" width="120" class="navback">	
-							<div style="padding-top: 3px;">
-							<table width="120" border="0" cellpadding="0" cellspacing="0">
-								<tr valign="top">
-									<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-									<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-									<td><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></td>
-									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-								</tr>
-							</table>
-							</div>
-						</td>
-					</tr>  			
-				</table>
-			</td>
-		</tr>	
-	</table>
-	{MONTH_LARGE|+0}
-	<table width="735" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<br />
-	{CALENDAR_NAV}
-	<!-- switch showbottom on -->
-	<br />
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle" bgcolor="white">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
-						<td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td>
-						<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
-					</tr>
-				</table>
-			</td>
-		</tr>	
-		<tr>
-			<td>
-				<table width="100%" cellspacing="1" cellpadding="4" border="0">
-					<!-- loop showbottomevents_odd on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td>
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_odd off -->
-					<!-- loop showbottomevents_even on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td bgcolor="#EEEEEE">
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_even off -->
-				</table>
-			</td>
-		</tr>
-	</table>
-	<table width="737" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-			<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-			<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		</tr>
-	</table>
-	<!-- switch showbottom off -->
-</center>
-{FOOTER}
diff --git a/templates/tan/month_large.tpl b/templates/tan/month_large.tpl
deleted file mode 100644
index ca3d3d3..0000000
--- a/templates/tan/month_large.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<table width="735" border="0" cellspacing="1" cellpadding="2" class="monthback">
-	<tr>
-		<!-- loop weekday on -->
-		<td valign="top" width="105" height="12" class="dateback">
-			<center class="V9BOLD">{LOOP_WEEKDAY}</center>
-		</td>
-		<!-- loop weekday off -->
-	</tr>
-	<!-- loop monthweeks on -->
-	<tr>
-		<!-- loop monthdays on -->
-		<!-- switch notthismonth on -->
-		<td class="monthoff">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch notthismonth off -->
-		<!-- switch istoday on -->
-		<td class="monthon">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch istoday off -->
-		<!-- switch ismonth on -->
-		<td class="monthreg">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch ismonth off -->
-		<!-- loop monthdays off -->
-	</tr>
-	<!-- loop monthweeks off -->
-</table>
diff --git a/templates/tan/month_medium.tpl b/templates/tan/month_medium.tpl
deleted file mode 100644
index 96e8e6b..0000000
--- a/templates/tan/month_medium.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder">
-	<tr>
-		<td align="center" class="medtitle">{MONTH_TITLE}</td>
-	</tr>
-	<tr>
-		<td>
-			<table border="0" width="210" cellspacing="1" cellpadding="0" class="yearmonth">
-				<tr>
-					<!-- loop weekday on -->
-					<td class="yearweek">{LOOP_WEEKDAY}</td>
-					<!-- loop weekday off -->
-				</tr>
-				<!-- loop monthweeks on -->
-				<tr>
-					<!-- loop monthdays on -->
-					<!-- switch notthismonth on -->
-					<td class="yearoff">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-					</td>
-					<!-- switch notthismonth off -->
-					<!-- switch istoday on -->
-					<td class="yearon">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch istoday off -->
-					<!-- switch ismonth on -->
-					<td class="yearreg">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch ismonth off -->
-					<!-- loop monthdays off -->
-				</tr>
-				<!-- loop monthweeks off -->	
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/tan/sidebar.tpl b/templates/tan/sidebar.tpl
deleted file mode 100644
index 8a96ae6..0000000
--- a/templates/tan/sidebar.tpl
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- switch show_user_login on -->
-<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-<input type="hidden" name="action" value="login" />
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-	</tr>
-	<!-- switch invalid_login on -->
-	<tr>
-		<td colspan="2" bgcolor="#FFFFFF" align="left">
-			<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-				<font color="red">{L_INVALID_LOGIN}</font>
-			</div>
-		</td>
-	</tr>
-	<!-- switch invalid_login off -->
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-	</tr>
-</table>
-</form>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-<!-- switch show_user_login off -->
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
-		<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
-		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
-	</tr>
-	<tr>
-		<td colspan="3" bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<b>{L_LEGEND}:</b><br />
-				{LEGEND}
-				<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br />
-				<!-- switch allow_preferences on -->
-				<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br />
-				<!-- switch allow_preferences off -->
-				<!-- switch display_download on -->
-				<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br />
-				<!-- switch display_download off -->
-				<!-- switch is_logged_in on -->
-				<a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a>
-				<!-- switch is_logged_in off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-
-				</form>
-				<!-- switch show_search on -->
-				{SEARCH_BOX}
-				<!-- switch show_search off -->
-				<!-- switch show_goto on -->
-				<form style="margin-bottom:0;" action="day.php" method="get">
-					<input type="hidden" name="cal" value="{URL_CAL}">
-					<input type="text" style="width:160px; font-size:10px" name="jumpto_day">
-					<input type="submit" value="Go"/>
-				</form>
-				<!-- switch show_goto off -->
-				<hr />
-				<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-					<input type="hidden" name="getdate" value="{GETDATE}"/>
-					<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-					<input type="submit" value="Go"/>
-				</form>
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<!-- switch t_allday on -->
-				{T_ALLDAY}<br />
-				<!-- switch t_allday off -->
-				<!-- switch t_event on -->
-				&bull; {T_EVENT}<br />
-				<!-- switch t_event off -->
-			</div>
-		</td>
-	</tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events off -->
-
-<!-- switch vtodo on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<table cellpadding="0" cellspacing="0" border="0">
-					<!-- switch show_completed on -->
-					<tr>
-						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td><s>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></s></td>
-					</tr>
-					<!-- switch show_completed off -->
-					<!-- switch show_important on -->
-					<tr>
-						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_important off -->
-					<!-- switch show_normal on -->
-					<tr>
-						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_normal off -->
-				</table>
-			</div>
-		</td>
-	</tr>			
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-
-<!-- switch vtodo off -->
-
-{MONTH_SMALL|-1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+0}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+1}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
-	</tr>
-</table>
diff --git a/templates/tan/year.tpl b/templates/tan/year.tpl
deleted file mode 100644
index adb9eb4..0000000
--- a/templates/tan/year.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-{HEADER}
-<center>
-	<table width="770" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td width="676">
-				<table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder">
-					<tr>
-						<td align="center" valign="middle" bgcolor="white">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td align="left" width="120" class="navback">
-										&nbsp;
-									</td>
-									<td class="navback">
-										<table width="100%" border="0" cellspacing="0" cellpadding="0">
-											<tr>
-												<td align="right" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={PREV_YEAR}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a>
-												</td>
-												<td align="center" width="10%" class="title" nowrap="nowrap" valign="middle">
-													<h1>{THIS_YEAR}</h1>
-												</td>
-												<td align="left" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={NEXT_YEAR}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="[Next Year]" border="0" align="left" /></a>
-												</td>
-											</tr>
-										</table>
-									</td>
-									<td align="right" width="120" class="navback">
-										<table width="120" border="0" cellpadding="0" cellspacing="0">
-											<tr valign="top">
-												<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-												<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-												<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-												<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<br />
-				<table border="0" width="670" cellspacing="0" cellpadding="0">
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|01}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|02}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|03}
-						</td>
-						<td width="20" rowspan='8'>
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|04}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|05}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|06}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|07}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|08}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|09}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|10}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|11}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|12}
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td valign="top">
-				{SIDEBAR}
-			</td>
-		</tr>
-	</table>
-</center>
-{FOOTER}
diff --git a/year.php b/year.php
index 9d5564d..bef2fd6 100644
--- a/year.php
+++ b/year.php
@@ -14,7 +14,7 @@ $next_year 	= date ("Ymd", $next_year);
 $prev_year 	= strtotime ("-1 year", strtotime($getdate));
 $prev_year 	= date ("Ymd", $prev_year);
 
-$sidebar_date 		= localizeDate($dateFormat_day, strtotime($getdate));
+$sidebar_date 		= localizeDate($dateFormat_week_list, strtotime($getdate));
 
 // For the side months
 ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
@@ -69,7 +69,6 @@ $page->replace_tags(array(
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
 	'todo_available' 	=> '',
-	'event_js' 			=> '',
 	'this_year'			=> $this_year,
 	'next_day' 			=> @$next_day,
 	'next_week' 		=> @$next_week,
@@ -99,6 +98,8 @@ $page->replace_tags(array(
 	'l_tomorrows'		=> $lang['l_tomorrows'],
 	'l_jump'			=> $lang['l_jump'],
 	'l_todo'			=> $lang['l_todo'],
+	'l_prev'			=> $lang['l_prev'],
+	'l_next'			=> $lang['l_next'],
 	'l_day'				=> $lang['l_day'],
 	'l_week'			=> $lang['l_week'],
 	'l_month'			=> $lang['l_month'],
-- 
cgit v1.2.3