[webui] Restructure file tree + convert tabs to 2 whitespaces + remove setup.html

316 files changed, 2600 insertions, 2642 deletions

diff --git a/module/setup.py b/module/setup.py
index 7848359a6..8f18b2568 100644
--- a/module/setup.py
+++ b/module/setup.py
@@ -40,9 +40,9 @@ class Setup:
         #        viaweb = self.ask(_("Start initial webinterface for configuration?"), "y", bool=True)
         #        if viaweb:
         #            try:
-        #                from module.web import ServerThread
+        #                from module.webui import ServerThread
         #                ServerThread.setup = self
-        #                from module.web import webinterface
+        #                import module.webui as webinterface
         #                webinterface.run_simple()
         #                return False
         #            except Exception, e:
diff --git a/module/web/__init__.py b/module/web/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/web/__init__.py
+++ /dev/null
diff --git a/module/web/themes/dark/css/MooDialog.css b/module/web/themes/dark/css/MooDialog.css
deleted file mode 100644
index 416089044..000000000
--- a/module/web/themes/dark/css/MooDialog.css
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Created by Arian Stolwijk <http://www.aryweb.nl> */
-
-.MooDialog {
-/*	position: fixed;*/
-    margin: 0 auto 0 -350px;
-    width:600px;
-    padding:14px;
-    left:50%;
-    top: 100px;
-    color:white;
-
-	position: absolute;
-	left: 50%;
-	z-index: 50000;
-
-	background: url(../img/dark-bg.jpg);
-	color: black;
-	border-radius: 7px;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-	border-radius: 7px;
-	-moz-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-	-webkit-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-	box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-}
-
-.MooDialogTitle {
-	padding-top: 30px;
-}
-
-.MooDialog .title {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	padding: 3px 20px;
-	background: #b7c4dc;
-	border-bottom: 1px solid #a1aec5;
-	font-weight: bold;
-	text-shadow: 1px 1px 0 #fff;
-	color: black;
-	border-radius: 7px;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-}
-
-.MooDialog .close {
-	background: url(../img/dialog-close.png) no-repeat;
-	width: 16px;
-	height: 16px;
-	display: block;
-	cursor: pointer;
-	top: -5px;
-	left: -5px;
-	position: absolute;
-}
-
-.MooDialog .buttons {
-	text-align: right;
-	margin: 0;
-	padding: 0;
-	border: 0;
-	background: none;
-}
-
-.MooDialog .iframe {
-	width: 100%;
-	height: 100%;
-}
-
-.MooDialog .textInput {
-	width: 200px;
-	float: left;
-        color:white;
-}
-
-.MooDialog .MooDialogAlert,
-.MooDialog .MooDialogConfirm,
-.MooDialog .MooDialogPrompt,
-.MooDialog .MooDialogError {
-	background: url(../img/dialog-warning.png) no-repeat;
-	padding-left: 40px;
-	min-height: 40px;
-        color:white;
-}
-
-.MooDialog .MooDialogConfirm,
-.MooDialog .MooDialogPromt {
-	background: url(../img/dialog-question.png) no-repeat;
-}
-
-.MooDialog .MooDialogError {
-	background: url(../img/dialog-error.png) no-repeat;
-}
-
diff --git a/module/web/themes/dark/css/default.css b/module/web/themes/dark/css/default.css
deleted file mode 100644
index da581299d..000000000
--- a/module/web/themes/dark/css/default.css
+++ /dev/null
@@ -1,968 +0,0 @@
-.hidden {
-	display:none;
-}
-.leftalign {
-	text-align:left;
-}
-.centeralign {
-	text-align:center;
-}
-.rightalign {
-	text-align:right;
-}
-
-
-.dokuwiki div.plugin_translation ul li a.wikilink1:link, .dokuwiki div.plugin_translation ul li a.wikilink1:hover, .dokuwiki div.plugin_translation ul li a.wikilink1:active, .dokuwiki div.plugin_translation ul li a.wikilink1:visited {
-	background-color:#000080;
-	color:#fff !important;
-	text-decoration:none;
-	padding:0 0.2em;
-	margin:0.1em 0.2em;
-	border:none !important;
-}
-.dokuwiki div.plugin_translation ul li a.wikilink2:link, .dokuwiki div.plugin_translation ul li a.wikilink2:hover, .dokuwiki div.plugin_translation ul li a.wikilink2:active, .dokuwiki div.plugin_translation ul li a.wikilink2:visited {
-	background-color:#808080;
-	color:#fff !important;
-	text-decoration:none;
-	padding:0 0.2em;
-	margin:0.1em 0.2em;
-	border:none !important;
-}
-
-.dokuwiki div.plugin_translation ul li a:hover img {
-	opacity:1.0;
-	height:15px;
-}
-
-body {
-	margin:0;
-	padding:0;
-	background-image: url(../img/dark-bg.jpg);
-	color:white;
-	font-size:12px;
-	font-family:Verdana, Helvetica, "Lucida Grande", Lucida, Arial, sans-serif;
-	font-family:sans-serif;
-	font-size:99, 96%;
-	font-size-adjust:none;
-	font-style:normal;
-	font-variant:normal;
-	font-weight:normal;
-	line-height:normal;
-}
-hr {
-	border-width:0;
-	border-bottom:1px #aaa dotted;
-}
-img {
-	border:none;
-}
-form {
-	margin:0px;
-	padding:0px;
-	border:none;
-	display:inline;
-	background:transparent;
-}
-ul li {
-	margin:5px;
-}
-textarea {
-	font-family:monospace;
-}
-table {
-	margin:0.5em 0;
-	border-collapse:collapse;
-}
-td {
-	padding:0.25em;
-	border:1pt solid #ADB9CC;
-}
-a {
-	color:#3465a4;
-	text-decoration:none;
-}
-a:hover {
-	text-decoration:underline;
-}
-
-option {
-	border:0 none #fff;
-}
-strong.highlight {
-	background-color:#fc9;
-	padding:1pt;
-}
-#pagebottom {
-	clear:both;
-}
-hr {
-	height:1px;
-	color:#c0c0c0;
-	background-color:#c0c0c0;
-	border:none;
-	margin:.2em 0 .2em 0;
-}
-
-.invisible {
-	margin:0px;
-	border:0px;
-	padding:0px;
-	height:0px;
-	visibility:hidden;
-}
-.left {
-	float:left !important;
-}
-.right {
-	float:right !important;
-}
-.center {
-	text-align:center;
-}
-div#body-wrapper {
-	padding:40px 40px 10px 40px;
-	font-size:127%;
-}
-div#content {
-	margin-top:-20px;
-	padding:0;
-	font-size:14px;
-	color:white;
-	line-height:1.5em;
-}
-h1, h2, h3, h4, h5, h6 {
-	background:transparent none repeat scroll 0 0;
-	border-bottom:1px solid #aaa;
-	color:white;
-	font-weight:normal;
-	margin:0;
-	padding:0;
-	padding-bottom:0.17em;
-	padding-top:0.5em;
-}
-h1 {
-	font-size:188%;
-	line-height:1.2em;
-	margin-bottom:0.1em;
-	padding-bottom:0;
-}
-h2 {
-	font-size:150%;
-}
-h3, h4, h5, h6 {
-	border-bottom:none;
-	font-weight:bold;
-}
-h3 {
-	font-size:132%;
-}
-h4 {
-	font-size:116%;
-}
-h5 {
-	font-size:100%;
-}
-h6 {
-	font-size:80%;
-}
-ul#page-actions, ul#page-actions-more {
-	float:right;
-	margin:10px 10px 0 10px;
-	padding:6px;
-	color:white;
-	background-color:#202020;
-	list-style-type:none;
-	white-space: nowrap;
-	border-radius:5px;
-	-moz-border-radius:5px;
-	border:1px solid grey;
-}
-ul#user-actions {
-	padding:5px;
-	margin:0;
-	display:inline;
-	color:white;
-	background-color:#202020;
-	list-style-type:none;
-	-moz-border-radius:3px;
-	border-radius:3px;
-}
-ul#page-actions li, ul#user-actions li, ul#page-actions-more li {
-	display:inline;
-}
-ul#page-actions a, ul#user-actions a, ul#page-actions-more a {
-	text-decoration:none;
-	color:white;
-	display:inline;
-	margin:0 3px;
-	padding:2px 0px 2px 18px;
-}
-ul#page-actions a:hover, ul#page-actions a:focus, ul#user-actions a:hover, ul#user-actions a:focus {
-	/*text-decoration:underline;*/
-}
-/***************************/
-ul#page-actions2 {
-	float:left;
-	margin:10px 10px 0 10px;
-	padding:6px;
-	color:white;
-	background-color:#202020;
-	list-style-type:none;
-	border-radius:5px;
-	-moz-border-radius:5px;
-	border:1px solid grey;
-}
-ul#user-actions2 {
-	padding:5px;
-	margin:0;
-	display:inline;
-	color:white;
-	background-color:#202020;
-	list-style-type:none;
-	border-radius:3px;
-	-moz-border-radius:3px;
-}
-ul#page-actions2 li, ul#user-actions2 li {
-	display:inline;
-}
-ul#page-actions2 a, ul#user-actions2 a {
-	text-decoration:none;
-	color:white;
-	display:inline;
-	margin:0 3px;
-	padding:2px 0px 2px 18px;
-}
-ul#page-actions2 a:hover, ul#page-actions2 a:focus, ul#user-actions2 a:hover, ul#user-actions2 a:focus,
-ul#page-actions-more a:hover, ul#page-actions-more a:focus{
-	color: #4e7bb4;
-}
-/****************************/
-.hidden {
-	display:none;
-}
-
-a.action.index {
-	background:transparent url(../img/wiki-tools-index.png) 0px 1px no-repeat;
-}
-a.action.recent {
-	background:transparent url(../img/wiki-tools-recent.png) 0px 1px no-repeat;
-}
-a.logout {
-	background:transparent url(../img/user-actions-logout.png) 0px 1px no-repeat;
-}
-
-a.info {
-    background:transparent url(../img/user-info.png) 0px 1px no-repeat;
-}
-
-a.admin {
-	background:transparent url(../img/user-actions-admin.png) 0px 1px no-repeat;
-}
-a.profile {
-	background:transparent url(../img/user-actions-profile.png) 0px 1px no-repeat;
-}
-a.create, a.edit {
-	background:transparent url(../img/page-tools-edit.png) 0px 1px no-repeat;
-}
-a.source, a.show {
-	background:transparent url(../img/page-tools-source.png) 0px 1px no-repeat;
-}
-a.revisions {
-	background:transparent url(../img/page-tools-revisions.png) 0px 1px no-repeat;
-}
-a.subscribe, a.unsubscribe {
-	background:transparent url(../img/page-tools-subscribe.png) 0px 1px no-repeat;
-}
-a.backlink {
-	background:transparent url(../img/page-tools-backlinks.png) 0px 1px no-repeat;
-}
-a.play {
-	background:transparent url(../img/control_play.png) 0px 1px no-repeat;
-}
-.time {
-	background:transparent url(../img/status_None.png) 0px 1px no-repeat;
-        padding: 2px 0px 2px 18px;
-        margin: 0px 3px;
-}
-.reconnect {
-	background:transparent url(../img/reconnect.png) 0px 1px no-repeat;
-        padding: 2px 0px 2px 18px;
-        margin: 0px 3px;
-}
-a.play:hover {
-	background:transparent url(../img/control_play_blue.png) 0px 1px no-repeat;
-}
-a.cancel {
-	background:transparent url(../img/control_cancel.png) 0px 1px no-repeat;
-}
-a.cancel:hover {
-	background:transparent url(../img/control_cancel_blue.png) 0px 1px no-repeat;
-}
-a.pause {
-	background:transparent url(../img/control_pause.png) 0px 1px no-repeat;
-}
-a.pause:hover {
-	background:transparent url(../img/control_pause_blue.png) 0px 1px no-repeat;
-	font-weight: bold;
-}
-a.stop {
-	background:transparent url(../img/control_stop.png) 0px 1px no-repeat;
-}
-a.stop:hover {
-	background:transparent url(../img/control_stop_blue.png) 0px 1px no-repeat;
-}
-a.add {
-	background:transparent url(../img/control_add.png) 0px 1px no-repeat;
-}
-a.add:hover {
-	background:transparent url(../img/control_add_blue.png) 0px 1px no-repeat;
-}
-a.cog {
-	background:transparent url(../img/cog.png) 0px 1px no-repeat;
-}
-#head-panel {
-	background:#525252 url(../img/head_bg1.png) bottom left repeat-x;
-}
-#head-panel h1 {
-	display:none;
-	margin:0;
-	text-decoration:none;
-	padding-top:0.8em;
-	padding-left:3.3em;
-	font-size:2.6em;
-	color:#eeeeec;
-}
-#head-panel #head-logo {
-	float:left;
-	margin:5px 0 -15px 5px;
-	padding:0;
-	overflow:visible;
-}
-#head-menu {
-	background:transparent url(../img/tabs-border-bottom.png) 0 100% repeat-x;
-	width:100%;
-	float:left;
-	margin:0;
-	padding:0;
-	padding-top:0.8em;
-}
-#head-menu ul {
-	list-style:none;
-	margin:0 1em 0 2em;
-}
-#head-menu ul li {
-	float:left;
-	margin:0;
-	margin-left:0.3em;
-	font-size:14px;
-	margin-bottom:4px;
-}
-#head-menu ul li.selected, #head-menu ul li:hover {
-	margin-bottom:0px;
-}
-#head-menu ul li a img {
-	height:22px;
-	width:22px;
-	vertical-align:middle;
-}
-#head-menu ul li a, #head-menu ul li a:link {
-	float:left;
-	text-decoration:none;
-	color:white;
-	background: url(../img/dark-bg.jpg) 0 100% repeat-x;
-	padding:3px 7px 3px 7px;
-	border:2px solid #ccc;
-	border-bottom:0px solid transparent;
-	padding-bottom:3px;
-	-moz-border-radius:5px;
-	border-radius:5px;
-}
-#head-menu ul li a:hover, #head-menu ul li a:focus {
-	color:#3465a4;
-	background-image: url(../img/dark-bg.jpg);
-	padding-bottom:7px;
-	border-bottom:0px none transparent;
-	outline:none;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	-moz-border-radius-bottomright:0px;
-	-moz-border-radius-bottomleft:0px;
-}
-#head-menu ul li a:focus {
-	margin-bottom:-4px;
-}
-#head-menu ul li.selected a {
-	color:white;
-	background-image: url(../img/dark-bg.jpg);
-	padding-bottom:7px;
-	border-bottom:0px none transparent;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	-moz-border-radius-bottomright:0px;
-	-moz-border-radius-bottomleft:0px;
-}
-#head-menu ul li.selected a:hover, #head-menu ul li.selected a:focus {
-	color:#3465a4;
-}
-div#head-search-and-login {
-	float:right;
-	margin:0 1em 0 0;
-	background-color:#222;
-	padding:7px 7px 5px 5px;
-	color:white;
-	white-space: nowrap;
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-	-moz-border-radius-bottomright:6px;
-	-moz-border-radius-bottomleft:6px;
-	border-right:1px solid grey;
-	border-left:1px solid grey;
-	border-bottom:1px solid grey;
-}
-div#head-search-and-login form {
-	display:inline;
-	padding:0 3px;
-}
-div#head-search-and-login form input {
-	border:2px solid #888;
-	background:#eee;
-	font-size:14px;
-	padding:2px;
-	border-radius:3px;
-	-moz-border-radius:3px;
-}
-div#head-search-and-login form input:focus {
-	background:#fff;
-}
-#head-search {
-	font-size:14px;
-}
-#head-username, #head-password {
-	width:80px;
-	font-size:14px;
-}
-#pageinfo {
-	clear:both;
-	color:#888;
-	padding:0.6em 0;
-	margin:0;
-}
-#foot {
-	font-style:normal;
-	color:#888;
-	text-align:center;
-}
-#foot a {
-	color:#aaf;
-}
-#foot img {
-	vertical-align:middle;
-}
-div.toc {
-	border:1px dotted #888;
-	background:#f0f0f0;
-	margin:1em 0 1em 1em;
-	float:right;
-	font-size:95%;
-}
-div.toc .tocheader {
-	font-weight:bold;
-	margin:0.5em 1em;
-}
-div.toc ol {
-	margin:1em 0.5em 1em 1em;
-	padding:0;
-}
-div.toc ol li {
-	margin:0;
-	padding:0;
-	margin-left:1em;
-}
-div.toc ol ol {
-	margin:0.5em 0.5em 0.5em 1em;
-	padding:0;
-}
-div.recentchanges table {
-	clear:both;
-}
-div#editor-help {
-	font-size:90%;
-	border:1px dotted #888;
-	padding:0ex 1ex 1ex 1ex;
-	background:#f7f6f2;
-}
-div#preview {
-	margin-top:1em;
-}
-label.block {
-	display:block;
-	text-align:right;
-	font-weight:bold;
-}
-label.simple {
-	display:block;
-	text-align:left;
-	font-weight:normal;
-}
-label.block input.edit {
-	width:50%;
-}
-/*fieldset {
-	width:300px;
-	text-align:center;
-	padding:0.5em;
-	margin:auto;
-}
-*/
-div.editor {
-	margin:0 0 0 0;
-}
-table {
-	margin:0.5em 0;
-	border-collapse:collapse;
-}
-td {
-	padding:0.25em;
-	border:1pt solid #ADB9CC;
-}
-td p {
-	margin:0;
-	padding:0;
-}
-.u {
-	text-decoration:underline;
-}
-.footnotes ul {
-	padding:0 2em;
-	margin:0 0 1em;
-}
-.footnotes li {
-	list-style:none;
-}
-.userpref table, .userpref td {
-	border:none;
-}
-#message {
-	clear:both;
-	padding:5px 10px;
-	background-color:#eee;
-	border-bottom:2px solid #ccc;
-}
-#message p {
-	margin:5px 0;
-	padding:0;
-	font-weight:bold;
-}
-#message div.buttons {
-	font-weight:normal;
-}
-.diff {
-	width:99%;
-}
-.diff-title {
-	background-color:#C0C0C0;
-}
-.searchresult dd span {
-	font-weight:bold;
-}
-.boxtext {
-	font-family:tahoma, arial, sans-serif;
-	font-size:11px;
-	color:#000;
-	float:none;
-	padding:3px 0 0 10px;
-}
-.statusbutton {
-	width:32px;
-	height:32px;
-	float:left;
-	margin-left:-32px;
-	margin-right:5px;
-	opacity:0;
-	cursor:pointer
-}
-.dlsize {
-	float:left;
-	padding-right: 8px;
-}
-.dlspeed {
-	float:left;
-	padding-right: 8px;
-}
-.package {
-	margin-bottom: 10px;
-}
-.packagename {
-	font-weight: bold;
-}
-
-.child {
-	margin-left: 20px;
-}
-.child_status {
-	margin-right: 10px;
-}
-.child_secrow {
-	font-size: 10px;
-}
-
-.header, .header th {
-	text-align: left;
-	font-weight: normal;
-	background-color:#202020;
-	border-top:1px solid grey;
-	border-bottom:1px solid grey;
-	-moz-border-radius:5px;
-	border-radius:5px;
-}
-.progress_bar {
-	background: #0C0;
-	height: 5px;
-	
-}
-
-.queue {
-	border: none
-}
-
-.queue tr td {
-	border: none
-}
-
-.header, .header th{
-	text-align: left;
-	font-weight: normal;
-}
-
-
-.clearer
-{
-	clear: both;
-	height: 1px;
-}
-
-.left
-{
-	float: left;
-}
-
-.right
-{
-	float: right;
-}
-
-
-.setfield
-{
-    display: table-cell;
-}
-
-ul.tabs li a
-{
-   padding: 5px 16px 4px 15px;
-   border: none;
-   font-weight: bold;
-
-    border-radius: 5px 5px 0 0;
-    -moz-border-radius: 5px 5px 0 0;
-
-}
-
-
-#tabs span
-{
-    display: none;
-}
-
-#tabs span.selected
-{
-    display: inline;
-}
-
-#tabsback
-{
-    background-color: #525252;
-    margin: 2px 0 0;
-    padding: 6px 4px 1px 4px;
-
-    border-top-right-radius: 30px;
-    border-top-left-radius: 3px;
-    -moz-border-radius-topright: 30px;
-    -moz-border-radius-topleft: 3px;
-}
-ul.tabs
-{
-    list-style-type: none;
-    margin:0;
-    padding: 0 40px 0 0;
-}
-
-ul.tabs li
-{
-    display: inline;
-    margin-left: 8px;
-}
-
-ul.tabs li a
-{
-    color: white;
-    background-color: #202020;
-    border: 1px solid grey;
-    border-bottom:none;
-    margin: 0;
-    text-decoration: none;
-
-    outline: 0;
-
-    padding: 5px 16px 4px 15px;
-    font-weight: bold;
-
-     border-radius: 5px 5px 0 0;
-     -moz-border-radius: 5px 5px 0 0;
-
-}
-
-ul.tabs li a.selected, ul.tabs li a:hover
-{
-    color: #3465a4;
-    background-color: white;
-
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    -moz-border-radius-bottomright: 0;
-    -moz-border-radius-bottomleft: 0;
-}
-
-ul.tabs li a:hover
-{
-    background-color: #202020;
-}
-
-ul.tabs li a.selected
-{
-    font-weight: bold;
-    background-color: #525252;
-    padding-bottom: 5px;
-    color: white;
-}
-
-
-#tabs-body {
-    position: relative;
-    overflow: hidden;
-}
-
-
-span.tabContent
-{
-    border: 2px solid #525252;
-    margin: 0;
-    padding: 0;
-    padding-bottom: 10px;
-}
-
-#tabs-body > span {
-    display: none;
-}
-
-#tabs-body > span.active {
-    display: block;
-}
-
-.hide
-{
-    display: none;
-}
-
-.settable
-{
-    color:white;
-    margin: 20px;
-    border: none;
-}
-.settable td
-{
-    border: none;
-    margin: 0;
-    padding: 5px;
-}
-
-.settable th{
-    padding-bottom: 8px;
-}
-
-.settable.wide td , .settable.wide th {
-    padding-left: 15px;
-    padding-right: 15px;
-}
-
-.settable input {
-background-color:#202020;
-color:white;
-}
-.settable select {
-background-color:#202020;
-color:white;
-}
-
-ul.nav {
-    margin: -30px 0 0;
-    padding: 0;
-	list-style: none;
-    position: absolute;
-}
-
-
-ul.nav li {
-	position: relative;
-	float: left;
-	padding: 5px;
-}
-
-ul.nav > li a {
-    background: #202020;
-    -moz-border-radius: 4px 4px 4px 4px;
-    border: 1px solid grey;
-    border-bottom: medium none;
-    color: white;
-}
-
-ul.nav ul {
-	position: absolute;
-	top: 26px;
-	left: 10px;
-	margin: 0;
-	padding: 0;
-	list-style: none;
-	border: 1px solid #AAA;
-	background: #202020;
-	-webkit-box-shadow: 1px 1px 5px #AAA;
-	-moz-box-shadow: 1px 1px 5px #AAA;
-	box-shadow: 1px 1px 5px #AAA;
-    cursor: pointer;
-}
-
-ul.nav .open {
-	display: block;
-}
-
-ul.nav .close {
-	display: none;
-}
-
-ul.nav ul li {
-	float: none;
-	padding: 0;
-}
-
-ul.nav ul li a {
-	width: 130px;
-	background: #f1f1f1;
-	padding: 3px;
-	display: block;
-	font-weight: normal;
-}
-
-ul.nav ul li a:hover {
-	background: #CDCDCD;
-}
-
-ul.nav ul ul {
-	left: 137px;
-	top: 0;
-}
-
-.purr-wrapper{
-	margin:10px;
-}
-
-/*Purr alert styles*/
-
-.purr-alert{
-	margin-bottom:10px;
-	padding:10px;
-	background:#000;
-	font-size:13px;
-	font-weight:bold;
-	color:#FFF;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	/*-moz-box-shadow: 0 0 10px rgba(255,255,0,.25);*/
-	width:300px;
-}
-.purr-alert.error{
-	color:#F55;
-	padding-left:30px;
-	background:url(../img/error.png) no-repeat #000 7px 10px;
-	width:280px;
-}
-.purr-alert.success{
-	color:#5F5;
-	padding-left:30px;
-	background:url(../img/success.png) no-repeat #000 7px 10px;
-	width:280px;
-}
-.purr-alert.notice{
-	color:#99F;
-	padding-left:30px;
-	background:url(../img/notice.png) no-repeat #000 7px 10px;
-	width:280px;
-}
-
-table.system {
-    border: none;
-    margin-left: 10px;
-}
-
-table.system td {
-    border: none
-}
-
-table.system tr > td:first-child {
-    font-weight: bold;
-    padding-right: 10px;
-}
-
-#foot {
-color:white;
-}
-
-#login_table {
-margin-left:auto;
-margin-right:auto;
-}
-
-#login_table td {
-padding:5px;
-border:1px solid grey;
-}
-
-#login_table input[type=text], #login_table input[type=password] {
-width:120px;
-background-color:transparent;
--moz-opacity: 0.10;
-color:white;
-border: 1px solid grey;
--moz-border-radius: 2px;
--webkit-border-radius: 2px;
-border-radius: 18px;
-padding-left:5px;
-padding-right:5px;
-}
-
-#login_table input[type=text]:focus, #login_table input[type=password]:focus {
-border:1px solid #3465a4;
-}
-
-#login_table input[type=submit] {
-background-color:transparent;
-color:white;
-border: 1px solid grey;
--moz-border-radius: 2px;
--webkit-border-radius: 2px;
-border-radius: 18px;
-}
-
-#login_table input[type=submit]:hover {
-border:1px solid #3465a4;
-}
\ No newline at end of file
diff --git a/module/web/themes/dark/tml/captcha.html b/module/web/themes/dark/tml/captcha.html
deleted file mode 100644
index 288375b76..000000000
--- a/module/web/themes/dark/tml/captcha.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- Captcha box -->
-<div id="cap_box" class="window_box">
-
-	<form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
-	
-		<h1>{{_("Captcha reading")}}</h1>
-		<p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
-		
-		<div id="cap_textual">
-		
-			<input id="cap_id" name="cap_id" type="hidden" value="" />
-		
-			<label>{{_("Captcha")}}
-			<span class="small">{{_("The captcha.")}}</span>
-			</label>
-			<span class="cont">
-			    <img id="cap_textual_img" src="">
-			</span>
-			
-			<label>{{_("Text")}}
-			<span class="small">{{_("Input the text on the captcha.")}}</span>
-			</label>
-			<input id="cap_result" name="cap_result" type="text" size="20" />
-					
-		</div>
-		
-		<div id="cap_positional" style="text-align: center">
-		    <img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
-		</div>
-
-		<div id="button_bar" style="text-align: center">
-			<span>
-				<button id="cap_submit" type="submit" style="margin-left: 0">{{_("Submit")}}</button>
-				<button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
-			</span>
-		</div>
-		
-		<div class="spacer"></div>
-	
-	</form>
-
-</div>
\ No newline at end of file
diff --git a/module/web/themes/dark/tml/folder.html b/module/web/themes/dark/tml/folder.html
deleted file mode 100644
index 95a671cf9..000000000
--- a/module/web/themes/dark/tml/folder.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<li class="folder">
-  <input type="hidden" name="path" class="path" value="{{ path }}" />
-  <input type="hidden" name="name" class="name" value="{{ name }}" />
-  <span>
-    <b>{{ name }}</b>
-    <span class="buttons" style="opacity:0">
-	  <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
-	  &nbsp;&nbsp;
-	  <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
-	  &nbsp;&nbsp;
-	  <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/add_folder.png" />
-    </span>
-  </span>
-  <div style="display:none">{{ _("Folder is empty") }}</div>
-</li>
\ No newline at end of file
diff --git a/module/web/themes/dark/tml/setup.html b/module/web/themes/dark/tml/setup.html
deleted file mode 100644
index 91671fbab..000000000
--- a/module/web/themes/dark/tml/setup.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends '/dark/tml/base.html' %}
-
-{% block title %}{{ _("Setup") }} - {{ super() }} {% endblock %}
-{% block subtitle %}{{ _("Setup") }}{% endblock %}
-{% block headpanel %}Welcome to pyLoad{% endblock %}
-{% block menu %}
-    <li style="height: 25px"> <!-- Needed to get enough margin -->
-    </li>
-{% endblock %}
-
-{% block content %}
-    Comming Soon.
-{% endblock %}
\ No newline at end of file
diff --git a/module/web/themes/default/css/sources/MooDialog.css b/module/web/themes/default/css/sources/MooDialog.css
deleted file mode 100644
index c88773ae9..000000000
--- a/module/web/themes/default/css/sources/MooDialog.css
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Created by Arian Stolwijk <http://www.aryweb.nl> */
-
-.MooDialog {
-	position: fixed;
-	width: 300px;
-	height: 100px;
-	top: 50%;
-	left: 50%;
-	margin: -150px 0 0 -150px;
-	padding: 10px;
-	z-index: 50000;
-
-	background: #eef5f8;
-	color: black;
-	border-radius: 7px;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-	border-radius: 7px;
-	-moz-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-	-webkit-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-	box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-}
-
-.MooDialogTitle {
-	padding-top: 30px;
-}
-
-.MooDialog .content {
-	height: 100px;
-}
-
-.MooDialog .title {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	padding: 3px 20px;
-
-	background: #b7c4dc;
-	border-bottom: 1px solid #a1aec5;
-	font-weight: bold;
-	text-shadow: 1px 1px 0 #fff;
-	color: black;
-	border-radius: 7px;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-}
-
-.MooDialog .close {
-	position: absolute;
-	width: 16px;
-	height: 16px;
-	top: -5px;
-	left: -5px;
-
-	background: url(dialog-close.png) no-repeat;
-	display: block;
-	cursor: pointer;
-}
-
-.MooDialog .buttons {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	background: none;
-	text-align: right;
-}
-
-.MooDialog .iframe {
-	width: 100%;
-	height: 100%;
-}
-
-.MooDialog .textInput {
-	width: 200px;
-	float: left;
-}
-
-.MooDialog .MooDialogAlert,
-.MooDialog .MooDialogConfirm,
-.MooDialog .MooDialogPrompt,
-.MooDialog .MooDialogError {
-	padding-left: 40px;
-	min-height: 40px;
-	background: url(dialog-warning.png) no-repeat;
-}
-
-.MooDialog .MooDialogConfirm,
-.MooDialog .MooDialogPrompt {
-	background: url(dialog-question.png) no-repeat;
-}
-
-.MooDialog .MooDialogError {
-	background: url(dialog-error.png) no-repeat;
-}
diff --git a/module/web/themes/default/css/sources/default.css b/module/web/themes/default/css/sources/default.css
deleted file mode 100644
index fee58583b..000000000
--- a/module/web/themes/default/css/sources/default.css
+++ /dev/null
@@ -1,908 +0,0 @@
-.hidden {
-	display:none;
-}
-.leftalign {
-	text-align:left;
-}
-.centeralign {
-	text-align:center;
-}
-.rightalign {
-	text-align:right;
-}
-
-
-.dokuwiki div.plugin_translation ul li a.wikilink1:link, .dokuwiki div.plugin_translation ul li a.wikilink1:hover, .dokuwiki div.plugin_translation ul li a.wikilink1:active, .dokuwiki div.plugin_translation ul li a.wikilink1:visited {
-	background-color:#000080;
-	color:#fff !important;
-	text-decoration:none;
-	padding:0 0.2em;
-	margin:0.1em 0.2em;
-	border:none !important;
-}
-.dokuwiki div.plugin_translation ul li a.wikilink2:link, .dokuwiki div.plugin_translation ul li a.wikilink2:hover, .dokuwiki div.plugin_translation ul li a.wikilink2:active, .dokuwiki div.plugin_translation ul li a.wikilink2:visited {
-	background-color:#808080;
-	color:#fff !important;
-	text-decoration:none;
-	padding:0 0.2em;
-	margin:0.1em 0.2em;
-	border:none !important;
-}
-
-.dokuwiki div.plugin_translation ul li a:hover img {
-	opacity:1.0;
-	height:15px;
-}
-
-body {
-	margin:0;
-	padding:0;
-	background-color:white;
-	color:black;
-	font-size:12px;
-	font-family:Verdana, Helvetica, "Lucida Grande", Lucida, Arial, sans-serif;
-	font-family:sans-serif;
-	font-size:99, 96%;
-	font-size-adjust:none;
-	font-style:normal;
-	font-variant:normal;
-	font-weight:normal;
-	line-height:normal;
-}
-hr {
-	border-width:0;
-	border-bottom:1px #aaa dotted;
-}
-img {
-	border:none;
-}
-form {
-	margin:0px;
-	padding:0px;
-	border:none;
-	display:inline;
-	background:transparent;
-}
-ul li {
-	margin:5px;
-}
-textarea {
-	font-family:monospace;
-}
-table {
-	margin:0.5em 0;
-	border-collapse:collapse;
-}
-td {
-	padding:0.25em;
-	border:1pt solid #ADB9CC;
-}
-a {
-	color:#3465a4;
-	text-decoration:none;
-}
-a:hover {
-	text-decoration:underline;
-}
-
-option {
-	border:0 none #fff;
-}
-strong.highlight {
-	background-color:#fc9;
-	padding:1pt;
-}
-#pagebottom {
-	clear:both;
-}
-hr {
-	height:1px;
-	color:#c0c0c0;
-	background-color:#c0c0c0;
-	border:none;
-	margin:.2em 0 .2em 0;
-}
-
-.invisible {
-	margin:0px;
-	border:0px;
-	padding:0px;
-	height:0px;
-	visibility:hidden;
-}
-.left {
-	float:left !important;
-}
-.right {
-	float:right !important;
-}
-.center {
-	text-align:center;
-}
-div#body-wrapper {
-	padding:40px 40px 10px 40px;
-	font-size:127%;
-}
-div#content {
-	margin-top:-20px;
-	padding:0;
-	font-size:14px;
-	color:black;
-	line-height:1.5em;
-}
-h1, h2, h3, h4, h5, h6 {
-	background:transparent none repeat scroll 0 0;
-	border-bottom:1px solid #aaa;
-	color:black;
-	font-weight:normal;
-	margin:0;
-	padding:0;
-	padding-bottom:0.17em;
-	padding-top:0.5em;
-}
-h1 {
-	font-size:188%;
-	line-height:1.2em;
-	margin-bottom:0.1em;
-	padding-bottom:0;
-}
-h2 {
-	font-size:150%;
-}
-h3, h4, h5, h6 {
-	border-bottom:none;
-	font-weight:bold;
-}
-h3 {
-	font-size:132%;
-}
-h4 {
-	font-size:116%;
-}
-h5 {
-	font-size:100%;
-}
-h6 {
-	font-size:80%;
-}
-ul#page-actions, ul#page-actions-more {
-	float:right;
-	margin:10px 10px 0 10px;
-	padding:6px;
-	color:black;
-	background-color:#ececec;
-	list-style-type:none;
-	white-space: nowrap;
-	border-radius:5px;
-	-moz-border-radius:5px;
-}
-ul#user-actions {
-	padding:5px;
-	margin:0;
-	display:inline;
-	color:black;
-	background-color:#ececec;
-	list-style-type:none;
-	-moz-border-radius:3px;
-	border-radius:3px;
-}
-ul#page-actions li, ul#user-actions li, ul#page-actions-more li {
-	display:inline;
-}
-ul#page-actions a, ul#user-actions a, ul#page-actions-more a {
-	text-decoration:none;
-	color:black;
-	display:inline;
-	margin:0 3px;
-	padding:2px 0px 2px 18px;
-}
-ul#page-actions a:hover, ul#page-actions a:focus, ul#user-actions a:hover, ul#user-actions a:focus {
-	/*text-decoration:underline;*/
-}
-/***************************/
-ul#page-actions2 {
-	float:left;
-	margin:10px 10px 0 10px;
-	padding:6px;
-	color:black;
-	background-color:#ececec;
-	list-style-type:none;
-	border-radius:5px;
-	-moz-border-radius:5px;
-}
-ul#user-actions2 {
-	padding:5px;
-	margin:0;
-	display:inline;
-	color:black;
-	background-color:#ececec;
-	list-style-type:none;
-	border-radius:3px;
-	-moz-border-radius:3px;
-}
-ul#page-actions2 li, ul#user-actions2 li {
-	display:inline;
-}
-ul#page-actions2 a, ul#user-actions2 a {
-	text-decoration:none;
-	color:black;
-	display:inline;
-	margin:0 3px;
-	padding:2px 0px 2px 18px;
-}
-ul#page-actions2 a:hover, ul#page-actions2 a:focus, ul#user-actions2 a:hover, ul#user-actions2 a:focus,
-ul#page-actions-more a:hover, ul#page-actions-more a:focus{
-	color: #4e7bb4;
-}
-/****************************/
-.hidden {
-	display:none;
-}
-
-a.action.index {
-	background:transparent url(../img/wiki-tools-index.png) 0px 1px no-repeat;
-}
-a.action.recent {
-	background:transparent url(../img/wiki-tools-recent.png) 0px 1px no-repeat;
-}
-a.logout {
-	background:transparent url(../img/user-actions-logout.png) 0px 1px no-repeat;
-}
-
-a.info {
-    background:transparent url(../img/user-info.png) 0px 1px no-repeat;
-}
-
-a.admin {
-	background:transparent url(../img/user-actions-admin.png) 0px 1px no-repeat;
-}
-a.profile {
-	background:transparent url(../img/user-actions-profile.png) 0px 1px no-repeat;
-}
-a.create, a.edit {
-	background:transparent url(../img/page-tools-edit.png) 0px 1px no-repeat;
-}
-a.source, a.show {
-	background:transparent url(../img/page-tools-source.png) 0px 1px no-repeat;
-}
-a.revisions {
-	background:transparent url(../img/page-tools-revisions.png) 0px 1px no-repeat;
-}
-a.subscribe, a.unsubscribe {
-	background:transparent url(../img/page-tools-subscribe.png) 0px 1px no-repeat;
-}
-a.backlink {
-	background:transparent url(../img/page-tools-backlinks.png) 0px 1px no-repeat;
-}
-a.play {
-	background:transparent url(../img/control_play.png) 0px 1px no-repeat;
-}
-.time {
-	background:transparent url(../img/status_None.png) 0px 1px no-repeat;
-        padding: 2px 0px 2px 18px;
-        margin: 0px 3px;
-}
-.reconnect {
-	background:transparent url(../img/reconnect.png) 0px 1px no-repeat;
-        padding: 2px 0px 2px 18px;
-        margin: 0px 3px;
-}
-a.play:hover {
-	background:transparent url(../img/control_play_blue.png) 0px 1px no-repeat;
-}
-a.cancel {
-	background:transparent url(../img/control_cancel.png) 0px 1px no-repeat;
-}
-a.cancel:hover {
-	background:transparent url(../img/control_cancel_blue.png) 0px 1px no-repeat;
-}
-a.pause {
-	background:transparent url(../img/control_pause.png) 0px 1px no-repeat;
-}
-a.pause:hover {
-	background:transparent url(../img/control_pause_blue.png) 0px 1px no-repeat;
-	font-weight: bold;
-}
-a.stop {
-	background:transparent url(../img/control_stop.png) 0px 1px no-repeat;
-}
-a.stop:hover {
-	background:transparent url(../img/control_stop_blue.png) 0px 1px no-repeat;
-}
-a.add {
-	background:transparent url(../img/control_add.png) 0px 1px no-repeat;
-}
-a.add:hover {
-	background:transparent url(../img/control_add_blue.png) 0px 1px no-repeat;
-}
-a.cog {
-	background:transparent url(../img/cog.png) 0px 1px no-repeat;
-}
-#head-panel {
-	background:#525252 url(../img/head_bg1.png) bottom left repeat-x;
-}
-#head-panel h1 {
-	display:none;
-	margin:0;
-	text-decoration:none;
-	padding-top:0.8em;
-	padding-left:3.3em;
-	font-size:2.6em;
-	color:#eeeeec;
-}
-#head-panel #head-logo {
-	float:left;
-	margin:5px 0 -15px 5px;
-	padding:0;
-	overflow:visible;
-}
-#head-menu {
-	background:transparent url(../img/tabs-border-bottom.png) 0 100% repeat-x;
-	width:100%;
-	float:left;
-	margin:0;
-	padding:0;
-	padding-top:0.8em;
-}
-#head-menu ul {
-	list-style:none;
-	margin:0 1em 0 2em;
-}
-#head-menu ul li {
-	float:left;
-	margin:0;
-	margin-left:0.3em;
-	font-size:14px;
-	margin-bottom:4px;
-}
-#head-menu ul li.selected, #head-menu ul li:hover {
-	margin-bottom:0px;
-}
-#head-menu ul li a img {
-	height:22px;
-	width:22px;
-	vertical-align:middle;
-}
-#head-menu ul li a, #head-menu ul li a:link {
-	float:left;
-	text-decoration:none;
-	color:#555;
-	background:#eaeaea url(../img/tab-background.png) 0 100% repeat-x;
-	padding:3px 7px 3px 7px;
-	border:2px solid #ccc;
-	border-bottom:0px solid transparent;
-	padding-bottom:3px;
-	-moz-border-radius:5px;
-	border-radius:5px;
-}
-#head-menu ul li a:hover, #head-menu ul li a:focus {
-	color:#111;
-	padding-bottom:7px;
-	border-bottom:0px none transparent;
-	outline:none;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	-moz-border-radius-bottomright:0px;
-	-moz-border-radius-bottomleft:0px;
-}
-#head-menu ul li a:focus {
-	margin-bottom:-4px;
-}
-#head-menu ul li.selected a {
-	color:#3566A5;
-	background:#fff;
-	padding-bottom:7px;
-	border-bottom:0px none transparent;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	-moz-border-radius-bottomright:0px;
-	-moz-border-radius-bottomleft:0px;
-}
-#head-menu ul li.selected a:hover, #head-menu ul li.selected a:focus {
-	color:#111;
-}
-div#head-search-and-login {
-	float:right;
-	margin:0 1em 0 0;
-	background-color:#222;
-	padding:7px 7px 5px 5px;
-	color:white;
-	white-space: nowrap;
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-	-moz-border-radius-bottomright:6px;
-	-moz-border-radius-bottomleft:6px;
-}
-div#head-search-and-login form {
-	display:inline;
-	padding:0 3px;
-}
-div#head-search-and-login form input {
-	border:2px solid #888;
-	background:#eee;
-	font-size:14px;
-	padding:2px;
-	border-radius:3px;
-	-moz-border-radius:3px;
-}
-div#head-search-and-login form input:focus {
-	background:#fff;
-}
-#head-search {
-	font-size:14px;
-}
-#head-username, #head-password {
-	width:80px;
-	font-size:14px;
-}
-#pageinfo {
-	clear:both;
-	color:#888;
-	padding:0.6em 0;
-	margin:0;
-}
-#foot {
-	font-style:normal;
-	color:#888;
-	text-align:center;
-}
-#foot a {
-	color:#aaf;
-}
-#foot img {
-	vertical-align:middle;
-}
-div.toc {
-	border:1px dotted #888;
-	background:#f0f0f0;
-	margin:1em 0 1em 1em;
-	float:right;
-	font-size:95%;
-}
-div.toc .tocheader {
-	font-weight:bold;
-	margin:0.5em 1em;
-}
-div.toc ol {
-	margin:1em 0.5em 1em 1em;
-	padding:0;
-}
-div.toc ol li {
-	margin:0;
-	padding:0;
-	margin-left:1em;
-}
-div.toc ol ol {
-	margin:0.5em 0.5em 0.5em 1em;
-	padding:0;
-}
-div.recentchanges table {
-	clear:both;
-}
-div#editor-help {
-	font-size:90%;
-	border:1px dotted #888;
-	padding:0ex 1ex 1ex 1ex;
-	background:#f7f6f2;
-}
-div#preview {
-	margin-top:1em;
-}
-label.block {
-	display:block;
-	text-align:right;
-	font-weight:bold;
-}
-label.simple {
-	display:block;
-	text-align:left;
-	font-weight:normal;
-}
-label.block input.edit {
-	width:50%;
-}
-/*fieldset {
-	width:300px;
-	text-align:center;
-	padding:0.5em;
-	margin:auto;
-}
-*/
-div.editor {
-	margin:0 0 0 0;
-}
-table {
-	margin:0.5em 0;
-	border-collapse:collapse;
-}
-td {
-	padding:0.25em;
-	border:1pt solid #ADB9CC;
-}
-td p {
-	margin:0;
-	padding:0;
-}
-.u {
-	text-decoration:underline;
-}
-.footnotes ul {
-	padding:0 2em;
-	margin:0 0 1em;
-}
-.footnotes li {
-	list-style:none;
-}
-.userpref table, .userpref td {
-	border:none;
-}
-#message {
-	clear:both;
-	padding:5px 10px;
-	background-color:#eee;
-	border-bottom:2px solid #ccc;
-}
-#message p {
-	margin:5px 0;
-	padding:0;
-	font-weight:bold;
-}
-#message div.buttons {
-	font-weight:normal;
-}
-.diff {
-	width:99%;
-}
-.diff-title {
-	background-color:#C0C0C0;
-}
-.searchresult dd span {
-	font-weight:bold;
-}
-.boxtext {
-	font-family:tahoma, arial, sans-serif;
-	font-size:11px;
-	color:#000;
-	float:none;
-	padding:3px 0 0 10px;
-}
-.statusbutton {
-	width:32px;
-	height:32px;
-	float:left;
-	margin-left:-32px;
-	margin-right:5px;
-	opacity:0;
-	cursor:pointer
-}
-.dlsize {
-	float:left;
-	padding-right: 8px;
-}
-.dlspeed {
-	float:left;
-	padding-right: 8px;
-}
-.package {
-	margin-bottom: 10px;
-}
-.packagename {
-	font-weight: bold;
-}
-
-.child {
-	margin-left: 20px;
-}
-.child_status {
-	margin-right: 10px;
-}
-.child_secrow {
-	font-size: 10px;
-}
-
-.header, .header th {
-	text-align: left;
-	font-weight: normal;
-	background-color:#ececec;
-	-moz-border-radius:5px;
-	border-radius:5px;
-}
-.progress_bar {
-	background: #0C0;
-	height: 5px;
-	
-}
-
-.queue {
-	border: none
-}
-
-.queue tr td {
-	border: none
-}
-
-.header, .header th{
-	text-align: left;
-	font-weight: normal;
-}
-
-
-.clearer
-{
-	clear: both;
-	height: 1px;
-}
-
-.left
-{
-	float: left;
-}
-
-.right
-{
-	float: right;
-}
-
-
-.setfield
-{
-    display: table-cell;
-}
-
-ul.tabs li a
-{
-   padding: 5px 16px 4px 15px;
-   border: none;
-   font-weight: bold;
-
-    border-radius: 5px 5px 0 0;
-    -moz-border-radius: 5px 5px 0 0;
-
-}
-
-
-#tabs span
-{
-    display: none;
-}
-
-#tabs span.selected
-{
-    display: inline;
-}
-
-#tabsback
-{
-    background-color: #525252;
-    margin: 2px 0 0;
-    padding: 6px 4px 1px 4px;
-
-    border-top-right-radius: 30px;
-    border-top-left-radius: 3px;
-    -moz-border-radius-topright: 30px;
-    -moz-border-radius-topleft: 3px;
-}
-ul.tabs
-{
-    list-style-type: none;
-    margin:0;
-    padding: 0 40px 0 0;
-}
-
-ul.tabs li
-{
-    display: inline;
-    margin-left: 8px;
-}
-
-
-ul.tabs li a
-{
-    color: #42454a;
-    background-color: #eaeaea;
-    border: 1px none #c9c3ba;
-    margin: 0;
-    text-decoration: none;
-
-    outline: 0;
-
-    padding: 5px 16px 4px 15px;
-    font-weight: bold;
-
-     border-radius: 5px 5px 0 0;
-     -moz-border-radius: 5px 5px 0 0;
-
-}
-
-ul.tabs li a.selected, ul.tabs li a:hover
-{
-    color: #000;
-    background-color: white;
-
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-    -moz-border-radius-bottomright: 0;
-    -moz-border-radius-bottomleft: 0;
-}
-
-ul.tabs li a:hover
-{
-    background-color: #f1f4ee;
-}
-
-ul.tabs li a.selected
-{
-    font-weight: bold;
-    background-color: #525252;
-    padding-bottom: 5px;
-    color: white;
-}
-
-
-#tabs-body {
-    position: relative;
-    overflow: hidden;
-}
-
-
-span.tabContent
-{
-    border: 2px solid #525252;
-    margin: 0;
-    padding: 0;
-    padding-bottom: 10px;
-}
-
-#tabs-body > span {
-    display: none;
-}
-
-#tabs-body > span.active {
-    display: block;
-}
-
-.hide
-{
-    display: none;
-}
-
-.settable
-{
-    margin: 20px;
-    border: none;
-}
-.settable td
-{
-    border: none;
-    margin: 0;
-    padding: 5px;
-}
-
-.settable th{
-    padding-bottom: 8px;
-}
-
-.settable.wide td , .settable.wide th {
-    padding-left: 15px;
-    padding-right: 15px;
-}
-
-
-/*settings navbar*/
-ul.nav {
-    margin: -30px 0 0;
-    padding: 0;
-	list-style: none;
-    position: absolute;
-}
-
-
-ul.nav li {
-	position: relative;
-	float: left;
-	padding: 5px;
-}
-
-ul.nav > li a {
-    background: white;
-    -moz-border-radius: 4px 4px 4px 4px;
-    border: 1px solid #C9C3BA;
-    border-bottom: medium none;
-    color: black;
-}
-
-ul.nav ul {
-	position: absolute;
-	top: 26px;
-	left: 10px;
-	margin: 0;
-	padding: 0;
-	list-style: none;
-	border: 1px solid #AAA;
-	background: #f1f1f1;
-	-webkit-box-shadow: 1px 1px 5px #AAA;
-	-moz-box-shadow: 1px 1px 5px #AAA;
-	box-shadow: 1px 1px 5px #AAA;
-    cursor: pointer;
-}
-
-ul.nav .open {
-	display: block;
-}
-
-ul.nav .close {
-	display: none;
-}
-
-ul.nav ul li {
-	float: none;
-	padding: 0;
-}
-
-ul.nav ul li a {
-	width: 130px;
-	background: #f1f1f1;
-	padding: 3px;
-	display: block;
-	font-weight: normal;
-}
-
-ul.nav ul li a:hover {
-	background: #CDCDCD;
-}
-
-ul.nav ul ul {
-	left: 137px;
-	top: 0;
-}
-
-.purr-wrapper{
-	margin:10px;
-}
-
-/*Purr alert styles*/
-
-.purr-alert{
-	margin-bottom:10px;
-	padding:10px;
-	background:#000;
-	font-size:13px;
-	font-weight:bold;
-	color:#FFF;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	/*-moz-box-shadow: 0 0 10px rgba(255,255,0,.25);*/
-	width:300px;
-}
-.purr-alert.error{
-	color:#F55;
-	padding-left:30px;
-	background:url(../img/error.png) no-repeat #000 7px 10px;
-	width:280px;
-}
-.purr-alert.success{
-	color:#5F5;
-	padding-left:30px;
-	background:url(../img/success.png) no-repeat #000 7px 10px;
-	width:280px;
-}
-.purr-alert.notice{
-	color:#99F;
-	padding-left:30px;
-	background:url(../img/notice.png) no-repeat #000 7px 10px;
-	width:280px;
-}
-
-table.system {
-    border: none;
-    margin-left: 10px;
-}
-
-table.system td {
-    border: none
-}
-
-table.system tr > td:first-child {
-    font-weight: bold;
-    padding-right: 10px;
-}
diff --git a/module/web/themes/default/tml/captcha.html b/module/web/themes/default/tml/captcha.html
deleted file mode 100644
index 541fe99da..000000000
--- a/module/web/themes/default/tml/captcha.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- Captcha box -->
-<div id="cap_box" class="window_box">
-
-	<form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
-	
-		<h1>{{_("Captcha reading")}}</h1>
-		<p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
-		
-		<div id="cap_textual">
-		
-			<input id="cap_id" name="cap_id" type="hidden" value="" />
-		
-			<label>{{_("Captcha")}}
-			<span class="small">{{_("The captcha.")}}</span>
-			</label>
-			<span class="cont">
-			    <img id="cap_textual_img" src="">
-			</span>
-			
-			<label>{{_("Text")}}
-			<span class="small">{{_("Input the text on the captcha.")}}</span>
-			</label>
-			<input id="cap_result" name="cap_result" type="text" size="20" />
-					
-		</div>
-		
-		<div id="cap_positional" style="text-align: center">
-		    <img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
-		</div>
-
-		<div id="button_bar" style="text-align: center">
-			<span>
-				<button id="cap_submit" type="submit" style="margin-left: 0">{{_("Submit")}}</button>
-				<button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
-			</span>
-		</div>
-		
-		<div class="spacer"></div>
-	
-	</form>
-
-</div>
diff --git a/module/web/themes/default/tml/folder.html b/module/web/themes/default/tml/folder.html
deleted file mode 100644
index 5553e25ce..000000000
--- a/module/web/themes/default/tml/folder.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<li class="folder">
-  <input type="hidden" name="path" class="path" value="{{ path }}" />
-  <input type="hidden" name="name" class="name" value="{{ name }}" />
-  <span>
-    <b>{{ name }}</b>
-    <span class="buttons" style="opacity:0">
-	  <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/default/img/pencil.png" />
-	  &nbsp;&nbsp;
-	  <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/delete.png" />
-	  &nbsp;&nbsp;
-	  <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/add_folder.png" />
-    </span>
-  </span>
-  <div style="display:none">{{ _("Folder is empty") }}</div>
-</li>
diff --git a/module/web/themes/default/tml/setup.html b/module/web/themes/default/tml/setup.html
deleted file mode 100644
index e5821f3ee..000000000
--- a/module/web/themes/default/tml/setup.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends '/default/tml/base.html' %}
-
-{% block title %}{{ _("Setup") }} - {{ super() }} {% endblock %}
-{% block subtitle %}{{ _("Setup") }}{% endblock %}
-{% block headpanel %}Welcome to pyLoad{% endblock %}
-{% block menu %}
-    <li style="height: 25px"> <!-- Needed to get enough margin -->
-    </li>
-{% endblock %}
-
-{% block content %}
-    Comming Soon.
-{% endblock %}
diff --git a/module/web/themes/flat/css/MooDialog.css b/module/web/themes/flat/css/MooDialog.css
deleted file mode 100644
index a452a8fd2..000000000
--- a/module/web/themes/flat/css/MooDialog.css
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Created by Arian Stolwijk <http://www.aryweb.nl> */
-
-.MooDialog {
-/*	position: fixed;*/
-    margin: 0 auto 0 -350px;
-    width:600px;
-    padding:14px;
-    left:50%;
-    top: 100px;
-
-	position: absolute;
-	left: 50%;
-	z-index: 50000;
-
-	background: #eef5f8;
-	color: black;
-	border-radius: 7px;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-	border-radius: 7px;
-	-moz-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-	-webkit-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-	box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
-}
-
-.MooDialogTitle {
-	padding-top: 30px;
-}
-
-.MooDialog .title {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	padding: 3px 20px;
-	background: #b7c4dc;
-	border-bottom: 1px solid #a1aec5;
-	font-weight: bold;
-	text-shadow: 1px 1px 0 #fff;
-	color: black;
-	border-radius: 7px;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-}
-
-.MooDialog .close {
-	background: url(../img/dialog-close.png) no-repeat;
-	width: 16px;
-	height: 16px;
-	display: block;
-	cursor: pointer;
-	top: -5px;
-	left: -5px;
-	position: absolute;
-}
-
-.MooDialog .buttons {
-	text-align: right;
-	margin: 0;
-	padding: 0;
-	border: 0;
-	background: none;
-}
-
-.MooDialog .iframe {
-	width: 100%;
-	height: 100%;
-}
-
-.MooDialog .textInput {
-	width: 200px;
-	float: left;
-}
-
-.MooDialog .MooDialogAlert,
-.MooDialog .MooDialogConfirm,
-.MooDialog .MooDialogPrompt,
-.MooDialog .MooDialogError {
-	background: url(../img/dialog-warning.png) no-repeat;
-	padding-left: 40px;
-	min-height: 40px;
-}
-
-.MooDialog .MooDialogConfirm,
-.MooDialog .MooDialogPromt {
-	background: url(../img/dialog-question.png) no-repeat;
-}
-
-.MooDialog .MooDialogError {
-	background: url(../img/dialog-error.png) no-repeat;
-}
-
diff --git a/module/web/themes/flat/tml/captcha.html b/module/web/themes/flat/tml/captcha.html
deleted file mode 100644
index 288375b76..000000000
--- a/module/web/themes/flat/tml/captcha.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- Captcha box -->
-<div id="cap_box" class="window_box">
-
-	<form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
-	
-		<h1>{{_("Captcha reading")}}</h1>
-		<p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
-		
-		<div id="cap_textual">
-		
-			<input id="cap_id" name="cap_id" type="hidden" value="" />
-		
-			<label>{{_("Captcha")}}
-			<span class="small">{{_("The captcha.")}}</span>
-			</label>
-			<span class="cont">
-			    <img id="cap_textual_img" src="">
-			</span>
-			
-			<label>{{_("Text")}}
-			<span class="small">{{_("Input the text on the captcha.")}}</span>
-			</label>
-			<input id="cap_result" name="cap_result" type="text" size="20" />
-					
-		</div>
-		
-		<div id="cap_positional" style="text-align: center">
-		    <img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
-		</div>
-
-		<div id="button_bar" style="text-align: center">
-			<span>
-				<button id="cap_submit" type="submit" style="margin-left: 0">{{_("Submit")}}</button>
-				<button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
-			</span>
-		</div>
-		
-		<div class="spacer"></div>
-	
-	</form>
-
-</div>
\ No newline at end of file
diff --git a/module/web/themes/flat/tml/folder.html b/module/web/themes/flat/tml/folder.html
deleted file mode 100644
index d280e418f..000000000
--- a/module/web/themes/flat/tml/folder.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<li class="folder">
-  <input type="hidden" name="path" class="path" value="{{ path }}" />
-  <input type="hidden" name="name" class="name" value="{{ name }}" />
-  <span>
-    <b>{{ name }}</b>
-    <span class="buttons" style="opacity:0">
-	  <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" />
-	  &nbsp;&nbsp;
-	  <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
-	  &nbsp;&nbsp;
-	  <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/add_folder.png" />
-    </span>
-  </span>
-  <div style="display:none">{{ _("Folder is empty") }}</div>
-</li>
\ No newline at end of file
diff --git a/module/web/themes/flat/tml/setup.html b/module/web/themes/flat/tml/setup.html
deleted file mode 100644
index ceea5284a..000000000
--- a/module/web/themes/flat/tml/setup.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends '/flat/tml/base.html' %}
-
-{% block title %}{{ _("Setup") }} - {{ super() }} {% endblock %}
-{% block subtitle %}{{ _("Setup") }}{% endblock %}
-{% block headpanel %}Welcome to pyLoad{% endblock %}
-{% block menu %}
-    <li style="height: 25px"> <!-- Needed to get enough margin -->
-    </li>
-{% endblock %}
-
-{% block content %}
-    Comming Soon.
-{% endblock %}
\ No newline at end of file
diff --git a/module/web/ServerThread.py b/module/webui/ServerThread.py
index 490071377..e9fe14708 100644
--- a/module/web/ServerThread.py
+++ b/module/webui/ServerThread.py
@@ -26,7 +26,7 @@ class WebServer(threading.Thread):
         self.setDaemon(True)
 
     def run(self):
