diff --git a/images/icon_cal.gif b/images/icon_cal.gif
deleted file mode 100644
index a9c7c87632..0000000000
Binary files a/images/icon_cal.gif and /dev/null differ
diff --git a/images/icon_restart.gif b/images/icon_restart.gif
deleted file mode 100644
index e49fbd73c2..0000000000
Binary files a/images/icon_restart.gif and /dev/null differ
diff --git a/images/icon_start.gif b/images/icon_start.gif
deleted file mode 100644
index 09bb58fd43..0000000000
Binary files a/images/icon_start.gif and /dev/null differ
diff --git a/images/icon_stop.gif b/images/icon_stop.gif
deleted file mode 100644
index 922addc5ca..0000000000
Binary files a/images/icon_stop.gif and /dev/null differ
diff --git a/images/icon_up.gif b/images/icon_up.gif
deleted file mode 100644
index 883c5a29e8..0000000000
Binary files a/images/icon_up.gif and /dev/null differ
diff --git a/themes/accessible/background_th_blue.png b/themes/accessible/background_th_blue.png
deleted file mode 100644
index 6eb3b4dd94..0000000000
Binary files a/themes/accessible/background_th_blue.png and /dev/null differ
diff --git a/themes/accessible/background_th_purple.png b/themes/accessible/background_th_purple.png
deleted file mode 100644
index 10c57f4d8f..0000000000
Binary files a/themes/accessible/background_th_purple.png and /dev/null differ
diff --git a/themes/accessible/config.php b/themes/accessible/config.php
index 08c1f75ab0..9680bff058 100644
--- a/themes/accessible/config.php
+++ b/themes/accessible/config.php
@@ -1,11 +1,9 @@
 <?php
 
 //define the link labels
-	$v_link_label_edit = "<img src='".PROJECT_PATH."/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
-	$v_link_label_add = "<img src='".PROJECT_PATH."/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
-	$v_link_label_delete = "<img src='".PROJECT_PATH."/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
-	$v_link_label_view = "<img src='".PROJECT_PATH."/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_cal = "<img src='".PROJECT_PATH."/images/icon_cal.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_up = "<img src='".PROJECT_PATH."/images/icon_up.gif' width='17' height='17' border='0' alt='up'>";
+	$v_link_label_edit = "<img src='".PROJECT_PATH."/themes/accessible/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
+	$v_link_label_add = "<img src='".PROJECT_PATH."/themes/accessible/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
+	$v_link_label_delete = "<img src='".PROJECT_PATH."/themes/accessible/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
+	$v_link_label_view = "<img src='".PROJECT_PATH."/themes/accessible/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
 
-?>
\ No newline at end of file
+?>
diff --git a/favicon.ico b/themes/accessible/favicon.ico
similarity index 100%
rename from favicon.ico
rename to themes/accessible/favicon.ico
diff --git a/themes/accessible/background_black.png b/themes/accessible/images/background_black.png
similarity index 100%
rename from themes/accessible/background_black.png
rename to themes/accessible/images/background_black.png
diff --git a/themes/accessible/background_cell.gif b/themes/accessible/images/background_cell.gif
similarity index 100%
rename from themes/accessible/background_cell.gif
rename to themes/accessible/images/background_cell.gif
diff --git a/images/background_cell_active.gif b/themes/accessible/images/background_cell_active.gif
similarity index 100%
rename from images/background_cell_active.gif
rename to themes/accessible/images/background_cell_active.gif
diff --git a/images/background_cell_conference.gif b/themes/accessible/images/background_cell_conference.gif
similarity index 100%
rename from images/background_cell_conference.gif
rename to themes/accessible/images/background_cell_conference.gif
diff --git a/images/background_cell_fifo.gif b/themes/accessible/images/background_cell_fifo.gif
similarity index 100%
rename from images/background_cell_fifo.gif
rename to themes/accessible/images/background_cell_fifo.gif
diff --git a/images/background_cell_light.gif b/themes/accessible/images/background_cell_light.gif
similarity index 100%
rename from images/background_cell_light.gif
rename to themes/accessible/images/background_cell_light.gif
diff --git a/themes/accessible/background_head.png b/themes/accessible/images/background_head.png
similarity index 100%
rename from themes/accessible/background_head.png
rename to themes/accessible/images/background_head.png
diff --git a/themes/accessible/background_th.png b/themes/accessible/images/background_th.png
similarity index 100%
rename from themes/accessible/background_th.png
rename to themes/accessible/images/background_th.png
diff --git a/images/icon_e.gif b/themes/accessible/images/icon_e.gif
similarity index 100%
rename from images/icon_e.gif
rename to themes/accessible/images/icon_e.gif
diff --git a/images/icon_e.png b/themes/accessible/images/icon_e.png
similarity index 100%
rename from images/icon_e.png
rename to themes/accessible/images/icon_e.png
diff --git a/images/icon_plus.gif b/themes/accessible/images/icon_plus.gif
similarity index 100%
rename from images/icon_plus.gif
rename to themes/accessible/images/icon_plus.gif
diff --git a/images/icon_plus.png b/themes/accessible/images/icon_plus.png
similarity index 100%
rename from images/icon_plus.png
rename to themes/accessible/images/icon_plus.png
diff --git a/images/icon_view.gif b/themes/accessible/images/icon_view.gif
similarity index 100%
rename from images/icon_view.gif
rename to themes/accessible/images/icon_view.gif
diff --git a/images/icon_x.gif b/themes/accessible/images/icon_x.gif
similarity index 100%
rename from images/icon_x.gif
rename to themes/accessible/images/icon_x.gif
diff --git a/images/icon_x.png b/themes/accessible/images/icon_x.png
similarity index 100%
rename from images/icon_x.png
rename to themes/accessible/images/icon_x.png
diff --git a/themes/accessible/logo.png b/themes/accessible/images/logo.png
similarity index 100%
rename from themes/accessible/logo.png
rename to themes/accessible/images/logo.png
diff --git a/themes/accessible/menu_background.jpg b/themes/accessible/images/menu_background.jpg
similarity index 100%
rename from themes/accessible/menu_background.jpg
rename to themes/accessible/images/menu_background.jpg
diff --git a/themes/accessible/template.php b/themes/accessible/template.php
index 3898c426f9..fe028aae71 100644
--- a/themes/accessible/template.php
+++ b/themes/accessible/template.php
@@ -14,7 +14,7 @@
 <head>
 <title><!--{title}--></title>
 <!--{head}-->
