diff --git a/calendar/templates/default/alarm.tpl b/calendar/templates/default/alarm.tpl
index 568028dfa5..90ba695990 100755
--- a/calendar/templates/default/alarm.tpl
+++ b/calendar/templates/default/alarm.tpl
@@ -1,44 +1,63 @@
 <!-- $Id$ -->
 <!-- BEGIN alarm_management -->
-<form action="{action_url}" method="post" name="alarmform">
+<form id="calendar_alarmform" action="{action_url}" method="post" name="alarmform">
 {hidden_vars}
-  <table border="0" width="90%" align="center">
-   {rows}
-   <tr><td colspan="4">
-    <br>&nbsp;{input_days}&nbsp;{input_hours}&nbsp;{input_minutes}&nbsp;{input_owner}&nbsp;{input_add}<br>&nbsp;
-   </td><td align="right">
-    {input_cancel}
-   </td></tr>
-  </table>
+	<table id="calendar_alarmform_table" border="0" width="90%" align="center">
+		{rows}
+		<tr>
+			<td colspan="4">
+				<br>&nbsp;{input_days}&nbsp;{input_hours}&nbsp;{input_minutes}&nbsp;{input_owner}&nbsp;{input_add}<br>&nbsp;
+			</td>
+			<td align="right">
+				{input_cancel}
+			</td>
+		</tr>
+	</table>
 </form>
 <!-- END alarm_management -->
+
 <!-- BEGIN alarm_headers -->
-  <tr bgcolor="{tr_color}">
-   <th align="left" width="25%">{lang_time}</th>
-   <th align="left" width="30%">{lang_text}</th>
-   <th align="left" width="25%">{lang_owner}</th>
-   <th width="10%">{lang_enabled}</th>
-   <th width="10%">{lang_select}</th>
-  </tr>
+	<tr bgcolor="{tr_color}">
+		<th align="left" width="25%">{lang_time}</th>
+		<th align="left" width="30%">{lang_text}</th>
+		<th align="left" width="25%">{lang_owner}</th>
+		<th width="10%">{lang_enabled}</th>
+		<th width="10%">{lang_select}</th>
+	</tr>
 <!-- END alarm_headers -->
+
 <!-- BEGIN list -->
-  <tr bgcolor="{tr_color}">
-   <td><b>{field}:</b></td>
-   <td>{data}</td>
-   <td>{owner}</td>
-   <td align="center">{enabled}</td>
-   <td align="center">{select}</td>
-  </tr>
+	<tr bgcolor="{tr_color}">
+		<td>
+			<b>{field}:</b>
+		</td>
+		<td>
+			{data}
+		</td>
+		<td>
+			{owner}
+		</td>
+		<td align="center">
+			{enabled}
+		</td>
+		<td align="center">
+			{select}
+		</td>
+	</tr>
 <!-- END list -->
+
 <!-- BEGIN hr -->
- <tr bgcolor="{th_bg}">
-  <td colspan="5" align="center"><b>{hr_text}</b></td>
- </tr>
+	<tr bgcolor="{th_bg}">
+		<td colspan="5" align="center">
+			<b>{hr_text}</b>
+		</td>
+	</tr>
 <!-- END hr -->
+
 <!-- BEGIN buttons -->
- <tr>
-  <td colspan="6" align="right">
-   {enable_button}&nbsp;{disable_button}&nbsp;{delete_button}
-  </td>
- </tr>
+	<tr>
+		<td colspan="6" align="right">
+			{enable_button}&nbsp;{disable_button}&nbsp;{delete_button}
+		</td>
+	</tr>
 <!-- END buttons -->
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 7364273eb9..f8c216fefa 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1,8 +1,14 @@
 /* CSS Document */
+
+.to_continue
+{
+	font-size: 9px;
+}
+
 A.minicalendar 
 { 
 	color: #000000; 
-	font-size: 10px;
+	font-size: 9px;
 	
 }
 
@@ -11,7 +17,7 @@ A.bminicalendar
 	color: #336699; 
 	font-style: italic;
 	font-weight: bold;
-	font-size: 10px; 
+	font-size: 9px; 
 }
 
 A.minicalendargrey 
@@ -107,14 +113,38 @@ A.bminicalgreyhol
 	border: thin solid black;
 }
 
+/* common */
 .calendar_link_print
 {
 	text-align: center;
 	font-size: 10px;
 }
 
-// week view
+//Mini Calendar
 
