diff --git a/interface/web/themes/default_64_navimg/templates/error.tpl.htm b/interface/web/themes/default_64_navimg/templates/error.tpl.htm
deleted file mode 100644
index bf66a22d6da1c271232fe15a33b392b470b39d8c..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/error.tpl.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="uniForm">
-  <div id="errorMsg">
-    <h3>Error</h3>
-      <ol>
-        <li>###ERRORMSG###</li>
-      </ol>
-  </div>
-</div>
\ No newline at end of file
diff --git a/interface/web/themes/default_64_navimg/templates/form.tpl.htm b/interface/web/themes/default_64_navimg/templates/form.tpl.htm
deleted file mode 100644
index 429bfd9f2497cae91ebd8b996f6897c6950ee1c0..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/form.tpl.htm
+++ /dev/null
@@ -1 +0,0 @@
-<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default_64_navimg/templates/listpage.tpl.htm b/interface/web/themes/default_64_navimg/templates/listpage.tpl.htm
deleted file mode 100644
index 429bfd9f2497cae91ebd8b996f6897c6950ee1c0..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/listpage.tpl.htm
+++ /dev/null
@@ -1 +0,0 @@
-<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default_64_navimg/templates/module.tpl.htm b/interface/web/themes/default_64_navimg/templates/module.tpl.htm
deleted file mode 100644
index 36cdd09c73687ae1d87f3dde00cecaec8cd5167e..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/module.tpl.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-  <tr>
-    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent">
-		<table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
-			<tr>
-				<td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
-      		</tr>
-    	</table>
-	</td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><table width="128" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="10">&nbsp;</td>
-      </tr>
-	  <tr><td align="center">
-	  <tmpl_loop name="nav_left">
-	  <table bgcolor="#F4F6FB" width="115">
-      <tr>
-        <td class="navLeftHead"><tmpl_var name="title"></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </table>
-	  <br />
-	  </tmpl_loop>
-	  </td></tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
\ No newline at end of file
diff --git a/interface/web/themes/default_64_navimg/templates/module_tree.tpl.htm b/interface/web/themes/default_64_navimg/templates/module_tree.tpl.htm
deleted file mode 100644
index b0895789ab97c225f126acfdf811ee10602989af..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/module_tree.tpl.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-  <tr>
-    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent">
-		<table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
-			<tr>
-        		<td width="200"><iframe height="100%" width="100%" frameborder="0" name="navframe" src="{tmpl_var name="navframe_page"}"></iframe></td>
-				<td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
-      		</tr>
-    	</table>
-	</td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><table width="128" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="10">&nbsp;</td>
-      </tr>
-	  <tr><td align="center">
-	  <tmpl_loop name="nav_left">
-	  <table bgcolor="#F4F6FB" width="115">
-      <tr>
-        <td class="navLeftHead"><tmpl_var name="title"></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </table>
-	  <br />
-	  </tmpl_loop>
-	  </td></tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
\ No newline at end of file
diff --git a/interface/web/themes/default_64_navimg/templates/sidenav.tpl.htm b/interface/web/themes/default_64_navimg/templates/sidenav.tpl.htm
deleted file mode 100644
index 4626d369e6bac78e4e914fe47feceec6714c2937..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/sidenav.tpl.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<ul id="submenu">
-<tmpl_loop name="nav_left">
-  <li id="title">
-    <tmpl_if name="startpage">
-      <a href="#" onClick="loadContent('<tmpl_var name='startpage'>')">
-    </tmpl_if>
-    <tmpl_var name="title">
-    <tmpl_if name="startpage">
-      </a>
-    </tmpl_if>
-  </li>
-  <tmpl_loop name="items">
-    <li>
-      <tmpl_if name="link">
-        <a href="#" onClick="loadContent('<tmpl_var name='link'>')">
-      </tmpl_if>
-      <tmpl_var name="title">
-      <tmpl_if name="link">
-        </a>
-      </tmpl_if>
-    </li>
-  </tmpl_loop>
-</tmpl_loop>
-</ul>
diff --git a/interface/web/themes/default_64_navimg/templates/tabbed_form.tpl.htm b/interface/web/themes/default_64_navimg/templates/tabbed_form.tpl.htm
deleted file mode 100644
index 0e31bc0565f834059e65d76ac35faa93057786b7..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/tabbed_form.tpl.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<tmpl_if name="form_hint">
-<h2><tmpl_var name="form_hint"></h2>
-</tmpl_if>
-<div class="tabbox_tabs">
-	<ul>
-<tmpl_loop name="formTab">
-<tmpl_if name="active">
-    <li class="active"><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
-<tmpl_else>
-    <li><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
-</tmpl_if>
-</tmpl_loop>
-	</ul>
-</div>
-<div id="tabbox_content">
-
-	<tmpl_if name="msg">
-	<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
-  </tmpl_if>
-  <tmpl_if name="error">
-	<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
-  </tmpl_if>
-  
-  <tmpl_dyninclude name="content_tpl">
-</div>
-
-<input type="hidden" name="next_tab" value="">
-<input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
diff --git a/interface/web/themes/default_64_navimg/templates/topnav.tpl.htm b/interface/web/themes/default_64_navimg/templates/topnav.tpl.htm
deleted file mode 100644
index 668df7ba37acddd1b22b8e8bd3f7115e92c5cd60..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_64_navimg/templates/topnav.tpl.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<ul id="topmenu">
-<tmpl_loop name="nav_top">
-<tmpl_if name="active">
-  <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
-<tmpl_else>
-  <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
-</tmpl_if>
-</tmpl_loop>
-</ul>
diff --git a/interface/web/themes/default_no_navimg/css/additional.css b/interface/web/themes/default_no_navimg/css/additional.css
index 276c33ef46749e7bf8821c22eb6eecacafe01deb..c5ceae24988e8d933089dc258361c100bdc94999 100644
--- a/interface/web/themes/default_no_navimg/css/additional.css
+++ b/interface/web/themes/default_no_navimg/css/additional.css
@@ -52,4 +52,9 @@
 	.topnav-domain {
 		background-image: none !important;
 	}
