13 files changed, 53 insertions, 53 deletions
diff --git a/pyload/webui/themes/Dark/tml/admin.html b/pyload/webui/themes/Dark/tml/admin.html
index 3a88ffc7a..c5cdb494b 100644
--- a/pyload/webui/themes/Dark/tml/admin.html
+++ b/pyload/webui/themes/Dark/tml/admin.html
@@ -1,7 +1,7 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 
 {% block head %}
-    <script type="text/javascript" src="/Dark/js/render/admin.min.js"></script>
+    <script type="text/javascript" src="/js/admin.min.js"></script>
 {% endblock %}
 
 
diff --git a/pyload/webui/themes/Dark/tml/base.html b/pyload/webui/themes/Dark/tml/base.html
index bebb0600d..c17e85a4a 100644
--- a/pyload/webui/themes/Dark/tml/base.html
+++ b/pyload/webui/themes/Dark/tml/base.html
@@ -5,17 +5,17 @@
 <head>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<link rel="stylesheet" type="text/css" href="/Dark/css/base.min.css"/>
-<link rel="stylesheet" type="text/css" href="/Dark/css/window.min.css"/>
-<link rel="stylesheet" type="text/css" href="/Dark/css/MooDialog.min.css"/>
+<link rel="stylesheet" type="text/css" href="/css/base.min.css"/>
+<link rel="stylesheet" type="text/css" href="/css/window.min.css"/>
+<link rel="stylesheet" type="text/css" href="/css/MooDialog.css"/>
 
-<script type="text/javascript" src="/Dark/js/static/mootools-core.min.js"></script>
-<script type="text/javascript" src="/Dark/js/static/mootools-more.min.js"></script>
-<script type="text/javascript" src="/Dark/js/static/MooDialog.min.js"></script>
-<script type="text/javascript" src="/Dark/js/static/purr.min.js"></script>
+<script type="text/javascript" src="/lib/MooTools/MooTools-Core.js"></script>
+<script type="text/javascript" src="/lib/MooTools/MooTools-More.js"></script>
+<script type="text/javascript" src="/lib/MooTools/MooDialog/MooDialog.js"></script>
+<script type="text/javascript" src="/lib/MooTools/Purr/purr.js"></script>
 
 
-<script type="text/javascript" src="/Dark/js/render/base.min.js"></script>
+<script type="text/javascript" src="/js/base.min.js"></script>
 
 <title>{% block title %}pyLoad {{_("Webinterface")}}{% endblock %}</title>
 
@@ -48,11 +48,11 @@
 {% endif %}
 
 <span id="cap_info" style="display: {% if captcha %}inline{%else%}none{% endif %}">
-<img src="/Dark/img/default/images.png" alt="Captcha:" style="vertical-align:middle; margin:2px" />
+<img src="/img/images.png" alt="Captcha:" style="vertical-align:middle; margin:2px" />
 <span style="font-weight: bold; cursor: pointer; margin-right: 2px;">{{_("Captcha waiting")}}</span>
 </span>
 
-    <img src="/Dark/img/default/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
+    <img src="/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 %}
@@ -68,7 +68,7 @@
     {% endblock %}
   </div>
 
-  <a href="/"><img id="head-logo" src="/Dark/img/pyload-logo.png" alt="pyLoad" /></a>
+  <a href="/"><img id="head-logo" src="/img/pyload-logo.png" alt="pyLoad" /></a>
 {% if user.is_authenticated %}
   <div id="head-menu">
     <ul>
@@ -81,22 +81,22 @@
 
     {% block menu %}
     <li>
-        <a href="/" title=""><img src="/Dark/img/default/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+        <a href="/" title=""><img src="/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
     </li>
     <li {{ selected('queue') }}>
-        <a href="/queue/" title=""><img src="/Dark/img/default/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+        <a href="/queue/" title=""><img src="/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
     </li>
     <li {{ selected('collector') }}>