+.calendar_minical_table
+{
+	width: 180px;
+	font-weight: bold;
+}
+
+.calendar_minical_daytable
+{
+	width: 100%;
+}
+
+.calendar_minical_dayname
+{
+	font-size: 9px;
+	text-align: right;
+}
+
+.calendar_minical_hrule
+{
+	width: 96%;
+}
+
+/* Header */
 .calendar_dropbuttons
 {
 	align: center;
@@ -128,6 +158,7 @@ A.bminicalgreyhol
 {
 	font-size:16px;
 	font-weight: bold;
+	text-align: center;
 }
 
 .calendar_header
@@ -151,7 +182,7 @@ A.bminicalgreyhol
 	font-weight: bold;
 }
 
-
+/* week view */
 .calendar_week_identifier_table
 {
 	border: 0px solid black;
@@ -169,6 +200,7 @@ A.bminicalgreyhol
 {
 	font-weight: bold;
 	font-size: 12px;
+	background: #D3DCE3;
 }
 
 .calendar_m_w_table
@@ -185,6 +217,7 @@ A.bminicalgreyhol
 	vertical-align: top;
 	padding-left: 4px;
 	padding-right: 4px;
+	padding-bottom: 6px;
 }
 
 A.event_entry
@@ -206,3 +239,19 @@ A.event_entry
 	color: #009999;
 	font-weight: bold;
 }
+
+.calendar_week_minical_table
+{
+	width:100%;
+	border: 0px solid #000000
+}
+
+.calendar_weekinfo
+{
+	color: #000000;
+	padding-left: 2px;
+	padding-right: 2px;
+	font-size: 10px;
+	font-weight: bold;
+	font-style: italic;
+}
\ No newline at end of file
diff --git a/calendar/templates/default/day.tpl b/calendar/templates/default/day.tpl
index 709a56084c..df9f66738a 100755
--- a/calendar/templates/default/day.tpl
+++ b/calendar/templates/default/day.tpl
@@ -4,10 +4,11 @@
 <table id="calendar_dayview_table" class="calendar_dayview_table" border="0" width="100%">
 	<tr>
 		<td valign="top" width="70%">
-			<table border="0" width=100%>
+			<table id="calendar_dayview1" border="0" width=100%>
 				<tr>
 					<td class="calendar_dayview_table_header">
-      					{date}&nbsp;[{username}]<br />
+      					{date}&nbsp;<span class="calendar_user_identifier">:&nbsp;{username}&nbsp;:</span>
+						<br />
      				</td>
     			</tr>
 				{day_events}
@@ -15,7 +16,7 @@
    			<p align="center">{print}</p>
   		</td>
  		 <td align="center" valign="top">
-  			 <table width="100%">
+  			 <table id="calendar_dayview2" width="100%">
     			<tr>
      				<td align="center">
 						{small_calendar}
diff --git a/calendar/templates/default/index.tpl b/calendar/templates/default/index.tpl
index 625c014296..0d0b69b86d 100755
--- a/calendar/templates/default/index.tpl
+++ b/calendar/templates/default/index.tpl
@@ -1,6 +1,6 @@
 <!-- $Id$ -->
 {printer_friendly}
-<table border="0" width="100%" cols="5">
+<table id="calendar_index_table" border="0" width="100%" cols="5">
 	<tr>
 		<td align="left" valign="top" width="20%">
 			{small_calendar_prev}
@@ -14,7 +14,7 @@
 			</span>
 				<br />
 			<span class="calendar_user_identifier">
-				[&nbsp;{username}&nbsp;]
+				:&nbsp;{username}&nbsp;:
 			</span>
 		</td>
 		<td align="center" valign="middle" width="15%">
diff --git a/calendar/templates/default/link_pict.tpl b/calendar/templates/default/link_pict.tpl
index 251bff4815..6df470d381 100755
--- a/calendar/templates/default/link_pict.tpl
+++ b/calendar/templates/default/link_pict.tpl
@@ -5,8 +5,8 @@
 <!-- END link_pict -->
 
 <!-- BEGIN link_open -->
-<div style="overflow:hidden;">
-<a class="event_entry" href="{link_link}" onMouseOver="window.status='{lang_view}'; return true;" onMouseOut="window.status=''; return true;" title="{desc} - {location}"><br>
+<div id="calendar_event_entry" style="overflow:hidden;">
+<a class="event_entry" href="{link_link}" onMouseOver="window.status='{lang_view}'; return true;" onMouseOut="window.status=''; return true;" title="{desc}  {location}"><br>
 <!-- END link_open -->
 
 <!-- BEGIN pict -->