-        import webinterface
+        import module.webui as webinterface
         global webinterface
 
         reset = False
diff --git a/module/web/webinterface.py b/module/webui/__init__.py
index b757b74f2..304a01498 100644
--- a/module/web/webinterface.py
+++ b/module/webui/__init__.py
@@ -40,7 +40,7 @@ from middlewares import StripPathMiddleware, GZipMiddleWare, PrefixMiddleware
 SETUP = None
 PYLOAD = None
 
-from module.web import ServerThread
+from module.webui import ServerThread
 
 if not ServerThread.core:
     if ServerThread.setup:
@@ -117,10 +117,7 @@ web = GZipMiddleWare(web)
 if PREFIX:
     web = PrefixMiddleware(web, prefix=PREFIX)
 
-import pyload_app
-import json_app
-import cnl_app
-import api_app
+import module.webui.app
 
 def run_simple(host="0.0.0.0", port="8000"):
     run(app=web, host=host, port=port, quiet=True)
@@ -139,7 +136,7 @@ def run_threaded(host="0.0.0.0", port="8000", theads=3, cert="", key=""):
 
     CherryPyWSGIServer.numthreads = theads
 
-    from utils import CherryPyWSGI
+    from module.webui.app.utils import CherryPyWSGI
 
     run(app=web, host=host, port=port, server=CherryPyWSGI, quiet=True)
 
