diff --git a/main/css/default/course.css b/main/css/default/course.css
index 1e542ec771..c1e39eb158 100644
--- a/main/css/default/course.css
+++ b/main/css/default/course.css
@@ -39,7 +39,7 @@
 	width: 690px;
 	background: transparent url("images/writerheader.png") no-repeat top
 		left;
-	height: 185px;
+	height: 150px;
 }
 
 /*
@@ -50,14 +50,13 @@
 
 #text_presentation { 
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 	width: 690px;
 	float:left;
 	text-align: justify;
 	background: transparent url("images/repeat_template.png") repeat-y top center;
-	padding-bottom: 2em;
 }
 
 #text_presentation em {
@@ -74,7 +73,7 @@
 #text_presentation p {
 	text-align: justify;
 	width: 620px;
-	margin: 0 auto 2em auto;
+	margin: 1em auto 1em auto;
 }
 
 /*
@@ -84,11 +83,10 @@
 */
 #body_explanation {
 	background: transparent url("images/repeat_template.png") repeat-y top center;
-	padding-bottom:2em;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 	width: 690px;
 	float:left;
 }
@@ -110,9 +108,9 @@
 	background: transparent url("images/vertdivider_template.jpg") no-repeat top right;
 	padding-right:15px;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 }
 
 
@@ -149,7 +147,7 @@
 	margin:0 0 0 10px;
 	text-align:justify;
 	float:left;
-	height:250px;
+	height:205px;
 	overflow: auto;
 }
 
@@ -178,7 +176,7 @@
 }
 
 #objectives_template {
-	margin:1em auto;
+	margin:.3em auto 0 auto;
 	padding:0;
 	width:550px;
 	text-align:justify;
@@ -188,17 +186,16 @@
 }
 
 #objectives_template li {
-	margin:0 0 1em 1em;
+	margin:0 0 .5em 1em;
 	padding:0;
 }
 
 #text_course_objectives {
 	background: transparent url("images/repeat_template.png") repeat-y top center;
-	padding-bottom:2em;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 	width: 690px;
 	float:left;
 }
@@ -214,11 +211,10 @@
 
 #body_proposal {
 	background: transparent url("images/repeat_template.png") repeat-y top center;
-	padding-bottom:2em;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 	width: 690px;
 	float:left;
 }
@@ -235,9 +231,9 @@
 	background: transparent url("images/vertdivider_template.jpg") no-repeat top right;
 	padding-right:15px;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 }
 
 
@@ -279,11 +275,10 @@
 
 #text_course_think {
 	background: transparent url("images/repeat_template.png") repeat-y top center;
-	padding-bottom:2em;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 	width: 690px;
 	float:left;
 }
@@ -294,7 +289,7 @@
 }
 
 #think_about_list {
-	margin:1em auto;
+	margin:.5em auto 0 auto;
 	padding:0;
 	width:600px;
 	text-align:justify;
@@ -310,7 +305,7 @@
 
 #think_forum {
 	width:500px;
-	margin:0 auto;
+	margin:-1em auto 0 auto;
 	color:#aaa;
 	font: bold 1.2em Arial, sans-serif, sans;
 	background: transparent url("images/forum_template.png") no-repeat top right;
@@ -352,11 +347,10 @@
 
 #text_colaborative_activity {
 	background: transparent url("images/repeat_template.png") repeat-y top center;
-	padding-bottom:2em;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 	width: 690px;
 	float:left;
 }
@@ -389,11 +383,10 @@
 
 #text_unit_overview {
 	background: transparent url("images/repeat_template.png") repeat-y top center;
-	padding-bottom:2em;
 	/* Min-height hack for IE 6*/
-	min-height: 250px;
+	min-height: 200px;
 	height: auto !important;
-	height: 250px;
+	height: 200px;
 	width: 690px;
 	float:left;
 }
@@ -406,4 +399,102 @@
 #unit_overview #header_template {
 	background: transparent url("images/readerheader.png") no-repeat top
 		left;