diff --git a/calendar/templates/default/mini_cal.tpl b/calendar/templates/default/mini_cal.tpl
index 676490024e..ab0c06d0f8 100755
--- a/calendar/templates/default/mini_cal.tpl
+++ b/calendar/templates/default/mini_cal.tpl
@@ -1,29 +1,43 @@
 <!-- $Id$ -->
+
 <!-- BEGIN mini_cal -->
-<table border="0" cellspacing="0" cellpadding="0" valign="top" width="80" cols="7">
-	<tr valign="middle">
-		<td align="left" colspan=4><font size="-2">&nbsp;&nbsp;&nbsp;&nbsp;<b>{month}</b></font></td>
-		<td align="right" colspan=3>{prevmonth}&nbsp;&nbsp;{nextmonth}</td>
-	</tr>
-	<tr>
-		<td align="center" colspan=7><img src="{cal_img_root}" width="90%" height="5"></td>
-	</tr>
-	<tr valign="top">
-		<td colspan="7">
-			<table border="0" width="100%" cellspacing="7" cellpadding="0" valign="top" cols="7">
-				<tr>{daynames}</tr>
-				{display_monthweek}
-			</table>
-		</td>
- 	</tr>
-</table>
+
+	<table id="calendar_minical_table" class="calendar_minical_table" border=0 cellspacing="0" cellpadding="0">
+		<tr>
+			<td style="padding-left: 8px; font-weight: bold; text-align: left;">
+				{month}
+			</td>
+			<td align="right">
+				<!-- why empty? -->
+				{prevmonth}&nbsp;&nbsp;{nextmonth}
+			</td>
+		</tr>
+		<tr>
+			<td  style="padding-left: 8px; text-align: left;">
+<!--				<img src="{cal_img_root}" width="90%" height="1"> -->
+					<hr class="calendar_minical_hrule">
+			</td>
+		</tr>
+		<tr valign="top">
+			<td>
+				<table id="calendar_minical_daytable" class="calendar_minical_daytable" cellspacing="5" cellpadding="0">
+					<tr>{daynames}</tr>
+						{display_monthweek}
+				</table>
+
+			</td>
+	 	</tr>
+	</table>
 <!-- END mini_cal -->
 
 <!-- BEGIN mini_week -->
-	<tr>{monthweek_day}
-    </tr>
+	<tr>
+		{monthweek_day}
+	</tr>
 <!-- END mini_week -->
 
 <!-- BEGIN mini_day -->
-     <td align="center"{day_image}><font size="-2">{dayname}</font></td>
+		<td class="calendar_minical_dayname" {day_image}>
+			{dayname}
+		</td>
 <!-- END mini_day -->
diff --git a/calendar/templates/default/month.tpl b/calendar/templates/default/month.tpl
index 3e06792d18..248f065fc1 100755
--- a/calendar/templates/default/month.tpl
+++ b/calendar/templates/default/month.tpl
@@ -1,6 +1,7 @@
 <!-- $Id$ -->
-<table width="100%" border="0" bordercolor="#FFFFFF" cellspacing="2" cellpadding="2" cols={cols}>
- {row}
+
+<table id="calendar_month_table" width="100%" border="0" bordercolor="#FFFFFF" cellspacing="2" cellpadding="2" cols={cols}>
+	{row}
 </table>
 
 
diff --git a/calendar/templates/default/month_column.tpl b/calendar/templates/default/month_column.tpl
index 7461fbceaa..d5940298df 100755
--- a/calendar/templates/default/month_column.tpl
+++ b/calendar/templates/default/month_column.tpl
@@ -1,5 +1,5 @@
 <!-- $Id$   month_column -->
-  <td valign="top" height="75" colspan="1" width="{col_width}%"{extra}>
-{column_data}
-  </td>
 
+<td valign="top" colspan="1" width="{col_width}%"{extra}>
+	{column_data}
+</td>
diff --git a/calendar/templates/default/month_day.tpl b/calendar/templates/default/month_day.tpl
index 1db333b704..24c54f62ae 100755
--- a/calendar/templates/default/month_day.tpl
+++ b/calendar/templates/default/month_day.tpl
@@ -1,13 +1,15 @@
 <!-- $Id$    month_day -->
 
 <!-- BEGIN m_w_table -->
