diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
new file mode 100644
index 0000000000..ab502002ba
--- /dev/null
+++ b/calendar/templates/default/app.css
@@ -0,0 +1,124 @@
+/* CSS Document */
+A.minicalendar 
+{ 
+	color: #000000; 
+	font-size: 10px;
+	
+}
+
+A.bminicalendar 
+{ 
+	color: #336699; 
+	font-style: italic;
+	font-weight: bold;
+	font-size: 10px; 
+}
+
+A.minicalendargrey 
+{ 
+	color: #999999; 
+	font-size: 10px;
+	font-weight: bold;
+}
+
+A.bminicalendargrey 
+{ 
+	color: #336699; 
+	font-style: italic; 
+	font-size:10px; 
+}
+
+A.minicalhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #000000; 
+	font-size: 10px; 
+}
+
+A.bminicalhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #336699; 
+	font-size: 10px; 
+}
+
+A.minicalgreyhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #999999; 
+	font-size: 10px; 
+}
+
+A.bminicalgreyhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #999999; 
+	font-size: 10px; 
+}
+
+
+.event-on
+{ 
+	background: #D3DCE3;
+	border: #E8F0F0 1px solid;
+}
+
+.event-off
+{ 
+	background: #E8F0F0;
+	border: #D3DCE3 1px solid;
+}
+
+.event-holiday
+{
+	font-size: 100%;
+	background: #dac0c0;
+	color:#000000;
+	vertical-align: middle;
+}
+
+.time
+{
+	background: #D3DCE3;
+	color:#000000;
+	font-size: 10px;
+	font-weight: bold;
+	vertical-align: middle;
+	width: 5.2%;
+	text-align: right;
+	padding-right: 5px;
+	line-height: 11px;
+	border: #E8F0F0 1px solid;
+}
+
+
+.planner-cell
+{
+	cursor: pointer;
+	cursor: hand;
+	border: thin solid black;
+}
+
+
+// week view
+
+.calendar-weekidentifier
+{
+	font-size:16px;
+	font-weight: bold;
+}
+
+.calendar_header
+{
+	font-size:16px;
+	font-weight: bold;
+	text-align: center;
+}
\ No newline at end of file
diff --git a/calendar/templates/default/day.tpl b/calendar/templates/default/day.tpl
index 9b73009d3a..8ea40af19c 100755
--- a/calendar/templates/default/day.tpl
+++ b/calendar/templates/default/day.tpl
@@ -6,12 +6,11 @@
   <td valign="top" width="70%">
    <table border="0" width=100%>
     <tr>
-     <td align="middle">
-      <font size="+2" color="{bg_text}"><b>{date}</b></font><br>
-      <font size="+1" color="{bg_text}">{username}</font><br>&nbsp;
+     <td class="calendar_header">
+      {date}&nbsp;[{username}]<br />
      </td>
     </tr>
-{day_events}
+	{day_events}
    </table>
    <p align="center">{print}</p>
   </td>
diff --git a/calendar/templates/default/week.tpl b/calendar/templates/default/week.tpl
index 096f96ca17..649c4e241c 100755
--- a/calendar/templates/default/week.tpl
+++ b/calendar/templates/default/week.tpl
@@ -20,8 +20,8 @@
  </tr>
 </table>
 <table border="0" width="100%">
-  <td align="center">
-   <font size="+2" color="#000000"><b>{week_identifier}</b><br>{username}</font>
+  <td style="font-size: 14px" align="center">
+   <b>{week_identifier}<br>{username}</b>
   </td>
 </table>
 {week_display}