diff --git a/codepot/Makefile.in b/codepot/Makefile.in
index 3a4488de..f3cad9a2 100644
--- a/codepot/Makefile.in
+++ b/codepot/Makefile.in
@@ -595,10 +595,12 @@ install-data-hook:
 	$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/svnrepo"
 	$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/files"
 	$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/attachments"
+	$(INSTALL) -d "$(DESTDIR)@DEPOTDIR@/usericons"
 	$(INSTALL) -d "$(DESTDIR)@LOGDIR@"
 	$(INSTALL) -d "$(DESTDIR)@CACHEDIR@"
 
 uninstall-hook:
+	$(RMDIR) "$(DESTDIR)@DEPOTDIR@/usericons"
 	$(RMDIR) "$(DESTDIR)@DEPOTDIR@/attachments"
 	$(RMDIR) "$(DESTDIR)@DEPOTDIR@/files"
 	$(RMDIR) "$(DESTDIR)@DEPOTDIR@/svnrepo"
diff --git a/codepot/src/codepot/views/file_edit.php b/codepot/src/codepot/views/file_edit.php
index bbdb584f..af25c330 100644
--- a/codepot/src/codepot/views/file_edit.php
+++ b/codepot/src/codepot/views/file_edit.php
@@ -8,12 +8,17 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
 
-
-
 <script type="text/javascript">
 
 function render_wiki(input_text)
@@ -24,6 +29,8 @@ function render_wiki(input_text)
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/",
 		"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
 	);
+
+	prettyPrint ();
 }
 
 $(function () {
diff --git a/codepot/src/codepot/views/file_show.php b/codepot/src/codepot/views/file_show.php
index b48e5af2..d7242cef 100644
--- a/codepot/src/codepot/views/file_show.php
+++ b/codepot/src/codepot/views/file_show.php
@@ -8,6 +8,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript">
 function render_wiki()
 {
@@ -17,6 +24,8 @@ function render_wiki()
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/",
 		"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
 	);
+
+	prettyPrint ();
 }
 </script>
 
diff --git a/codepot/src/codepot/views/issue_edit.php b/codepot/src/codepot/views/issue_edit.php
index 35f19af9..ce3ed63e 100644
--- a/codepot/src/codepot/views/issue_edit.php
+++ b/codepot/src/codepot/views/issue_edit.php
@@ -8,6 +8,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@@ -22,6 +29,7 @@ function render_wiki(input_text)
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/",
 		"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
 	);
+	prettyPrint ();
 }
 
 $(function () {
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php
index 73c22917..6dd406c5 100644
--- a/codepot/src/codepot/views/issue_show.php
+++ b/codepot/src/codepot/views/issue_show.php
@@ -7,6 +7,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@@ -474,6 +481,8 @@ function render_wiki()
 		}
 	}
 	?>
+
+	prettyPrint ();
 }
 </script>
 
diff --git a/codepot/src/codepot/views/project_edit.php b/codepot/src/codepot/views/project_edit.php
index 76c1f4e9..c2525295 100644
--- a/codepot/src/codepot/views/project_edit.php
+++ b/codepot/src/codepot/views/project_edit.php
@@ -8,6 +8,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@@ -21,6 +28,8 @@ function render_wiki(input_text)
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/",
 		"<?=site_url()?>/wiki/attachment0/<?=$project->id?>/"
 	);