-<table id="calendar_m_w_table" class="calendar_m_w_table" cellspacing="2">
+
+<table id="calendar_m_w_table" class="calendar_m_w_table">
+	<! from month_header.tpl -->
 	{row}
 </table>
 <!-- END m_w_table -->
 
 <!-- BEGIN month_daily -->
-<span style="font-size:10px">[ {day_number} ]</span>{new_event_link}<br />
+<span id="calendar_m_w_table_daynumber" style="font-size:10px">[ {day_number} ]</span>{new_event_link}<br />
     {daily_events}
 <!-- END month_daily -->
 
diff --git a/calendar/templates/default/month_header.tpl b/calendar/templates/default/month_header.tpl
index e783639ded..2d4a8edd31 100755
--- a/calendar/templates/default/month_header.tpl
+++ b/calendar/templates/default/month_header.tpl
@@ -1,12 +1,12 @@
 <!-- $Id$ -->
 
 <!-- BEGIN monthly_header -->
- <tr colspan="{cols}" width="{col_width}%">
+ <tr class="calendar_m_w_table_header" colspan="{cols}" width="{col_width}%">
 {column_header}</tr>
 <!-- END monthly_header -->
 
 <!-- BEGIN column_title -->
-  <th class="calendar_weekview_daytitle" width="11%" bgcolor="{bgcolor}">{col_title}</th>
+  <th class="calendar_weekview_daytitle" width="14.28%">{col_title}</th>
 <!-- END column_title -->
 
 <!-- BEGIN month_column -->
diff --git a/calendar/templates/default/overlap.tpl b/calendar/templates/default/overlap.tpl
index 6c29afd1d4..9899bc814b 100755
--- a/calendar/templates/default/overlap.tpl
+++ b/calendar/templates/default/overlap.tpl
@@ -1,15 +1,31 @@
 <!-- $Id$ -->
 <!-- BEGIN overlap -->
-<center><br>
-<table>
- <tr><td>{overlap_text}</td></tr>
- <tr><td><ul>{overlap_list}</ul></td></tr>
- <tr><td>
-  <table cellspacing="5"><tr>
-   <td>{resubmit_button}</td>
-   <td>{reedit_button}</td>
-  </tr></table>
- </td></tr>
+<center><br />
+<table id="calendar_overlap_table">
+	<tr>
+		<td>
+			{overlap_text}
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<ul>{overlap_list}</ul>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<table id="calendar_overlap_table2" cellspacing="5">
+				<tr>
+					<td>
+						{resubmit_button}
+					</td>
+					<td>
+						{reedit_button}
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
 </table>
 </center>
 <!-- END overlap -->
diff --git a/calendar/templates/default/search.tpl b/calendar/templates/default/search.tpl
index 363ebafb62..9ec9abd665 100755
--- a/calendar/templates/default/search.tpl
+++ b/calendar/templates/default/search.tpl
@@ -1,19 +1,30 @@
 <!-- $Id$ -->
 <!-- BEGIN search -->
-<table width="90%">
- <tr><td colspan="2" align="center" bgcolor="{th_bg}"><b>{quantity}</b></td></tr>
-{rows}
+<table id="calendar_search_table" width="90%">
+	<tr>
+		<td colspan="2" align="center" bgcolor="{th_bg}">
+			<b>{quantity}</b>
+		</td>
+	</tr>
+	{rows}
 </table>
 <!-- END search -->
+
 <!-- BEGIN search_list_header -->
 
 <!-- END search_list_header -->
+
 <!-- BEGIN search_list -->
- <tr bgcolor="{tr_color}">
-  <td width="20%">&nbsp;{date}</td>
-  <td>{link}</td>
- </tr>
+	<tr bgcolor="{tr_color}">
+		<td width="20%">
+			&nbsp;{date}
+		</td>
+		<td>
+			{link}
+		</td>
+	</tr>
 <!-- END search_list -->
+
 <!-- BEGIN search_list_footer -->
 
 <!-- END search_list_footer -->
diff --git a/calendar/templates/default/view.tpl b/calendar/templates/default/view.tpl
index 6c6298a728..daf75fa90c 100755
--- a/calendar/templates/default/view.tpl
+++ b/calendar/templates/default/view.tpl
@@ -2,28 +2,46 @@
 
 <!-- BEGIN view_event -->
 <center>
-	<table border="0" width="90%">
-		{row}
+<table id="calendar_view_event" border="0" width="90%">
+	{row}
 	<tr>