diff --git a/module/webui/app/__init__.py b/module/webui/app/__init__.py
new file mode 100644
index 000000000..175cafb3f
--- /dev/null
+++ b/module/webui/app/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+#from module.webui.app import api, cnl, json, pyload
diff --git a/module/web/api_app.py b/module/webui/app/api.py
index 0e95b559a..ba178682a 100644
--- a/module/web/api_app.py
+++ b/module/webui/app/api.py
@@ -7,7 +7,7 @@ from traceback import format_exc, print_exc
 from bottle import route, request, response, HTTPError
 
 from utils import toDict, set_session
-from webinterface import PYLOAD
+from module.webui import PYLOAD
 
 from module.common.json_layer import json
 from module.lib.SafeEval import const_eval as literal_eval
diff --git a/module/web/cnl_app.py b/module/webui/app/cnl.py
index 13c0bdd42..b29013d82 100644
--- a/module/web/cnl_app.py
+++ b/module/webui/app/cnl.py
@@ -6,7 +6,7 @@ from base64 import standard_b64decode
 from binascii import unhexlify
 
 from bottle import route, request, HTTPError
-from webinterface import PYLOAD, DL_ROOT, JS
+from module.webui import PYLOAD, DL_ROOT, JS
 
 
 try:
diff --git a/module/web/json_app.py b/module/webui/app/json.py
index 79e9d4012..cf9a8f238 100644
--- a/module/web/json_app.py
+++ b/module/webui/app/json.py
@@ -6,7 +6,7 @@ from shutil import copyfileobj
 
 from bottle import route, request, HTTPError
 
-from webinterface import PYLOAD
+from module.webui import PYLOAD
 
 from utils import login_required, render_to_response, toDict
 
diff --git a/module/web/pyload_app.py b/module/webui/app/pyload.py
index 0888f6d21..30d5f50c2 100644
--- a/module/web/pyload_app.py
+++ b/module/webui/app/pyload.py
@@ -28,7 +28,7 @@ from urllib import unquote
 
 from bottle import route, static_file, request, response, redirect, HTTPError, error
 
-from webinterface import PYLOAD, PYLOAD_DIR, THEME, THEME_DIR, SETUP, env
+from module.webui import PYLOAD, PYLOAD_DIR, THEME, THEME_DIR, SETUP, env
 
 from utils import render_to_response, parse_permissions, parse_userdata, \
     login_required, get_permission, set_permission, permlist, toDict, set_session
@@ -504,10 +504,7 @@ def admin():
 
 @route('/setup')
 def setup():
-    if PYLOAD or not SETUP:
-        return base([_("Run pyload.py -s to access the setup.")])
-
-    return render_to_response('setup.html', {"user": False, "perms": False})
+    return base([_("Run pyload.py -s to access the setup.")])
 
 
 @route('/info')