-        <a href="/collector/" title=""><img src="/Dark/img/default/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+        <a href="/collector/" title=""><img src="/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
     </li>
     <li {{ selected('downloads') }}>
-        <a href="/downloads/" title=""><img src="/Dark/img/default/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+        <a href="/downloads/" title=""><img src="/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
     </li>
     <li {{ selected('logs', True) }}>
-        <a href="/logs/"  title=""><img src="/Dark/img/default/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+        <a href="/logs/"  title=""><img src="/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
     </li>
     <li {{ selected('settings', True) }}>
-        <a href="/settings/"  title=""><img src="/Dark/img/default/head-menu-config.png" alt="" />{{_("Config")}}</a>
+        <a href="/settings/"  title=""><img src="/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
     </li>
     {% endblock %}
 
@@ -150,7 +150,7 @@
 {% endfor %}
 
 <div id="load-indicator" style="opacity: 0; float: right; margin-top: -10px;">
-    <img src="/Dark/img/default/ajax-loader.gif" alt="" style="padding-right: 5px"/>
+    <img src="/img/ajax-loader.gif" alt="" style="padding-right: 5px"/>
     {{_("loading")}}
 </div>
 
@@ -168,8 +168,8 @@
 </div>
 
 <div id="window_popup" style="display: none;">
-    {% include '/Dark/tml/window.html' %}
-    {% include '/Dark/tml/captcha.html' %}
+    {% include '/tml/window.html' %}
+    {% include '/tml/captcha.html' %}
     {% block hidden %}
     {% endblock %}
 </div>
diff --git a/pyload/webui/themes/Dark/tml/downloads.html b/pyload/webui/themes/Dark/tml/downloads.html
index c6ff7a243..c77744a92 100644
--- a/pyload/webui/themes/Dark/tml/downloads.html
+++ b/pyload/webui/themes/Dark/tml/downloads.html
@@ -1,4 +1,4 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 
 {% block title %}Downloads - {{super()}} {% endblock %}
 
diff --git a/pyload/webui/themes/Dark/tml/folder.html b/pyload/webui/themes/Dark/tml/folder.html
index b57338d5e..d4977ea4b 100644
--- a/pyload/webui/themes/Dark/tml/folder.html
+++ b/pyload/webui/themes/Dark/tml/folder.html
@@ -4,11 +4,11 @@
   <span>
     <b>{{ name }}</b>
     <span class="buttons" style="opacity:0">
-    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/Dark/img/default/pencil.png" />
+    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/img/pencil.png" />
     &nbsp;&nbsp;
-    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/Dark/img/default/delete.png" />
+    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/img/delete.png" />
     &nbsp;&nbsp;
-    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/Dark/img/default/add_folder.png" />
+    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/img/add_folder.png" />
     </span>
   </span>
   <div style="display:none">{{ _("Folder is empty") }}</div>
diff --git a/pyload/webui/themes/Dark/tml/home.html b/pyload/webui/themes/Dark/tml/home.html
index 9131c640e..89050d681 100644
--- a/pyload/webui/themes/Dark/tml/home.html
+++ b/pyload/webui/themes/Dark/tml/home.html
@@ -1,4 +1,4 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 {% block head %}
 
 <script type="text/javascript">