+
+	prettyPrint ();
 }
 
 $(function() {
diff --git a/codepot/src/codepot/views/site_edit.php b/codepot/src/codepot/views/site_edit.php
index 06037f1e..a9a35a8f 100644
--- a/codepot/src/codepot/views/site_edit.php
+++ b/codepot/src/codepot/views/site_edit.php
@@ -9,12 +9,17 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
 
-
-
 <script type="text/javascript">
 
 function render_wiki(input_text)
@@ -25,6 +30,8 @@ function render_wiki(input_text)
 		"<?=site_url()?>/site/wiki/",
 		"<?=site_url()?>/site/image/"
 	);
+
+	prettyPrint ();
 }
 
 $(function () {
diff --git a/codepot/src/codepot/views/site_show.php b/codepot/src/codepot/views/site_show.php
index dc550f1d..db5f86e0 100644
--- a/codepot/src/codepot/views/site_show.php
+++ b/codepot/src/codepot/views/site_show.php
@@ -8,6 +8,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript">
 function render_wiki()
 {
@@ -17,6 +24,8 @@ function render_wiki()
 		"<?=site_url()?>/site/wiki/",
 		"<?=site_url()?>/site/image/"
 	);
+
+	prettyPrint ();
 }
 </script>
 
diff --git a/codepot/src/codepot/views/taskbar.php b/codepot/src/codepot/views/taskbar.php
index 4527f5d7..d8fd6f16 100644
--- a/codepot/src/codepot/views/taskbar.php
+++ b/codepot/src/codepot/views/taskbar.php
@@ -16,7 +16,7 @@ function show_taskbar ($con, $login)
 		// check a file system may be faster than checking the database.
 		$icon_src = '';
 		$icon_path = CODEPOT_USERICON_DIR . '/' . $login['id'] . '.png';
-		$icon_image = file_get_contents($icon_path);
+		$icon_image = @file_get_contents($icon_path);
 		if ($icon_image)
 		{
 			$icon_src = sprintf (
diff --git a/codepot/src/codepot/views/wiki_edit.php b/codepot/src/codepot/views/wiki_edit.php
index de97b3c3..44c4180f 100644
--- a/codepot/src/codepot/views/wiki_edit.php
+++ b/codepot/src/codepot/views/wiki_edit.php
@@ -8,6 +8,13 @@
 
 <script type="text/javascript" src="<?=base_url_make('/js/creole.js')?>"></script>
 
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/prettify.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-css.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lisp.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-lua.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-sql.js')?>"></script>
+<script type="text/javascript" src="<?=base_url_make('/js/prettify/lang-vb.js')?>"></script>
+
 <script type="text/javascript" src="<?=base_url_make('/js/jquery.min.js')?>"></script>
 <script type="text/javascript" src="<?=base_url_make('/js/jquery-ui.min.js')?>"></script>
 <link type="text/css" rel="stylesheet" href="<?=base_url_make('/css/jquery-ui.css')?>" />
@@ -26,6 +33,8 @@ function render_wiki(input_text)
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/",
 		"<?=site_url()?>/wiki/attachment/<?=$project->id?>/<?=$hexname?>/"
 	);
+
+	prettyPrint ();
 }
 
 var new_attachment_no = 0;
diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css
index 4d15a211..6fdbba76 100644
--- a/codepot/src/css/code.css
+++ b/codepot/src/css/code.css
@@ -334,14 +334,14 @@
 #code_diff_mainarea_result_fulldiffold {
 	border: none;
 	//padding-left: 10px;
-	//background: #F8FAF8;
+	//background: #F8F8FA;
 	padding-left: 1px;
 }
 
 #code_diff_mainarea_result_fulldiffnew {
 	border: none;
 	//padding-left: 10px;
-	background: #F8F8FA;
+	background: #FEF8F8;
 	padding-left: 1px;
 }
 
diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css
index 7ba51642..7a4f61c5 100644
--- a/codepot/src/css/common.css
+++ b/codepot/src/css/common.css
@@ -116,9 +116,6 @@ body {
 	padding-right: 5px;
 	text-transform: uppercase;
 }
-
-}
-
 .content .projectbar {
 	/*margin: 0.1em 0em 0em 0em;*/
 	padding: 0.5em 0.5em 0.5em 0.5em;
@@ -266,14 +263,19 @@ body {
 
 .content .mainarea pre {
 	/*padding: .3em .3em .3em .3em;*/
-	border: 1px dashed #BBCCDD;
-	background-color: #F1F1FF;
+	/*border: 1px dashed #BBCCDD;*/
+	/*background-color: #F1F1FF;*/
+	border: none;
+	background-color: #F8F8FA;
 	overflow: auto;
 	width: inherit;
 }
 
 .content .mainarea pre.wiki {
 	white-space: pre-wrap;
+	padding: 1em;
+	line-height: 1.5em;
+	font-size: 1.1em;
 }
 
 .content .mainarea tt {
@@ -364,11 +366,12 @@ body {
 .content .mainarea pre.prettyprint {
 	/* anything that make prettyprint area different from other pres? */
 	/*background-color: #FFFFFF;*/
-	background: white;
-	font-size: 12px;
-	line-height: 1.5;
-	border: 1px solid #ccc;
-	padding: 10px;
+	/*border: 1px solid #ccc;*/
+	background-color: #F8F8FA;
+	border: none;
+	font-size: 1.1em;
+	line-height: 1.5em;
+	padding: 1em;
 
 	tab-size: 5;
 	-moz-tab-size: 5;