-   <td><table cellspacing="5"><tr>{button_left}</tr></table></td>
-   <td align="center"><table cellspacing="5"><tr>{button_center}</tr></table></td>
-   <td align="right"><table cellspacing="5"><tr>{button_right}</tr></table></td>
-  </tr>
- </table>
+		<td>
+			<table id="calendar_viewevent_button_left" cellspacing="5">
+				<tr>
+					{button_left}
+				</tr>
+			</table>
+		</td>
+	   <td align="center">
+			<table id="calendar_viewevent_button_center" cellspacing="5">
+				<tr>
+					{button_center}
+				</tr>
+			</table>
+		</td>
+		<td align="right">
+			<table id="calendar_viewevent_button_right" cellspacing="5">
+				<tr>
+					{button_right}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
 </center>
 <!-- END view_event -->
 
 <!-- BEGIN list -->
-  <tr bgcolor="{tr_color}">
-   <td valign="top" width="30%">&nbsp;<b>{field}:</b></td>
-   <td colspan="2" valign="top" width="70%">{data}</td>
-  </tr>
+	<tr bgcolor="{tr_color}">
+		<td valign="top" width="30%">&nbsp;<b>{field}:</b></td>
+		<td colspan="2" valign="top" width="70%">{data}</td>
+	</tr>
 <!-- END list -->
 
 <!-- BEGIN hr -->
- <tr>
-  <td colspan="3" bgcolor="{th_bg}" align="center">
-   <b>{hr_text}</b>
-  </td>
- </tr>
+	<tr>
+		<td colspan="3" bgcolor="{th_bg}" align="center">
+			<b>{hr_text}</b>
+		</td>
+	</tr>
 <!-- END hr -->
diff --git a/calendar/templates/default/week.tpl b/calendar/templates/default/week.tpl
index ebea6c9319..efffc2941d 100755
--- a/calendar/templates/default/week.tpl
+++ b/calendar/templates/default/week.tpl
@@ -1,34 +1,41 @@
 <!-- $Id$ -->
+
 {printer_friendly}
-<table id="calendar_minical_table" border="0" width="100%" cols="5">
+
+<!-- head table with mini calendars -->
+
+<table id="calendar_week_minical_table" class="calendar_week_minical_table">
 	<tr>
-		<td align="left" valign="top" width="20%">
+		<td id="small_calendar_prev" align="left" valign="top" width="20%">
 			{small_calendar_prev}
 		</td>
-		<td align="center" valign="middle" width="20%">
+		<td  id="prev_week_link"  align="center" valign="middle" width="20%">
 			<b>{prev_week_link}</b>
 		</td>
-		<td align="center" valign="top" width="20%">
+		<td  id="small_calendar_this"  align="center" valign="top" width="20%">
 			{small_calendar_this}
 		</td>
-		<td align="center" valign="middle" width="20%">
+		<td  id="next_week_link"  align="center" valign="middle" width="20%">
 			<b>{next_week_link}</b>
 		</td>
-		<td align="right" valign="top" width="20%">
+		<td  id="small_calendar_right"  align="right" valign="top" width="20%">
 			{small_calendar_next}
 		</td>
 	</tr>
 </table>
-
+<br />
 <table id="calendar_week_identifier_table" class="calendar_week_identifier_table">
 	<tr>
 		<td align="center">
 			<span class="calendar_week_identifier">{week_identifier}&nbsp;&nbsp;</span>
-			<span class="calendar_user_identifier">[&nbsp;{username}&nbsp;]</span>
+			<span class="calendar_user_identifier">::&nbsp;{username}&nbsp;::</span>
 		</td>
 	</tr>
 </table>
+<!-- from month_day.tpl -->
 {week_display}
+
 <div class="calendar_link_print">
+<br />
 {print}
 </div>
\ No newline at end of file
diff --git a/calendar/templates/default/year.tpl b/calendar/templates/default/year.tpl
index 009384af2d..2529bc1b02 100755
--- a/calendar/templates/default/year.tpl
+++ b/calendar/templates/default/year.tpl
@@ -1,7 +1,7 @@
 <!-- BEGIN year -->
 {print}
 <center>
-<table border="0" cellspacing="3" cellpadding="4" cols=4>
+<table id="calendar_year_table" border="0" cellspacing="3" cellpadding="4" cols=4>
 	<tr>
 		<td align="center">
 			{left_link}