+}
+/*
+------------------------------------------------------------------------------
+	Blank template
+------------------------------------------------------------------------------
+*/
+
+#blank_template #text_presentation { 
+	/* Min-height hack for IE 6*/
+	min-height: 200px;
+	height: auto !important;
+	height: 200px;
+	width: 690px;
+	float:left;
+	text-align: justify;
+	background: transparent url("images/repeat_template.png") repeat-y top center;
+}
+
+#blank_template #box_title {
+	text-align: right;
+	width: 640px;
+	margin:3em 0 0 0;
+	float:left;
+}
+
+#blank_template #box_title h1 {
+	font: bold 2em Arial, sans-serif, sans;
+	color: #bbb;
+}
+
+#blank_template #header_template {
+	width: 690px;
+	background: transparent url("images/blankheader.png") no-repeat top
+		left;
+	height: 150px;
+}
+/*
+------------------------------------------------------------------------------
+	More templates
+------------------------------------------------------------------------------
+*/
+
+#contact_template {
+	color:#aaa;
+	font: bold 1.2em Arial, sans-serif, sans;
+}
+
+#contact_template a{
+	color:#4271b5;
+	text-decoration:none;
+}
+
+#contact_template a:hover, #contact_template a:focus{
+	text-decoration:underline;
+}
+
+
+#more_templates #box_title {
+	text-align: right;
+	width: 640px;
+	margin:3em 0 0 0;
+	float:left;
+}
+
+#more_templates #box_title h1 {
+	font: bold 2em Arial, sans-serif, sans;
+	color: #bbb;
+}
+
+#more_templates #header_template {
+	width: 690px;
+	background: transparent url("images/blankheader.png") no-repeat top
+		left;
+	height: 150px;
+}
+
+#more_templates p {
+	margin-top:4em;
+	padding-top:.8em;
+	width:450px;
+	padding-right:60px;
+	text-align:justify;
+	background: transparent url("images/forum_template.png") no-repeat top right;
+}
+
+#more_templates #text_presentation { 
+	height: 150px;
+	width: 690px;
+	float:left;
+	text-align: justify;
+	background: transparent url("images/repeat_template.png") repeat-y top center;
+}
+
+#more_templates #footer_template {
+	background: transparent url("images/footer_dokeos.png") no-repeat top center;
+	width: 690px;
+	height: 48px;
+	clear:both;
 }
\ No newline at end of file
diff --git a/main/css/default/images/blankheader.png b/main/css/default/images/blankheader.png
new file mode 100644
index 0000000000..ae2e746731
Binary files /dev/null and b/main/css/default/images/blankheader.png differ
diff --git a/main/css/default/images/footer_dokeos.png b/main/css/default/images/footer_dokeos.png
new file mode 100644
index 0000000000..55684b599c
Binary files /dev/null and b/main/css/default/images/footer_dokeos.png differ
diff --git a/main/css/default/images/footer_template.png b/main/css/default/images/footer_template.png
index 55684b599c..c1c39b674a 100644
Binary files a/main/css/default/images/footer_template.png and b/main/css/default/images/footer_template.png differ
diff --git a/main/inc/footer.inc.php b/main/inc/footer.inc.php
index 43ee657fba..2ffbe791f1 100644
--- a/main/inc/footer.inc.php
+++ b/main/inc/footer.inc.php
@@ -46,7 +46,7 @@ api_plugin('footer');
   <?php
   if (get_setting('show_administrator_data')=="true")
   	{
-  	echo get_lang("Manager") ?> : <?php echo Display::encrypted_mailto_link(get_setting('emailAdministrator'),get_setting('administratorSurname')." ".get_setting('administratorName'));
+  	echo get_lang("Manager") ?> : <?php echo Display::encrypted_mailto_link(get_setting('emailAdministrator'),get_setting('administratorName')." ".get_setting('administratorSurname'));
 	}
   ?>&nbsp;
 </div> <!-- end of #footer -->
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb1.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb1.png
new file mode 100644
index 0000000000..7e0664913f
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb1.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb2.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb2.png
new file mode 100644
index 0000000000..706146b31e
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb2.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb3.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb3.png
new file mode 100644
index 0000000000..81e7dd3d6a
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb3.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb4.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb4.png
new file mode 100644
index 0000000000..0f577dfadf
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb4.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb5.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb5.png
new file mode 100644
index 0000000000..faeabf636c
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb5.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb6.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb6.png
new file mode 100644
index 0000000000..4f15aaba42
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb6.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb7.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb7.png
new file mode 100644
index 0000000000..9a9fab1852
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb7.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb8.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb8.png
new file mode 100644
index 0000000000..ba7a31e6ab
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb8.png differ
diff --git a/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb9.png b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb9.png
new file mode 100644
index 0000000000..5f80cc0a38
Binary files /dev/null and b/main/inc/lib/fckeditor/editor/dialog/fck_template/images/thumb9.png differ
diff --git a/main/inc/lib/fckeditor/fcktemplates.xml.php b/main/inc/lib/fckeditor/fcktemplates.xml.php
index 1302bd3dea..3a79013cac 100644
--- a/main/inc/lib/fckeditor/fcktemplates.xml.php
+++ b/main/inc/lib/fckeditor/fcktemplates.xml.php
@@ -13,7 +13,7 @@ $css = loadCSS('default');
 
 ?>
 <Templates imagesBasePath="fck_template/images/">
-	<Template title="Content" image="1.jpg">
+	<Template title="Content" image="thumb1.png">
 		<Description>Introductory title</Description>
 		<Html>
 			<![CDATA[
@@ -35,7 +35,7 @@ $css = loadCSS('default');
 			]]>
 		</Html>
 	</Template>