diff --git a/module/web/utils.py b/module/webui/app/utils.py
index 7afa5f203..5bb10e478 100644
--- a/module/web/utils.py
+++ b/module/webui/app/utils.py
@@ -17,7 +17,7 @@
 """
 from bottle import request, HTTPError, redirect, ServerAdapter
 
-from webinterface import env, THEME
+from module.webui import env, THEME
 
 from module.Api import has_permission, PERMS, ROLE
 
diff --git a/module/web/filters.py b/module/webui/filters.py
index c5e9447ee..c5e9447ee 100644
--- a/module/web/filters.py
+++ b/module/webui/filters.py
diff --git a/module/web/middlewares.py b/module/webui/middlewares.py
index 5f56f81ee..5f56f81ee 100644
--- a/module/web/middlewares.py
+++ b/module/webui/middlewares.py
diff --git a/module/web/servers/lighttpd_default.conf b/module/webui/servers/lighttpd_default.conf
index bbeb5f7a7..bbeb5f7a7 100644
--- a/module/web/servers/lighttpd_default.conf
+++ b/module/webui/servers/lighttpd_default.conf
diff --git a/module/web/servers/nginx_default.conf b/module/webui/servers/nginx_default.conf
index b4ebd1e02..b4ebd1e02 100644
--- a/module/web/servers/nginx_default.conf
+++ b/module/webui/servers/nginx_default.conf
diff --git a/module/webui/themes/dark/css/MooDialog.css b/module/webui/themes/dark/css/MooDialog.css
new file mode 100644
index 000000000..7e08b1c80
--- /dev/null
+++ b/module/webui/themes/dark/css/MooDialog.css
@@ -0,0 +1,95 @@
+/* Created by Arian Stolwijk <http://www.aryweb.nl> */
+
+.MooDialog {
+/*  position: fixed;*/
+    margin: 0 auto 0 -350px;
+    width:600px;
+    padding:14px;
+    left:50%;
+    top: 100px;
+    color:white;
+
+  position: absolute;
+  left: 50%;
+  z-index: 50000;
+
+  background: url(../img/dark-bg.jpg);
+  color: black;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+  -webkit-border-radius: 7px;
+  border-radius: 7px;
+  -moz-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+  -webkit-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+  box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+}
+
+.MooDialogTitle {
+  padding-top: 30px;
+}
+
+.MooDialog .title {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  padding: 3px 20px;
+  background: #b7c4dc;
+  border-bottom: 1px solid #a1aec5;
+  font-weight: bold;
+  text-shadow: 1px 1px 0 #fff;
+  color: black;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+  -webkit-border-radius: 7px;
+}
+
+.MooDialog .close {
+  background: url(../img/dialog-close.png) no-repeat;
+  width: 16px;
+  height: 16px;
+  display: block;
+  cursor: pointer;
+  top: -5px;
+  left: -5px;
+  position: absolute;
+}
+
+.MooDialog .buttons {
+  text-align: right;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  background: none;
+}
+
+.MooDialog .iframe {
+  width: 100%;
+  height: 100%;
+}
+
+.MooDialog .textInput {
+  width: 200px;
+  float: left;
+        color:white;
+}
+
+.MooDialog .MooDialogAlert,
+.MooDialog .MooDialogConfirm,
+.MooDialog .MooDialogPrompt,
+.MooDialog .MooDialogError {
+  background: url(../img/dialog-warning.png) no-repeat;
+  padding-left: 40px;
+  min-height: 40px;
+        color:white;
+}
+
+.MooDialog .MooDialogConfirm,
+.MooDialog .MooDialogPromt {
+  background: url(../img/dialog-question.png) no-repeat;
+}
+
+.MooDialog .MooDialogError {
+  background: url(../img/dialog-error.png) no-repeat;
+}
+
diff --git a/module/webui/themes/dark/css/default.css b/module/webui/themes/dark/css/default.css
new file mode 100644
index 000000000..af7146312
--- /dev/null
+++ b/module/webui/themes/dark/css/default.css
@@ -0,0 +1,968 @@
+.hidden {
+  display:none;
+}
+.leftalign {
+  text-align:left;
+}
+.centeralign {
+  text-align:center;
+}
+.rightalign {
+  text-align:right;
+}
+
+
+.dokuwiki div.plugin_translation ul li a.wikilink1:link, .dokuwiki div.plugin_translation ul li a.wikilink1:hover, .dokuwiki div.plugin_translation ul li a.wikilink1:active, .dokuwiki div.plugin_translation ul li a.wikilink1:visited {
+  background-color:#000080;
+  color:#fff !important;
+  text-decoration:none;
+  padding:0 0.2em;
+  margin:0.1em 0.2em;
+  border:none !important;
+}
+.dokuwiki div.plugin_translation ul li a.wikilink2:link, .dokuwiki div.plugin_translation ul li a.wikilink2:hover, .dokuwiki div.plugin_translation ul li a.wikilink2:active, .dokuwiki div.plugin_translation ul li a.wikilink2:visited {
+  background-color:#808080;
+  color:#fff !important;
+  text-decoration:none;
+  padding:0 0.2em;
+  margin:0.1em 0.2em;
+  border:none !important;
+}
+
+.dokuwiki div.plugin_translation ul li a:hover img {
+  opacity:1.0;
+  height:15px;
+}
+
+body {
+  margin:0;
+  padding:0;
+  background-image: url(../img/dark-bg.jpg);
+  color:white;
+  font-size:12px;
+  font-family:Verdana, Helvetica, "Lucida Grande", Lucida, Arial, sans-serif;
+  font-family:sans-serif;
+  font-size:99, 96%;
+  font-size-adjust:none;
+  font-style:normal;
+  font-variant:normal;
+  font-weight:normal;
+  line-height:normal;
+}
+hr {
+  border-width:0;
+  border-bottom:1px #aaa dotted;
+}
+img {
+  border:none;
+}
+form {
+  margin:0px;
+  padding:0px;
+  border:none;
+  display:inline;
+  background:transparent;
+}
+ul li {
+  margin:5px;
+}
+textarea {
+  font-family:monospace;
+}
+table {
+  margin:0.5em 0;
+  border-collapse:collapse;
+}
+td {
+  padding:0.25em;
+  border:1pt solid #ADB9CC;
+}
+a {
+  color:#3465a4;
+  text-decoration:none;
+}
+a:hover {
+  text-decoration:underline;
+}
+
+option {
+  border:0 none #fff;
+}
+strong.highlight {
+  background-color:#fc9;
+  padding:1pt;
+}
+#pagebottom {
+  clear:both;
+}
+hr {
+  height:1px;
+  color:#c0c0c0;
+  background-color:#c0c0c0;
+  border:none;
+  margin:.2em 0 .2em 0;
+}
+
+.invisible {
+  margin:0px;
+  border:0px;
+  padding:0px;
+  height:0px;
+  visibility:hidden;
+}
+.left {
+  float:left !important;
+}
+.right {
+  float:right !important;
+}
+.center {
+  text-align:center;
+}
+div#body-wrapper {
+  padding:40px 40px 10px 40px;
+  font-size:127%;
+}
+div#content {
+  margin-top:-20px;
+  padding:0;
+  font-size:14px;
+  color:white;
+  line-height:1.5em;
+}
+h1, h2, h3, h4, h5, h6 {
+  background:transparent none repeat scroll 0 0;
+  border-bottom:1px solid #aaa;
+  color:white;
+  font-weight:normal;
+  margin:0;
+  padding:0;
+  padding-bottom:0.17em;
+  padding-top:0.5em;
+}
+h1 {
+  font-size:188%;
+  line-height:1.2em;
+  margin-bottom:0.1em;
+  padding-bottom:0;
+}
+h2 {
+  font-size:150%;
+}
+h3, h4, h5, h6 {
+  border-bottom:none;
+  font-weight:bold;
+}
+h3 {
+  font-size:132%;
+}
+h4 {
+  font-size:116%;
+}
+h5 {
+  font-size:100%;
+}
+h6 {
+  font-size:80%;
+}
+ul#page-actions, ul#page-actions-more {
+  float:right;
+  margin:10px 10px 0 10px;
+  padding:6px;
+  color:white;
+  background-color:#202020;
+  list-style-type:none;
+  white-space: nowrap;
+  border-radius:5px;
+  -moz-border-radius:5px;
+  border:1px solid grey;
+}
+ul#user-actions {
+  padding:5px;
+  margin:0;
+  display:inline;
+  color:white;
+  background-color:#202020;
+  list-style-type:none;
+  -moz-border-radius:3px;
+  border-radius:3px;
+}
+ul#page-actions li, ul#user-actions li, ul#page-actions-more li {
+  display:inline;
+}
+ul#page-actions a, ul#user-actions a, ul#page-actions-more a {
+  text-decoration:none;
+  color:white;
+  display:inline;
+  margin:0 3px;
+  padding:2px 0px 2px 18px;
+}
+ul#page-actions a:hover, ul#page-actions a:focus, ul#user-actions a:hover, ul#user-actions a:focus {
+  /*text-decoration:underline;*/
+}
+/***************************/
+ul#page-actions2 {
+  float:left;
+  margin:10px 10px 0 10px;
+  padding:6px;
+  color:white;
+  background-color:#202020;
+  list-style-type:none;
+  border-radius:5px;
+  -moz-border-radius:5px;
+  border:1px solid grey;
+}
+ul#user-actions2 {
+  padding:5px;
+  margin:0;
+  display:inline;
+  color:white;
+  background-color:#202020;
+  list-style-type:none;
+  border-radius:3px;
+  -moz-border-radius:3px;
+}
+ul#page-actions2 li, ul#user-actions2 li {
+  display:inline;
+}
+ul#page-actions2 a, ul#user-actions2 a {
+  text-decoration:none;
+  color:white;
+  display:inline;
+  margin:0 3px;
+  padding:2px 0px 2px 18px;
+}
+ul#page-actions2 a:hover, ul#page-actions2 a:focus, ul#user-actions2 a:hover, ul#user-actions2 a:focus,
+ul#page-actions-more a:hover, ul#page-actions-more a:focus{
+  color: #4e7bb4;
+}
+/****************************/
+.hidden {
+  display:none;
+}
+
+a.action.index {
+  background:transparent url(../img/wiki-tools-index.png) 0px 1px no-repeat;
+}
+a.action.recent {
+  background:transparent url(../img/wiki-tools-recent.png) 0px 1px no-repeat;
+}
+a.logout {
+  background:transparent url(../img/user-actions-logout.png) 0px 1px no-repeat;
+}
+
+a.info {
+    background:transparent url(../img/user-info.png) 0px 1px no-repeat;
+}
+
+a.admin {
+  background:transparent url(../img/user-actions-admin.png) 0px 1px no-repeat;
+}
+a.profile {
+  background:transparent url(../img/user-actions-profile.png) 0px 1px no-repeat;
+}
+a.create, a.edit {
+  background:transparent url(../img/page-tools-edit.png) 0px 1px no-repeat;
+}
+a.source, a.show {
+  background:transparent url(../img/page-tools-source.png) 0px 1px no-repeat;
+}
+a.revisions {
+  background:transparent url(../img/page-tools-revisions.png) 0px 1px no-repeat;
+}
+a.subscribe, a.unsubscribe {
+  background:transparent url(../img/page-tools-subscribe.png) 0px 1px no-repeat;
+}
+a.backlink {
+  background:transparent url(../img/page-tools-backlinks.png) 0px 1px no-repeat;
+}
+a.play {
+  background:transparent url(../img/control_play.png) 0px 1px no-repeat;
+}
+.time {
+  background:transparent url(../img/status_None.png) 0px 1px no-repeat;
+        padding: 2px 0px 2px 18px;
+        margin: 0px 3px;
+}
+.reconnect {
+  background:transparent url(../img/reconnect.png) 0px 1px no-repeat;
+        padding: 2px 0px 2px 18px;
+        margin: 0px 3px;
+}
+a.play:hover {
+  background:transparent url(../img/control_play_blue.png) 0px 1px no-repeat;
+}
+a.cancel {
+  background:transparent url(../img/control_cancel.png) 0px 1px no-repeat;
+}
+a.cancel:hover {
+  background:transparent url(../img/control_cancel_blue.png) 0px 1px no-repeat;
+}
+a.pause {
+  background:transparent url(../img/control_pause.png) 0px 1px no-repeat;
+}
+a.pause:hover {
+  background:transparent url(../img/control_pause_blue.png) 0px 1px no-repeat;
+  font-weight: bold;
+}
+a.stop {
+  background:transparent url(../img/control_stop.png) 0px 1px no-repeat;
+}
+a.stop:hover {
+  background:transparent url(../img/control_stop_blue.png) 0px 1px no-repeat;
+}
+a.add {
+  background:transparent url(../img/control_add.png) 0px 1px no-repeat;
+}
+a.add:hover {
+  background:transparent url(../img/control_add_blue.png) 0px 1px no-repeat;
+}
+a.cog {
+  background:transparent url(../img/cog.png) 0px 1px no-repeat;
+}
+#head-panel {
+  background:#525252 url(../img/head_bg1.png) bottom left repeat-x;
+}
+#head-panel h1 {
+  display:none;
+  margin:0;
+  text-decoration:none;
+  padding-top:0.8em;
+  padding-left:3.3em;
+  font-size:2.6em;
+  color:#eeeeec;
+}
+#head-panel #head-logo {
+  float:left;
+  margin:5px 0 -15px 5px;
+  padding:0;
+  overflow:visible;
+}
+#head-menu {
+  background:transparent url(../img/tabs-border-bottom.png) 0 100% repeat-x;
+  width:100%;
+  float:left;
+  margin:0;
+  padding:0;
+  padding-top:0.8em;
+}
+#head-menu ul {
+  list-style:none;
+  margin:0 1em 0 2em;
+}
+#head-menu ul li {
+  float:left;
+  margin:0;
+  margin-left:0.3em;
+  font-size:14px;
+  margin-bottom:4px;
+}
+#head-menu ul li.selected, #head-menu ul li:hover {
+  margin-bottom:0px;
+}
+#head-menu ul li a img {
+  height:22px;
+  width:22px;
+  vertical-align:middle;
+}
+#head-menu ul li a, #head-menu ul li a:link {
+  float:left;
+  text-decoration:none;
+  color:white;
+  background: url(../img/dark-bg.jpg) 0 100% repeat-x;
+  padding:3px 7px 3px 7px;
+  border:2px solid #ccc;
+  border-bottom:0px solid transparent;
+  padding-bottom:3px;
+  -moz-border-radius:5px;
+  border-radius:5px;
+}
+#head-menu ul li a:hover, #head-menu ul li a:focus {
+  color:#3465a4;
+  background-image: url(../img/dark-bg.jpg);
+  padding-bottom:7px;
+  border-bottom:0px none transparent;
+  outline:none;
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px;
+  -moz-border-radius-bottomright:0px;
+  -moz-border-radius-bottomleft:0px;
+}
+#head-menu ul li a:focus {
+  margin-bottom:-4px;
+}
+#head-menu ul li.selected a {
+  color:white;
+  background-image: url(../img/dark-bg.jpg);
+  padding-bottom:7px;
+  border-bottom:0px none transparent;
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px;
+  -moz-border-radius-bottomright:0px;
+  -moz-border-radius-bottomleft:0px;
+}
+#head-menu ul li.selected a:hover, #head-menu ul li.selected a:focus {
+  color:#3465a4;
+}
+div#head-search-and-login {
+  float:right;
+  margin:0 1em 0 0;
+  background-color:#222;
+  padding:7px 7px 5px 5px;
+  color:white;
+  white-space: nowrap;
+  border-bottom-left-radius: 6px;
+  border-bottom-right-radius: 6px;
+  -moz-border-radius-bottomright:6px;
+  -moz-border-radius-bottomleft:6px;
+  border-right:1px solid grey;
+  border-left:1px solid grey;
+  border-bottom:1px solid grey;
+}
+div#head-search-and-login form {
+  display:inline;
+  padding:0 3px;
+}
+div#head-search-and-login form input {
+  border:2px solid #888;
+  background:#eee;
+  font-size:14px;
+  padding:2px;
+  border-radius:3px;
+  -moz-border-radius:3px;
+}
+div#head-search-and-login form input:focus {
+  background:#fff;
+}
+#head-search {
+  font-size:14px;
+}
+#head-username, #head-password {
+  width:80px;
+  font-size:14px;
+}
+#pageinfo {
+  clear:both;
+  color:#888;
+  padding:0.6em 0;
+  margin:0;
+}
+#foot {
+  font-style:normal;
+  color:#888;
+  text-align:center;
+}
+#foot a {
+  color:#aaf;
+}
+#foot img {
+  vertical-align:middle;
+}
+div.toc {
+  border:1px dotted #888;
+  background:#f0f0f0;
+  margin:1em 0 1em 1em;
+  float:right;
+  font-size:95%;
+}
+div.toc .tocheader {
+  font-weight:bold;
+  margin:0.5em 1em;
+}
+div.toc ol {
+  margin:1em 0.5em 1em 1em;
+  padding:0;
+}
+div.toc ol li {
+  margin:0;
+  padding:0;
+  margin-left:1em;
+}
+div.toc ol ol {
+  margin:0.5em 0.5em 0.5em 1em;
+  padding:0;
+}
+div.recentchanges table {
+  clear:both;
+}
+div#editor-help {
+  font-size:90%;
+  border:1px dotted #888;
+  padding:0ex 1ex 1ex 1ex;
+  background:#f7f6f2;
+}
+div#preview {
+  margin-top:1em;
+}
+label.block {
+  display:block;
+  text-align:right;
+  font-weight:bold;
+}
+label.simple {
+  display:block;
+  text-align:left;
+  font-weight:normal;
+}
+label.block input.edit {
+  width:50%;
+}
+/*fieldset {
+  width:300px;
+  text-align:center;
+  padding:0.5em;
+  margin:auto;
+}
+*/
+div.editor {
+  margin:0 0 0 0;
+}
+table {
+  margin:0.5em 0;
+  border-collapse:collapse;
+}
+td {
+  padding:0.25em;
+  border:1pt solid #ADB9CC;
+}
+td p {
+  margin:0;
+  padding:0;
+}
+.u {
+  text-decoration:underline;
+}
+.footnotes ul {
+  padding:0 2em;
+  margin:0 0 1em;
+}
+.footnotes li {
+  list-style:none;
+}
+.userpref table, .userpref td {
+  border:none;
+}
+#message {
+  clear:both;
+  padding:5px 10px;
+  background-color:#eee;
+  border-bottom:2px solid #ccc;
+}
+#message p {
+  margin:5px 0;
+  padding:0;
+  font-weight:bold;
+}
+#message div.buttons {
+  font-weight:normal;
+}
+.diff {
+  width:99%;
+}
+.diff-title {
+  background-color:#C0C0C0;
+}
+.searchresult dd span {
+  font-weight:bold;
+}
+.boxtext {
+  font-family:tahoma, arial, sans-serif;
+  font-size:11px;
+  color:#000;
+  float:none;
+  padding:3px 0 0 10px;
+}
+.statusbutton {
+  width:32px;
+  height:32px;
+  float:left;
+  margin-left:-32px;
+  margin-right:5px;
+  opacity:0;
+  cursor:pointer
+}
+.dlsize {
+  float:left;
+  padding-right: 8px;
+}
+.dlspeed {
+  float:left;
+  padding-right: 8px;
+}
+.package {
+  margin-bottom: 10px;
+}
+.packagename {
+  font-weight: bold;
+}
+
+.child {
+  margin-left: 20px;
+}
+.child_status {
+  margin-right: 10px;
+}
+.child_secrow {
+  font-size: 10px;
+}
+
+.header, .header th {
+  text-align: left;
+  font-weight: normal;
+  background-color:#202020;
+  border-top:1px solid grey;
+  border-bottom:1px solid grey;
+  -moz-border-radius:5px;
+  border-radius:5px;
+}
+.progress_bar {
+  background: #0C0;
+  height: 5px;
+  
+}
+
+.queue {
+  border: none
+}
+
+.queue tr td {
+  border: none
+}
+
+.header, .header th{
+  text-align: left;
+  font-weight: normal;
+}
+
+
+.clearer
+{
+  clear: both;
+  height: 1px;
+}
+
+.left
+{
+  float: left;
+}
+
+.right
+{
+  float: right;
+}
+
+
+.setfield
+{
+    display: table-cell;
+}
+
+ul.tabs li a
+{
+   padding: 5px 16px 4px 15px;
+   border: none;
+   font-weight: bold;
+
+    border-radius: 5px 5px 0 0;
+    -moz-border-radius: 5px 5px 0 0;
+
+}
+
+
+#tabs span
+{
+    display: none;
+}
+
+#tabs span.selected
+{
+    display: inline;
+}
+
+#tabsback
+{
+    background-color: #525252;
+    margin: 2px 0 0;
+    padding: 6px 4px 1px 4px;
+
+    border-top-right-radius: 30px;
+    border-top-left-radius: 3px;
+    -moz-border-radius-topright: 30px;
+    -moz-border-radius-topleft: 3px;
+}
+ul.tabs
+{
+    list-style-type: none;
+    margin:0;
+    padding: 0 40px 0 0;
+}
+
+ul.tabs li
+{
+    display: inline;
+    margin-left: 8px;
+}
+
+ul.tabs li a
+{
+    color: white;
+    background-color: #202020;
+    border: 1px solid grey;
+    border-bottom:none;
+    margin: 0;
+    text-decoration: none;
+
+    outline: 0;
+
+    padding: 5px 16px 4px 15px;
+    font-weight: bold;
+
+     border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+
+}
+
+ul.tabs li a.selected, ul.tabs li a:hover
+{
+    color: #3465a4;
+    background-color: white;
+
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+    -moz-border-radius-bottomright: 0;
+    -moz-border-radius-bottomleft: 0;
+}
+
+ul.tabs li a:hover
+{
+    background-color: #202020;
+}
+
+ul.tabs li a.selected
+{
+    font-weight: bold;
+    background-color: #525252;
+    padding-bottom: 5px;
+    color: white;
+}
+
+
+#tabs-body {
+    position: relative;
+    overflow: hidden;
+}
+
+
+span.tabContent
+{
+    border: 2px solid #525252;
+    margin: 0;
+    padding: 0;
+    padding-bottom: 10px;
+}
+
+#tabs-body > span {
+    display: none;
+}
+
+#tabs-body > span.active {
+    display: block;
+}
+
+.hide
+{
+    display: none;
+}
+
+.settable
+{
+    color:white;
+    margin: 20px;
+    border: none;
+}
+.settable td
+{
+    border: none;
+    margin: 0;
+    padding: 5px;
+}
+
+.settable th{
+    padding-bottom: 8px;
+}
+
+.settable.wide td , .settable.wide th {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+.settable input {
+background-color:#202020;
+color:white;
+}
+.settable select {
+background-color:#202020;
+color:white;
+}
+
+ul.nav {
+    margin: -30px 0 0;
+    padding: 0;
+  list-style: none;
+    position: absolute;
+}
+
+
+ul.nav li {
+  position: relative;
+  float: left;
+  padding: 5px;
+}
+
+ul.nav > li a {
+    background: #202020;
+    -moz-border-radius: 4px 4px 4px 4px;
+    border: 1px solid grey;
+    border-bottom: medium none;
+    color: white;
+}
+
+ul.nav ul {
+  position: absolute;
+  top: 26px;
+  left: 10px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  border: 1px solid #AAA;
+  background: #202020;
+  -webkit-box-shadow: 1px 1px 5px #AAA;
+  -moz-box-shadow: 1px 1px 5px #AAA;
+  box-shadow: 1px 1px 5px #AAA;
+    cursor: pointer;
+}
+
+ul.nav .open {
+  display: block;
+}
+
+ul.nav .close {
+  display: none;
+}
+
+ul.nav ul li {
+  float: none;
+  padding: 0;
+}
+
+ul.nav ul li a {
+  width: 130px;
+  background: #f1f1f1;
+  padding: 3px;
+  display: block;
+  font-weight: normal;
+}
+
+ul.nav ul li a:hover {
+  background: #CDCDCD;
+}
+
+ul.nav ul ul {
+  left: 137px;
+  top: 0;
+}
+
+.purr-wrapper{
+  margin:10px;
+}
+
+/*Purr alert styles*/
+
+.purr-alert{
+  margin-bottom:10px;
+  padding:10px;
+  background:#000;
+  font-size:13px;
+  font-weight:bold;
+  color:#FFF;
+  -moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  /*-moz-box-shadow: 0 0 10px rgba(255,255,0,.25);*/
+  width:300px;
+}
+.purr-alert.error{
+  color:#F55;
+  padding-left:30px;
+  background:url(../img/error.png) no-repeat #000 7px 10px;
+  width:280px;
+}
+.purr-alert.success{
+  color:#5F5;
+  padding-left:30px;
+  background:url(../img/success.png) no-repeat #000 7px 10px;
+  width:280px;
+}
+.purr-alert.notice{
+  color:#99F;
+  padding-left:30px;
+  background:url(../img/notice.png) no-repeat #000 7px 10px;
+  width:280px;
+}
+
+table.system {
+    border: none;
+    margin-left: 10px;
+}
+
+table.system td {
+    border: none
+}
+
+table.system tr > td:first-child {
+    font-weight: bold;
+    padding-right: 10px;
+}
+
+#foot {
+color:white;
+}
+
+#login_table {
+margin-left:auto;
+margin-right:auto;
+}
+
+#login_table td {
+padding:5px;
+border:1px solid grey;
+}
+
+#login_table input[type=text], #login_table input[type=password] {
+width:120px;
+background-color:transparent;
+-moz-opacity: 0.10;
+color:white;
+border: 1px solid grey;
+-moz-border-radius: 2px;
+-webkit-border-radius: 2px;
+border-radius: 18px;
+padding-left:5px;
+padding-right:5px;
+}
+
+#login_table input[type=text]:focus, #login_table input[type=password]:focus {
+border:1px solid #3465a4;
+}
+
+#login_table input[type=submit] {
+background-color:transparent;
+color:white;
+border: 1px solid grey;
+-moz-border-radius: 2px;
+-webkit-border-radius: 2px;
+border-radius: 18px;
+}
+
+#login_table input[type=submit]:hover {
+border:1px solid #3465a4;
+}
\ No newline at end of file
diff --git a/module/web/themes/dark/css/log.css b/module/webui/themes/dark/css/log.css
index 50be016e3..99cfe267b 100644
--- a/module/web/themes/dark/css/log.css
+++ b/module/webui/themes/dark/css/log.css
@@ -17,15 +17,15 @@ html, body, #content
     background-color: #FFE;
     margin-right: auto;
     margin-left: auto;
-	background-color:#202020;
-	color:white;
+  background-color:#202020;
+  color:white;
 }
 .logform
 {
     display: table;
     margin: 0 auto 0 auto;
     padding-top: 5px;
-	color: white;
+  color: white;
 }
 .logtable
 {
diff --git a/module/web/themes/dark/css/pathchooser.css b/module/webui/themes/dark/css/pathchooser.css
index 894cc335e..894cc335e 100644
--- a/module/web/themes/dark/css/pathchooser.css
+++ b/module/webui/themes/dark/css/pathchooser.css
diff --git a/module/web/themes/dark/css/window.css b/module/webui/themes/dark/css/window.css
index 11ba84b39..11ba84b39 100644
--- a/module/web/themes/dark/css/window.css
+++ b/module/webui/themes/dark/css/window.css
diff --git a/module/web/themes/dark/img/add_folder.png b/module/webui/themes/dark/img/add_folder.png
index 8acbc411b..8acbc411b 100644
--- a/module/web/themes/dark/img/add_folder.png
+++ b/module/webui/themes/dark/img/add_folder.png
diff --git a/module/web/themes/dark/img/ajax-loader.gif b/module/webui/themes/dark/img/ajax-loader.gif
index 2fd8e0737..2fd8e0737 100644
--- a/module/web/themes/dark/img/ajax-loader.gif
+++ b/module/webui/themes/dark/img/ajax-loader.gif
diff --git a/module/web/themes/dark/img/arrow_refresh.png b/module/webui/themes/dark/img/arrow_refresh.png
index 0de26566d..0de26566d 100644
--- a/module/web/themes/dark/img/arrow_refresh.png
+++ b/module/webui/themes/dark/img/arrow_refresh.png
diff --git a/module/web/themes/dark/img/arrow_right.png b/module/webui/themes/dark/img/arrow_right.png
index b1a181923..b1a181923 100644
--- a/module/web/themes/dark/img/arrow_right.png
+++ b/module/webui/themes/dark/img/arrow_right.png
diff --git a/module/web/themes/dark/img/big_button.gif b/module/webui/themes/dark/img/big_button.gif
index 7680490ea..7680490ea 100644
--- a/module/web/themes/dark/img/big_button.gif
+++ b/module/webui/themes/dark/img/big_button.gif
diff --git a/module/web/themes/dark/img/big_button_over.gif b/module/webui/themes/dark/img/big_button_over.gif
index 2e3ee10d2..2e3ee10d2 100644
--- a/module/web/themes/dark/img/big_button_over.gif
+++ b/module/webui/themes/dark/img/big_button_over.gif
diff --git a/module/web/themes/dark/img/body.png b/module/webui/themes/dark/img/body.png
index 7ff1043e0..7ff1043e0 100644
--- a/module/web/themes/dark/img/body.png
+++ b/module/webui/themes/dark/img/body.png
diff --git a/module/web/themes/dark/img/button.png b/module/webui/themes/dark/img/button.png
index bb408a7d6..bb408a7d6 100644
--- a/module/web/themes/dark/img/button.png
+++ b/module/webui/themes/dark/img/button.png
diff --git a/module/web/themes/dark/img/closebtn.gif b/module/webui/themes/dark/img/closebtn.gif
index 3e27e6030..3e27e6030 100644
--- a/module/web/themes/dark/img/closebtn.gif
+++ b/module/webui/themes/dark/img/closebtn.gif
diff --git a/module/web/themes/dark/img/cog.png b/module/webui/themes/dark/img/cog.png
index 67de2c6cc..67de2c6cc 100644
--- a/module/web/themes/dark/img/cog.png
+++ b/module/webui/themes/dark/img/cog.png
diff --git a/module/web/themes/dark/img/control_add.png b/module/webui/themes/dark/img/control_add.png
index d39886893..d39886893 100644
--- a/module/web/themes/dark/img/control_add.png
+++ b/module/webui/themes/dark/img/control_add.png
diff --git a/module/web/themes/dark/img/control_add_blue.png b/module/webui/themes/dark/img/control_add_blue.png
index d11b7f41d..d11b7f41d 100644
--- a/module/web/themes/dark/img/control_add_blue.png
+++ b/module/webui/themes/dark/img/control_add_blue.png
diff --git a/module/web/themes/dark/img/control_cancel.png b/module/webui/themes/dark/img/control_cancel.png
index 7b9bc3fba..7b9bc3fba 100644
--- a/module/web/themes/dark/img/control_cancel.png
+++ b/module/webui/themes/dark/img/control_cancel.png
diff --git a/module/web/themes/dark/img/control_cancel_blue.png b/module/webui/themes/dark/img/control_cancel_blue.png
index 0c5c96ce3..0c5c96ce3 100644
--- a/module/web/themes/dark/img/control_cancel_blue.png
+++ b/module/webui/themes/dark/img/control_cancel_blue.png
diff --git a/module/web/themes/dark/img/control_pause.png b/module/webui/themes/dark/img/control_pause.png
index 2d9ce9c4e..2d9ce9c4e 100644
--- a/module/web/themes/dark/img/control_pause.png
+++ b/module/webui/themes/dark/img/control_pause.png
diff --git a/module/web/themes/dark/img/control_pause_blue.png b/module/webui/themes/dark/img/control_pause_blue.png
index ec61099b0..ec61099b0 100644
--- a/module/web/themes/dark/img/control_pause_blue.png
+++ b/module/webui/themes/dark/img/control_pause_blue.png
diff --git a/module/web/themes/dark/img/control_play.png b/module/webui/themes/dark/img/control_play.png
index 0846555d0..0846555d0 100644
--- a/module/web/themes/dark/img/control_play.png
+++ b/module/webui/themes/dark/img/control_play.png
diff --git a/module/web/themes/dark/img/control_play_blue.png b/module/webui/themes/dark/img/control_play_blue.png
index f8c8ec683..f8c8ec683 100644
--- a/module/web/themes/dark/img/control_play_blue.png
+++ b/module/webui/themes/dark/img/control_play_blue.png
diff --git a/module/web/themes/dark/img/control_stop.png b/module/webui/themes/dark/img/control_stop.png
index 893bb60e5..893bb60e5 100644
--- a/module/web/themes/dark/img/control_stop.png
+++ b/module/webui/themes/dark/img/control_stop.png
diff --git a/module/web/themes/dark/img/control_stop_blue.png b/module/webui/themes/dark/img/control_stop_blue.png
index e6f75d232..e6f75d232 100644
--- a/module/web/themes/dark/img/control_stop_blue.png
+++ b/module/webui/themes/dark/img/control_stop_blue.png
diff --git a/module/web/themes/dark/img/dark-bg.jpg b/module/webui/themes/dark/img/dark-bg.jpg
index 637fa6b93..637fa6b93 100644
--- a/module/web/themes/dark/img/dark-bg.jpg
+++ b/module/webui/themes/dark/img/dark-bg.jpg
diff --git a/module/web/themes/dark/img/delete.png b/module/webui/themes/dark/img/delete.png
index 08f249365..08f249365 100644
--- a/module/web/themes/dark/img/delete.png
+++ b/module/webui/themes/dark/img/delete.png
diff --git a/module/web/themes/dark/img/dialog-close.png b/module/webui/themes/dark/img/dialog-close.png
index 81ebb88b2..81ebb88b2 100644
--- a/module/web/themes/dark/img/dialog-close.png
+++ b/module/webui/themes/dark/img/dialog-close.png
diff --git a/module/web/themes/dark/img/dialog-error.png b/module/webui/themes/dark/img/dialog-error.png
index d70328403..d70328403 100644
--- a/module/web/themes/dark/img/dialog-error.png
+++ b/module/webui/themes/dark/img/dialog-error.png
diff --git a/module/web/themes/dark/img/dialog-question.png b/module/webui/themes/dark/img/dialog-question.png
index b0af3db5b..b0af3db5b 100644
--- a/module/web/themes/dark/img/dialog-question.png
+++ b/module/webui/themes/dark/img/dialog-question.png
diff --git a/module/web/themes/dark/img/dialog-warning.png b/module/webui/themes/dark/img/dialog-warning.png
index aad64d4be..aad64d4be 100644
--- a/module/web/themes/dark/img/dialog-warning.png
+++ b/module/webui/themes/dark/img/dialog-warning.png
diff --git a/module/web/themes/dark/img/drag_corner.gif b/module/webui/themes/dark/img/drag_corner.gif
index befb1adf1..befb1adf1 100644
--- a/module/web/themes/dark/img/drag_corner.gif
+++ b/module/webui/themes/dark/img/drag_corner.gif
diff --git a/module/web/themes/dark/img/error.png b/module/webui/themes/dark/img/error.png
index c37bd062e..c37bd062e 100644
--- a/module/web/themes/dark/img/error.png
+++ b/module/webui/themes/dark/img/error.png
diff --git a/module/web/themes/dark/img/folder.png b/module/webui/themes/dark/img/folder.png
index 784e8fa48..784e8fa48 100644
--- a/module/web/themes/dark/img/folder.png
+++ b/module/webui/themes/dark/img/folder.png
diff --git a/module/web/themes/dark/img/full.png b/module/webui/themes/dark/img/full.png
index fea52af76..fea52af76 100644
--- a/module/web/themes/dark/img/full.png
+++ b/module/webui/themes/dark/img/full.png
diff --git a/module/web/themes/dark/img/head-login.png b/module/webui/themes/dark/img/head-login.png
index b59b7cbbf..b59b7cbbf 100644
--- a/module/web/themes/dark/img/head-login.png
+++ b/module/webui/themes/dark/img/head-login.png
diff --git a/module/web/themes/dark/img/head-menu-collector.png b/module/webui/themes/dark/img/head-menu-collector.png
index 861be40bc..861be40bc 100644
--- a/module/web/themes/dark/img/head-menu-collector.png
+++ b/module/webui/themes/dark/img/head-menu-collector.png
diff --git a/module/web/themes/dark/img/head-menu-config.png b/module/webui/themes/dark/img/head-menu-config.png
index bbf43d4f3..bbf43d4f3 100644
--- a/module/web/themes/dark/img/head-menu-config.png
+++ b/module/webui/themes/dark/img/head-menu-config.png
diff --git a/module/web/themes/dark/img/head-menu-development.png b/module/webui/themes/dark/img/head-menu-development.png
index fad150fe1..fad150fe1 100644
--- a/module/web/themes/dark/img/head-menu-development.png
+++ b/module/webui/themes/dark/img/head-menu-development.png
diff --git a/module/web/themes/dark/img/head-menu-download.png b/module/webui/themes/dark/img/head-menu-download.png
index 98c5da9db..98c5da9db 100644
--- a/module/web/themes/dark/img/head-menu-download.png
+++ b/module/webui/themes/dark/img/head-menu-download.png
diff --git a/module/web/themes/dark/img/head-menu-home.png b/module/webui/themes/dark/img/head-menu-home.png
index 9d62109aa..9d62109aa 100644
--- a/module/web/themes/dark/img/head-menu-home.png
+++ b/module/webui/themes/dark/img/head-menu-home.png
diff --git a/module/web/themes/dark/img/head-menu-index.png b/module/webui/themes/dark/img/head-menu-index.png
index 44d631064..44d631064 100644
--- a/module/web/themes/dark/img/head-menu-index.png
+++ b/module/webui/themes/dark/img/head-menu-index.png
diff --git a/module/web/themes/dark/img/head-menu-news.png b/module/webui/themes/dark/img/head-menu-news.png
index 43950ebc9..43950ebc9 100644
--- a/module/web/themes/dark/img/head-menu-news.png
+++ b/module/webui/themes/dark/img/head-menu-news.png
diff --git a/module/web/themes/dark/img/head-menu-queue.png b/module/webui/themes/dark/img/head-menu-queue.png
index be98793ce..be98793ce 100644
--- a/module/web/themes/dark/img/head-menu-queue.png
+++ b/module/webui/themes/dark/img/head-menu-queue.png
diff --git a/module/web/themes/dark/img/head-menu-recent.png b/module/webui/themes/dark/img/head-menu-recent.png
index fc9b0497f..fc9b0497f 100644
--- a/module/web/themes/dark/img/head-menu-recent.png
+++ b/module/webui/themes/dark/img/head-menu-recent.png
diff --git a/module/web/themes/dark/img/head-menu-wiki.png b/module/webui/themes/dark/img/head-menu-wiki.png
index 07cf0102d..07cf0102d 100644
--- a/module/web/themes/dark/img/head-menu-wiki.png
+++ b/module/webui/themes/dark/img/head-menu-wiki.png
diff --git a/module/web/themes/dark/img/head-search-noshadow.png b/module/webui/themes/dark/img/head-search-noshadow.png
index aafdae015..aafdae015 100644
--- a/module/web/themes/dark/img/head-search-noshadow.png
+++ b/module/webui/themes/dark/img/head-search-noshadow.png
diff --git a/module/web/themes/dark/img/head_bg1.png b/module/webui/themes/dark/img/head_bg1.png
index f2848c3cc..f2848c3cc 100644
--- a/module/web/themes/dark/img/head_bg1.png
+++ b/module/webui/themes/dark/img/head_bg1.png
diff --git a/module/web/themes/dark/img/images.png b/module/webui/themes/dark/img/images.png
index 184860d1e..184860d1e 100644
--- a/module/web/themes/dark/img/images.png
+++ b/module/webui/themes/dark/img/images.png
diff --git a/module/web/themes/dark/img/notice.png b/module/webui/themes/dark/img/notice.png
index 12cd1aef9..12cd1aef9 100644
--- a/module/web/themes/dark/img/notice.png
+++ b/module/webui/themes/dark/img/notice.png
diff --git a/module/web/themes/dark/img/package_go.png b/module/webui/themes/dark/img/package_go.png
index aace63ad6..aace63ad6 100644
--- a/module/web/themes/dark/img/package_go.png
+++ b/module/webui/themes/dark/img/package_go.png
diff --git a/module/web/themes/dark/img/page-tools-backlinks.png b/module/webui/themes/dark/img/page-tools-backlinks.png
index 3eb6a9ce3..3eb6a9ce3 100644
--- a/module/web/themes/dark/img/page-tools-backlinks.png
+++ b/module/webui/themes/dark/img/page-tools-backlinks.png
diff --git a/module/web/themes/dark/img/page-tools-edit.png b/module/webui/themes/dark/img/page-tools-edit.png
index 188e1c12b..188e1c12b 100644
--- a/module/web/themes/dark/img/page-tools-edit.png
+++ b/module/webui/themes/dark/img/page-tools-edit.png
diff --git a/module/web/themes/dark/img/page-tools-revisions.png b/module/webui/themes/dark/img/page-tools-revisions.png
index 5c3b8587f..5c3b8587f 100644
--- a/module/web/themes/dark/img/page-tools-revisions.png
+++ b/module/webui/themes/dark/img/page-tools-revisions.png
diff --git a/module/web/themes/dark/img/parseUri.png b/module/webui/themes/dark/img/parseUri.png
index 937bded9d..937bded9d 100644
--- a/module/web/themes/dark/img/parseUri.png
+++ b/module/webui/themes/dark/img/parseUri.png
diff --git a/module/web/themes/dark/img/pencil.png b/module/webui/themes/dark/img/pencil.png
index 0bfecd50e..0bfecd50e 100644
--- a/module/web/themes/dark/img/pencil.png
+++ b/module/webui/themes/dark/img/pencil.png
diff --git a/module/web/themes/dark/img/pyload-logo-edited3.5-new-font-small.png b/module/webui/themes/dark/img/pyload-logo-edited3.5-new-font-small.png
index e878afee5..e878afee5 100644
--- a/module/web/themes/dark/img/pyload-logo-edited3.5-new-font-small.png
+++ b/module/webui/themes/dark/img/pyload-logo-edited3.5-new-font-small.png
diff --git a/module/web/themes/dark/img/reconnect.png b/module/webui/themes/dark/img/reconnect.png
index 49b269145..49b269145 100644
--- a/module/web/themes/dark/img/reconnect.png
+++ b/module/webui/themes/dark/img/reconnect.png
diff --git a/module/web/themes/dark/img/status_None.png b/module/webui/themes/dark/img/status_None.png
index e2672c206..e2672c206 100644
--- a/module/web/themes/dark/img/status_None.png
+++ b/module/webui/themes/dark/img/status_None.png
diff --git a/module/web/themes/dark/img/status_downloading.png b/module/webui/themes/dark/img/status_downloading.png
index fb4ebc850..fb4ebc850 100644
--- a/module/web/themes/dark/img/status_downloading.png
+++ b/module/webui/themes/dark/img/status_downloading.png
diff --git a/module/web/themes/dark/img/status_failed.png b/module/webui/themes/dark/img/status_failed.png
index c37bd062e..c37bd062e 100644
--- a/module/web/themes/dark/img/status_failed.png
+++ b/module/webui/themes/dark/img/status_failed.png
diff --git a/module/web/themes/dark/img/status_finished.png b/module/webui/themes/dark/img/status_finished.png
index 89c8129a4..89c8129a4 100644
--- a/module/web/themes/dark/img/status_finished.png
+++ b/module/webui/themes/dark/img/status_finished.png
diff --git a/module/web/themes/dark/img/status_offline.png b/module/webui/themes/dark/img/status_offline.png
index 0cfd58596..0cfd58596 100644
--- a/module/web/themes/dark/img/status_offline.png
+++ b/module/webui/themes/dark/img/status_offline.png
diff --git a/module/web/themes/dark/img/status_proc.png b/module/webui/themes/dark/img/status_proc.png
index 67de2c6cc..67de2c6cc 100644
--- a/module/web/themes/dark/img/status_proc.png
+++ b/module/webui/themes/dark/img/status_proc.png
diff --git a/module/web/themes/dark/img/status_queue.png b/module/webui/themes/dark/img/status_queue.png
index e2672c206..e2672c206 100644
--- a/module/web/themes/dark/img/status_queue.png
+++ b/module/webui/themes/dark/img/status_queue.png
diff --git a/module/web/themes/dark/img/status_waiting.png b/module/webui/themes/dark/img/status_waiting.png
index 2842cc338..2842cc338 100644
--- a/module/web/themes/dark/img/status_waiting.png
+++ b/module/webui/themes/dark/img/status_waiting.png
diff --git a/module/web/themes/dark/img/success.png b/module/webui/themes/dark/img/success.png
index 89c8129a4..89c8129a4 100644
--- a/module/web/themes/dark/img/success.png
+++ b/module/webui/themes/dark/img/success.png
diff --git a/module/web/themes/dark/img/tab-background.png b/module/webui/themes/dark/img/tab-background.png
index ee96b8407..ee96b8407 100644
--- a/module/web/themes/dark/img/tab-background.png
+++ b/module/webui/themes/dark/img/tab-background.png
diff --git a/module/web/themes/dark/img/tabs-border-bottom.png b/module/webui/themes/dark/img/tabs-border-bottom.png
index 02440f428..02440f428 100644
--- a/module/web/themes/dark/img/tabs-border-bottom.png
+++ b/module/webui/themes/dark/img/tabs-border-bottom.png
diff --git a/module/web/themes/dark/img/user-actions-logout.png b/module/webui/themes/dark/img/user-actions-logout.png
index 0010931e2..0010931e2 100644
--- a/module/web/themes/dark/img/user-actions-logout.png
+++ b/module/webui/themes/dark/img/user-actions-logout.png
diff --git a/module/web/themes/dark/img/user-actions-profile.png b/module/webui/themes/dark/img/user-actions-profile.png
index 46573fff6..46573fff6 100644
--- a/module/web/themes/dark/img/user-actions-profile.png
+++ b/module/webui/themes/dark/img/user-actions-profile.png
diff --git a/module/web/themes/dark/img/user-info.png b/module/webui/themes/dark/img/user-info.png
index 6e643100f..6e643100f 100644
--- a/module/web/themes/dark/img/user-info.png
+++ b/module/webui/themes/dark/img/user-info.png
diff --git a/module/web/themes/dark/tml/admin.html b/module/webui/themes/dark/tml/admin.html
index b9d3a8d1e..b9d3a8d1e 100644
--- a/module/web/themes/dark/tml/admin.html
+++ b/module/webui/themes/dark/tml/admin.html
diff --git a/module/web/themes/dark/tml/base.html b/module/webui/themes/dark/tml/base.html
index f40e21d15..ebfb1ba3e 100644
--- a/module/web/themes/dark/tml/base.html
+++ b/module/webui/themes/dark/tml/base.html
@@ -53,25 +53,25 @@
 </span>
 
     <img src="/dark/img/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
-	<ul id="user-actions">
-		<li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
-		{% if user.is_admin %}
-		<li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
-		{% endif %}
+  <ul id="user-actions">
+    <li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
+    {% if user.is_admin %}
+    <li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
+    {% endif %}
         <li><a href="/info"  class="action info" rel="nofollow">{{_("Info")}}</a></li>
 
-	</ul>
+  </ul>
 {% else %}
     <span style="padding-right: 2px;">{{_("Please Login!")}}</span>
 {% endif %}
 
     {% endblock %}
-	</div>
+  </div>
 
-	<a href="/"><img id="head-logo" src="/dark/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
+  <a href="/"><img id="head-logo" src="/dark/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
 {% if user.is_authenticated %}
-	<div id="head-menu">
-		<ul>
+  <div id="head-menu">
+    <ul>
 
         {% macro selected(name, right=False) -%}
             {% if name in url -%}class="{% if right -%}right {% endif %}selected"{%- endif %}
@@ -79,39 +79,39 @@
         {%- endmacro %}
 
 
-		{% block menu %}
-		<li>
-		    <a href="/" title=""><img src="/dark/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
-		</li>
-		<li {{ selected('queue') }}>
-		    <a href="/queue/" title=""><img src="/dark/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
-		</li>
-		<li {{ selected('collector') }}>
-		    <a href="/collector/" title=""><img src="/dark/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
-		</li>
-		<li {{ selected('downloads') }}>
-		    <a href="/downloads/" title=""><img src="/dark/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
-		</li>
-{#		<li {{ selected('filemanager') }}>#}
-{#		    <a href="/filemanager/" title=""><img src="/dark/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
-{#		</li>#}
-		<li {{ selected('logs', True) }}>
-		    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
-		</li>
-		<li {{ selected('settings', True) }}>
-		    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
-		</li>
-		{% endblock %}
-		
-		</ul>
-	</div>{% endif %}
-
-	<div style="clear:both;"></div>
+    {% block menu %}
+    <li>
+        <a href="/" title=""><img src="/dark/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+    </li>
+    <li {{ selected('queue') }}>
+        <a href="/queue/" title=""><img src="/dark/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+    </li>
+    <li {{ selected('collector') }}>
+        <a href="/collector/" title=""><img src="/dark/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+    </li>
+    <li {{ selected('downloads') }}>
+        <a href="/downloads/" title=""><img src="/dark/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+    </li>
+{#    <li {{ selected('filemanager') }}>#}
+{#        <a href="/filemanager/" title=""><img src="/dark/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
+{#    </li>#}
+    <li {{ selected('logs', True) }}>
+        <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+    </li>
+    <li {{ selected('settings', True) }}>
+        <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
+    </li>
+    {% endblock %}
+    
+    </ul>
+  </div>{% endif %}
+
+  <div style="clear:both;"></div>
 </div>
 
 {% if perms.STATUS %}
 <ul id="page-actions2">
-	<li id="action_play"><a href="#"  class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
+  <li id="action_play"><a href="#"  class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
     <li id="action_stop"><a href="#"  class="action stop" accesskey="o" rel="nofollow">{{_("Stop")}}</a></li>
     <li id="action_cancel"><a href="#"  class="action cancel" accesskey="o" rel="nofollow">{{_("Cancel")}}</a></li>
     <li id="action_add"><a href="#"  class="action add" accesskey="o" rel="nofollow" >{{_("Add")}}</a></li>
@@ -149,7 +149,7 @@
 <noscript><h1>Enable JavaScript to use the webinterface.</h1></noscript>
 
 {% for message in messages %}
-	<b><p>{{message}}</p></b>
+  <b><p>{{message}}</p></b>
 {% endfor %}
 
 <div id="load-indicator" style="opacity: 0; float: right; margin-top: -10px;">
@@ -160,7 +160,7 @@
 {% block content %}
 {% endblock content %}
 
-	<hr style="clear: both;" />
+  <hr style="clear: both;" />
 
 <div id="foot">&copy; 2008-2011 pyLoad Team
 <a href="#top" class="action top" accesskey="x"><span>{{_("Back to top")}}</span></a><br />
diff --git a/module/webui/themes/dark/tml/captcha.html b/module/webui/themes/dark/tml/captcha.html
new file mode 100644
index 000000000..ae1afe444
--- /dev/null
+++ b/module/webui/themes/dark/tml/captcha.html
@@ -0,0 +1,42 @@
+<!-- Captcha box -->
+<div id="cap_box" class="window_box">
+
+  <form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
+  
+    <h1>{{_("Captcha reading")}}</h1>
+    <p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
+    
+    <div id="cap_textual">
+    
+      <input id="cap_id" name="cap_id" type="hidden" value="" />
+    
+      <label>{{_("Captcha")}}
+      <span class="small">{{_("The captcha.")}}</span>
+      </label>
+      <span class="cont">
+          <img id="cap_textual_img" src="">
+      </span>
+      
+      <label>{{_("Text")}}
+      <span class="small">{{_("Input the text on the captcha.")}}</span>
+      </label>
+      <input id="cap_result" name="cap_result" type="text" size="20" />
+          
+    </div>
+    
+    <div id="cap_positional" style="text-align: center">
+        <img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
+    </div>
+
+    <div id="button_bar" style="text-align: center">
+      <span>
+        <button id="cap_submit" type="submit" style="margin-left: 0">{{_("Submit")}}</button>
+        <button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
+      </span>
+    </div>
+    
+    <div class="spacer"></div>
+  
+  </form>
+
+</div>
\ No newline at end of file
diff --git a/module/web/themes/dark/tml/downloads.html b/module/webui/themes/dark/tml/downloads.html
index 8a68d3f99..8a68d3f99 100644
--- a/module/web/themes/dark/tml/downloads.html
+++ b/module/webui/themes/dark/tml/downloads.html
diff --git a/module/web/themes/dark/tml/filemanager.html b/module/webui/themes/dark/tml/filemanager.html
index f9ce543ee..fc3a1fcd3 100644
--- a/module/web/themes/dark/tml/filemanager.html
+++ b/module/webui/themes/dark/tml/filemanager.html
@@ -26,9 +26,9 @@ document.addEvent("domready", function(){
     <span>
       <b>{{ file.name }}</b>
       <span class="buttons" style="opacity:0">
-	    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
-	    &nbsp;&nbsp;
-	    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
+      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
+      &nbsp;&nbsp;
+      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
       </span>
     </span>
   </li>
@@ -39,30 +39,30 @@ document.addEvent("domready", function(){
       <input type="hidden" name="path" class="path" value="{{ fld.path }}" />
       <input type="hidden" name="name" class="name" value="{{ fld.name }}" />
       <span>
-	<b>{{ fld.name }}</b>
-	<span class="buttons" style="opacity:0">
-	      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
-	      &nbsp;&nbsp;
-	      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
-	      &nbsp;&nbsp;
-	      <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/add_folder.png" />
-	</span>
+  <b>{{ fld.name }}</b>
+  <span class="buttons" style="opacity:0">
+        <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
+        &nbsp;&nbsp;
+        <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
+        &nbsp;&nbsp;
+        <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/add_folder.png" />
+  </span>
       </span>
       {% if (fld.folders|length + fld.files|length) > 0 %}
-	{% if open %}
-	  <ul>
-	{% else %}
-	  <ul style="display:none">
-	{% endif %}
-	  {% for child in fld.folders %}
-	      {{ display_folder(child) }}
-	  {% endfor %}
-	  {% for child in fld.files %}
-	      {{ display_file(child) }}
-	  {% endfor %}
-	</ul>
+  {% if open %}
+    <ul>
+  {% else %}
+    <ul style="display:none">
+  {% endif %}
+    {% for child in fld.folders %}
+        {{ display_folder(child) }}
+    {% endfor %}
+    {% for child in fld.files %}
+        {{ display_file(child) }}
+    {% endfor %}
+  </ul>
       {% else %}
-	<div style="display:none">{{ _("Folder is empty") }}</div>
+  <div style="display:none">{{ _("Folder is empty") }}</div>
       {% endif %}
     </li>
 {%- endmacro %}
diff --git a/module/webui/themes/dark/tml/folder.html b/module/webui/themes/dark/tml/folder.html
new file mode 100644
index 000000000..81758b544
--- /dev/null
+++ b/module/webui/themes/dark/tml/folder.html
@@ -0,0 +1,15 @@
+<li class="folder">
+  <input type="hidden" name="path" class="path" value="{{ path }}" />
+  <input type="hidden" name="name" class="name" value="{{ name }}" />
+  <span>
+    <b>{{ name }}</b>
+    <span class="buttons" style="opacity:0">
+    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
+    &nbsp;&nbsp;
+    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
+    &nbsp;&nbsp;
+    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/add_folder.png" />
+    </span>
+  </span>
+  <div style="display:none">{{ _("Folder is empty") }}</div>
+</li>
\ No newline at end of file
diff --git a/module/web/themes/dark/tml/home.html b/module/webui/themes/dark/tml/home.html
index eb3688719..68bf387af 100644
--- a/module/web/themes/dark/tml/home.html
+++ b/module/webui/themes/dark/tml/home.html
@@ -7,21 +7,21 @@ var em;
 var operafix = (navigator.userAgent.toLowerCase().search("opera") >= 0);
 
 document.addEvent("domready", function(){
-	em = new EntryManager();
+  em = new EntryManager();
 });
 
 var EntryManager = new Class({
     initialize: function(){
         this.json = new Request.JSON({
-		url: "json/links",
+    url: "json/links",
                 secure: false,
                 async: true,
-		onSuccess: this.update.bind(this),
-		initialDelay: 0,
-		delay: 2500,
-		limit: 30000
-	});
-	
+    onSuccess: this.update.bind(this),
+    initialDelay: 0,
+    delay: 2500,
+    limit: 30000
+  });
+  
         this.ids = [{% for link in content %}
         {% if forloop.last %}
             {{ link.id }}
diff --git a/module/web/themes/dark/tml/info.html b/module/webui/themes/dark/tml/info.html
index 7ff2b639b..7ff2b639b 100644
--- a/module/web/themes/dark/tml/info.html
+++ b/module/webui/themes/dark/tml/info.html
diff --git a/module/web/themes/dark/tml/login.html b/module/webui/themes/dark/tml/login.html
index 05bff2f54..9ddb308df 100644
--- a/module/web/themes/dark/tml/login.html
+++ b/module/webui/themes/dark/tml/login.html
@@ -13,7 +13,7 @@
 {% if errors %}
 <p style="color:red;">{{_("Your username and password didn't match. Please try again.")}}</p>
 {% endif %}
-		<table id="login_table">
+    <table id="login_table">
         <tr>
             <td>{{_("Username")}}</td>
             <td><input type="text" size="20" name="username" /></td>
diff --git a/module/web/themes/dark/tml/logout.html b/module/webui/themes/dark/tml/logout.html
index 5320e07f5..5320e07f5 100644
--- a/module/web/themes/dark/tml/logout.html
+++ b/module/webui/themes/dark/tml/logout.html
diff --git a/module/web/themes/dark/tml/logs.html b/module/webui/themes/dark/tml/logs.html
index 86983f2af..86983f2af 100644
--- a/module/web/themes/dark/tml/logs.html
+++ b/module/webui/themes/dark/tml/logs.html
diff --git a/module/web/themes/dark/tml/pathchooser.html b/module/webui/themes/dark/tml/pathchooser.html
index 3f4183ff4..a38c0614b 100644
--- a/module/web/themes/dark/tml/pathchooser.html
+++ b/module/webui/themes/dark/tml/pathchooser.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<script class="javascript">
+  <script class="javascript">
         function chosen()
         {
             opener.ifield.value = document.forms[0].p.value;
@@ -24,21 +24,21 @@
             setValid();
             
         }
-	</script>
-	<link rel="stylesheet" type="text/css" href="/dark/css/pathchooser.css"/>
+  </script>
+  <link rel="stylesheet" type="text/css" href="/dark/css/pathchooser.css"/>
 </head>
 <body{% if type == 'file' %}{% if not oldfile %} onload="setInvalid();"{% endif %}{% endif %}>
 <center>
     <div id="paths">
-	<form method="get" action="?" onSubmit="chosen();" onReset="exit();">
-	    <input type="text" name="p" value="{{ oldfile|default(cwd) }}" size="60" onfocus="setValid();">
-	    <input type="submit" value="Ok" name="send">
-	</form>
+  <form method="get" action="?" onSubmit="chosen();" onReset="exit();">
+      <input type="text" name="p" value="{{ oldfile|default(cwd) }}" size="60" onfocus="setValid();">
+      <input type="submit" value="Ok" name="send">
+  </form>
     
     {% if type == 'folder' %}
-	<span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/pathchooser" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/pathchooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
+  <span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/pathchooser" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/pathchooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
     {% else %}
-	<span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/filechooser/" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/filechooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
+  <span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/filechooser/" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/filechooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
     {% endif %}
     </div>
     <table border="0" cellspacing="0" cellpadding="3">
@@ -48,13 +48,13 @@
             <th>{{_("type")}}</th>
             <th>{{_("last modified")}}</th>
         </tr>
-	{% if parentdir %}
+  {% if parentdir %}
         <tr>
             <td colspan="4">
                 <a href="{% if type == 'folder' %}{{ "/pathchooser/" + parentdir|quotepath }}{% else %}{{ "/filechooser/" + parentdir|quotepath }}{% endif %}"><span class="parentdir">{{_("parent directory")}}</span></a>
             </td>
         </tr>
-	{% endif %}
+  {% endif %}
 {% for file in files %}
         <tr>
             {% if type == 'folder' %}
diff --git a/module/web/themes/dark/tml/queue.html b/module/webui/themes/dark/tml/queue.html
index 30c621466..30c621466 100644
--- a/module/web/themes/dark/tml/queue.html
+++ b/module/webui/themes/dark/tml/queue.html
diff --git a/module/web/themes/dark/tml/settings.html b/module/webui/themes/dark/tml/settings.html
index 502eb8130..502eb8130 100644
--- a/module/web/themes/dark/tml/settings.html
+++ b/module/webui/themes/dark/tml/settings.html
diff --git a/module/web/themes/dark/tml/settings_item.html b/module/webui/themes/dark/tml/settings_item.html
index e417e564c..e417e564c 100644
--- a/module/web/themes/dark/tml/settings_item.html
+++ b/module/webui/themes/dark/tml/settings_item.html
diff --git a/module/web/themes/dark/tml/window.html b/module/webui/themes/dark/tml/window.html
index 82481fb27..82481fb27 100644
--- a/module/web/themes/dark/tml/window.html
+++ b/module/webui/themes/dark/tml/window.html
diff --git a/module/web/themes/default/css/MooDialog.min.css b/module/webui/themes/default/css/MooDialog.min.css
index 20cdbef66..20cdbef66 100644
--- a/module/web/themes/default/css/MooDialog.min.css
+++ b/module/webui/themes/default/css/MooDialog.min.css
diff --git a/module/web/themes/default/css/default.min.css b/module/webui/themes/default/css/default.min.css
index 76d187252..76d187252 100644
--- a/module/web/themes/default/css/default.min.css
+++ b/module/webui/themes/default/css/default.min.css
diff --git a/module/web/themes/default/css/log.min.css b/module/webui/themes/default/css/log.min.css
index f3e75a670..f3e75a670 100644
--- a/module/web/themes/default/css/log.min.css
+++ b/module/webui/themes/default/css/log.min.css
diff --git a/module/web/themes/default/css/pathchooser.min.css b/module/webui/themes/default/css/pathchooser.min.css
index dee37cf2d..dee37cf2d 100644
--- a/module/web/themes/default/css/pathchooser.min.css
+++ b/module/webui/themes/default/css/pathchooser.min.css
diff --git a/module/webui/themes/default/css/sources/MooDialog.css b/module/webui/themes/default/css/sources/MooDialog.css
new file mode 100644
index 000000000..f62b3dd7d
--- /dev/null
+++ b/module/webui/themes/default/css/sources/MooDialog.css
@@ -0,0 +1,95 @@
+/* Created by Arian Stolwijk <http://www.aryweb.nl> */
+
+.MooDialog {
+  position: fixed;
+  width: 300px;
+  height: 100px;
+  top: 50%;
+  left: 50%;
+  margin: -150px 0 0 -150px;
+  padding: 10px;
+  z-index: 50000;
+
+  background: #eef5f8;
+  color: black;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+  -webkit-border-radius: 7px;
+  border-radius: 7px;
+  -moz-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+  -webkit-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+  box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+}
+
+.MooDialogTitle {
+  padding-top: 30px;
+}
+
+.MooDialog .content {
+  height: 100px;
+}
+
+.MooDialog .title {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  padding: 3px 20px;
+
+  background: #b7c4dc;
+  border-bottom: 1px solid #a1aec5;
+  font-weight: bold;
+  text-shadow: 1px 1px 0 #fff;
+  color: black;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+  -webkit-border-radius: 7px;
+}
+
+.MooDialog .close {
+  position: absolute;
+  width: 16px;
+  height: 16px;
+  top: -5px;
+  left: -5px;
+
+  background: url(dialog-close.png) no-repeat;
+  display: block;
+  cursor: pointer;
+}
+
+.MooDialog .buttons {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  background: none;
+  text-align: right;
+}
+
+.MooDialog .iframe {
+  width: 100%;
+  height: 100%;
+}
+
+.MooDialog .textInput {
+  width: 200px;
+  float: left;
+}
+
+.MooDialog .MooDialogAlert,
+.MooDialog .MooDialogConfirm,
+.MooDialog .MooDialogPrompt,
+.MooDialog .MooDialogError {
+  padding-left: 40px;
+  min-height: 40px;
+  background: url(dialog-warning.png) no-repeat;
+}
+
+.MooDialog .MooDialogConfirm,
+.MooDialog .MooDialogPrompt {
+  background: url(dialog-question.png) no-repeat;
+}
+
+.MooDialog .MooDialogError {
+  background: url(dialog-error.png) no-repeat;
+}
diff --git a/module/webui/themes/default/css/sources/default.css b/module/webui/themes/default/css/sources/default.css
new file mode 100644
index 000000000..1843e2391
--- /dev/null
+++ b/module/webui/themes/default/css/sources/default.css
@@ -0,0 +1,908 @@
+.hidden {
+  display:none;
+}
+.leftalign {
+  text-align:left;
+}
+.centeralign {
+  text-align:center;
+}
+.rightalign {
+  text-align:right;
+}
+
+
+.dokuwiki div.plugin_translation ul li a.wikilink1:link, .dokuwiki div.plugin_translation ul li a.wikilink1:hover, .dokuwiki div.plugin_translation ul li a.wikilink1:active, .dokuwiki div.plugin_translation ul li a.wikilink1:visited {
+  background-color:#000080;
+  color:#fff !important;
+  text-decoration:none;
+  padding:0 0.2em;
+  margin:0.1em 0.2em;
+  border:none !important;
+}
+.dokuwiki div.plugin_translation ul li a.wikilink2:link, .dokuwiki div.plugin_translation ul li a.wikilink2:hover, .dokuwiki div.plugin_translation ul li a.wikilink2:active, .dokuwiki div.plugin_translation ul li a.wikilink2:visited {
+  background-color:#808080;
+  color:#fff !important;
+  text-decoration:none;
+  padding:0 0.2em;
+  margin:0.1em 0.2em;
+  border:none !important;
+}
+
+.dokuwiki div.plugin_translation ul li a:hover img {
+  opacity:1.0;
+  height:15px;
+}
+
+body {
+  margin:0;
+  padding:0;
+  background-color:white;
+  color:black;
+  font-size:12px;
+  font-family:Verdana, Helvetica, "Lucida Grande", Lucida, Arial, sans-serif;
+  font-family:sans-serif;
+  font-size:99, 96%;
+  font-size-adjust:none;
+  font-style:normal;
+  font-variant:normal;
+  font-weight:normal;
+  line-height:normal;
+}
+hr {
+  border-width:0;
+  border-bottom:1px #aaa dotted;
+}
+img {
+  border:none;
+}
+form {
+  margin:0px;
+  padding:0px;
+  border:none;
+  display:inline;
+  background:transparent;
+}
+ul li {
+  margin:5px;
+}
+textarea {
+  font-family:monospace;
+}
+table {
+  margin:0.5em 0;
+  border-collapse:collapse;
+}
+td {
+  padding:0.25em;
+  border:1pt solid #ADB9CC;
+}
+a {
+  color:#3465a4;
+  text-decoration:none;
+}
+a:hover {
+  text-decoration:underline;
+}
+
+option {
+  border:0 none #fff;
+}
+strong.highlight {
+  background-color:#fc9;
+  padding:1pt;
+}
+#pagebottom {
+  clear:both;
+}
+hr {
+  height:1px;
+  color:#c0c0c0;
+  background-color:#c0c0c0;
+  border:none;
+  margin:.2em 0 .2em 0;
+}
+
+.invisible {
+  margin:0px;
+  border:0px;
+  padding:0px;
+  height:0px;
+  visibility:hidden;
+}
+.left {
+  float:left !important;
+}
+.right {
+  float:right !important;
+}
+.center {
+  text-align:center;
+}
+div#body-wrapper {
+  padding:40px 40px 10px 40px;
+  font-size:127%;
+}
+div#content {
+  margin-top:-20px;
+  padding:0;
+  font-size:14px;
+  color:black;
+  line-height:1.5em;
+}
+h1, h2, h3, h4, h5, h6 {
+  background:transparent none repeat scroll 0 0;
+  border-bottom:1px solid #aaa;
+  color:black;
+  font-weight:normal;
+  margin:0;
+  padding:0;
+  padding-bottom:0.17em;
+  padding-top:0.5em;
+}
+h1 {
+  font-size:188%;
+  line-height:1.2em;
+  margin-bottom:0.1em;
+  padding-bottom:0;
+}
+h2 {
+  font-size:150%;
+}
+h3, h4, h5, h6 {
+  border-bottom:none;
+  font-weight:bold;
+}
+h3 {
+  font-size:132%;
+}
+h4 {
+  font-size:116%;
+}
+h5 {
+  font-size:100%;
+}
+h6 {
+  font-size:80%;
+}
+ul#page-actions, ul#page-actions-more {
+  float:right;
+  margin:10px 10px 0 10px;
+  padding:6px;
+  color:black;
+  background-color:#ececec;
+  list-style-type:none;
+  white-space: nowrap;
+  border-radius:5px;
+  -moz-border-radius:5px;
+}
+ul#user-actions {
+  padding:5px;
+  margin:0;
+  display:inline;
+  color:black;
+  background-color:#ececec;
+  list-style-type:none;
+  -moz-border-radius:3px;
+  border-radius:3px;
+}
+ul#page-actions li, ul#user-actions li, ul#page-actions-more li {
+  display:inline;
+}
+ul#page-actions a, ul#user-actions a, ul#page-actions-more a {
+  text-decoration:none;
+  color:black;
+  display:inline;
+  margin:0 3px;
+  padding:2px 0px 2px 18px;
+}
+ul#page-actions a:hover, ul#page-actions a:focus, ul#user-actions a:hover, ul#user-actions a:focus {
+  /*text-decoration:underline;*/
+}
+/***************************/
+ul#page-actions2 {
+  float:left;
+  margin:10px 10px 0 10px;
+  padding:6px;
+  color:black;
+  background-color:#ececec;
+  list-style-type:none;
+  border-radius:5px;
+  -moz-border-radius:5px;
+}
+ul#user-actions2 {
+  padding:5px;
+  margin:0;
+  display:inline;
+  color:black;
+  background-color:#ececec;
+  list-style-type:none;
+  border-radius:3px;
+  -moz-border-radius:3px;
+}
+ul#page-actions2 li, ul#user-actions2 li {
+  display:inline;
+}
+ul#page-actions2 a, ul#user-actions2 a {
+  text-decoration:none;
+  color:black;
+  display:inline;
+  margin:0 3px;
+  padding:2px 0px 2px 18px;
+}
+ul#page-actions2 a:hover, ul#page-actions2 a:focus, ul#user-actions2 a:hover, ul#user-actions2 a:focus,
+ul#page-actions-more a:hover, ul#page-actions-more a:focus{
+  color: #4e7bb4;
+}
+/****************************/
+.hidden {
+  display:none;
+}
+
+a.action.index {
+  background:transparent url(../img/wiki-tools-index.png) 0px 1px no-repeat;
+}
+a.action.recent {
+  background:transparent url(../img/wiki-tools-recent.png) 0px 1px no-repeat;
+}
+a.logout {
+  background:transparent url(../img/user-actions-logout.png) 0px 1px no-repeat;
+}
+
+a.info {
+    background:transparent url(../img/user-info.png) 0px 1px no-repeat;
+}
+
+a.admin {
+  background:transparent url(../img/user-actions-admin.png) 0px 1px no-repeat;
+}
+a.profile {
+  background:transparent url(../img/user-actions-profile.png) 0px 1px no-repeat;
+}
+a.create, a.edit {
+  background:transparent url(../img/page-tools-edit.png) 0px 1px no-repeat;
+}
+a.source, a.show {
+  background:transparent url(../img/page-tools-source.png) 0px 1px no-repeat;
+}
+a.revisions {
+  background:transparent url(../img/page-tools-revisions.png) 0px 1px no-repeat;
+}
+a.subscribe, a.unsubscribe {
+  background:transparent url(../img/page-tools-subscribe.png) 0px 1px no-repeat;
+}
+a.backlink {
+  background:transparent url(../img/page-tools-backlinks.png) 0px 1px no-repeat;
+}
+a.play {
+  background:transparent url(../img/control_play.png) 0px 1px no-repeat;
+}
+.time {
+  background:transparent url(../img/status_None.png) 0px 1px no-repeat;
+        padding: 2px 0px 2px 18px;
+        margin: 0px 3px;
+}
+.reconnect {
+  background:transparent url(../img/reconnect.png) 0px 1px no-repeat;
+        padding: 2px 0px 2px 18px;
+        margin: 0px 3px;
+}
+a.play:hover {
+  background:transparent url(../img/control_play_blue.png) 0px 1px no-repeat;
+}
+a.cancel {
+  background:transparent url(../img/control_cancel.png) 0px 1px no-repeat;
+}
+a.cancel:hover {
+  background:transparent url(../img/control_cancel_blue.png) 0px 1px no-repeat;
+}
+a.pause {
+  background:transparent url(../img/control_pause.png) 0px 1px no-repeat;
+}
+a.pause:hover {
+  background:transparent url(../img/control_pause_blue.png) 0px 1px no-repeat;
+  font-weight: bold;
+}
+a.stop {
+  background:transparent url(../img/control_stop.png) 0px 1px no-repeat;
+}
+a.stop:hover {
+  background:transparent url(../img/control_stop_blue.png) 0px 1px no-repeat;
+}
+a.add {
+  background:transparent url(../img/control_add.png) 0px 1px no-repeat;
+}
+a.add:hover {
+  background:transparent url(../img/control_add_blue.png) 0px 1px no-repeat;
+}
+a.cog {
+  background:transparent url(../img/cog.png) 0px 1px no-repeat;
+}
+#head-panel {
+  background:#525252 url(../img/head_bg1.png) bottom left repeat-x;
+}
+#head-panel h1 {
+  display:none;
+  margin:0;
+  text-decoration:none;
+  padding-top:0.8em;
+  padding-left:3.3em;
+  font-size:2.6em;
+  color:#eeeeec;
+}
+#head-panel #head-logo {
+  float:left;
+  margin:5px 0 -15px 5px;
+  padding:0;
+  overflow:visible;
+}
+#head-menu {
+  background:transparent url(../img/tabs-border-bottom.png) 0 100% repeat-x;
+  width:100%;
+  float:left;
+  margin:0;
+  padding:0;
+  padding-top:0.8em;
+}
+#head-menu ul {
+  list-style:none;
+  margin:0 1em 0 2em;
+}
+#head-menu ul li {
+  float:left;
+  margin:0;
+  margin-left:0.3em;
+  font-size:14px;
+  margin-bottom:4px;
+}
+#head-menu ul li.selected, #head-menu ul li:hover {
+  margin-bottom:0px;
+}
+#head-menu ul li a img {
+  height:22px;
+  width:22px;
+  vertical-align:middle;
+}
+#head-menu ul li a, #head-menu ul li a:link {
+  float:left;
+  text-decoration:none;
+  color:#555;
+  background:#eaeaea url(../img/tab-background.png) 0 100% repeat-x;
+  padding:3px 7px 3px 7px;
+  border:2px solid #ccc;
+  border-bottom:0px solid transparent;
+  padding-bottom:3px;
+  -moz-border-radius:5px;
+  border-radius:5px;
+}
+#head-menu ul li a:hover, #head-menu ul li a:focus {
+  color:#111;
+  padding-bottom:7px;
+  border-bottom:0px none transparent;
+  outline:none;
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px;
+  -moz-border-radius-bottomright:0px;
+  -moz-border-radius-bottomleft:0px;
+}
+#head-menu ul li a:focus {
+  margin-bottom:-4px;
+}
+#head-menu ul li.selected a {
+  color:#3566A5;
+  background:#fff;
+  padding-bottom:7px;
+  border-bottom:0px none transparent;
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px;
+  -moz-border-radius-bottomright:0px;
+  -moz-border-radius-bottomleft:0px;
+}
+#head-menu ul li.selected a:hover, #head-menu ul li.selected a:focus {
+  color:#111;
+}
+div#head-search-and-login {
+  float:right;
+  margin:0 1em 0 0;
+  background-color:#222;
+  padding:7px 7px 5px 5px;
+  color:white;
+  white-space: nowrap;
+  border-bottom-left-radius: 6px;
+  border-bottom-right-radius: 6px;
+  -moz-border-radius-bottomright:6px;
+  -moz-border-radius-bottomleft:6px;
+}
+div#head-search-and-login form {
+  display:inline;
+  padding:0 3px;
+}
+div#head-search-and-login form input {
+  border:2px solid #888;
+  background:#eee;
+  font-size:14px;
+  padding:2px;
+  border-radius:3px;
+  -moz-border-radius:3px;
+}
+div#head-search-and-login form input:focus {
+  background:#fff;
+}
+#head-search {
+  font-size:14px;
+}
+#head-username, #head-password {
+  width:80px;
+  font-size:14px;
+}
+#pageinfo {
+  clear:both;
+  color:#888;
+  padding:0.6em 0;
+  margin:0;
+}
+#foot {
+  font-style:normal;
+  color:#888;
+  text-align:center;
+}
+#foot a {
+  color:#aaf;
+}
+#foot img {
+  vertical-align:middle;
+}
+div.toc {
+  border:1px dotted #888;
+  background:#f0f0f0;
+  margin:1em 0 1em 1em;
+  float:right;
+  font-size:95%;
+}
+div.toc .tocheader {
+  font-weight:bold;
+  margin:0.5em 1em;
+}
+div.toc ol {
+  margin:1em 0.5em 1em 1em;
+  padding:0;
+}
+div.toc ol li {
+  margin:0;
+  padding:0;
+  margin-left:1em;
+}
+div.toc ol ol {
+  margin:0.5em 0.5em 0.5em 1em;
+  padding:0;
+}
+div.recentchanges table {
+  clear:both;
+}
+div#editor-help {
+  font-size:90%;
+  border:1px dotted #888;
+  padding:0ex 1ex 1ex 1ex;
+  background:#f7f6f2;
+}
+div#preview {
+  margin-top:1em;
+}
+label.block {
+  display:block;
+  text-align:right;
+  font-weight:bold;
+}
+label.simple {
+  display:block;
+  text-align:left;
+  font-weight:normal;
+}
+label.block input.edit {
+  width:50%;
+}
+/*fieldset {
+  width:300px;
+  text-align:center;
+  padding:0.5em;
+  margin:auto;
+}
+*/
+div.editor {
+  margin:0 0 0 0;
+}
+table {
+  margin:0.5em 0;
+  border-collapse:collapse;
+}
+td {
+  padding:0.25em;
+  border:1pt solid #ADB9CC;
+}
+td p {
+  margin:0;
+  padding:0;
+}
+.u {
+  text-decoration:underline;
+}
+.footnotes ul {
+  padding:0 2em;
+  margin:0 0 1em;
+}
+.footnotes li {
+  list-style:none;
+}
+.userpref table, .userpref td {
+  border:none;
+}
+#message {
+  clear:both;
+  padding:5px 10px;
+  background-color:#eee;
+  border-bottom:2px solid #ccc;
+}
+#message p {
+  margin:5px 0;
+  padding:0;
+  font-weight:bold;
+}
+#message div.buttons {
+  font-weight:normal;
+}
+.diff {
+  width:99%;
+}
+.diff-title {
+  background-color:#C0C0C0;
+}
+.searchresult dd span {
+  font-weight:bold;
+}
+.boxtext {
+  font-family:tahoma, arial, sans-serif;
+  font-size:11px;
+  color:#000;
+  float:none;
+  padding:3px 0 0 10px;
+}
+.statusbutton {
+  width:32px;
+  height:32px;
+  float:left;
+  margin-left:-32px;
+  margin-right:5px;
+  opacity:0;
+  cursor:pointer
+}
+.dlsize {
+  float:left;
+  padding-right: 8px;
+}
+.dlspeed {
+  float:left;
+  padding-right: 8px;
+}
+.package {
+  margin-bottom: 10px;
+}
+.packagename {
+  font-weight: bold;
+}
+
+.child {
+  margin-left: 20px;
+}
+.child_status {
+  margin-right: 10px;
+}
+.child_secrow {
+  font-size: 10px;
+}
+
+.header, .header th {
+  text-align: left;
+  font-weight: normal;
+  background-color:#ececec;
+  -moz-border-radius:5px;
+  border-radius:5px;
+}
+.progress_bar {
+  background: #0C0;
+  height: 5px;
+  
+}
+
+.queue {
+  border: none
+}
+
+.queue tr td {
+  border: none
+}
+
+.header, .header th{
+  text-align: left;
+  font-weight: normal;
+}
+
+
+.clearer
+{
+  clear: both;
+  height: 1px;
+}
+
+.left
+{
+  float: left;
+}
+
+.right
+{
+  float: right;
+}
+
+
+.setfield
+{
+    display: table-cell;
+}
+
+ul.tabs li a
+{
+   padding: 5px 16px 4px 15px;
+   border: none;
+   font-weight: bold;
+
+    border-radius: 5px 5px 0 0;
+    -moz-border-radius: 5px 5px 0 0;
+
+}
+
+
+#tabs span
+{
+    display: none;
+}
+
+#tabs span.selected
+{
+    display: inline;
+}
+
+#tabsback
+{
+    background-color: #525252;
+    margin: 2px 0 0;
+    padding: 6px 4px 1px 4px;
+
+    border-top-right-radius: 30px;
+    border-top-left-radius: 3px;
+    -moz-border-radius-topright: 30px;
+    -moz-border-radius-topleft: 3px;
+}
+ul.tabs
+{
+    list-style-type: none;
+    margin:0;
+    padding: 0 40px 0 0;
+}
+
+ul.tabs li
+{
+    display: inline;
+    margin-left: 8px;
+}
+
+
+ul.tabs li a
+{
+    color: #42454a;
+    background-color: #eaeaea;
+    border: 1px none #c9c3ba;
+    margin: 0;
+    text-decoration: none;
+
+    outline: 0;
+
+    padding: 5px 16px 4px 15px;
+    font-weight: bold;
+
+     border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+
+}
+
+ul.tabs li a.selected, ul.tabs li a:hover
+{
+    color: #000;
+    background-color: white;
+
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+    -moz-border-radius-bottomright: 0;
+    -moz-border-radius-bottomleft: 0;
+}
+
+ul.tabs li a:hover
+{
+    background-color: #f1f4ee;
+}
+
+ul.tabs li a.selected
+{
+    font-weight: bold;
+    background-color: #525252;
+    padding-bottom: 5px;
+    color: white;
+}
+
+
+#tabs-body {
+    position: relative;
+    overflow: hidden;
+}
+
+
+span.tabContent
+{
+    border: 2px solid #525252;
+    margin: 0;
+    padding: 0;
+    padding-bottom: 10px;
+}
+
+#tabs-body > span {
+    display: none;
+}
+
+#tabs-body > span.active {
+    display: block;
+}
+
+.hide
+{
+    display: none;
+}
+
+.settable
+{
+    margin: 20px;
+    border: none;
+}
+.settable td
+{
+    border: none;
+    margin: 0;
+    padding: 5px;
+}
+
+.settable th{
+    padding-bottom: 8px;
+}
+
+.settable.wide td , .settable.wide th {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+
+/*settings navbar*/
+ul.nav {
+    margin: -30px 0 0;
+    padding: 0;
+  list-style: none;
+    position: absolute;
+}
+
+
+ul.nav li {
+  position: relative;
+  float: left;
+  padding: 5px;
+}
+
+ul.nav > li a {
+    background: white;
+    -moz-border-radius: 4px 4px 4px 4px;
+    border: 1px solid #C9C3BA;
+    border-bottom: medium none;
+    color: black;
+}
+
+ul.nav ul {
+  position: absolute;
+  top: 26px;
+  left: 10px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  border: 1px solid #AAA;
+  background: #f1f1f1;
+  -webkit-box-shadow: 1px 1px 5px #AAA;
+  -moz-box-shadow: 1px 1px 5px #AAA;
+  box-shadow: 1px 1px 5px #AAA;
+    cursor: pointer;
+}
+
+ul.nav .open {
+  display: block;
+}
+
+ul.nav .close {
+  display: none;
+}
+
+ul.nav ul li {
+  float: none;
+  padding: 0;
+}
+
+ul.nav ul li a {
+  width: 130px;
+  background: #f1f1f1;
+  padding: 3px;
+  display: block;
+  font-weight: normal;
+}
+
+ul.nav ul li a:hover {
+  background: #CDCDCD;
+}
+
+ul.nav ul ul {
+  left: 137px;
+  top: 0;
+}
+
+.purr-wrapper{
+  margin:10px;
+}
+
+/*Purr alert styles*/
+
+.purr-alert{
+  margin-bottom:10px;
+  padding:10px;
+  background:#000;
+  font-size:13px;
+  font-weight:bold;
+  color:#FFF;
+  -moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  /*-moz-box-shadow: 0 0 10px rgba(255,255,0,.25);*/
+  width:300px;
+}
+.purr-alert.error{
+  color:#F55;
+  padding-left:30px;
+  background:url(../img/error.png) no-repeat #000 7px 10px;
+  width:280px;
+}
+.purr-alert.success{
+  color:#5F5;
+  padding-left:30px;
+  background:url(../img/success.png) no-repeat #000 7px 10px;
+  width:280px;
+}
+.purr-alert.notice{
+  color:#99F;
+  padding-left:30px;
+  background:url(../img/notice.png) no-repeat #000 7px 10px;
+  width:280px;
+}
+
+table.system {
+    border: none;
+    margin-left: 10px;
+}
+
+table.system td {
+    border: none
+}
+
+table.system tr > td:first-child {
+    font-weight: bold;
+    padding-right: 10px;
+}
diff --git a/module/web/themes/default/css/sources/log.css b/module/webui/themes/default/css/sources/log.css
index 26449b244..26449b244 100644
--- a/module/web/themes/default/css/sources/log.css
+++ b/module/webui/themes/default/css/sources/log.css
diff --git a/module/web/themes/default/css/sources/pathchooser.css b/module/webui/themes/default/css/sources/pathchooser.css
index 894cc335e..894cc335e 100644
--- a/module/web/themes/default/css/sources/pathchooser.css
+++ b/module/webui/themes/default/css/sources/pathchooser.css
diff --git a/module/web/themes/default/css/sources/window.css b/module/webui/themes/default/css/sources/window.css
index 12829868b..12829868b 100644
--- a/module/web/themes/default/css/sources/window.css
+++ b/module/webui/themes/default/css/sources/window.css
diff --git a/module/web/themes/default/css/window.min.css b/module/webui/themes/default/css/window.min.css
index 11927d614..11927d614 100644
--- a/module/web/themes/default/css/window.min.css
+++ b/module/webui/themes/default/css/window.min.css
diff --git a/module/web/themes/default/img/add_folder.png b/module/webui/themes/default/img/add_folder.png
index 8acbc411b..8acbc411b 100644
--- a/module/web/themes/default/img/add_folder.png
+++ b/module/webui/themes/default/img/add_folder.png
diff --git a/module/web/themes/default/img/ajax-loader.gif b/module/webui/themes/default/img/ajax-loader.gif
index 2fd8e0737..2fd8e0737 100644
--- a/module/web/themes/default/img/ajax-loader.gif
+++ b/module/webui/themes/default/img/ajax-loader.gif
diff --git a/module/web/themes/default/img/arrow_refresh.png b/module/webui/themes/default/img/arrow_refresh.png
index 0de26566d..0de26566d 100644
--- a/module/web/themes/default/img/arrow_refresh.png
+++ b/module/webui/themes/default/img/arrow_refresh.png
diff --git a/module/web/themes/default/img/arrow_right.png b/module/webui/themes/default/img/arrow_right.png
index b1a181923..b1a181923 100644
--- a/module/web/themes/default/img/arrow_right.png
+++ b/module/webui/themes/default/img/arrow_right.png
diff --git a/module/web/themes/default/img/big_button.gif b/module/webui/themes/default/img/big_button.gif
index 7680490ea..7680490ea 100644
--- a/module/web/themes/default/img/big_button.gif
+++ b/module/webui/themes/default/img/big_button.gif
diff --git a/module/web/themes/default/img/big_button_over.gif b/module/webui/themes/default/img/big_button_over.gif
index 2e3ee10d2..2e3ee10d2 100644
--- a/module/web/themes/default/img/big_button_over.gif
+++ b/module/webui/themes/default/img/big_button_over.gif
diff --git a/module/web/themes/default/img/body.png b/module/webui/themes/default/img/body.png
index 7ff1043e0..7ff1043e0 100644
--- a/module/web/themes/default/img/body.png
+++ b/module/webui/themes/default/img/body.png
diff --git a/module/web/themes/default/img/button.png b/module/webui/themes/default/img/button.png
index 890160614..890160614 100644
--- a/module/web/themes/default/img/button.png
+++ b/module/webui/themes/default/img/button.png
diff --git a/module/web/themes/default/img/closebtn.gif b/module/webui/themes/default/img/closebtn.gif
index 3e27e6030..3e27e6030 100644
--- a/module/web/themes/default/img/closebtn.gif
+++ b/module/webui/themes/default/img/closebtn.gif
diff --git a/module/web/themes/default/img/cog.png b/module/webui/themes/default/img/cog.png
index 67de2c6cc..67de2c6cc 100644
--- a/module/web/themes/default/img/cog.png
+++ b/module/webui/themes/default/img/cog.png
diff --git a/module/web/themes/default/img/control_add.png b/module/webui/themes/default/img/control_add.png
index d39886893..d39886893 100644
--- a/module/web/themes/default/img/control_add.png
+++ b/module/webui/themes/default/img/control_add.png
diff --git a/module/web/themes/default/img/control_add_blue.png b/module/webui/themes/default/img/control_add_blue.png
index d11b7f41d..d11b7f41d 100644
--- a/module/web/themes/default/img/control_add_blue.png
+++ b/module/webui/themes/default/img/control_add_blue.png
diff --git a/module/web/themes/default/img/control_cancel.png b/module/webui/themes/default/img/control_cancel.png
index 7b9bc3fba..7b9bc3fba 100644
--- a/module/web/themes/default/img/control_cancel.png
+++ b/module/webui/themes/default/img/control_cancel.png
diff --git a/module/web/themes/default/img/control_cancel_blue.png b/module/webui/themes/default/img/control_cancel_blue.png
index 0c5c96ce3..0c5c96ce3 100644
--- a/module/web/themes/default/img/control_cancel_blue.png
+++ b/module/webui/themes/default/img/control_cancel_blue.png
diff --git a/module/web/themes/default/img/control_pause.png b/module/webui/themes/default/img/control_pause.png
index 2d9ce9c4e..2d9ce9c4e 100644
--- a/module/web/themes/default/img/control_pause.png
+++ b/module/webui/themes/default/img/control_pause.png
diff --git a/module/web/themes/default/img/control_pause_blue.png b/module/webui/themes/default/img/control_pause_blue.png
index ec61099b0..ec61099b0 100644
--- a/module/web/themes/default/img/control_pause_blue.png
+++ b/module/webui/themes/default/img/control_pause_blue.png
diff --git a/module/web/themes/default/img/control_play.png b/module/webui/themes/default/img/control_play.png
index 0846555d0..0846555d0 100644
--- a/module/web/themes/default/img/control_play.png
+++ b/module/webui/themes/default/img/control_play.png
diff --git a/module/web/themes/default/img/control_play_blue.png b/module/webui/themes/default/img/control_play_blue.png
index f8c8ec683..f8c8ec683 100644
--- a/module/web/themes/default/img/control_play_blue.png
+++ b/module/webui/themes/default/img/control_play_blue.png
diff --git a/module/web/themes/default/img/control_stop.png b/module/webui/themes/default/img/control_stop.png
index 893bb60e5..893bb60e5 100644
--- a/module/web/themes/default/img/control_stop.png
+++ b/module/webui/themes/default/img/control_stop.png
diff --git a/module/web/themes/default/img/control_stop_blue.png b/module/webui/themes/default/img/control_stop_blue.png
index e6f75d232..e6f75d232 100644
--- a/module/web/themes/default/img/control_stop_blue.png
+++ b/module/webui/themes/default/img/control_stop_blue.png
diff --git a/module/web/themes/default/img/delete.png b/module/webui/themes/default/img/delete.png
index 08f249365..08f249365 100644
--- a/module/web/themes/default/img/delete.png
+++ b/module/webui/themes/default/img/delete.png
diff --git a/module/web/themes/default/img/dialog-close.png b/module/webui/themes/default/img/dialog-close.png
index 81ebb88b2..81ebb88b2 100644
--- a/module/web/themes/default/img/dialog-close.png
+++ b/module/webui/themes/default/img/dialog-close.png
diff --git a/module/web/themes/default/img/dialog-error.png b/module/webui/themes/default/img/dialog-error.png
index d70328403..d70328403 100644
--- a/module/web/themes/default/img/dialog-error.png
+++ b/module/webui/themes/default/img/dialog-error.png
diff --git a/module/web/themes/default/img/dialog-question.png b/module/webui/themes/default/img/dialog-question.png
index b0af3db5b..b0af3db5b 100644
--- a/module/web/themes/default/img/dialog-question.png
+++ b/module/webui/themes/default/img/dialog-question.png
diff --git a/module/web/themes/default/img/dialog-warning.png b/module/webui/themes/default/img/dialog-warning.png
index aad64d4be..aad64d4be 100644
--- a/module/web/themes/default/img/dialog-warning.png
+++ b/module/webui/themes/default/img/dialog-warning.png
diff --git a/module/web/themes/default/img/drag_corner.gif b/module/webui/themes/default/img/drag_corner.gif
index befb1adf1..befb1adf1 100644
--- a/module/web/themes/default/img/drag_corner.gif
+++ b/module/webui/themes/default/img/drag_corner.gif
diff --git a/module/web/themes/default/img/error.png b/module/webui/themes/default/img/error.png
index c37bd062e..c37bd062e 100644
--- a/module/web/themes/default/img/error.png
+++ b/module/webui/themes/default/img/error.png
diff --git a/module/web/themes/default/img/folder.png b/module/webui/themes/default/img/folder.png
index 784e8fa48..784e8fa48 100644
--- a/module/web/themes/default/img/folder.png
+++ b/module/webui/themes/default/img/folder.png
diff --git a/module/web/themes/default/img/full.png b/module/webui/themes/default/img/full.png
index fea52af76..fea52af76 100644
--- a/module/web/themes/default/img/full.png
+++ b/module/webui/themes/default/img/full.png
diff --git a/module/web/themes/default/img/head-login.png b/module/webui/themes/default/img/head-login.png
index b59b7cbbf..b59b7cbbf 100644
--- a/module/web/themes/default/img/head-login.png
+++ b/module/webui/themes/default/img/head-login.png
diff --git a/module/web/themes/default/img/head-menu-collector.png b/module/webui/themes/default/img/head-menu-collector.png
index 861be40bc..861be40bc 100644
--- a/module/web/themes/default/img/head-menu-collector.png
+++ b/module/webui/themes/default/img/head-menu-collector.png
diff --git a/module/web/themes/default/img/head-menu-config.png b/module/webui/themes/default/img/head-menu-config.png
index bbf43d4f3..bbf43d4f3 100644
--- a/module/web/themes/default/img/head-menu-config.png
+++ b/module/webui/themes/default/img/head-menu-config.png
diff --git a/module/web/themes/default/img/head-menu-development.png b/module/webui/themes/default/img/head-menu-development.png
index fad150fe1..fad150fe1 100644
--- a/module/web/themes/default/img/head-menu-development.png
+++ b/module/webui/themes/default/img/head-menu-development.png
diff --git a/module/web/themes/default/img/head-menu-download.png b/module/webui/themes/default/img/head-menu-download.png
index 98c5da9db..98c5da9db 100644
--- a/module/web/themes/default/img/head-menu-download.png
+++ b/module/webui/themes/default/img/head-menu-download.png
diff --git a/module/web/themes/default/img/head-menu-home.png b/module/webui/themes/default/img/head-menu-home.png
index 9d62109aa..9d62109aa 100644
--- a/module/web/themes/default/img/head-menu-home.png
+++ b/module/webui/themes/default/img/head-menu-home.png
diff --git a/module/web/themes/default/img/head-menu-index.png b/module/webui/themes/default/img/head-menu-index.png
index 44d631064..44d631064 100644
--- a/module/web/themes/default/img/head-menu-index.png
+++ b/module/webui/themes/default/img/head-menu-index.png
diff --git a/module/web/themes/default/img/head-menu-news.png b/module/webui/themes/default/img/head-menu-news.png
index 43950ebc9..43950ebc9 100644
--- a/module/web/themes/default/img/head-menu-news.png
+++ b/module/webui/themes/default/img/head-menu-news.png
diff --git a/module/web/themes/default/img/head-menu-queue.png b/module/webui/themes/default/img/head-menu-queue.png
index be98793ce..be98793ce 100644
--- a/module/web/themes/default/img/head-menu-queue.png
+++ b/module/webui/themes/default/img/head-menu-queue.png
diff --git a/module/web/themes/default/img/head-menu-recent.png b/module/webui/themes/default/img/head-menu-recent.png
index fc9b0497f..fc9b0497f 100644
--- a/module/web/themes/default/img/head-menu-recent.png
+++ b/module/webui/themes/default/img/head-menu-recent.png
diff --git a/module/web/themes/default/img/head-menu-wiki.png b/module/webui/themes/default/img/head-menu-wiki.png
index 07cf0102d..07cf0102d 100644
--- a/module/web/themes/default/img/head-menu-wiki.png
+++ b/module/webui/themes/default/img/head-menu-wiki.png
diff --git a/module/web/themes/default/img/head-search-noshadow.png b/module/webui/themes/default/img/head-search-noshadow.png
index aafdae015..aafdae015 100644
--- a/module/web/themes/default/img/head-search-noshadow.png
+++ b/module/webui/themes/default/img/head-search-noshadow.png
diff --git a/module/web/themes/default/img/head_bg1.png b/module/webui/themes/default/img/head_bg1.png
index f2848c3cc..f2848c3cc 100644
--- a/module/web/themes/default/img/head_bg1.png
+++ b/module/webui/themes/default/img/head_bg1.png
diff --git a/module/web/themes/default/img/images.png b/module/webui/themes/default/img/images.png
index 184860d1e..184860d1e 100644
--- a/module/web/themes/default/img/images.png
+++ b/module/webui/themes/default/img/images.png
diff --git a/module/web/themes/default/img/notice.png b/module/webui/themes/default/img/notice.png
index 12cd1aef9..12cd1aef9 100644
--- a/module/web/themes/default/img/notice.png
+++ b/module/webui/themes/default/img/notice.png
diff --git a/module/web/themes/default/img/package_go.png b/module/webui/themes/default/img/package_go.png
index aace63ad6..aace63ad6 100644
--- a/module/web/themes/default/img/package_go.png
+++ b/module/webui/themes/default/img/package_go.png
diff --git a/module/web/themes/default/img/page-tools-backlinks.png b/module/webui/themes/default/img/page-tools-backlinks.png
index 3eb6a9ce3..3eb6a9ce3 100644
--- a/module/web/themes/default/img/page-tools-backlinks.png
+++ b/module/webui/themes/default/img/page-tools-backlinks.png
diff --git a/module/web/themes/default/img/page-tools-edit.png b/module/webui/themes/default/img/page-tools-edit.png
index 188e1c12b..188e1c12b 100644
--- a/module/web/themes/default/img/page-tools-edit.png
+++ b/module/webui/themes/default/img/page-tools-edit.png
diff --git a/module/web/themes/default/img/page-tools-revisions.png b/module/webui/themes/default/img/page-tools-revisions.png
index 5c3b8587f..5c3b8587f 100644
--- a/module/web/themes/default/img/page-tools-revisions.png
+++ b/module/webui/themes/default/img/page-tools-revisions.png
diff --git a/module/web/themes/default/img/parseUri.png b/module/webui/themes/default/img/parseUri.png
index 937bded9d..937bded9d 100644
--- a/module/web/themes/default/img/parseUri.png
+++ b/module/webui/themes/default/img/parseUri.png
diff --git a/module/web/themes/default/img/pencil.png b/module/webui/themes/default/img/pencil.png
index 0bfecd50e..0bfecd50e 100644
--- a/module/web/themes/default/img/pencil.png
+++ b/module/webui/themes/default/img/pencil.png
diff --git a/module/web/themes/default/img/pyload-logo-edited3.5-new-font-small.png b/module/webui/themes/default/img/pyload-logo-edited3.5-new-font-small.png
index 2443cd8b1..2443cd8b1 100644
--- a/module/web/themes/default/img/pyload-logo-edited3.5-new-font-small.png
+++ b/module/webui/themes/default/img/pyload-logo-edited3.5-new-font-small.png
diff --git a/module/web/themes/default/img/reconnect.png b/module/webui/themes/default/img/reconnect.png
index 49b269145..49b269145 100644
--- a/module/web/themes/default/img/reconnect.png
+++ b/module/webui/themes/default/img/reconnect.png
diff --git a/module/web/themes/default/img/status_None.png b/module/webui/themes/default/img/status_None.png
index 293b13f77..293b13f77 100644
--- a/module/web/themes/default/img/status_None.png
+++ b/module/webui/themes/default/img/status_None.png
diff --git a/module/web/themes/default/img/status_downloading.png b/module/webui/themes/default/img/status_downloading.png
index fb4ebc850..fb4ebc850 100644
--- a/module/web/themes/default/img/status_downloading.png
+++ b/module/webui/themes/default/img/status_downloading.png
diff --git a/module/web/themes/default/img/status_failed.png b/module/webui/themes/default/img/status_failed.png
index c37bd062e..c37bd062e 100644
--- a/module/web/themes/default/img/status_failed.png
+++ b/module/webui/themes/default/img/status_failed.png
diff --git a/module/web/themes/default/img/status_finished.png b/module/webui/themes/default/img/status_finished.png
index 89c8129a4..89c8129a4 100644
--- a/module/web/themes/default/img/status_finished.png
+++ b/module/webui/themes/default/img/status_finished.png
diff --git a/module/web/themes/default/img/status_offline.png b/module/webui/themes/default/img/status_offline.png
index 0cfd58596..0cfd58596 100644
--- a/module/web/themes/default/img/status_offline.png
+++ b/module/webui/themes/default/img/status_offline.png
diff --git a/module/web/themes/default/img/status_proc.png b/module/webui/themes/default/img/status_proc.png
index 67de2c6cc..67de2c6cc 100644
--- a/module/web/themes/default/img/status_proc.png
+++ b/module/webui/themes/default/img/status_proc.png
diff --git a/module/web/themes/default/img/status_queue.png b/module/webui/themes/default/img/status_queue.png
index 293b13f77..293b13f77 100644
--- a/module/web/themes/default/img/status_queue.png
+++ b/module/webui/themes/default/img/status_queue.png
diff --git a/module/web/themes/default/img/status_waiting.png b/module/webui/themes/default/img/status_waiting.png
index 2842cc338..2842cc338 100644
--- a/module/web/themes/default/img/status_waiting.png
+++ b/module/webui/themes/default/img/status_waiting.png
diff --git a/module/web/themes/default/img/success.png b/module/webui/themes/default/img/success.png
index 89c8129a4..89c8129a4 100644
--- a/module/web/themes/default/img/success.png
+++ b/module/webui/themes/default/img/success.png
diff --git a/module/web/themes/default/img/tab-background.png b/module/webui/themes/default/img/tab-background.png
index 29a5d1991..29a5d1991 100644
--- a/module/web/themes/default/img/tab-background.png
+++ b/module/webui/themes/default/img/tab-background.png
diff --git a/module/web/themes/default/img/tabs-border-bottom.png b/module/webui/themes/default/img/tabs-border-bottom.png
index 02440f428..02440f428 100644
--- a/module/web/themes/default/img/tabs-border-bottom.png
+++ b/module/webui/themes/default/img/tabs-border-bottom.png
diff --git a/module/web/themes/default/img/user-actions-logout.png b/module/webui/themes/default/img/user-actions-logout.png
index 0010931e2..0010931e2 100644
--- a/module/web/themes/default/img/user-actions-logout.png
+++ b/module/webui/themes/default/img/user-actions-logout.png
diff --git a/module/web/themes/default/img/user-actions-profile.png b/module/webui/themes/default/img/user-actions-profile.png
index 46573fff6..46573fff6 100644
--- a/module/web/themes/default/img/user-actions-profile.png
+++ b/module/webui/themes/default/img/user-actions-profile.png
diff --git a/module/web/themes/default/img/user-info.png b/module/webui/themes/default/img/user-info.png
index 6e643100f..6e643100f 100644
--- a/module/web/themes/default/img/user-info.png
+++ b/module/webui/themes/default/img/user-info.png
diff --git a/module/web/themes/default/js/MooDialog.min.static.js b/module/webui/themes/default/js/MooDialog.min.static.js
index 90b3ae100..90b3ae100 100644
--- a/module/web/themes/default/js/MooDialog.min.static.js
+++ b/module/webui/themes/default/js/MooDialog.min.static.js
diff --git a/module/web/themes/default/js/MooDropMenu.min.static.js b/module/webui/themes/default/js/MooDropMenu.min.static.js
index 552ae247a..552ae247a 100644
--- a/module/web/themes/default/js/MooDropMenu.min.static.js
+++ b/module/webui/themes/default/js/MooDropMenu.min.static.js
diff --git a/module/web/themes/default/js/admin.min.js b/module/webui/themes/default/js/admin.min.js
index 94a5e494d..94a5e494d 100644
--- a/module/web/themes/default/js/admin.min.js
+++ b/module/webui/themes/default/js/admin.min.js
diff --git a/module/web/themes/default/js/base.min.js b/module/webui/themes/default/js/base.min.js
index 1ba1d73f9..1ba1d73f9 100644
--- a/module/web/themes/default/js/base.min.js
+++ b/module/webui/themes/default/js/base.min.js
diff --git a/module/web/themes/default/js/filemanager.min.js b/module/webui/themes/default/js/filemanager.min.js
index d518e44ea..d518e44ea 100644
--- a/module/web/themes/default/js/filemanager.min.js
+++ b/module/webui/themes/default/js/filemanager.min.js
diff --git a/module/web/themes/default/js/mootools-core.min.static.js b/module/webui/themes/default/js/mootools-core.min.static.js
index 94a090990..94a090990 100644
--- a/module/web/themes/default/js/mootools-core.min.static.js
+++ b/module/webui/themes/default/js/mootools-core.min.static.js
diff --git a/module/web/themes/default/js/mootools-more.min.static.js b/module/webui/themes/default/js/mootools-more.min.static.js
index ff7dab17e..ff7dab17e 100644
--- a/module/web/themes/default/js/mootools-more.min.static.js
+++ b/module/webui/themes/default/js/mootools-more.min.static.js
diff --git a/module/web/themes/default/js/package.min.js b/module/webui/themes/default/js/package.min.js
index fa12f7817..fa12f7817 100644
--- a/module/web/themes/default/js/package.min.js
+++ b/module/webui/themes/default/js/package.min.js
diff --git a/module/web/themes/default/js/purr.min.static.js b/module/webui/themes/default/js/purr.min.static.js
index bf70e357d..bf70e357d 100644
--- a/module/web/themes/default/js/purr.min.static.js
+++ b/module/webui/themes/default/js/purr.min.static.js
diff --git a/module/web/themes/default/js/settings.min.js b/module/webui/themes/default/js/settings.min.js
index 41d1cb25a..41d1cb25a 100644
--- a/module/web/themes/default/js/settings.min.js
+++ b/module/webui/themes/default/js/settings.min.js
diff --git a/module/web/themes/default/js/sources/MooDialog.js b/module/webui/themes/default/js/sources/MooDialog.js
index 45a52496f..45a52496f 100644
--- a/module/web/themes/default/js/sources/MooDialog.js
+++ b/module/webui/themes/default/js/sources/MooDialog.js
diff --git a/module/web/themes/default/js/sources/MooDropMenu.js b/module/webui/themes/default/js/sources/MooDropMenu.js
index ac0fa1874..ac0fa1874 100644
--- a/module/web/themes/default/js/sources/MooDropMenu.js
+++ b/module/webui/themes/default/js/sources/MooDropMenu.js
diff --git a/module/web/themes/default/js/sources/admin.coffee b/module/webui/themes/default/js/sources/admin.coffee
index c4ab86911..c4ab86911 100644
--- a/module/web/themes/default/js/sources/admin.coffee
+++ b/module/webui/themes/default/js/sources/admin.coffee
diff --git a/module/web/themes/default/js/sources/base.coffee b/module/webui/themes/default/js/sources/base.coffee
index 55151acc9..55151acc9 100644
--- a/module/web/themes/default/js/sources/base.coffee
+++ b/module/webui/themes/default/js/sources/base.coffee
diff --git a/module/web/themes/default/js/sources/filemanager.js b/module/webui/themes/default/js/sources/filemanager.js
index be2f51e13..be2f51e13 100644
--- a/module/web/themes/default/js/sources/filemanager.js
+++ b/module/webui/themes/default/js/sources/filemanager.js
diff --git a/module/web/themes/default/js/sources/package.js b/module/webui/themes/default/js/sources/package.js
index 5d0ecbd3e..5d0ecbd3e 100644
--- a/module/web/themes/default/js/sources/package.js
+++ b/module/webui/themes/default/js/sources/package.js
diff --git a/module/web/themes/default/js/sources/purr.js b/module/webui/themes/default/js/sources/purr.js
index 9cbc503d9..9cbc503d9 100644
--- a/module/web/themes/default/js/sources/purr.js
+++ b/module/webui/themes/default/js/sources/purr.js
diff --git a/module/web/themes/default/js/sources/settings.coffee b/module/webui/themes/default/js/sources/settings.coffee
index 68ca6c6a0..68ca6c6a0 100644
--- a/module/web/themes/default/js/sources/settings.coffee
+++ b/module/webui/themes/default/js/sources/settings.coffee
diff --git a/module/web/themes/default/js/sources/tinytab.js b/module/webui/themes/default/js/sources/tinytab.js
index de50279fc..de50279fc 100644
--- a/module/web/themes/default/js/sources/tinytab.js
+++ b/module/webui/themes/default/js/sources/tinytab.js
diff --git a/module/web/themes/default/js/tinytab.min.static.js b/module/webui/themes/default/js/tinytab.min.static.js
index 2f4fa0436..2f4fa0436 100644
--- a/module/web/themes/default/js/tinytab.min.static.js
+++ b/module/webui/themes/default/js/tinytab.min.static.js
diff --git a/module/web/themes/default/tml/admin.html b/module/webui/themes/default/tml/admin.html
index 05f0811f6..05f0811f6 100644
--- a/module/web/themes/default/tml/admin.html
+++ b/module/webui/themes/default/tml/admin.html
diff --git a/module/web/themes/default/tml/base.html b/module/webui/themes/default/tml/base.html
index 57de724ee..0aa24e133 100644
--- a/module/web/themes/default/tml/base.html
+++ b/module/webui/themes/default/tml/base.html
@@ -53,25 +53,25 @@
 </span>
 
     <img src="/default/img/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
-	<ul id="user-actions">
-		<li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
-		{% if user.is_admin %}
-		<li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
-		{% endif %}
+  <ul id="user-actions">
+    <li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
+    {% if user.is_admin %}
+    <li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
+    {% endif %}
         <li><a href="/info"  class="action info" rel="nofollow">{{_("Info")}}</a></li>
 
-	</ul>
+  </ul>
 {% else %}
     <span style="padding-right: 2px;">{{_("Please Login!")}}</span>
 {% endif %}
 
     {% endblock %}
-	</div>
+  </div>
 
-	<a href="/"><img id="head-logo" src="/default/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
+  <a href="/"><img id="head-logo" src="/default/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
 
-	<div id="head-menu">
-		<ul>
+  <div id="head-menu">
+    <ul>
 
         {% macro selected(name, right=False) -%}
             {% if name in url -%}class="{% if right -%}right {% endif %}selected"{%- endif %}
@@ -79,39 +79,39 @@
         {%- endmacro %}
 
 
-		{% block menu %}
-		<li>
-		    <a href="/" title=""><img src="/default/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
-		</li>
-		<li {{ selected('queue') }}>
-		    <a href="/queue/" title=""><img src="/default/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
-		</li>
-		<li {{ selected('collector') }}>
-		    <a href="/collector/" title=""><img src="/default/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
-		</li>
-		<li {{ selected('downloads') }}>
-		    <a href="/downloads/" title=""><img src="/default/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
-		</li>
-{#		<li {{ selected('filemanager') }}>#}
-{#		    <a href="/filemanager/" title=""><img src="/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
-{#		</li>#}
-		<li {{ selected('logs', True) }}>
-		    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/default/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
-		</li>
-		<li {{ selected('settings', True) }}>
-		    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/default/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
-		</li>
-		{% endblock %}
-		
-		</ul>
-	</div>
-
-	<div style="clear:both;"></div>
+    {% block menu %}
+    <li>
+        <a href="/" title=""><img src="/default/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+    </li>
+    <li {{ selected('queue') }}>
+        <a href="/queue/" title=""><img src="/default/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+    </li>
+    <li {{ selected('collector') }}>
+        <a href="/collector/" title=""><img src="/default/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+    </li>
+    <li {{ selected('downloads') }}>
+        <a href="/downloads/" title=""><img src="/default/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+    </li>
+{#    <li {{ selected('filemanager') }}>#}
+{#        <a href="/filemanager/" title=""><img src="/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
+{#    </li>#}
+    <li {{ selected('logs', True) }}>
+        <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/default/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+    </li>
+    <li {{ selected('settings', True) }}>
+        <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/default/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
+    </li>
+    {% endblock %}
+    
+    </ul>
+  </div>
+
+  <div style="clear:both;"></div>
 </div>
 
 {% if perms.STATUS %}
 <ul id="page-actions2">
-	<li id="action_play"><a href="#"  class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
+  <li id="action_play"><a href="#"  class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
     <li id="action_stop"><a href="#"  class="action stop" accesskey="o" rel="nofollow">{{_("Stop")}}</a></li>
     <li id="action_cancel"><a href="#"  class="action cancel" accesskey="o" rel="nofollow">{{_("Cancel")}}</a></li>
     <li id="action_add"><a href="#"  class="action add" accesskey="o" rel="nofollow" >{{_("Add")}}</a></li>
@@ -149,7 +149,7 @@
 <noscript><h1>Enable JavaScript to use the webinterface.</h1></noscript>
 
 {% for message in messages %}
-	<b><p>{{message}}</p></b>
+  <b><p>{{message}}</p></b>
 {% endfor %}
 
 <div id="load-indicator" style="opacity: 0; float: right; margin-top: -10px;">
@@ -160,7 +160,7 @@
 {% block content %}
 {% endblock content %}
 
-	<hr style="clear: both;" />
+  <hr style="clear: both;" />
 
 <div id="foot">&copy; 2008-2014 pyLoad Team
 <a href="#top" class="action top" accesskey="x"><span>{{_("Back to top")}}</span></a><br />
diff --git a/module/webui/themes/default/tml/captcha.html b/module/webui/themes/default/tml/captcha.html
new file mode 100644
index 000000000..56892593f
--- /dev/null
+++ b/module/webui/themes/default/tml/captcha.html
@@ -0,0 +1,42 @@
+<!-- Captcha box -->
+<div id="cap_box" class="window_box">
+
+  <form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
+  
+    <h1>{{_("Captcha reading")}}</h1>
+    <p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
+    
+    <div id="cap_textual">
+    
+      <input id="cap_id" name="cap_id" type="hidden" value="" />
+    
+      <label>{{_("Captcha")}}
+      <span class="small">{{_("The captcha.")}}</span>
+      </label>
+      <span class="cont">
+          <img id="cap_textual_img" src="">
+      </span>
+      
+      <label>{{_("Text")}}
+      <span class="small">{{_("Input the text on the captcha.")}}</span>
+      </label>
+      <input id="cap_result" name="cap_result" type="text" size="20" />
+          
+    </div>
+    
+    <div id="cap_positional" style="text-align: center">
+        <img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
+    </div>
+
+    <div id="button_bar" style="text-align: center">
+      <span>
+        <button id="cap_submit" type="submit" style="margin-left: 0">{{_("Submit")}}</button>
+        <button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
+      </span>
+    </div>
+    
+    <div class="spacer"></div>
+  
+  </form>
+
+</div>
diff --git a/module/web/themes/default/tml/downloads.html b/module/webui/themes/default/tml/downloads.html
index ba0f77c18..ba0f77c18 100644
--- a/module/web/themes/default/tml/downloads.html
+++ b/module/webui/themes/default/tml/downloads.html
diff --git a/module/web/themes/default/tml/filemanager.html b/module/webui/themes/default/tml/filemanager.html
index e77358dc6..13027529c 100644
--- a/module/web/themes/default/tml/filemanager.html
+++ b/module/webui/themes/default/tml/filemanager.html
@@ -26,9 +26,9 @@ document.addEvent("domready", function(){
     <span>
       <b>{{ file.name }}</b>
       <span class="buttons" style="opacity:0">
-	    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/default/img/pencil.png" />
-	    &nbsp;&nbsp;
-	    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/delete.png" />
+      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/default/img/pencil.png" />
+      &nbsp;&nbsp;
+      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/delete.png" />
       </span>
     </span>
   </li>
@@ -39,30 +39,30 @@ document.addEvent("domready", function(){
       <input type="hidden" name="path" class="path" value="{{ fld.path }}" />
       <input type="hidden" name="name" class="name" value="{{ fld.name }}" />
       <span>
-	<b>{{ fld.name }}</b>
-	<span class="buttons" style="opacity:0">
-	      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/default/img/pencil.png" />
-	      &nbsp;&nbsp;
-	      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/delete.png" />
-	      &nbsp;&nbsp;
-	      <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/add_folder.png" />
-	</span>
+  <b>{{ fld.name }}</b>
+  <span class="buttons" style="opacity:0">
+        <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/default/img/pencil.png" />
+        &nbsp;&nbsp;
+        <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/delete.png" />
+        &nbsp;&nbsp;
+        <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/add_folder.png" />
+  </span>
       </span>
       {% if (fld.folders|length + fld.files|length) > 0 %}
-	{% if open %}
-	  <ul>
-	{% else %}
-	  <ul style="display:none">
-	{% endif %}
-	  {% for child in fld.folders %}
-	      {{ display_folder(child) }}
-	  {% endfor %}
-	  {% for child in fld.files %}
-	      {{ display_file(child) }}
-	  {% endfor %}
-	</ul>
+  {% if open %}
+    <ul>
+  {% else %}
+    <ul style="display:none">
+  {% endif %}
+    {% for child in fld.folders %}
+        {{ display_folder(child) }}
+    {% endfor %}
+    {% for child in fld.files %}
+        {{ display_file(child) }}
+    {% endfor %}
+  </ul>
       {% else %}
-	<div style="display:none">{{ _("Folder is empty") }}</div>
+  <div style="display:none">{{ _("Folder is empty") }}</div>
       {% endif %}
     </li>
 {%- endmacro %}
diff --git a/module/webui/themes/default/tml/folder.html b/module/webui/themes/default/tml/folder.html
new file mode 100644
index 000000000..227a46ba0
--- /dev/null
+++ b/module/webui/themes/default/tml/folder.html
@@ -0,0 +1,15 @@
+<li class="folder">
+  <input type="hidden" name="path" class="path" value="{{ path }}" />
+  <input type="hidden" name="name" class="name" value="{{ name }}" />
+  <span>
+    <b>{{ name }}</b>
+    <span class="buttons" style="opacity:0">
+    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/default/img/pencil.png" />
+    &nbsp;&nbsp;
+    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/delete.png" />
+    &nbsp;&nbsp;
+    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/default/img/add_folder.png" />
+    </span>
+  </span>
+  <div style="display:none">{{ _("Folder is empty") }}</div>
+</li>
diff --git a/module/web/themes/default/tml/home.html b/module/webui/themes/default/tml/home.html
index 91c9cdb8a..85f1bd05e 100644
--- a/module/web/themes/default/tml/home.html
+++ b/module/webui/themes/default/tml/home.html
@@ -7,21 +7,21 @@ var em;
 var operafix = (navigator.userAgent.toLowerCase().search("opera") >= 0);
 
 document.addEvent("domready", function(){
-	em = new EntryManager();
+  em = new EntryManager();
 });
 
 var EntryManager = new Class({
     initialize: function(){
         this.json = new Request.JSON({
-		url: "json/links",
+    url: "json/links",
                 secure: false,
                 async: true,
-		onSuccess: this.update.bind(this),
-		initialDelay: 0,
-		delay: 2500,
-		limit: 30000
-	});
-	
+    onSuccess: this.update.bind(this),
+    initialDelay: 0,
+    delay: 2500,
+    limit: 30000
+  });
+  
         this.ids = [{% for link in content %}
         {% if forloop.last %}
             {{ link.id }}
diff --git a/module/web/themes/default/tml/info.html b/module/webui/themes/default/tml/info.html
index 49abe3f1b..49abe3f1b 100644
--- a/module/web/themes/default/tml/info.html
+++ b/module/webui/themes/default/tml/info.html
diff --git a/module/web/themes/default/tml/login.html b/module/webui/themes/default/tml/login.html
index d11941bb7..d11941bb7 100644
--- a/module/web/themes/default/tml/login.html
+++ b/module/webui/themes/default/tml/login.html
diff --git a/module/web/themes/default/tml/logout.html b/module/webui/themes/default/tml/logout.html
index 196676de5..196676de5 100644
--- a/module/web/themes/default/tml/logout.html
+++ b/module/webui/themes/default/tml/logout.html
diff --git a/module/web/themes/default/tml/logs.html b/module/webui/themes/default/tml/logs.html
index 1706be8a6..1706be8a6 100644
--- a/module/web/themes/default/tml/logs.html
+++ b/module/webui/themes/default/tml/logs.html
diff --git a/module/web/themes/default/tml/pathchooser.html b/module/webui/themes/default/tml/pathchooser.html
index 89b209311..8ce9ab072 100644
--- a/module/web/themes/default/tml/pathchooser.html
+++ b/module/webui/themes/default/tml/pathchooser.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<script class="javascript">
+  <script class="javascript">
         function chosen()
         {
             opener.ifield.value = document.forms[0].p.value;
@@ -24,21 +24,21 @@
             setValid();
 
         }
-	</script>
-	<link rel="stylesheet" type="text/css" href="/default/css/pathchooser.min.css"/>
+  </script>
+  <link rel="stylesheet" type="text/css" href="/default/css/pathchooser.min.css"/>
 </head>
 <body{% if type == 'file' %}{% if not oldfile %} onload="setInvalid();"{% endif %}{% endif %}>
 <center>
     <div id="paths">
-	<form method="get" action="?" onSubmit="chosen();" onReset="exit();">
-	    <input type="text" name="p" value="{{ oldfile|default(cwd) }}" size="60" onfocus="setValid();">
-	    <input type="submit" value="Ok" name="send">
-	</form>
+  <form method="get" action="?" onSubmit="chosen();" onReset="exit();">
+      <input type="text" name="p" value="{{ oldfile|default(cwd) }}" size="60" onfocus="setValid();">
+      <input type="submit" value="Ok" name="send">
+  </form>
 
     {% if type == 'folder' %}
-	<span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/pathchooser" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/pathchooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
+  <span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/pathchooser" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/pathchooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
     {% else %}
-	<span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/filechooser/" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/filechooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
+  <span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/filechooser/" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/filechooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
     {% endif %}
     </div>
     <table border="0" cellspacing="0" cellpadding="3">
@@ -48,13 +48,13 @@
             <th>{{_("type")}}</th>
             <th>{{_("last modified")}}</th>
         </tr>
-	{% if parentdir %}
+  {% if parentdir %}
         <tr>
             <td colspan="4">
                 <a href="{% if type == 'folder' %}{{ "/pathchooser/" + parentdir|quotepath }}{% else %}{{ "/filechooser/" + parentdir|quotepath }}{% endif %}"><span class="parentdir">{{_("parent directory")}}</span></a>
             </td>
         </tr>
-	{% endif %}
+  {% endif %}
 {% for file in files %}
         <tr>
             {% if type == 'folder' %}
diff --git a/module/web/themes/default/tml/queue.html b/module/webui/themes/default/tml/queue.html
index 181f9575a..181f9575a 100644
--- a/module/web/themes/default/tml/queue.html
+++ b/module/webui/themes/default/tml/queue.html
diff --git a/module/web/themes/default/tml/settings.html b/module/webui/themes/default/tml/settings.html
index 6c80808b8..6c80808b8 100644
--- a/module/web/themes/default/tml/settings.html
+++ b/module/webui/themes/default/tml/settings.html
diff --git a/module/web/themes/default/tml/settings_item.html b/module/webui/themes/default/tml/settings_item.html
index 6642d34b4..6642d34b4 100644
--- a/module/web/themes/default/tml/settings_item.html
+++ b/module/webui/themes/default/tml/settings_item.html
diff --git a/module/web/themes/default/tml/window.html b/module/webui/themes/default/tml/window.html
index e73eba2bd..e73eba2bd 100644
--- a/module/web/themes/default/tml/window.html
+++ b/module/webui/themes/default/tml/window.html
diff --git a/module/webui/themes/flat/css/MooDialog.css b/module/webui/themes/flat/css/MooDialog.css
new file mode 100644
index 000000000..8bbf7603c
--- /dev/null
+++ b/module/webui/themes/flat/css/MooDialog.css
@@ -0,0 +1,92 @@
+/* Created by Arian Stolwijk <http://www.aryweb.nl> */
+
+.MooDialog {
+/*  position: fixed;*/
+    margin: 0 auto 0 -350px;
+    width:600px;
+    padding:14px;
+    left:50%;
+    top: 100px;
+
+  position: absolute;
+  left: 50%;
+  z-index: 50000;
+
+  background: #eef5f8;
+  color: black;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+  -webkit-border-radius: 7px;
+  border-radius: 7px;
+  -moz-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+  -webkit-box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+  box-shadow: 1px 1px 5px rgba(0,0,0,0.8);
+}
+
+.MooDialogTitle {
+  padding-top: 30px;
+}
+
+.MooDialog .title {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  padding: 3px 20px;
+  background: #b7c4dc;
+  border-bottom: 1px solid #a1aec5;
+  font-weight: bold;
+  text-shadow: 1px 1px 0 #fff;
+  color: black;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+  -webkit-border-radius: 7px;
+}
+
+.MooDialog .close {
+  background: url(../img/dialog-close.png) no-repeat;
+  width: 16px;
+  height: 16px;
+  display: block;
+  cursor: pointer;
+  top: -5px;
+  left: -5px;
+  position: absolute;
+}
+
+.MooDialog .buttons {
+  text-align: right;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  background: none;
+}
+
+.MooDialog .iframe {
+  width: 100%;
+  height: 100%;
+}
+
+.MooDialog .textInput {
+  width: 200px;
+  float: left;
+}
+
+.MooDialog .MooDialogAlert,
+.MooDialog .MooDialogConfirm,
+.MooDialog .MooDialogPrompt,
+.MooDialog .MooDialogError {
+  background: url(../img/dialog-warning.png) no-repeat;
+  padding-left: 40px;
+  min-height: 40px;
+}
+
+.MooDialog .MooDialogConfirm,
+.MooDialog .MooDialogPromt {
+  background: url(../img/dialog-question.png) no-repeat;
+}
+
+.MooDialog .MooDialogError {
+  background: url(../img/dialog-error.png) no-repeat;
+}
+
diff --git a/module/web/themes/flat/css/default.css b/module/webui/themes/flat/css/default.css
index 0c53c4199..0c53c4199 100644
--- a/module/web/themes/flat/css/default.css
+++ b/module/webui/themes/flat/css/default.css
diff --git a/module/web/themes/flat/css/log.css b/module/webui/themes/flat/css/log.css
index 73786bfb4..73786bfb4 100644
--- a/module/web/themes/flat/css/log.css
+++ b/module/webui/themes/flat/css/log.css
diff --git a/module/web/themes/flat/css/pathchooser.css b/module/webui/themes/flat/css/pathchooser.css
index 894cc335e..894cc335e 100644
--- a/module/web/themes/flat/css/pathchooser.css
+++ b/module/webui/themes/flat/css/pathchooser.css
diff --git a/module/web/themes/flat/css/window.css b/module/webui/themes/flat/css/window.css
index 12829868b..12829868b 100644
--- a/module/web/themes/flat/css/window.css
+++ b/module/webui/themes/flat/css/window.css
diff --git a/module/web/themes/flat/img/add_folder.png b/module/webui/themes/flat/img/add_folder.png
index 8acbc411b..8acbc411b 100644
--- a/module/web/themes/flat/img/add_folder.png
+++ b/module/webui/themes/flat/img/add_folder.png
diff --git a/module/web/themes/flat/img/ajax-loader.gif b/module/webui/themes/flat/img/ajax-loader.gif
index 2fd8e0737..2fd8e0737 100644
--- a/module/web/themes/flat/img/ajax-loader.gif
+++ b/module/webui/themes/flat/img/ajax-loader.gif
diff --git a/module/web/themes/flat/img/arrow_refresh.png b/module/webui/themes/flat/img/arrow_refresh.png
index b1b6fa4dc..b1b6fa4dc 100644
--- a/module/web/themes/flat/img/arrow_refresh.png
+++ b/module/webui/themes/flat/img/arrow_refresh.png
diff --git a/module/web/themes/flat/img/arrow_refresh.psd b/module/webui/themes/flat/img/arrow_refresh.psd
index 6a5e68a55..6a5e68a55 100644
--- a/module/web/themes/flat/img/arrow_refresh.psd
+++ b/module/webui/themes/flat/img/arrow_refresh.psd
diff --git a/module/web/themes/flat/img/arrow_right.png b/module/webui/themes/flat/img/arrow_right.png
index 68f379fc7..68f379fc7 100644
--- a/module/web/themes/flat/img/arrow_right.png
+++ b/module/webui/themes/flat/img/arrow_right.png
diff --git a/module/web/themes/flat/img/big_button.gif b/module/webui/themes/flat/img/big_button.gif
index 7680490ea..7680490ea 100644
--- a/module/web/themes/flat/img/big_button.gif
+++ b/module/webui/themes/flat/img/big_button.gif
diff --git a/module/web/themes/flat/img/big_button_over.gif b/module/webui/themes/flat/img/big_button_over.gif
index 2e3ee10d2..2e3ee10d2 100644
--- a/module/web/themes/flat/img/big_button_over.gif
+++ b/module/webui/themes/flat/img/big_button_over.gif
diff --git a/module/web/themes/flat/img/body.png b/module/webui/themes/flat/img/body.png
index 7ff1043e0..7ff1043e0 100644
--- a/module/web/themes/flat/img/body.png
+++ b/module/webui/themes/flat/img/body.png
diff --git a/module/web/themes/flat/img/button.png b/module/webui/themes/flat/img/button.png
index 890160614..890160614 100644
--- a/module/web/themes/flat/img/button.png
+++ b/module/webui/themes/flat/img/button.png
diff --git a/module/web/themes/flat/img/closebtn.gif b/module/webui/themes/flat/img/closebtn.gif
index 3e27e6030..3e27e6030 100644
--- a/module/web/themes/flat/img/closebtn.gif
+++ b/module/webui/themes/flat/img/closebtn.gif
diff --git a/module/web/themes/flat/img/cog.png b/module/webui/themes/flat/img/cog.png
index 833f779ac..833f779ac 100644
--- a/module/web/themes/flat/img/cog.png
+++ b/module/webui/themes/flat/img/cog.png
diff --git a/module/web/themes/flat/img/control_add.png b/module/webui/themes/flat/img/control_add.png
index e3f29fab2..e3f29fab2 100644
--- a/module/web/themes/flat/img/control_add.png
+++ b/module/webui/themes/flat/img/control_add.png
diff --git a/module/web/themes/flat/img/control_add_blue.png b/module/webui/themes/flat/img/control_add_blue.png
index e3f29fab2..e3f29fab2 100644
--- a/module/web/themes/flat/img/control_add_blue.png
+++ b/module/webui/themes/flat/img/control_add_blue.png
diff --git a/module/web/themes/flat/img/control_cancel.png b/module/webui/themes/flat/img/control_cancel.png
index 07c9cad30..07c9cad30 100644
--- a/module/web/themes/flat/img/control_cancel.png
+++ b/module/webui/themes/flat/img/control_cancel.png
diff --git a/module/web/themes/flat/img/control_cancel_blue.png b/module/webui/themes/flat/img/control_cancel_blue.png
index 07c9cad30..07c9cad30 100644
--- a/module/web/themes/flat/img/control_cancel_blue.png
+++ b/module/webui/themes/flat/img/control_cancel_blue.png
diff --git a/module/web/themes/flat/img/control_pause.png b/module/webui/themes/flat/img/control_pause.png
index 24e3705fa..24e3705fa 100644
--- a/module/web/themes/flat/img/control_pause.png
+++ b/module/webui/themes/flat/img/control_pause.png
diff --git a/module/web/themes/flat/img/control_pause_blue.png b/module/webui/themes/flat/img/control_pause_blue.png
index 24e3705fa..24e3705fa 100644
--- a/module/web/themes/flat/img/control_pause_blue.png
+++ b/module/webui/themes/flat/img/control_pause_blue.png
diff --git a/module/web/themes/flat/img/control_play.png b/module/webui/themes/flat/img/control_play.png
index 15ced1e21..15ced1e21 100644
--- a/module/web/themes/flat/img/control_play.png
+++ b/module/webui/themes/flat/img/control_play.png
diff --git a/module/web/themes/flat/img/control_play_blue.png b/module/webui/themes/flat/img/control_play_blue.png
index 15ced1e21..15ced1e21 100644
--- a/module/web/themes/flat/img/control_play_blue.png
+++ b/module/webui/themes/flat/img/control_play_blue.png
diff --git a/module/web/themes/flat/img/control_stop.png b/module/webui/themes/flat/img/control_stop.png
index 71215ef67..71215ef67 100644
--- a/module/web/themes/flat/img/control_stop.png
+++ b/module/webui/themes/flat/img/control_stop.png
diff --git a/module/web/themes/flat/img/control_stop_blue.png b/module/webui/themes/flat/img/control_stop_blue.png
index 71215ef67..71215ef67 100644
--- a/module/web/themes/flat/img/control_stop_blue.png
+++ b/module/webui/themes/flat/img/control_stop_blue.png
diff --git a/module/web/themes/flat/img/delete.png b/module/webui/themes/flat/img/delete.png
index 4539cff12..4539cff12 100644
--- a/module/web/themes/flat/img/delete.png
+++ b/module/webui/themes/flat/img/delete.png
diff --git a/module/web/themes/flat/img/dialog-close.png b/module/webui/themes/flat/img/dialog-close.png
index 81ebb88b2..81ebb88b2 100644
--- a/module/web/themes/flat/img/dialog-close.png
+++ b/module/webui/themes/flat/img/dialog-close.png
diff --git a/module/web/themes/flat/img/dialog-error.png b/module/webui/themes/flat/img/dialog-error.png
index d70328403..d70328403 100644
--- a/module/web/themes/flat/img/dialog-error.png
+++ b/module/webui/themes/flat/img/dialog-error.png
diff --git a/module/web/themes/flat/img/dialog-question.png b/module/webui/themes/flat/img/dialog-question.png
index b0af3db5b..b0af3db5b 100644
--- a/module/web/themes/flat/img/dialog-question.png
+++ b/module/webui/themes/flat/img/dialog-question.png
diff --git a/module/web/themes/flat/img/dialog-warning.png b/module/webui/themes/flat/img/dialog-warning.png
index aad64d4be..aad64d4be 100644
--- a/module/web/themes/flat/img/dialog-warning.png
+++ b/module/webui/themes/flat/img/dialog-warning.png
diff --git a/module/web/themes/flat/img/drag_corner.gif b/module/webui/themes/flat/img/drag_corner.gif
index befb1adf1..befb1adf1 100644
--- a/module/web/themes/flat/img/drag_corner.gif
+++ b/module/webui/themes/flat/img/drag_corner.gif
diff --git a/module/web/themes/flat/img/error.png b/module/webui/themes/flat/img/error.png
index 6c565c99c..6c565c99c 100644
--- a/module/web/themes/flat/img/error.png
+++ b/module/webui/themes/flat/img/error.png
diff --git a/module/web/themes/flat/img/folder.png b/module/webui/themes/flat/img/folder.png
index 0b067dd3c..0b067dd3c 100644
--- a/module/web/themes/flat/img/folder.png
+++ b/module/webui/themes/flat/img/folder.png
diff --git a/module/web/themes/flat/img/full.png b/module/webui/themes/flat/img/full.png
index fea52af76..fea52af76 100644
--- a/module/web/themes/flat/img/full.png
+++ b/module/webui/themes/flat/img/full.png
diff --git a/module/web/themes/flat/img/head-login.png b/module/webui/themes/flat/img/head-login.png
index 6b57515bc..6b57515bc 100644
--- a/module/web/themes/flat/img/head-login.png
+++ b/module/webui/themes/flat/img/head-login.png
diff --git a/module/web/themes/flat/img/head-menu-collector.png b/module/webui/themes/flat/img/head-menu-collector.png
index bbcbe6406..bbcbe6406 100644
--- a/module/web/themes/flat/img/head-menu-collector.png
+++ b/module/webui/themes/flat/img/head-menu-collector.png
diff --git a/module/web/themes/flat/img/head-menu-config.png b/module/webui/themes/flat/img/head-menu-config.png
index 93e8f83ac..93e8f83ac 100644
--- a/module/web/themes/flat/img/head-menu-config.png
+++ b/module/webui/themes/flat/img/head-menu-config.png
diff --git a/module/web/themes/flat/img/head-menu-development.png b/module/webui/themes/flat/img/head-menu-development.png
index 33d8b062f..33d8b062f 100644
--- a/module/web/themes/flat/img/head-menu-development.png
+++ b/module/webui/themes/flat/img/head-menu-development.png
diff --git a/module/web/themes/flat/img/head-menu-download.png b/module/webui/themes/flat/img/head-menu-download.png
index 3691deebc..3691deebc 100644
--- a/module/web/themes/flat/img/head-menu-download.png
+++ b/module/webui/themes/flat/img/head-menu-download.png
diff --git a/module/web/themes/flat/img/head-menu-home.png b/module/webui/themes/flat/img/head-menu-home.png
index b77bef5eb..b77bef5eb 100644
--- a/module/web/themes/flat/img/head-menu-home.png
+++ b/module/webui/themes/flat/img/head-menu-home.png
diff --git a/module/web/themes/flat/img/head-menu-index.png b/module/webui/themes/flat/img/head-menu-index.png
index 8bc6e9604..8bc6e9604 100644
--- a/module/web/themes/flat/img/head-menu-index.png
+++ b/module/webui/themes/flat/img/head-menu-index.png
diff --git a/module/web/themes/flat/img/head-menu-news.png b/module/webui/themes/flat/img/head-menu-news.png
index 44e79a9a9..44e79a9a9 100644
--- a/module/web/themes/flat/img/head-menu-news.png
+++ b/module/webui/themes/flat/img/head-menu-news.png
diff --git a/module/web/themes/flat/img/head-menu-queue.png b/module/webui/themes/flat/img/head-menu-queue.png
index e4fa41ad8..e4fa41ad8 100644
--- a/module/web/themes/flat/img/head-menu-queue.png
+++ b/module/webui/themes/flat/img/head-menu-queue.png
diff --git a/module/web/themes/flat/img/head-menu-recent.png b/module/webui/themes/flat/img/head-menu-recent.png
index fc9b0497f..fc9b0497f 100644
--- a/module/web/themes/flat/img/head-menu-recent.png
+++ b/module/webui/themes/flat/img/head-menu-recent.png
diff --git a/module/web/themes/flat/img/head-menu-wiki.png b/module/webui/themes/flat/img/head-menu-wiki.png
index 61b0e54ea..61b0e54ea 100644
--- a/module/web/themes/flat/img/head-menu-wiki.png
+++ b/module/webui/themes/flat/img/head-menu-wiki.png
diff --git a/module/web/themes/flat/img/head-search-noshadow.png b/module/webui/themes/flat/img/head-search-noshadow.png
index 16d39bd06..16d39bd06 100644
--- a/module/web/themes/flat/img/head-search-noshadow.png
+++ b/module/webui/themes/flat/img/head-search-noshadow.png
diff --git a/module/web/themes/flat/img/head_bg1.png b/module/webui/themes/flat/img/head_bg1.png
index f2848c3cc..f2848c3cc 100644
--- a/module/web/themes/flat/img/head_bg1.png
+++ b/module/webui/themes/flat/img/head_bg1.png
diff --git a/module/web/themes/flat/img/images.png b/module/webui/themes/flat/img/images.png
index 184860d1e..184860d1e 100644
--- a/module/web/themes/flat/img/images.png
+++ b/module/webui/themes/flat/img/images.png
diff --git a/module/web/themes/flat/img/notice.png b/module/webui/themes/flat/img/notice.png
index 305332260..305332260 100644
--- a/module/web/themes/flat/img/notice.png
+++ b/module/webui/themes/flat/img/notice.png
diff --git a/module/web/themes/flat/img/package_go.png b/module/webui/themes/flat/img/package_go.png
index 80b2c42ee..80b2c42ee 100644
--- a/module/web/themes/flat/img/package_go.png
+++ b/module/webui/themes/flat/img/package_go.png
diff --git a/module/web/themes/flat/img/page-tools-backlinks.png b/module/webui/themes/flat/img/page-tools-backlinks.png
index fb8f55b38..fb8f55b38 100644
--- a/module/web/themes/flat/img/page-tools-backlinks.png
+++ b/module/webui/themes/flat/img/page-tools-backlinks.png
diff --git a/module/web/themes/flat/img/page-tools-edit.png b/module/webui/themes/flat/img/page-tools-edit.png
index 67177cf89..67177cf89 100644
--- a/module/web/themes/flat/img/page-tools-edit.png
+++ b/module/webui/themes/flat/img/page-tools-edit.png
diff --git a/module/web/themes/flat/img/page-tools-revisions.png b/module/webui/themes/flat/img/page-tools-revisions.png
index 088fe0087..088fe0087 100644
--- a/module/web/themes/flat/img/page-tools-revisions.png
+++ b/module/webui/themes/flat/img/page-tools-revisions.png
diff --git a/module/web/themes/flat/img/parseUri.png b/module/webui/themes/flat/img/parseUri.png
index 937bded9d..937bded9d 100644
--- a/module/web/themes/flat/img/parseUri.png
+++ b/module/webui/themes/flat/img/parseUri.png
diff --git a/module/web/themes/flat/img/pencil.png b/module/webui/themes/flat/img/pencil.png
index e39c93cd8..e39c93cd8 100644
--- a/module/web/themes/flat/img/pencil.png
+++ b/module/webui/themes/flat/img/pencil.png
diff --git a/module/web/themes/flat/img/pyload-logo-edited3.5-new-font-small.png b/module/webui/themes/flat/img/pyload-logo-edited3.5-new-font-small.png
index 2443cd8b1..2443cd8b1 100644
--- a/module/web/themes/flat/img/pyload-logo-edited3.5-new-font-small.png
+++ b/module/webui/themes/flat/img/pyload-logo-edited3.5-new-font-small.png
diff --git a/module/web/themes/flat/img/reconnect.png b/module/webui/themes/flat/img/reconnect.png
index 3779c19b1..3779c19b1 100644
--- a/module/web/themes/flat/img/reconnect.png
+++ b/module/webui/themes/flat/img/reconnect.png
diff --git a/module/web/themes/flat/img/status_None.png b/module/webui/themes/flat/img/status_None.png
index 1400d3eb3..1400d3eb3 100644
--- a/module/web/themes/flat/img/status_None.png
+++ b/module/webui/themes/flat/img/status_None.png
diff --git a/module/web/themes/flat/img/status_downloading.png b/module/webui/themes/flat/img/status_downloading.png
index 50f6be0f7..50f6be0f7 100644
--- a/module/web/themes/flat/img/status_downloading.png
+++ b/module/webui/themes/flat/img/status_downloading.png
diff --git a/module/web/themes/flat/img/status_failed.png b/module/webui/themes/flat/img/status_failed.png
index 6c565c99c..6c565c99c 100644
--- a/module/web/themes/flat/img/status_failed.png
+++ b/module/webui/themes/flat/img/status_failed.png
diff --git a/module/web/themes/flat/img/status_finished.png b/module/webui/themes/flat/img/status_finished.png
index 2c4aca40d..2c4aca40d 100644
--- a/module/web/themes/flat/img/status_finished.png
+++ b/module/webui/themes/flat/img/status_finished.png
diff --git a/module/web/themes/flat/img/status_offline.png b/module/webui/themes/flat/img/status_offline.png
index 6c565c99c..6c565c99c 100644
--- a/module/web/themes/flat/img/status_offline.png
+++ b/module/webui/themes/flat/img/status_offline.png
diff --git a/module/web/themes/flat/img/status_proc.png b/module/webui/themes/flat/img/status_proc.png
index 833f779ac..833f779ac 100644
--- a/module/web/themes/flat/img/status_proc.png
+++ b/module/webui/themes/flat/img/status_proc.png
diff --git a/module/web/themes/flat/img/status_queue.png b/module/webui/themes/flat/img/status_queue.png
index e756efc6f..e756efc6f 100644
--- a/module/web/themes/flat/img/status_queue.png
+++ b/module/webui/themes/flat/img/status_queue.png
diff --git a/module/web/themes/flat/img/status_waiting.png b/module/webui/themes/flat/img/status_waiting.png
index fd038175e..fd038175e 100644
--- a/module/web/themes/flat/img/status_waiting.png
+++ b/module/webui/themes/flat/img/status_waiting.png
diff --git a/module/web/themes/flat/img/success.png b/module/webui/themes/flat/img/success.png
index 2c4aca40d..2c4aca40d 100644
--- a/module/web/themes/flat/img/success.png
+++ b/module/webui/themes/flat/img/success.png
diff --git a/module/web/themes/flat/img/tab-background.png b/module/webui/themes/flat/img/tab-background.png
index 29a5d1991..29a5d1991 100644
--- a/module/web/themes/flat/img/tab-background.png
+++ b/module/webui/themes/flat/img/tab-background.png
diff --git a/module/web/themes/flat/img/tabs-border-bottom.png b/module/webui/themes/flat/img/tabs-border-bottom.png
index 02440f428..02440f428 100644
--- a/module/web/themes/flat/img/tabs-border-bottom.png
+++ b/module/webui/themes/flat/img/tabs-border-bottom.png
diff --git a/module/web/themes/flat/img/user-actions-logout.png b/module/webui/themes/flat/img/user-actions-logout.png
index d4ef360e8..d4ef360e8 100644
--- a/module/web/themes/flat/img/user-actions-logout.png
+++ b/module/webui/themes/flat/img/user-actions-logout.png
diff --git a/module/web/themes/flat/img/user-actions-profile.png b/module/webui/themes/flat/img/user-actions-profile.png
index 9ec410b13..9ec410b13 100644
--- a/module/web/themes/flat/img/user-actions-profile.png
+++ b/module/webui/themes/flat/img/user-actions-profile.png
diff --git a/module/web/themes/flat/img/user-info.png b/module/webui/themes/flat/img/user-info.png
index 197f2f4ee..197f2f4ee 100644
--- a/module/web/themes/flat/img/user-info.png
+++ b/module/webui/themes/flat/img/user-info.png
diff --git a/module/web/themes/flat/tml/admin.html b/module/webui/themes/flat/tml/admin.html
index 882cd5a4e..882cd5a4e 100644
--- a/module/web/themes/flat/tml/admin.html
+++ b/module/webui/themes/flat/tml/admin.html
diff --git a/module/web/themes/flat/tml/base.html b/module/webui/themes/flat/tml/base.html
index 572911454..9f6a934fb 100644
--- a/module/web/themes/flat/tml/base.html
+++ b/module/webui/themes/flat/tml/base.html
@@ -53,25 +53,25 @@
 </span>
 
     <img src="/flat/img/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
-	<ul id="user-actions">
-		<li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
-		{% if user.is_admin %}
-		<li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
-		{% endif %}
+  <ul id="user-actions">
+    <li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
+    {% if user.is_admin %}
+    <li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
+    {% endif %}
         <li><a href="/info"  class="action info" rel="nofollow">{{_("Info")}}</a></li>
 
-	</ul>
+  </ul>
 {% else %}
     <span style="padding-right: 2px;">{{_("Please Login!")}}</span>
 {% endif %}
 
     {% endblock %}
-	</div>
+  </div>
 
-	<a href="/"><img id="head-logo" src="/flat/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
+  <a href="/"><img id="head-logo" src="/flat/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
 
-	<div id="head-menu">
-		<ul>
+  <div id="head-menu">
+    <ul>
 
         {% macro selected(name, right=False) -%}
             {% if name in url -%}class="{% if right -%}right {% endif %}selected"{%- endif %}
@@ -79,39 +79,39 @@
         {%- endmacro %}
 
 
-		{% block menu %}
-		<li>
-		    <a href="/" title=""><img src="/flat/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
-		</li>
-		<li {{ selected('queue') }}>
-		    <a href="/queue/" title=""><img src="/flat/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
-		</li>
-		<li {{ selected('collector') }}>
-		    <a href="/collector/" title=""><img src="/flat/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
-		</li>
-		<li {{ selected('downloads') }}>
-		    <a href="/downloads/" title=""><img src="/flat/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
-		</li>
-{#		<li {{ selected('filemanager') }}>#}
-{#		    <a href="/filemanager/" title=""><img src="/flat/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
-{#		</li>#}
-		<li {{ selected('logs', True) }}>
-		    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
-		</li>
-		<li {{ selected('settings', True) }}>
-		    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
-		</li>
-		{% endblock %}
-		
-		</ul>
-	</div>
-
-	<div style="clear:both;"></div>
+    {% block menu %}
+    <li>
+        <a href="/" title=""><img src="/flat/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+    </li>
+    <li {{ selected('queue') }}>
+        <a href="/queue/" title=""><img src="/flat/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+    </li>
+    <li {{ selected('collector') }}>
+        <a href="/collector/" title=""><img src="/flat/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+    </li>
+    <li {{ selected('downloads') }}>
+        <a href="/downloads/" title=""><img src="/flat/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+    </li>
+{#    <li {{ selected('filemanager') }}>#}
+{#        <a href="/filemanager/" title=""><img src="/flat/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
+{#    </li>#}
+    <li {{ selected('logs', True) }}>
+        <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+    </li>
+    <li {{ selected('settings', True) }}>
+        <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
+    </li>
+    {% endblock %}
+    
+    </ul>
+  </div>
+
+  <div style="clear:both;"></div>
 </div>
 
 {% if perms.STATUS %}
 <ul id="page-actions2">
-	<li id="action_play"><a href="#"  class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
+  <li id="action_play"><a href="#"  class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
     <li id="action_stop"><a href="#"  class="action stop" accesskey="o" rel="nofollow">{{_("Stop")}}</a></li>
     <li id="action_cancel"><a href="#"  class="action cancel" accesskey="o" rel="nofollow">{{_("Cancel")}}</a></li>
     <li id="action_add"><a href="#"  class="action add" accesskey="o" rel="nofollow" >{{_("Add")}}</a></li>
@@ -148,7 +148,7 @@
 <noscript><h1>Enable JavaScript to use the webinterface.</h1></noscript>
 
 {% for message in messages %}
-	<b><p>{{message}}</p></b>
+  <b><p>{{message}}</p></b>
 {% endfor %}
 
 <div id="load-indicator" style="opacity: 0; float: right; margin-top: -10px;">
@@ -159,7 +159,7 @@
 {% block content %}
 {% endblock content %}
 
-	<hr style="clear: both;" />
+  <hr style="clear: both;" />
 
 <div id="foot">&copy; 2008-2011 pyLoad Team
 <a href="#top" class="action top" accesskey="x"><span>{{_("Back to top")}}</span></a><br />
diff --git a/module/webui/themes/flat/tml/captcha.html b/module/webui/themes/flat/tml/captcha.html
new file mode 100644
index 000000000..ae1afe444
--- /dev/null
+++ b/module/webui/themes/flat/tml/captcha.html
@@ -0,0 +1,42 @@
+<!-- Captcha box -->
+<div id="cap_box" class="window_box">
+
+  <form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
+  
+    <h1>{{_("Captcha reading")}}</h1>
+    <p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
+    
+    <div id="cap_textual">
+    
+      <input id="cap_id" name="cap_id" type="hidden" value="" />
+    
+      <label>{{_("Captcha")}}
+      <span class="small">{{_("The captcha.")}}</span>
+      </label>
+      <span class="cont">
+          <img id="cap_textual_img" src="">
+      </span>
+      
+      <label>{{_("Text")}}
+      <span class="small">{{_("Input the text on the captcha.")}}</span>
+      </label>
+      <input id="cap_result" name="cap_result" type="text" size="20" />
+          
+    </div>
+    
+    <div id="cap_positional" style="text-align: center">
+        <img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
+    </div>
+
+    <div id="button_bar" style="text-align: center">
+      <span>
+        <button id="cap_submit" type="submit" style="margin-left: 0">{{_("Submit")}}</button>
+        <button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
+      </span>
+    </div>
+    
+    <div class="spacer"></div>
+  
+  </form>
+
+</div>
\ No newline at end of file
diff --git a/module/web/themes/flat/tml/downloads.html b/module/webui/themes/flat/tml/downloads.html
index be56b4915..be56b4915 100644
--- a/module/web/themes/flat/tml/downloads.html
+++ b/module/webui/themes/flat/tml/downloads.html
diff --git a/module/web/themes/flat/tml/filemanager.html b/module/webui/themes/flat/tml/filemanager.html
index 550901db9..75e862c51 100644
--- a/module/web/themes/flat/tml/filemanager.html
+++ b/module/webui/themes/flat/tml/filemanager.html
@@ -26,9 +26,9 @@ document.addEvent("domready", function(){
     <span>
       <b>{{ file.name }}</b>
       <span class="buttons" style="opacity:0">
-	    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" />
-	    &nbsp;&nbsp;
-	    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
+      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" />
+      &nbsp;&nbsp;
+      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
       </span>
     </span>
   </li>
@@ -39,30 +39,30 @@ document.addEvent("domready", function(){
       <input type="hidden" name="path" class="path" value="{{ fld.path }}" />
       <input type="hidden" name="name" class="name" value="{{ fld.name }}" />
       <span>
-	<b>{{ fld.name }}</b>
-	<span class="buttons" style="opacity:0">
-	      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" />
-	      &nbsp;&nbsp;
-	      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
-	      &nbsp;&nbsp;
-	      <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/add_folder.png" />
-	</span>
+  <b>{{ fld.name }}</b>
+  <span class="buttons" style="opacity:0">
+        <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" />
+        &nbsp;&nbsp;
+        <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
+        &nbsp;&nbsp;
+        <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/add_folder.png" />
+  </span>
       </span>
       {% if (fld.folders|length + fld.files|length) > 0 %}
-	{% if open %}
-	  <ul>
-	{% else %}
-	  <ul style="display:none">
-	{% endif %}
-	  {% for child in fld.folders %}
-	      {{ display_folder(child) }}
-	  {% endfor %}
-	  {% for child in fld.files %}
-	      {{ display_file(child) }}
-	  {% endfor %}
-	</ul>
+  {% if open %}
+    <ul>
+  {% else %}
+    <ul style="display:none">
+  {% endif %}
+    {% for child in fld.folders %}
+        {{ display_folder(child) }}
+    {% endfor %}
+    {% for child in fld.files %}
+        {{ display_file(child) }}
+    {% endfor %}
+  </ul>
       {% else %}
-	<div style="display:none">{{ _("Folder is empty") }}</div>
+  <div style="display:none">{{ _("Folder is empty") }}</div>
       {% endif %}
     </li>
 {%- endmacro %}
diff --git a/module/webui/themes/flat/tml/folder.html b/module/webui/themes/flat/tml/folder.html
new file mode 100644
index 000000000..0c4dacd63
--- /dev/null
+++ b/module/webui/themes/flat/tml/folder.html
@@ -0,0 +1,15 @@
+<li class="folder">
+  <input type="hidden" name="path" class="path" value="{{ path }}" />
+  <input type="hidden" name="name" class="name" value="{{ name }}" />
+  <span>
+    <b>{{ name }}</b>
+    <span class="buttons" style="opacity:0">
+    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" />
+    &nbsp;&nbsp;
+    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
+    &nbsp;&nbsp;
+    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/add_folder.png" />
+    </span>
+  </span>
+  <div style="display:none">{{ _("Folder is empty") }}</div>
+</li>
\ No newline at end of file
diff --git a/module/web/themes/flat/tml/home.html b/module/webui/themes/flat/tml/home.html
index 9e2a4b6e2..377fc1359 100644
--- a/module/web/themes/flat/tml/home.html
+++ b/module/webui/themes/flat/tml/home.html
@@ -7,21 +7,21 @@ var em;
 var operafix = (navigator.userAgent.toLowerCase().search("opera") >= 0);
 
 document.addEvent("domready", function(){
-	em = new EntryManager();
+  em = new EntryManager();
 });
 
 var EntryManager = new Class({
     initialize: function(){
         this.json = new Request.JSON({
-		url: "json/links",
+    url: "json/links",
                 secure: false,
                 async: true,
-		onSuccess: this.update.bind(this),
-		initialDelay: 0,
-		delay: 2500,
-		limit: 30000
-	});
-	
+    onSuccess: this.update.bind(this),
+    initialDelay: 0,
+    delay: 2500,
+    limit: 30000
+  });
+  
         this.ids = [{% for link in content %}
         {% if forloop.last %}
             {{ link.id }}
diff --git a/module/web/themes/flat/tml/info.html b/module/webui/themes/flat/tml/info.html
index 5ff9bc804..5ff9bc804 100644
--- a/module/web/themes/flat/tml/info.html
+++ b/module/webui/themes/flat/tml/info.html
diff --git a/module/web/themes/flat/tml/login.html b/module/webui/themes/flat/tml/login.html
index de6c152d3..de6c152d3 100644
--- a/module/web/themes/flat/tml/login.html
+++ b/module/webui/themes/flat/tml/login.html
diff --git a/module/web/themes/flat/tml/logout.html b/module/webui/themes/flat/tml/logout.html
index 370031b25..370031b25 100644
--- a/module/web/themes/flat/tml/logout.html
+++ b/module/webui/themes/flat/tml/logout.html
diff --git a/module/web/themes/flat/tml/logs.html b/module/webui/themes/flat/tml/logs.html
index 24f2e3bb3..24f2e3bb3 100644
--- a/module/web/themes/flat/tml/logs.html
+++ b/module/webui/themes/flat/tml/logs.html
diff --git a/module/web/themes/flat/tml/pathchooser.html b/module/webui/themes/flat/tml/pathchooser.html
index c4b2684d7..b19eb582f 100644
--- a/module/web/themes/flat/tml/pathchooser.html
+++ b/module/webui/themes/flat/tml/pathchooser.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<script class="javascript">
+  <script class="javascript">
         function chosen()
         {
             opener.ifield.value = document.forms[0].p.value;
@@ -24,21 +24,21 @@
             setValid();
             
         }
-	</script>
-	<link rel="stylesheet" type="text/css" href="/flat/css/pathchooser.css"/>
+  </script>
+  <link rel="stylesheet" type="text/css" href="/flat/css/pathchooser.css"/>
 </head>
 <body{% if type == 'file' %}{% if not oldfile %} onload="setInvalid();"{% endif %}{% endif %}>
 <center>
     <div id="paths">
-	<form method="get" action="?" onSubmit="chosen();" onReset="exit();">
-	    <input type="text" name="p" value="{{ oldfile|default(cwd) }}" size="60" onfocus="setValid();">
-	    <input type="submit" value="Ok" name="send">
-	</form>
+  <form method="get" action="?" onSubmit="chosen();" onReset="exit();">
+      <input type="text" name="p" value="{{ oldfile|default(cwd) }}" size="60" onfocus="setValid();">
+      <input type="submit" value="Ok" name="send">
+  </form>
     
     {% if type == 'folder' %}
-	<span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/pathchooser" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/pathchooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
+  <span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/pathchooser" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/pathchooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
     {% else %}
-	<span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/filechooser/" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/filechooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
+  <span class="path_abs_rel">{{_("Path")}}: <a href="{{ "/filechooser/" + cwd|path_make_absolute|quotepath }}"{% if absolute %} style="text-decoration: underline;"{% endif %}>{{_("absolute")}}</a> | <a href="{{ "/filechooser/" + cwd|path_make_relative|quotepath }}"{% if not absolute %} style="text-decoration: underline;"{% endif %}>{{_("relative")}}</a></span>
     {% endif %}
     </div>
     <table border="0" cellspacing="0" cellpadding="3">
@@ -48,13 +48,13 @@
             <th>{{_("type")}}</th>
             <th>{{_("last modified")}}</th>
         </tr>
-	{% if parentdir %}
+  {% if parentdir %}
         <tr>
             <td colspan="4">
                 <a href="{% if type == 'folder' %}{{ "/pathchooser/" + parentdir|quotepath }}{% else %}{{ "/filechooser/" + parentdir|quotepath }}{% endif %}"><span class="parentdir">{{_("parent directory")}}</span></a>
             </td>
         </tr>
-	{% endif %}
+  {% endif %}
 {% for file in files %}
         <tr>
             {% if type == 'folder' %}
diff --git a/module/web/themes/flat/tml/queue.html b/module/webui/themes/flat/tml/queue.html
index 31e8fef49..31e8fef49 100644
--- a/module/web/themes/flat/tml/queue.html
+++ b/module/webui/themes/flat/tml/queue.html
diff --git a/module/web/themes/flat/tml/settings.html b/module/webui/themes/flat/tml/settings.html
index 469947399..469947399 100644
--- a/module/web/themes/flat/tml/settings.html
+++ b/module/webui/themes/flat/tml/settings.html
diff --git a/module/web/themes/flat/tml/settings_item.html b/module/webui/themes/flat/tml/settings_item.html
index 813383343..813383343 100644
--- a/module/web/themes/flat/tml/settings_item.html
+++ b/module/webui/themes/flat/tml/settings_item.html
diff --git a/module/web/themes/flat/tml/window.html b/module/webui/themes/flat/tml/window.html
index 96afe4146..96afe4146 100644
--- a/module/web/themes/flat/tml/window.html
+++ b/module/webui/themes/flat/tml/window.html