@@ -129,7 +129,7 @@ var LinkEntry = new Class({
                 'html': item.percent+ '% / '+ humanFileSize(item.size-item.bleft)
                 }),
                 remove: new Element('img',{
-                'src': '/Dark/img/default/control_cancel.png',
+                'src': '/img/control_cancel.png',
                 'styles':{
                     'vertical-align': 'middle',
                     'margin-right': '-20px',
@@ -208,22 +208,22 @@ var LinkEntry = new Class({
 
 {% block menu %}
 <li class="selected">
-    <a href="/" title=""><img src="/Dark/img/default/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+    <a href="/" title=""><img src="/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
 </li>
 <li>
-    <a href="/queue/" title=""><img src="/Dark/img/default/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+    <a href="/queue/" title=""><img src="/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
 </li>
 <li>
-    <a href="/collector/" title=""><img src="/Dark/img/default/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+    <a href="/collector/" title=""><img src="/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
 </li>
 <li>
-    <a href="/downloads/" title=""><img src="/Dark/img/default/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+    <a href="/downloads/" title=""><img src="/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
 </li>
 <li class="right">
-    <a href="/logs/"  title=""><img src="/Dark/img/default/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+    <a href="/logs/"  title=""><img src="/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
 </li>
 <li class="right">
-    <a href="/settings/"  title=""><img src="/Dark/img/default/head-menu-config.png" alt="" />{{_("Config")}}</a>
+    <a href="/settings/"  title=""><img src="/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
 </li>
 {% endblock %}
 
@@ -248,7 +248,7 @@ var LinkEntry = new Class({
     <td id="link_{{ link.id }}_bleft">{{ link.format_size }}</td>
     <td>
         <span id="link_{{ link.id }}_percent">{{ link.percent }}% /{{ link.bleft }}</span>
-        <img id="link_{{ link.id }}_remove" style="vertical-align: middle; margin-right: -20px; margin-left: 5px; margin-top: -2px; cursor:pointer;" src="/Dark/img/default/control_cancel.png"/>
+        <img id="link_{{ link.id }}_remove" style="vertical-align: middle; margin-right: -20px; margin-left: 5px; margin-top: -2px; cursor:pointer;" src="/img/control_cancel.png"/>
     </td>
   </tr>
   <tr id="link_{{ link.id }}_pgb_tr">
diff --git a/pyload/webui/themes/Dark/tml/info.html b/pyload/webui/themes/Dark/tml/info.html
index 1c0a35e9f..ccacde3a1 100644
--- a/pyload/webui/themes/Dark/tml/info.html
+++ b/pyload/webui/themes/Dark/tml/info.html
@@ -1,4 +1,4 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 
 {% block head %}
 {% endblock %}
diff --git a/pyload/webui/themes/Dark/tml/login.html b/pyload/webui/themes/Dark/tml/login.html
index dcb3a18b8..004bc506b 100644
--- a/pyload/webui/themes/Dark/tml/login.html
+++ b/pyload/webui/themes/Dark/tml/login.html
@@ -1,4 +1,4 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 
 {% block title %}{{_("Login")}} - {{super()}} {% endblock %}
 
diff --git a/pyload/webui/themes/Dark/tml/logout.html b/pyload/webui/themes/Dark/tml/logout.html
index 08adfcf6c..e711b2a42 100644
--- a/pyload/webui/themes/Dark/tml/logout.html
+++ b/pyload/webui/themes/Dark/tml/logout.html
@@ -1,4 +1,4 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 
 {% block head %}
 <meta http-equiv="refresh" content="3; url=/">
diff --git a/pyload/webui/themes/Dark/tml/logs.html b/pyload/webui/themes/Dark/tml/logs.html
index e7fead2df..3b5d9d04a 100644
--- a/pyload/webui/themes/Dark/tml/logs.html
+++ b/pyload/webui/themes/Dark/tml/logs.html
@@ -1,9 +1,9 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 
 {% block title %}{{_("Logs")}} - {{super()}} {% endblock %}
 {% block subtitle %}{{_("Logs")}}{% endblock %}
 {% block head %}
-<link rel="stylesheet" type="text/css" href="/Dark/css/log.min.css"/>
+<link rel="stylesheet" type="text/css" href="/css/log.min.css"/>
 {% endblock %}
 
 {% block content %}
diff --git a/pyload/webui/themes/Dark/tml/pathchooser.html b/pyload/webui/themes/Dark/tml/pathchooser.html
index 288af8bfa..085da56fd 100644
--- a/pyload/webui/themes/Dark/tml/pathchooser.html
+++ b/pyload/webui/themes/Dark/tml/pathchooser.html
@@ -25,7 +25,7 @@
 
         }
   </script>
-  <link rel="stylesheet" type="text/css" href="/Dark/css/pathchooser.min.css"/>
+  <link rel="stylesheet" type="text/css" href="/css/pathchooser.min.css"/>
 </head>
 <body{% if type == 'file' %}{% if not oldfile %} onload="setInvalid();"{% endif %}{% endif %}>
 <center>
diff --git a/pyload/webui/themes/Dark/tml/queue.html b/pyload/webui/themes/Dark/tml/queue.html
index 1a61e2638..3e3d5b61d 100644
--- a/pyload/webui/themes/Dark/tml/queue.html
+++ b/pyload/webui/themes/Dark/tml/queue.html
@@ -1,7 +1,7 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 {% block head %}
 
-<script type="text/javascript" src="/Dark/js/render/package.min.js"></script>
+<script type="text/javascript" src="/js/package.js"></script>
 
 <script type="text/javascript">
 
@@ -37,17 +37,17 @@ document.addEvent("domready", function(){
     <div class="order" style="display: none;">{{ package.order }}</div>
 
     <div class="packagename" style="cursor: pointer">
-        <img class="package_drag" src="/Dark/img/default/folder.png" style="cursor: move; margin-bottom: -2px">
+        <img class="package_drag" src="/img/folder.png" style="cursor: move; margin-bottom: -2px">
         <span class="name">{{package.name}}</span>
         &nbsp;&nbsp;
         <span class="buttons" style="opacity:0">
-        <img title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/Dark/img/default/delete.png" />
+        <img title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/img/delete.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Restart Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/Dark/img/default/arrow_refresh.png" />
+        <img title="{{_("Restart Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/img/arrow_refresh.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/Dark/img/default/pencil.png" />
+        <img title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/img/pencil.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/Dark/img/default/package_go.png" />
+        <img title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/img/package_go.png" />
         </span>
     </div>
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
diff --git a/pyload/webui/themes/Dark/tml/settings.html b/pyload/webui/themes/Dark/tml/settings.html
index cf0fe1745..8c98f74c6 100644
--- a/pyload/webui/themes/Dark/tml/settings.html
+++ b/pyload/webui/themes/Dark/tml/settings.html
@@ -1,12 +1,12 @@
-{% extends '/Dark/tml/base.html' %}
+{% extends '/tml/base.html' %}
 
 {% block title %}{{ _("Config") }} - {{ super() }} {% endblock %}
 {% block subtitle %}{{ _("Config") }}{% endblock %}
 
 {% block head %}
-    <script type="text/javascript" src="/Dark/js/static/tinytab.min.js"></script>
-    <script type="text/javascript" src="/Dark/js/static/MooDropMenu.min.js"></script>
-    <script type="text/javascript" src="/Dark/js/render/settings.min.js"></script>
+    <script type="text/javascript" src="/lib/MooTools/TinyTab/tinytab.js"></script>
+    <script type="text/javascript" src="/lib/MooTools/MooDropMenu/MooDropMenu.js"></script>
+    <script type="text/javascript" src="/js/settings.min.js"></script>
 
 {% endblock %}
 
diff --git a/pyload/webui/themes/Dark/tml/window.html b/pyload/webui/themes/Dark/tml/window.html
index a518a7b95..3f0e1f882 100644
--- a/pyload/webui/themes/Dark/tml/window.html
+++ b/pyload/webui/themes/Dark/tml/window.html
@@ -12,7 +12,7 @@
 <label for="add_links">{{_("Links")}}
 <span class="small">{{_("Paste your links here or any text and press the filter button.")}}</span>
 <span class="small"> {{ _("Filter urls") }}
-<img alt="URIParsing" Title="Parse Uri" src="/Dark/img/default/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
+<img alt="URIParsing" Title="Parse Uri" src="/img/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
 </span>
 
 </label>