-	<Template title="Content" image="3.jpg">
+	<Template title="Content" image="thumb2.png">
 		<Description>Explanation</Description>
 		<Html>
 			<![CDATA[
@@ -69,7 +69,7 @@ $css = loadCSS('default');
 			]]>
 		</Html>
 	</Template>
-	<Template title="Content" image="2.jpg">
+	<Template title="Content" image="thumb3.png">
 		<Description>Course objectives</Description>
 		<Html>
 			<![CDATA[
@@ -100,7 +100,7 @@ $css = loadCSS('default');
 			]]>
 		</Html>
 	</Template>
-	<Template title="Content" image="3.jpg">
+	<Template title="Content" image="thumb4.png">
 		<Description>Activity proposal</Description>
 		<Html>
 			<![CDATA[
@@ -132,11 +132,7 @@ $css = loadCSS('default');
 				Nulla faciddsi. Praesent consequat, lectus ac solddcitudin condimentum,
 				nunc fedds pharetra ddgula, at tincidunt mauris neque vel nulla.
 				Vivamus nec magna vitae leo egestas hendrerit. Fusce sagittis
-				scelerisque sapien. Class aptent taciti sociosqu ad ddtora torquent per
-				conubia nostra, per inceptos hymenaeos. Praesent convaldds. Cum sociis
-				natoque penatibus et magnis dis parturient montes, nascetur ridiculus
-				mus. In tristique laoreet fedds. Ut vitae est. Integer posuere lacus
-				sed ddbero.</p>
+				scelerisque sapien.</p>
 						</div>
 					</div>		
 					<div id="footer_template">
@@ -145,7 +141,7 @@ $css = loadCSS('default');
 			]]>
 		</Html>
 	</Template>
-	<Template title="Content" image="3.png">
+	<Template title="Content" image="thumb5.png">
 		<Description>Think about this...</Description>
 		<Html>
 			<![CDATA[
@@ -172,7 +168,7 @@ $css = loadCSS('default');
 			]]>
 		</Html>
 	</Template>
-	<Template title="Content" image="1.jpg">
+	<Template title="Content" image="thumb6.png">
 		<Description>Colaborative activity</Description>
 		<Html>
 			<![CDATA[
@@ -206,7 +202,7 @@ $css = loadCSS('default');
 			]]>
 		</Html>
 	</Template>
-	<Template title="Content" image="1.jpg">
+	<Template title="Content" image="thumb7.png">
 		<Description>Unit overview</Description>
 		<Html>
 			<![CDATA[
@@ -233,6 +229,47 @@ $css = loadCSS('default');
 			]]>
 		</Html>
 	</Template>
+	<Template title="Content" image="thumb8.png">
+		<Description>Blank Template</Description>
+		<Html>
+			<![CDATA[
+					<?php echo $css ?>
+				   <div class="dokeos_course" id="blank_template">
+						<div id="header_template">
+							<div id="box_title">
+								<h1>Title</h1>
+							</div>
+						</div>
+						<div id="text_presentation">
+							<p>Lorem ipsum dolor sit amet, consectetuer adipiscing eddt. Curabitur commodo urna in justo. Nulla faciddsi. Vestibulum dapibus mattis sapien. <em>Keyword 1, keyword 2</em>. Nunc suscipit. Nulla odio urna, faucibus et, porttitor sed, tincidunt in, mauris. Phasellus semper hendrerit magna. Maecenas nec ddgula. Quisque tellus tortor, semper in, blandit quis, addquet ut, tellus. Quisque vulputate. Sed ddgula ipsum, interdum vel, congue tincidunt, faciddsis eget, arcu.</p>
+							<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.<em>Keyword 3, keyword 4</em>. Nulla faciddsi. Praesent consequat, lectus ac solddcitudin condimentum, nunc fedds pharetra ddgula, at tincidunt mauris neque vel nulla. Vivamus nec magna vitae leo egestas hendrerit. Fusce sagittis scelerisque sapien. Class aptent taciti sociosqu ad ddtora torquent per conubia nostra, per inceptos hymenaeos. Praesent convaldds. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In tristique laoreet fedds. Ut vitae est. Integer posuere lacus sed ddbero.</p>
+					    </div>
+						<div id="footer_template">
+						</div>
+					</div>
+			]]>
+		</Html>
+	</Template>
+	<Template title="Content" image="thumb9.png">
+		<Description>Need templates?</Description>
+		<Html>
+			<![CDATA[
+					<?php echo $css ?>
+				  	<div class="dokeos_course" id="more_templates">
+						<div id="header_template">
+							<div id="box_title">
+								<h1>Need more templates?</h1>
+							</div>
+						</div>
+						<div id="text_presentation">
+							<p>Do you need more? We can customize you templates and produce tailored ones. Just ask us at <span id="contact_template"><a href="mailto:info@dokeos.com">info@dokeos.com</a></span> and we will see what can we do for you.</p>
+					    </div>
+						<div id="footer_template">
+						</div>
+					</div>
+			]]>
+		</Html>
+	</Template>
 </Templates>