-<link rel="icon" href="<!--{project_path}-->/favicon.ico">
+<link rel="icon" href="<!--{project_path}-->/themes/accessible/favicon.ico">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style type='text/css'>
 
@@ -33,7 +33,7 @@ body {
 	margin-right: 0px;
 	margin-left: 0px;
 	/*background-image: url('<!--{project_path}-->/themes/accessible/background.gif');*/
-	background-image: url('<!--{project_path}-->/themes/accessible/menu_background.jpg');
+	background-image: url('<!--{project_path}-->/themes/accessible/images/menu_background.jpg');
 	background-repeat: repeat-x;
 	background-color: #FFFFFF;
 	background-attachment:fixed;
@@ -47,7 +47,7 @@ th {
 	font-family: arial;
 	font-weight: bold;
 	background-color: #FFFFFF;
-	background-image: url('<!--{project_path}-->/themes/accessible/background_th.png');
+	background-image: url('<!--{project_path}-->/themes/accessible/images/background_th.png');
 	padding-top: 4px;
 	padding-bottom: 4px;
 	padding-right: 7px;
@@ -162,7 +162,7 @@ INPUT.txt {
 	background: #EFEFEF;
 	color: gray;
 	border-bottom: 1px solid #CCCCCC;
-	background-image: url('<!--{project_path}-->/themes/accessible/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/accessible/images/background_cell.gif');
 	padding-right: 20px;
 	padding-left: 8px;
 	text-align: left;
@@ -176,7 +176,7 @@ INPUT.txt {
 .vncell a:active{ color:#555555; }
 
 .vncellreq {
-	background-image: url('<!--{project_path}-->/themes/accessible/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/accessible/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	background-color: #639BC1;
 	padding-right: 20px;
@@ -203,7 +203,7 @@ INPUT.txt {
 }
 
 .row_style0 {
-	background-image: url('<!--{project_path}-->/themes/accessible/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/accessible/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	/*background-color: #ECE9D8; */
 	background-color: #639BC1;
@@ -310,7 +310,7 @@ table tr:last-child td:last-child {
 
 /* begin the menu css*/
 	.menu_bg {
-		background-image: url('<!--{project_path}-->/themes/accessible/menu_background.jpg');
+		background-image: url('<!--{project_path}-->/themes/accessible/images/menu_background.jpg');
 		background-repeat: repeat-x;
 		background-color: #FFFFFF;
 		text-align: left;
@@ -407,7 +407,7 @@ function confirmdelete(url) {
 <table width='90%' class='border' border='0' cellpadding='0' cellspacing='0'>
 <tr>
 <td class='headermain' style='background-color:#FFFFFF;' width='100%'>
-	<table cellpadding='0' cellspacing='0' border='0' style="background-image: url('<!--{project_path}-->/themes/accessible/background_head.png'); color: #FFFFFF; font-size: 20px;" width='100%'>
+	<table cellpadding='0' cellspacing='0' border='0' style="background-image: url('<!--{project_path}-->/themes/accessible/images/background_head.png'); color: #FFFFFF; font-size: 20px;" width='100%'>
 	<tr>
 	<td align='center' colspan='2' style='' width='100%' height='4'>
 	</td>
@@ -418,7 +418,7 @@ function confirmdelete(url) {
 		<table border='0' cellpadding='0' cellspacing='0' width='100%'>
 			<tr>
 				<td width='50%'>
-					<a href='/<!--{project_path}-->'><img src='<!--{project_path}-->/themes/accessible/logo.png' /></a>
+					<a href='/<!--{project_path}-->'><img src='<!--{project_path}-->/themes/accessible/images/logo.png' /></a>
 				</td>
 				<td width='50%' class='' align='right' valign='middle'>
 					<?php
@@ -449,7 +449,7 @@ function confirmdelete(url) {
 	</td>
 	</tr>
 	<tr>
-	<td align='center' colspan='2' style="background-image: url('<!--{project_path}-->/themes/accessible/background_black.png');" width='100%' height='22'>
+	<td align='center' colspan='2' style="background-image: url('<!--{project_path}-->/themes/accessible/images/background_black.png');" width='100%' height='22'>
 		<!--{menu.disabled}-->
 	</td>
 	</tr>
@@ -495,4 +495,4 @@ function confirmdelete(url) {
 
 <br>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/themes/classic/background.jpg b/themes/classic/background.jpg
deleted file mode 100644
index 7652e61eea..0000000000
Binary files a/themes/classic/background.jpg and /dev/null differ
diff --git a/themes/classic/background_th_blue.png b/themes/classic/background_th_blue.png
deleted file mode 100644
index 6eb3b4dd94..0000000000
Binary files a/themes/classic/background_th_blue.png and /dev/null differ
diff --git a/themes/classic/background_th_purple.png b/themes/classic/background_th_purple.png
deleted file mode 100644
index 10c57f4d8f..0000000000
Binary files a/themes/classic/background_th_purple.png and /dev/null differ
diff --git a/themes/classic/config.php b/themes/classic/config.php
index 08c1f75ab0..1e85a29f41 100644
--- a/themes/classic/config.php
+++ b/themes/classic/config.php
@@ -1,11 +1,9 @@
 <?php
 
 //define the link labels
-	$v_link_label_edit = "<img src='".PROJECT_PATH."/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
-	$v_link_label_add = "<img src='".PROJECT_PATH."/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
-	$v_link_label_delete = "<img src='".PROJECT_PATH."/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
-	$v_link_label_view = "<img src='".PROJECT_PATH."/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_cal = "<img src='".PROJECT_PATH."/images/icon_cal.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_up = "<img src='".PROJECT_PATH."/images/icon_up.gif' width='17' height='17' border='0' alt='up'>";
+	$v_link_label_edit = "<img src='".PROJECT_PATH."/themes/classic/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
+	$v_link_label_add = "<img src='".PROJECT_PATH."/themes/classic/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
+	$v_link_label_delete = "<img src='".PROJECT_PATH."/themes/classic/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
+	$v_link_label_view = "<img src='".PROJECT_PATH."/themes/classic/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
 
-?>
\ No newline at end of file
+?>
diff --git a/themes/classic/favicon.ico b/themes/classic/favicon.ico
new file mode 100644
index 0000000000..e0c7a83001
Binary files /dev/null and b/themes/classic/favicon.ico differ
diff --git a/themes/accessible/background.jpg b/themes/classic/images/background.jpg
similarity index 100%
rename from themes/accessible/background.jpg
rename to themes/classic/images/background.jpg
diff --git a/themes/classic/background_black.png b/themes/classic/images/background_black.png
similarity index 100%
rename from themes/classic/background_black.png
rename to themes/classic/images/background_black.png
diff --git a/themes/classic/background_cell.gif b/themes/classic/images/background_cell.gif
similarity index 100%
rename from themes/classic/background_cell.gif
rename to themes/classic/images/background_cell.gif
diff --git a/themes/classic/images/background_cell_active.gif b/themes/classic/images/background_cell_active.gif
new file mode 100644
index 0000000000..7dbcf6a6fd
Binary files /dev/null and b/themes/classic/images/background_cell_active.gif differ
diff --git a/themes/classic/images/background_cell_conference.gif b/themes/classic/images/background_cell_conference.gif
new file mode 100644
index 0000000000..7b5b792bdc
Binary files /dev/null and b/themes/classic/images/background_cell_conference.gif differ
diff --git a/themes/classic/images/background_cell_fifo.gif b/themes/classic/images/background_cell_fifo.gif
new file mode 100644
index 0000000000..a0082263b6
Binary files /dev/null and b/themes/classic/images/background_cell_fifo.gif differ
diff --git a/themes/classic/images/background_cell_light.gif b/themes/classic/images/background_cell_light.gif
new file mode 100644
index 0000000000..76d32d0b8d
Binary files /dev/null and b/themes/classic/images/background_cell_light.gif differ
diff --git a/themes/classic/background_head.png b/themes/classic/images/background_head.png
similarity index 100%
rename from themes/classic/background_head.png
rename to themes/classic/images/background_head.png
diff --git a/themes/classic/background_th.png b/themes/classic/images/background_th.png
similarity index 100%
rename from themes/classic/background_th.png
rename to themes/classic/images/background_th.png
diff --git a/themes/classic/images/icon_e.gif b/themes/classic/images/icon_e.gif
new file mode 100644
index 0000000000..29508006ff
Binary files /dev/null and b/themes/classic/images/icon_e.gif differ
diff --git a/themes/classic/images/icon_e.png b/themes/classic/images/icon_e.png
new file mode 100644
index 0000000000..5496ed3a23
Binary files /dev/null and b/themes/classic/images/icon_e.png differ
diff --git a/themes/classic/images/icon_plus.gif b/themes/classic/images/icon_plus.gif
new file mode 100644
index 0000000000..2a94eeb93f
Binary files /dev/null and b/themes/classic/images/icon_plus.gif differ
diff --git a/themes/classic/images/icon_plus.png b/themes/classic/images/icon_plus.png
new file mode 100644
index 0000000000..1a3f39522f
Binary files /dev/null and b/themes/classic/images/icon_plus.png differ
diff --git a/themes/classic/images/icon_view.gif b/themes/classic/images/icon_view.gif
new file mode 100644
index 0000000000..d11a5f00c8
Binary files /dev/null and b/themes/classic/images/icon_view.gif differ
diff --git a/themes/classic/images/icon_x.gif b/themes/classic/images/icon_x.gif
new file mode 100644
index 0000000000..24e4d49297
Binary files /dev/null and b/themes/classic/images/icon_x.gif differ
diff --git a/themes/classic/images/icon_x.png b/themes/classic/images/icon_x.png
new file mode 100644
index 0000000000..eb08bf4a4f
Binary files /dev/null and b/themes/classic/images/icon_x.png differ
diff --git a/themes/classic/logo.png b/themes/classic/images/logo.png
similarity index 100%
rename from themes/classic/logo.png
rename to themes/classic/images/logo.png
diff --git a/themes/classic/template.php b/themes/classic/template.php
index 73e5d0b309..87780d5095 100644
--- a/themes/classic/template.php
+++ b/themes/classic/template.php
@@ -14,7 +14,7 @@
 <head>
 <title><!--{title}--></title>
 <!--{head}-->
-<link rel="icon" href="<!--{project_path}-->/favicon.ico">
+<link rel="icon" href="<!--{project_path}-->/themes/classic/favicon.ico">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style type='text/css'>
 
@@ -32,7 +32,7 @@ body {
 	margin-bottom: 0px;
 	margin-right: 0px;
 	margin-left: 0px;
-	background-image: url('<!--{project_path}-->/themes/classic/background.jpg');
+	background-image: url('<!--{project_path}-->/themes/classic/images/background.jpg');
 	background-repeat: repeat-x;
 	background-attachment: fixed;
 	background-color: #FFFFFF;
@@ -47,7 +47,7 @@ th {
 	font-family: arial;
 	font-weight: bold;
 	/*background-color: #506eab;*/
-	background-image: url('<!--{project_path}-->/themes/classic/background_th.png');
+	background-image: url('<!--{project_path}-->/themes/classic/images/background_th.png');
 	padding-top: 4px;
 	padding-bottom: 4px;
 	padding-right: 7px;
@@ -173,7 +173,7 @@ th:last-child th:first-child {
 .vncell {
 	border-bottom: 1px solid #999999;
 	/*background-color: #639BC1;*/
-	background-image: url('<!--{project_path}-->/themes/classic/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/classic/images/background_cell.gif');
 	padding-right: 20px;
 	padding-left: 8px;
 	text-align: left;
@@ -188,7 +188,7 @@ th:last-child th:first-child {
 */
 
 .vncellreq {
-	background-image: url('<!--{project_path}-->/themes/classic/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/classic/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	background-color: #639BC1;
 	padding-right: 20px;
@@ -215,7 +215,7 @@ th:last-child th:first-child {
 }
 
 .row_style0 {
-	background-image: url('<!--{project_path}-->/themes/classic/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/classic/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	color: #444444;
 	text-align: left;
@@ -290,7 +290,7 @@ table td {
 
 table tr.even td {
 	background:#eee;
-	background-image: url('<!--{project_path}-->/themes/classic/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/classic/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	color: #444444;
 }
@@ -437,7 +437,7 @@ table tr:nth-last-child(-5) td:first-of-type {
 		-moz-border-radius: 12px 12px 0px 0px;
 		border-radius: 12px 12px 0px 0px;
 		/*background:#1F1F1F url(<!--{project_path}-->/css/images/expand3.gif) no-repeat -999px -9999px;*/
-		/*background:#1F1F1F url(<!--{project_path}-->/themes/classic/background_cell.gif) no-repeat -999px -9999px;*/
+		/*background:#1F1F1F url(<!--{project_path}-->/themes/classic/images/background_cell.gif) no-repeat -999px -9999px;*/
 	}
 
 	div#menu li:hover{
@@ -504,7 +504,7 @@ function confirmdelete(url) {
 <table width='90%' class='border.disabled' style='background-color:#FFFFFF;' border='0' cellpadding='0' cellspacing='0'>
 <tr>
 <td class='headermain' style='background-color:#FFFFFF;' width='100%'>
-	<table cellpadding='0' cellspacing='0' border='0' style="background-image: url('<!--{project_path}-->/themes/classic/background_head.png'); color: #FFFFFF; font-size: 20px;" width='100%'>
+	<table cellpadding='0' cellspacing='0' border='0' style="background-image: url('<!--{project_path}-->/themes/classic/images/background_head.png'); color: #FFFFFF; font-size: 20px;" width='100%'>
 	<tr>
 	<td align='center' colspan='2' style='' width='100%' height='4'>
 	</td>
@@ -515,7 +515,7 @@ function confirmdelete(url) {
 		<table border='0' cellpadding='0' cellspacing='0' width='100%'>
 			<tr>
 				<td>
-					<a href='/<!--{project_path}-->'><img src='<!--{project_path}-->/themes/classic/logo.png' /></a>
+					<a href='/<!--{project_path}-->'><img src='<!--{project_path}-->/themes/classic/images/logo.png' /></a>
 				</td>
 				<td width='50%' class='' align='right' valign='middle'>
 					<?php
@@ -546,7 +546,7 @@ function confirmdelete(url) {
 	</td>
 	</tr>
 	<tr>
-	<td align='center' colspan='2' style="background-image: url('<!--{project_path}-->/themes/classic/background_black.png');" width='100%' height='22'>
+	<td align='center' colspan='2' style="background-image: url('<!--{project_path}-->/themes/classic/images/background_black.png');" width='100%' height='22'>
 	<!--{menu}-->
 	</td>
 	</tr>
@@ -588,4 +588,4 @@ function confirmdelete(url) {
 
 <br>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/themes/default/blank.gif b/themes/default/blank.gif
deleted file mode 100644
index 75b945d255..0000000000
Binary files a/themes/default/blank.gif and /dev/null differ
diff --git a/themes/default/config.php b/themes/default/config.php
index 08c1f75ab0..2bcf4ea159 100644
--- a/themes/default/config.php
+++ b/themes/default/config.php
@@ -1,11 +1,9 @@
 <?php
 
 //define the link labels
-	$v_link_label_edit = "<img src='".PROJECT_PATH."/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
-	$v_link_label_add = "<img src='".PROJECT_PATH."/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
-	$v_link_label_delete = "<img src='".PROJECT_PATH."/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
-	$v_link_label_view = "<img src='".PROJECT_PATH."/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_cal = "<img src='".PROJECT_PATH."/images/icon_cal.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_up = "<img src='".PROJECT_PATH."/images/icon_up.gif' width='17' height='17' border='0' alt='up'>";
+	$v_link_label_edit = "<img src='".PROJECT_PATH."/themes/default/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
+	$v_link_label_add = "<img src='".PROJECT_PATH."/themes/default/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
+	$v_link_label_delete = "<img src='".PROJECT_PATH."/themes/default/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
+	$v_link_label_view = "<img src='".PROJECT_PATH."/themes/default/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
 
-?>
\ No newline at end of file
+?>
diff --git a/themes/default/favicon.ico b/themes/default/favicon.ico
new file mode 100644
index 0000000000..e0c7a83001
Binary files /dev/null and b/themes/default/favicon.ico differ
diff --git a/themes/default/arrow.png b/themes/default/images/arrow.png
similarity index 100%
rename from themes/default/arrow.png
rename to themes/default/images/arrow.png
diff --git a/themes/default/background_black.png b/themes/default/images/background_black.png
similarity index 100%
rename from themes/default/background_black.png
rename to themes/default/images/background_black.png
diff --git a/themes/default/background_cell.gif b/themes/default/images/background_cell.gif
similarity index 100%
rename from themes/default/background_cell.gif
rename to themes/default/images/background_cell.gif
diff --git a/themes/default/images/background_cell_active.gif b/themes/default/images/background_cell_active.gif
new file mode 100644
index 0000000000..7dbcf6a6fd
Binary files /dev/null and b/themes/default/images/background_cell_active.gif differ
diff --git a/themes/default/images/background_cell_conference.gif b/themes/default/images/background_cell_conference.gif
new file mode 100644
index 0000000000..7b5b792bdc
Binary files /dev/null and b/themes/default/images/background_cell_conference.gif differ
diff --git a/themes/default/images/background_cell_fifo.gif b/themes/default/images/background_cell_fifo.gif
new file mode 100644
index 0000000000..a0082263b6
Binary files /dev/null and b/themes/default/images/background_cell_fifo.gif differ
diff --git a/themes/default/images/background_cell_light.gif b/themes/default/images/background_cell_light.gif
new file mode 100644
index 0000000000..76d32d0b8d
Binary files /dev/null and b/themes/default/images/background_cell_light.gif differ
diff --git a/themes/default/background_th.png b/themes/default/images/background_th.png
similarity index 100%
rename from themes/default/background_th.png
rename to themes/default/images/background_th.png
diff --git a/themes/default/images/icon_e.gif b/themes/default/images/icon_e.gif
new file mode 100644
index 0000000000..29508006ff
Binary files /dev/null and b/themes/default/images/icon_e.gif differ
diff --git a/themes/default/images/icon_e.png b/themes/default/images/icon_e.png
new file mode 100644
index 0000000000..5496ed3a23
Binary files /dev/null and b/themes/default/images/icon_e.png differ
diff --git a/themes/default/images/icon_plus.gif b/themes/default/images/icon_plus.gif
new file mode 100644
index 0000000000..2a94eeb93f
Binary files /dev/null and b/themes/default/images/icon_plus.gif differ
diff --git a/themes/default/images/icon_plus.png b/themes/default/images/icon_plus.png
new file mode 100644
index 0000000000..1a3f39522f
Binary files /dev/null and b/themes/default/images/icon_plus.png differ
diff --git a/themes/default/images/icon_view.gif b/themes/default/images/icon_view.gif
new file mode 100644
index 0000000000..d11a5f00c8
Binary files /dev/null and b/themes/default/images/icon_view.gif differ
diff --git a/themes/default/images/icon_x.gif b/themes/default/images/icon_x.gif
new file mode 100644
index 0000000000..24e4d49297
Binary files /dev/null and b/themes/default/images/icon_x.gif differ
diff --git a/themes/default/images/icon_x.png b/themes/default/images/icon_x.png
new file mode 100644
index 0000000000..eb08bf4a4f
Binary files /dev/null and b/themes/default/images/icon_x.png differ
diff --git a/themes/default/login_background.png b/themes/default/images/login_background.png
similarity index 100%
rename from themes/default/login_background.png
rename to themes/default/images/login_background.png
diff --git a/themes/default/logo.png b/themes/default/images/logo.png
similarity index 100%
rename from themes/default/logo.png
rename to themes/default/images/logo.png
diff --git a/themes/default/menu_background.png b/themes/default/images/menu_background.png
similarity index 100%
rename from themes/default/menu_background.png
rename to themes/default/images/menu_background.png
diff --git a/themes/default/template.php b/themes/default/template.php
index 07f81a6e19..35d08e2937 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -28,7 +28,7 @@
 		$php_self_dir = substr($php_self_dir, strlen(PROJECT_PATH), strlen($php_self_dir));
 	}
 ?>
-<link rel="icon" href="<!--{project_path}-->/favicon.ico">
+<link rel="icon" href="<!--{project_path}-->/themes/default/favicon.ico">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style type='text/css'>
 
@@ -46,7 +46,7 @@ body {
 	margin-bottom: 0px;
 	margin-right: 0px;
 	margin-left: 0px;
-	/*background-image: url('<!--{project_path}-->/themes/default/background.jpg');*/
+	/*background-image: url('<!--{project_path}-->/themes/default/images/background.jpg');*/
 	/*background-repeat: repeat-x;*/
 	/*background-attachment: fixed;*/
 	/*background-color: #FFFFFF;*/
@@ -61,7 +61,7 @@ th {
 	font-family: arial;
 	font-weight: bold;
 	/*background-color: #506eab;*/
-	background-image: url('<!--{project_path}-->/themes/default/background_th.png');
+	background-image: url('<!--{project_path}-->/themes/default/images/background_th.png');
 	padding-top: 4px;
 	padding-bottom: 4px;
 	padding-right: 7px;
@@ -167,7 +167,7 @@ INPUT.txt {
 .vncell {
 	border-bottom: 1px solid #999999;
 	/*background-color: #639BC1;*/
-	background-image: url('<!--{project_path}-->/themes/default/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/default/images/background_cell.gif');
 	padding-right: 20px;
 	padding-left: 8px;
 	text-align: left;
@@ -181,7 +181,7 @@ INPUT.txt {
 
 
 .vncellreq {
-	background-image: url('<!--{project_path}-->/themes/default/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/default/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	background-color: #639BC1;
 	padding-right: 20px;
@@ -207,7 +207,7 @@ INPUT.txt {
 }
 
 .row_style0 {
-	background-image: url('<!--{project_path}-->/themes/default/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/default/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	color: #444444;
 	text-align: left;
@@ -282,7 +282,7 @@ table td {
 
 table tr.even td {
 	background:#eee;
-	background-image: url('<!--{project_path}-->/themes/default/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/default/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	color: #333333;
 }
@@ -320,7 +320,7 @@ table tr:nth-last-child(-5) td:first-of-type {
 /* begin the menu css*/
 
 	.menu_bar {
-		background-image: url('<!--{project_path}-->/themes/default/background_black.png');
+		background-image: url('<!--{project_path}-->/themes/default/images/background_black.png');
 		-webkit-border-radius: 7px 7px 7px 7px;
 		-moz-border-radius: 7px 7px 7px 7px;
 		border-radius: 7px 7px 7px 7px;
@@ -334,10 +334,10 @@ table tr:nth-last-child(-5) td:first-of-type {
 			}
 			else {
 				if (substr($_SERVER['PHP_SELF'], -9) != "login.php") {
-					echo "background-image: url('<!--{project_path}-->/themes/default/menu_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/default/images/menu_background.png');";
 				}
 				else {
-					echo "background-image: url('<!--{project_path}-->/themes/default/login_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/default/images/login_background.png');";
 				}
 			}
 		?>
@@ -368,10 +368,10 @@ table tr:nth-last-child(-5) td:first-of-type {
 			}
 			else {
 				if (substr($_SERVER['PHP_SELF'], -9) != "login.php") {
-					echo "background-image: url('<!--{project_path}-->/themes/default/menu_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/default/images/menu_background.png');";
 				}
 				else {
-					echo "background-image: url('<!--{project_path}-->/themes/default/login_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/default/images/login_background.png');";
 				}
 			}
 		?>
@@ -526,7 +526,7 @@ table tr:nth-last-child(-5) td:first-of-type {
 		border-color:#ccc;
 		border-width: 1px;
 		padding-bottom:25px;
-		list-style-image: url(<!--{project_path}-->/themes/default/arrow.png);
+		list-style-image: url(<!--{project_path}-->/themes/default/images/arrow.png);
 		padding-left: 35px;
 		opacity: 1.0;
 	}
@@ -651,7 +651,7 @@ function confirmdelete(url) {
 	<table border='0' cellpadding='0' cellspacing='0' width='100%'>
 		<tr>
 			<td width='50%'>
-				<a href='/<!--{project_path}-->'><img src='<!--{project_path}-->/themes/enhanced/logo.png' /></a>
+				<a href='/<!--{project_path}-->'><img src='<!--{project_path}-->/themes/default/images/logo.png' /></a>
 			</td>
 			<td width='50%' class='' align='right' valign='middle'>
 				<?php
@@ -792,4 +792,4 @@ else {
 
 <br>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/themes/enhanced/background.jpg b/themes/enhanced/background.jpg
deleted file mode 100644
index 7652e61eea..0000000000
Binary files a/themes/enhanced/background.jpg and /dev/null differ
diff --git a/themes/enhanced/blank.gif b/themes/enhanced/blank.gif
deleted file mode 100644
index 75b945d255..0000000000
Binary files a/themes/enhanced/blank.gif and /dev/null differ
diff --git a/themes/enhanced/config.php b/themes/enhanced/config.php
index 08c1f75ab0..d778c68a82 100644
--- a/themes/enhanced/config.php
+++ b/themes/enhanced/config.php
@@ -1,11 +1,9 @@
 <?php
 
 //define the link labels
-	$v_link_label_edit = "<img src='".PROJECT_PATH."/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
-	$v_link_label_add = "<img src='".PROJECT_PATH."/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
-	$v_link_label_delete = "<img src='".PROJECT_PATH."/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
-	$v_link_label_view = "<img src='".PROJECT_PATH."/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_cal = "<img src='".PROJECT_PATH."/images/icon_cal.gif' width='17' height='17' border='0' alt='add'>";
-	//$v_link_label_up = "<img src='".PROJECT_PATH."/images/icon_up.gif' width='17' height='17' border='0' alt='up'>";
+	$v_link_label_edit = "<img src='".PROJECT_PATH."/themes/enhanced/images/icon_e.png' width='17' height='17' alt='edit' border='0'>";
+	$v_link_label_add = "<img src='".PROJECT_PATH."/themes/enhanced/images/icon_plus.png' width='17' height='17' border='0' alt='add'>";
+	$v_link_label_delete = "<img src='".PROJECT_PATH."/themes/enhanced/images/icon_x.png' width='17' height='17' alt='delete' border='0'>";
+	$v_link_label_view = "<img src='".PROJECT_PATH."/themes/enhanced/images/icon_view.gif' width='17' height='17' border='0' alt='add'>";
 
-?>
\ No newline at end of file
+?>
diff --git a/themes/enhanced/content_background.png b/themes/enhanced/content_background.png
deleted file mode 100644
index 6b33cae806..0000000000
Binary files a/themes/enhanced/content_background.png and /dev/null differ
diff --git a/themes/enhanced/favicon.ico b/themes/enhanced/favicon.ico
new file mode 100644
index 0000000000..e0c7a83001
Binary files /dev/null and b/themes/enhanced/favicon.ico differ
diff --git a/themes/enhanced/background_black.png b/themes/enhanced/images/background_black.png
similarity index 100%
rename from themes/enhanced/background_black.png
rename to themes/enhanced/images/background_black.png
diff --git a/themes/enhanced/background_cell.gif b/themes/enhanced/images/background_cell.gif
similarity index 100%
rename from themes/enhanced/background_cell.gif
rename to themes/enhanced/images/background_cell.gif
diff --git a/themes/enhanced/images/background_cell_active.gif b/themes/enhanced/images/background_cell_active.gif
new file mode 100644
index 0000000000..7dbcf6a6fd
Binary files /dev/null and b/themes/enhanced/images/background_cell_active.gif differ
diff --git a/themes/enhanced/images/background_cell_conference.gif b/themes/enhanced/images/background_cell_conference.gif
new file mode 100644
index 0000000000..7b5b792bdc
Binary files /dev/null and b/themes/enhanced/images/background_cell_conference.gif differ
diff --git a/themes/enhanced/images/background_cell_fifo.gif b/themes/enhanced/images/background_cell_fifo.gif
new file mode 100644
index 0000000000..a0082263b6
Binary files /dev/null and b/themes/enhanced/images/background_cell_fifo.gif differ
diff --git a/themes/enhanced/images/background_cell_light.gif b/themes/enhanced/images/background_cell_light.gif
new file mode 100644
index 0000000000..76d32d0b8d
Binary files /dev/null and b/themes/enhanced/images/background_cell_light.gif differ
diff --git a/themes/enhanced/background_th.png b/themes/enhanced/images/background_th.png
similarity index 100%
rename from themes/enhanced/background_th.png
rename to themes/enhanced/images/background_th.png
diff --git a/images/blank.gif b/themes/enhanced/images/blank.gif
similarity index 100%
rename from images/blank.gif
rename to themes/enhanced/images/blank.gif
diff --git a/themes/default/content_background.png b/themes/enhanced/images/content_background.png
similarity index 100%
rename from themes/default/content_background.png
rename to themes/enhanced/images/content_background.png
diff --git a/themes/enhanced/images/icon_e.gif b/themes/enhanced/images/icon_e.gif
new file mode 100644
index 0000000000..29508006ff
Binary files /dev/null and b/themes/enhanced/images/icon_e.gif differ
diff --git a/themes/enhanced/images/icon_e.png b/themes/enhanced/images/icon_e.png
new file mode 100644
index 0000000000..5496ed3a23
Binary files /dev/null and b/themes/enhanced/images/icon_e.png differ
diff --git a/themes/enhanced/images/icon_plus.gif b/themes/enhanced/images/icon_plus.gif
new file mode 100644
index 0000000000..2a94eeb93f
Binary files /dev/null and b/themes/enhanced/images/icon_plus.gif differ
diff --git a/themes/enhanced/images/icon_plus.png b/themes/enhanced/images/icon_plus.png
new file mode 100644
index 0000000000..1a3f39522f
Binary files /dev/null and b/themes/enhanced/images/icon_plus.png differ
diff --git a/themes/enhanced/images/icon_view.gif b/themes/enhanced/images/icon_view.gif
new file mode 100644
index 0000000000..d11a5f00c8
Binary files /dev/null and b/themes/enhanced/images/icon_view.gif differ
diff --git a/themes/enhanced/images/icon_x.gif b/themes/enhanced/images/icon_x.gif
new file mode 100644
index 0000000000..24e4d49297
Binary files /dev/null and b/themes/enhanced/images/icon_x.gif differ
diff --git a/themes/enhanced/images/icon_x.png b/themes/enhanced/images/icon_x.png
new file mode 100644
index 0000000000..eb08bf4a4f
Binary files /dev/null and b/themes/enhanced/images/icon_x.png differ
diff --git a/themes/enhanced/login_background.png b/themes/enhanced/images/login_background.png
similarity index 100%
rename from themes/enhanced/login_background.png
rename to themes/enhanced/images/login_background.png
diff --git a/themes/enhanced/logo.png b/themes/enhanced/images/logo.png
similarity index 100%
rename from themes/enhanced/logo.png
rename to themes/enhanced/images/logo.png
diff --git a/themes/enhanced/menu_background.png b/themes/enhanced/images/menu_background.png
similarity index 100%
rename from themes/enhanced/menu_background.png
rename to themes/enhanced/images/menu_background.png
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index bd4f528b44..ade73a3adc 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -34,7 +34,7 @@
 		$php_self_dir = substr($php_self_dir, strlen(PROJECT_PATH), strlen($php_self_dir));
 	}
 ?>
-<link rel="icon" href="<!--{project_path}-->/favicon.ico">
+<link rel="icon" href="<!--{project_path}-->/themes/enhanced/favicon.ico">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style type='text/css'>
 
@@ -52,7 +52,7 @@ body {
 	margin-bottom: 0px;
 	margin-right: 0px;
 	margin-left: 0px;
-	/*background-image: url('<!--{project_path}-->/themes/enhanced/background.jpg');*/
+	/*background-image: url('<!--{project_path}-->/themes/enhanced/images/background.jpg');*/
 	/*background-repeat: repeat-x;*/
 	/*background-attachment: fixed;*/
 	/*background-color: #FFFFFF;*/
@@ -67,7 +67,7 @@ th {
 	font-family: arial;
 	font-weight: bold;
 	/*background-color: #506eab;*/
-	background-image: url('<!--{project_path}-->/themes/enhanced/background_th.png');
+	background-image: url('<!--{project_path}-->/themes/enhanced/images/background_th.png');
 	padding-top: 4px;
 	padding-bottom: 4px;
 	padding-right: 7px;
@@ -173,7 +173,7 @@ INPUT.txt {
 .vncell {
 	border-bottom: 1px solid #999999;
 	/*background-color: #639BC1;*/
-	background-image: url('<!--{project_path}-->/themes/enhanced/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/enhanced/images/background_cell.gif');
 	padding-right: 20px;
 	padding-left: 8px;
 	text-align: left;
@@ -187,7 +187,7 @@ INPUT.txt {
 
 
 .vncellreq {
-	background-image: url('<!--{project_path}-->/themes/enhanced/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/enhanced/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	background-color: #639BC1;
 	padding-right: 20px;
@@ -213,7 +213,7 @@ INPUT.txt {
 }
 
 .row_style0 {
-	background-image: url('<!--{project_path}-->/themes/enhanced/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/enhanced/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	color: #444444;
 	text-align: left;
@@ -288,7 +288,7 @@ table td {
 
 table tr.even td {
 	background:#eee;
-	background-image: url('<!--{project_path}-->/themes/enhanced/background_cell.gif');
+	background-image: url('<!--{project_path}-->/themes/enhanced/images/background_cell.gif');
 	border-bottom: 1px solid #999999;
 	color: #333333;
 }
@@ -326,7 +326,7 @@ table tr:nth-last-child(-5) td:first-of-type {
 /* begin the menu css*/
 
 	.menu_bar {
-		background-image: url('<!--{project_path}-->/themes/enhanced/background_black.png');
+		background-image: url('<!--{project_path}-->/themes/enhanced/images/background_black.png');
 		-webkit-border-radius: 7px 7px 7px 7px;
 		-moz-border-radius: 7px 7px 7px 7px;
 		border-radius: 7px 7px 7px 7px;
@@ -340,10 +340,10 @@ table tr:nth-last-child(-5) td:first-of-type {
 			}
 			else {
 				if (substr($_SERVER['PHP_SELF'], -9) != "login.php") {
-					echo "background-image: url('<!--{project_path}-->/themes/enhanced/menu_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/enhanced/images/menu_background.png');";
 				}
 				else {
-					echo "background-image: url('<!--{project_path}-->/themes/enhanced/login_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/enhanced/images/login_background.png');";
 				}
 			}
 		?>
@@ -374,10 +374,10 @@ table tr:nth-last-child(-5) td:first-of-type {
 			}
 			else {
 				if (substr($_SERVER['PHP_SELF'], -9) != "login.php") {
-					echo "background-image: url('<!--{project_path}-->/themes/enhanced/content_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/enhanced/images/content_background.png');";
 				}
 				else {
-					echo "background-image: url('<!--{project_path}-->/themes/enhanced/login_background.png');";
+					echo "background-image: url('<!--{project_path}-->/themes/enhanced/images/login_background.png');";
 				}
 			}
 		?>
@@ -647,10 +647,10 @@ function confirmdelete(url) {
 						<td width='50%'>
 							<?php
 							if (strlen(PROJECT_PATH) > 0) {
-								echo "<a href='".PROJECT_PATH."'><img src='".PROJECT_PATH."/themes/enhanced/logo.png' /></a>";
+								echo "<a href='".PROJECT_PATH."'><img src='".PROJECT_PATH."/themes/enhanced/images/logo.png' /></a>";
 							}
 							else {
-								echo "<a href='/'><img src='/themes/enhanced/logo.png' /></a>";
+								echo "<a href='/'><img src='/themes/enhanced/images/logo.png' /></a>";
 							}
 							?>
 						</td>
@@ -682,7 +682,7 @@ function confirmdelete(url) {
 			</td>
 		</tr>
 		<tr>
-			<td class='' colspan='2' width='100%' height='7px'><img src='<!--{project_path}-->/images/blank.gif'></td>
+			<td class='' colspan='2' width='100%' height='7px'><img src='<!--{project_path}-->/themes/enhanced/images/blank.gif'></td>
 		</tr>
 		<tr>
 			<td class='menu_bar' colspan='2' width='100%' height='30px'>
@@ -690,7 +690,7 @@ function confirmdelete(url) {
 			</td>
 		</tr>
 		<tr>
-			<td class='' colspan='2' width='100%' height='7px'><img src='<!--{project_path}-->/images/blank.gif'></td>
+			<td class='' colspan='2' width='100%' height='7px'><img src='<!--{project_path}-->/themes/enhanced/images/blank.gif'></td>
 		</tr>
 		<tr>
 			<td valign='top' align='center' width='100%'>
@@ -743,4 +743,4 @@ function confirmdelete(url) {
 
 <br />
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/themes/accessible/blank.gif b/themes/finesource/images/blank.gif
similarity index 100%
rename from themes/accessible/blank.gif
rename to themes/finesource/images/blank.gif
diff --git a/themes/classic/blank.gif b/themes/go/images/blank.gif
similarity index 100%
rename from themes/classic/blank.gif
rename to themes/go/images/blank.gif