+	
+	.topnav-dashboard {
+		background-image: none !important;
+	}
+	
 }
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/templates/error.tpl.htm b/interface/web/themes/default_no_navimg/templates/error.tpl.htm
deleted file mode 100644
index bf66a22d6da1c271232fe15a33b392b470b39d8c..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/error.tpl.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="uniForm">
-  <div id="errorMsg">
-    <h3>Error</h3>
-      <ol>
-        <li>###ERRORMSG###</li>
-      </ol>
-  </div>
-</div>
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/templates/form.tpl.htm b/interface/web/themes/default_no_navimg/templates/form.tpl.htm
deleted file mode 100644
index 429bfd9f2497cae91ebd8b996f6897c6950ee1c0..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/form.tpl.htm
+++ /dev/null
@@ -1 +0,0 @@
-<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/templates/listpage.tpl.htm b/interface/web/themes/default_no_navimg/templates/listpage.tpl.htm
deleted file mode 100644
index 429bfd9f2497cae91ebd8b996f6897c6950ee1c0..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/listpage.tpl.htm
+++ /dev/null
@@ -1 +0,0 @@
-<tmpl_dyninclude name="content_tpl">
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/templates/module.tpl.htm b/interface/web/themes/default_no_navimg/templates/module.tpl.htm
deleted file mode 100644
index 36cdd09c73687ae1d87f3dde00cecaec8cd5167e..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/module.tpl.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-  <tr>
-    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent">
-		<table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
-			<tr>
-				<td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
-      		</tr>
-    	</table>
-	</td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><table width="128" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="10">&nbsp;</td>
-      </tr>
-	  <tr><td align="center">
-	  <tmpl_loop name="nav_left">
-	  <table bgcolor="#F4F6FB" width="115">
-      <tr>
-        <td class="navLeftHead"><tmpl_var name="title"></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </table>
-	  <br />
-	  </tmpl_loop>
-	  </td></tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/templates/module_tree.tpl.htm b/interface/web/themes/default_no_navimg/templates/module_tree.tpl.htm
deleted file mode 100644
index b0895789ab97c225f126acfdf811ee10602989af..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/module_tree.tpl.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-  <tr>
-    <td width="128" height="26" background="themes/{tmpl_var name="theme"}/images/nav_top_bg.gif">&nbsp;</td>
-    <td rowspan="3" class="mainContent">
-		<table width="100%" height="100%" border="0" cellpadding="20" cellspacing="0">
-			<tr>
-        		<td width="200"><iframe height="100%" width="100%" frameborder="0" name="navframe" src="{tmpl_var name="navframe_page"}"></iframe></td>
-				<td><iframe height="100%" width="100%" frameborder="0" name="content" src="{tmpl_var name="startpage"}"></iframe></td>
-      		</tr>
-    	</table>
-	</td>
-  </tr>
-  <tr>
-    <td width="128" align="right" valign="top" bgcolor="#DEE4F2"><table width="128" border="0" cellspacing="0" cellpadding="2">
-      <tr>
-        <td height="10">&nbsp;</td>
-      </tr>
-	  <tr><td align="center">
-	  <tmpl_loop name="nav_left">
-	  <table bgcolor="#F4F6FB" width="115">
-      <tr>
-        <td class="navLeftHead"><tmpl_var name="title"></td>
-        </tr>
-      <tr>
-        <td>
-		  <tmpl_loop name="items">
-		  <a href="<tmpl_var name='link'>" class="navLeftItem" target="<tmpl_var name='target'>"><tmpl_var name="title"></a><br>
-		  </tmpl_loop>
-		</td>
-      </tr>
-	  </table>
-	  <br />
-	  </tmpl_loop>
-	  </td></tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td align="left" valign="bottom" bgcolor="#DEE4F2">&nbsp;</td>
-  </tr>
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/templates/sidenav.tpl.htm b/interface/web/themes/default_no_navimg/templates/sidenav.tpl.htm
deleted file mode 100644
index 4626d369e6bac78e4e914fe47feceec6714c2937..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/sidenav.tpl.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<ul id="submenu">
-<tmpl_loop name="nav_left">
-  <li id="title">
-    <tmpl_if name="startpage">
-      <a href="#" onClick="loadContent('<tmpl_var name='startpage'>')">
-    </tmpl_if>
-    <tmpl_var name="title">
-    <tmpl_if name="startpage">
-      </a>
-    </tmpl_if>
-  </li>
-  <tmpl_loop name="items">
-    <li>
-      <tmpl_if name="link">
-        <a href="#" onClick="loadContent('<tmpl_var name='link'>')">
-      </tmpl_if>
-      <tmpl_var name="title">
-      <tmpl_if name="link">
-        </a>
-      </tmpl_if>
-    </li>
-  </tmpl_loop>
-</tmpl_loop>
-</ul>
diff --git a/interface/web/themes/default_no_navimg/templates/tabbed_form.tpl.htm b/interface/web/themes/default_no_navimg/templates/tabbed_form.tpl.htm
deleted file mode 100644
index 0e31bc0565f834059e65d76ac35faa93057786b7..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/tabbed_form.tpl.htm
+++ /dev/null
@@ -1,28 +0,0 @@
-<tmpl_if name="form_hint">
-<h2><tmpl_var name="form_hint"></h2>
-</tmpl_if>
-<div class="tabbox_tabs">
-	<ul>
-<tmpl_loop name="formTab">
-<tmpl_if name="active">
-    <li class="active"><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
-<tmpl_else>
-    <li><a href="javascript:changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a></li>
-</tmpl_if>
-</tmpl_loop>
-	</ul>
-</div>
-<div id="tabbox_content">
-
-	<tmpl_if name="msg">
-	<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
-  </tmpl_if>
-  <tmpl_if name="error">
-	<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
-  </tmpl_if>
-  
-  <tmpl_dyninclude name="content_tpl">
-</div>
-
-<input type="hidden" name="next_tab" value="">
-<input type="hidden" name="phpsessid" value="{tmpl_var name='phpsessid'}">
diff --git a/interface/web/themes/default_no_navimg/templates/topnav.tpl.htm b/interface/web/themes/default_no_navimg/templates/topnav.tpl.htm
deleted file mode 100644
index 668df7ba37acddd1b22b8e8bd3f7115e92c5cd60..0000000000000000000000000000000000000000
--- a/interface/web/themes/default_no_navimg/templates/topnav.tpl.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<ul id="topmenu">
-<tmpl_loop name="nav_top">
-<tmpl_if name="active">
-  <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
-<tmpl_else>
-  <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
-</tmpl_if>
-</tmpl_loop>
-</ul>