diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index ea318787763bbcb3f3224b9095b1a786e05c31a7..32ca3f5dbc7458875cd758753c4dd89c25156c16 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -201,10 +201,7 @@ public class I2PSnarkServlet extends BasicServlet {
             return;
         }
 
-        if (_context.isRouterContext())
-            _themePath = "/themes/snark/" + _manager.getTheme() + '/';
-        else
-            _themePath = _contextPath + WARBASE + "themes/snark/" + _manager.getTheme() + '/';
+        _themePath = _contextPath + WARBASE + "themes/" + _manager.getTheme() + '/';
         _imgPath = _themePath + "images/";
         req.setCharacterEncoding("UTF-8");
 
diff --git a/apps/routerconsole/jsp/themes/snark/dark/favicon.ico b/apps/i2psnark/resources/themes/dark/favicon.ico
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/favicon.ico
rename to apps/i2psnark/resources/themes/dark/favicon.ico
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/add.png b/apps/i2psnark/resources/themes/dark/images/add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/add.png
rename to apps/i2psnark/resources/themes/dark/images/add.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/author.png b/apps/i2psnark/resources/themes/dark/images/author.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/author.png
rename to apps/i2psnark/resources/themes/dark/images/author.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/bullet.png b/apps/i2psnark/resources/themes/dark/images/bullet.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/bullet.png
rename to apps/i2psnark/resources/themes/dark/images/bullet.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_forum.png b/apps/i2psnark/resources/themes/dark/images/button_forum.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_forum.png
rename to apps/i2psnark/resources/themes/dark/images/button_forum.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_forum_active.png b/apps/i2psnark/resources/themes/dark/images/button_forum_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_forum_active.png
rename to apps/i2psnark/resources/themes/dark/images/button_forum_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_forum_hover.png b/apps/i2psnark/resources/themes/dark/images/button_forum_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_forum_hover.png
rename to apps/i2psnark/resources/themes/dark/images/button_forum_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_snark.png b/apps/i2psnark/resources/themes/dark/images/button_snark.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_snark.png
rename to apps/i2psnark/resources/themes/dark/images/button_snark.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_snark_active.png b/apps/i2psnark/resources/themes/dark/images/button_snark_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_snark_active.png
rename to apps/i2psnark/resources/themes/dark/images/button_snark_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_snark_hover.png b/apps/i2psnark/resources/themes/dark/images/button_snark_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_snark_hover.png
rename to apps/i2psnark/resources/themes/dark/images/button_snark_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_tracker.png b/apps/i2psnark/resources/themes/dark/images/button_tracker.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_tracker.png
rename to apps/i2psnark/resources/themes/dark/images/button_tracker.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_active.png b/apps/i2psnark/resources/themes/dark/images/button_tracker_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_active.png
rename to apps/i2psnark/resources/themes/dark/images/button_tracker_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_hover.png b/apps/i2psnark/resources/themes/dark/images/button_tracker_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/button_tracker_hover.png
rename to apps/i2psnark/resources/themes/dark/images/button_tracker_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/clock.png b/apps/i2psnark/resources/themes/dark/images/clock.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/clock.png
rename to apps/i2psnark/resources/themes/dark/images/clock.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/comment.png b/apps/i2psnark/resources/themes/dark/images/comment.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/comment.png
rename to apps/i2psnark/resources/themes/dark/images/comment.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/complete.png b/apps/i2psnark/resources/themes/dark/images/complete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/complete.png
rename to apps/i2psnark/resources/themes/dark/images/complete.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/config.png b/apps/i2psnark/resources/themes/dark/images/config.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/config.png
rename to apps/i2psnark/resources/themes/dark/images/config.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/configuration.png b/apps/i2psnark/resources/themes/dark/images/configuration.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/configuration.png
rename to apps/i2psnark/resources/themes/dark/images/configuration.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/create.png b/apps/i2psnark/resources/themes/dark/images/create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/create.png
rename to apps/i2psnark/resources/themes/dark/images/create.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/create0.png b/apps/i2psnark/resources/themes/dark/images/create0.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/create0.png
rename to apps/i2psnark/resources/themes/dark/images/create0.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/debug.png b/apps/i2psnark/resources/themes/dark/images/debug.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/debug.png
rename to apps/i2psnark/resources/themes/dark/images/debug.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/delete.png b/apps/i2psnark/resources/themes/dark/images/delete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/delete.png
rename to apps/i2psnark/resources/themes/dark/images/delete.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/details.png b/apps/i2psnark/resources/themes/dark/images/details.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/details.png
rename to apps/i2psnark/resources/themes/dark/images/details.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/downloading.png b/apps/i2psnark/resources/themes/dark/images/downloading.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/downloading.png
rename to apps/i2psnark/resources/themes/dark/images/downloading.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/dropdown.png b/apps/i2psnark/resources/themes/dark/images/dropdown.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/dropdown.png
rename to apps/i2psnark/resources/themes/dark/images/dropdown.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/dropdown_active.png b/apps/i2psnark/resources/themes/dark/images/dropdown_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/dropdown_active.png
rename to apps/i2psnark/resources/themes/dark/images/dropdown_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/dropdown_hover.png b/apps/i2psnark/resources/themes/dark/images/dropdown_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/dropdown_hover.png
rename to apps/i2psnark/resources/themes/dark/images/dropdown_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/eta.png b/apps/i2psnark/resources/themes/dark/images/eta.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/eta.png
rename to apps/i2psnark/resources/themes/dark/images/eta.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/file.png b/apps/i2psnark/resources/themes/dark/images/file.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/file.png
rename to apps/i2psnark/resources/themes/dark/images/file.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/file_sm.png b/apps/i2psnark/resources/themes/dark/images/file_sm.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/file_sm.png
rename to apps/i2psnark/resources/themes/dark/images/file_sm.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/first.png b/apps/i2psnark/resources/themes/dark/images/first.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/first.png
rename to apps/i2psnark/resources/themes/dark/images/first.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/head_rx.png b/apps/i2psnark/resources/themes/dark/images/head_rx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/head_rx.png
rename to apps/i2psnark/resources/themes/dark/images/head_rx.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/head_rxspeed.png b/apps/i2psnark/resources/themes/dark/images/head_rxspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/head_rxspeed.png
rename to apps/i2psnark/resources/themes/dark/images/head_rxspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/head_tx.png b/apps/i2psnark/resources/themes/dark/images/head_tx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/head_tx.png
rename to apps/i2psnark/resources/themes/dark/images/head_tx.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/head_txspeed.png b/apps/i2psnark/resources/themes/dark/images/head_txspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/head_txspeed.png
rename to apps/i2psnark/resources/themes/dark/images/head_txspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/hidepeers.png b/apps/i2psnark/resources/themes/dark/images/hidepeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/hidepeers.png
rename to apps/i2psnark/resources/themes/dark/images/hidepeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/infocircle.png b/apps/i2psnark/resources/themes/dark/images/infocircle.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/infocircle.png
rename to apps/i2psnark/resources/themes/dark/images/infocircle.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/last.png b/apps/i2psnark/resources/themes/dark/images/last.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/last.png
rename to apps/i2psnark/resources/themes/dark/images/last.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/next.png b/apps/i2psnark/resources/themes/dark/images/next.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/next.png
rename to apps/i2psnark/resources/themes/dark/images/next.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/nopeers.png b/apps/i2psnark/resources/themes/dark/images/nopeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/nopeers.png
rename to apps/i2psnark/resources/themes/dark/images/nopeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/peer.png b/apps/i2psnark/resources/themes/dark/images/peer.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/peer.png
rename to apps/i2psnark/resources/themes/dark/images/peer.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/previous.png b/apps/i2psnark/resources/themes/dark/images/previous.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/previous.png
rename to apps/i2psnark/resources/themes/dark/images/previous.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/priority.png b/apps/i2psnark/resources/themes/dark/images/priority.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/priority.png
rename to apps/i2psnark/resources/themes/dark/images/priority.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/progressbar.gif b/apps/i2psnark/resources/themes/dark/images/progressbar.gif
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/progressbar.gif
rename to apps/i2psnark/resources/themes/dark/images/progressbar.gif
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/rateme.png b/apps/i2psnark/resources/themes/dark/images/rateme.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/rateme.png
rename to apps/i2psnark/resources/themes/dark/images/rateme.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/remove.png b/apps/i2psnark/resources/themes/dark/images/remove.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/remove.png
rename to apps/i2psnark/resources/themes/dark/images/remove.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/seeding.png b/apps/i2psnark/resources/themes/dark/images/seeding.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/seeding.png
rename to apps/i2psnark/resources/themes/dark/images/seeding.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/showpeers.png b/apps/i2psnark/resources/themes/dark/images/showpeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/showpeers.png
rename to apps/i2psnark/resources/themes/dark/images/showpeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/size.png b/apps/i2psnark/resources/themes/dark/images/size.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/size.png
rename to apps/i2psnark/resources/themes/dark/images/size.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/snark_add.png b/apps/i2psnark/resources/themes/dark/images/snark_add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/snark_add.png
rename to apps/i2psnark/resources/themes/dark/images/snark_add.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/snark_create.png b/apps/i2psnark/resources/themes/dark/images/snark_create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/snark_create.png
rename to apps/i2psnark/resources/themes/dark/images/snark_create.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/stalled.png b/apps/i2psnark/resources/themes/dark/images/stalled.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/stalled.png
rename to apps/i2psnark/resources/themes/dark/images/stalled.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/start.png b/apps/i2psnark/resources/themes/dark/images/start.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/start.png
rename to apps/i2psnark/resources/themes/dark/images/start.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/start_all.png b/apps/i2psnark/resources/themes/dark/images/start_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/start_all.png
rename to apps/i2psnark/resources/themes/dark/images/start_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/status.png b/apps/i2psnark/resources/themes/dark/images/status.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/status.png
rename to apps/i2psnark/resources/themes/dark/images/status.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/stop.png b/apps/i2psnark/resources/themes/dark/images/stop.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/stop.png
rename to apps/i2psnark/resources/themes/dark/images/stop.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/stop_all.png b/apps/i2psnark/resources/themes/dark/images/stop_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/stop_all.png
rename to apps/i2psnark/resources/themes/dark/images/stop_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/stopped.png b/apps/i2psnark/resources/themes/dark/images/stopped.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/stopped.png
rename to apps/i2psnark/resources/themes/dark/images/stopped.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/torrent.png b/apps/i2psnark/resources/themes/dark/images/torrent.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/torrent.png
rename to apps/i2psnark/resources/themes/dark/images/torrent.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/trackererror.png b/apps/i2psnark/resources/themes/dark/images/trackererror.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/trackererror.png
rename to apps/i2psnark/resources/themes/dark/images/trackererror.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/images/up.png b/apps/i2psnark/resources/themes/dark/images/up.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/images/up.png
rename to apps/i2psnark/resources/themes/dark/images/up.png
diff --git a/apps/routerconsole/jsp/themes/snark/dark/nocollapse.css b/apps/i2psnark/resources/themes/dark/nocollapse.css
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/dark/nocollapse.css
rename to apps/i2psnark/resources/themes/dark/nocollapse.css
diff --git a/apps/routerconsole/jsp/themes/snark/dark/snark.css b/apps/i2psnark/resources/themes/dark/snark.css
similarity index 99%
rename from apps/routerconsole/jsp/themes/snark/dark/snark.css
rename to apps/i2psnark/resources/themes/dark/snark.css
index 85f2ab503bce60f23539466eb95a6b32812cf2ff..a9e331b27cdb9f95f940f7e5575c368cd8dc94ce 100644
--- a/apps/routerconsole/jsp/themes/snark/dark/snark.css
+++ b/apps/i2psnark/resources/themes/dark/snark.css
@@ -2238,15 +2238,15 @@ hr.debug:last-child {
 }
 
 .priorityHigh {
-     background: url(/themes/snark/dark/images/icons/clock_red.png) left 24px center no-repeat;
+     background: url(images/icons/clock_red.png) left 24px center no-repeat;
 }
 
 .priorityNormal {
-     background: url(/themes/snark/dark/images/icons/clock.png) left 24px  center no-repeat;
+     background: url(images/icons/clock.png) left 24px  center no-repeat;
 }
 
 .prioritySkip {
-     background: url(/themes/snark/dark/images/icons/cancel.png) left 22px center no-repeat;
+     background: url(images/icons/cancel.png) left 22px center no-repeat;
 }
 
 /* configs */
diff --git a/apps/routerconsole/jsp/themes/snark/light/favicon.ico b/apps/i2psnark/resources/themes/light/favicon.ico
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/favicon.ico
rename to apps/i2psnark/resources/themes/light/favicon.ico
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/add.png b/apps/i2psnark/resources/themes/light/images/add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/add.png
rename to apps/i2psnark/resources/themes/light/images/add.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/author.png b/apps/i2psnark/resources/themes/light/images/author.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/author.png
rename to apps/i2psnark/resources/themes/light/images/author.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/bullet.png b/apps/i2psnark/resources/themes/light/images/bullet.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/bullet.png
rename to apps/i2psnark/resources/themes/light/images/bullet.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_forum.png b/apps/i2psnark/resources/themes/light/images/button_forum.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_forum.png
rename to apps/i2psnark/resources/themes/light/images/button_forum.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_forum_active.png b/apps/i2psnark/resources/themes/light/images/button_forum_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_forum_active.png
rename to apps/i2psnark/resources/themes/light/images/button_forum_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_forum_hover.png b/apps/i2psnark/resources/themes/light/images/button_forum_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_forum_hover.png
rename to apps/i2psnark/resources/themes/light/images/button_forum_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_snark.png b/apps/i2psnark/resources/themes/light/images/button_snark.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_snark.png
rename to apps/i2psnark/resources/themes/light/images/button_snark.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_snark_active.png b/apps/i2psnark/resources/themes/light/images/button_snark_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_snark_active.png
rename to apps/i2psnark/resources/themes/light/images/button_snark_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_snark_hover.png b/apps/i2psnark/resources/themes/light/images/button_snark_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_snark_hover.png
rename to apps/i2psnark/resources/themes/light/images/button_snark_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_tracker.png b/apps/i2psnark/resources/themes/light/images/button_tracker.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_tracker.png
rename to apps/i2psnark/resources/themes/light/images/button_tracker.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_tracker_active.png b/apps/i2psnark/resources/themes/light/images/button_tracker_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_tracker_active.png
rename to apps/i2psnark/resources/themes/light/images/button_tracker_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/button_tracker_hover.png b/apps/i2psnark/resources/themes/light/images/button_tracker_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/button_tracker_hover.png
rename to apps/i2psnark/resources/themes/light/images/button_tracker_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/clock.png b/apps/i2psnark/resources/themes/light/images/clock.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/clock.png
rename to apps/i2psnark/resources/themes/light/images/clock.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/comment.png b/apps/i2psnark/resources/themes/light/images/comment.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/comment.png
rename to apps/i2psnark/resources/themes/light/images/comment.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/complete.png b/apps/i2psnark/resources/themes/light/images/complete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/complete.png
rename to apps/i2psnark/resources/themes/light/images/complete.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/config.png b/apps/i2psnark/resources/themes/light/images/config.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/config.png
rename to apps/i2psnark/resources/themes/light/images/config.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/configuration.png b/apps/i2psnark/resources/themes/light/images/configuration.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/configuration.png
rename to apps/i2psnark/resources/themes/light/images/configuration.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/create.png b/apps/i2psnark/resources/themes/light/images/create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/create.png
rename to apps/i2psnark/resources/themes/light/images/create.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/debug.png b/apps/i2psnark/resources/themes/light/images/debug.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/debug.png
rename to apps/i2psnark/resources/themes/light/images/debug.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/delete.png b/apps/i2psnark/resources/themes/light/images/delete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/delete.png
rename to apps/i2psnark/resources/themes/light/images/delete.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/delete_hover.png b/apps/i2psnark/resources/themes/light/images/delete_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/delete_hover.png
rename to apps/i2psnark/resources/themes/light/images/delete_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/details.png b/apps/i2psnark/resources/themes/light/images/details.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/details.png
rename to apps/i2psnark/resources/themes/light/images/details.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/downloading.png b/apps/i2psnark/resources/themes/light/images/downloading.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/downloading.png
rename to apps/i2psnark/resources/themes/light/images/downloading.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/dropdown.png b/apps/i2psnark/resources/themes/light/images/dropdown.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/dropdown.png
rename to apps/i2psnark/resources/themes/light/images/dropdown.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/eta.png b/apps/i2psnark/resources/themes/light/images/eta.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/eta.png
rename to apps/i2psnark/resources/themes/light/images/eta.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/file.png b/apps/i2psnark/resources/themes/light/images/file.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/file.png
rename to apps/i2psnark/resources/themes/light/images/file.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/first.png b/apps/i2psnark/resources/themes/light/images/first.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/first.png
rename to apps/i2psnark/resources/themes/light/images/first.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/first_hover.png b/apps/i2psnark/resources/themes/light/images/first_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/first_hover.png
rename to apps/i2psnark/resources/themes/light/images/first_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/head_rx.png b/apps/i2psnark/resources/themes/light/images/head_rx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/head_rx.png
rename to apps/i2psnark/resources/themes/light/images/head_rx.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/head_rxspeed.png b/apps/i2psnark/resources/themes/light/images/head_rxspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/head_rxspeed.png
rename to apps/i2psnark/resources/themes/light/images/head_rxspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/head_tx.png b/apps/i2psnark/resources/themes/light/images/head_tx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/head_tx.png
rename to apps/i2psnark/resources/themes/light/images/head_tx.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/head_txspeed.png b/apps/i2psnark/resources/themes/light/images/head_txspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/head_txspeed.png
rename to apps/i2psnark/resources/themes/light/images/head_txspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/hidepeers.png b/apps/i2psnark/resources/themes/light/images/hidepeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/hidepeers.png
rename to apps/i2psnark/resources/themes/light/images/hidepeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/infocircle.png b/apps/i2psnark/resources/themes/light/images/infocircle.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/infocircle.png
rename to apps/i2psnark/resources/themes/light/images/infocircle.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/last.png b/apps/i2psnark/resources/themes/light/images/last.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/last.png
rename to apps/i2psnark/resources/themes/light/images/last.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/last_hover.png b/apps/i2psnark/resources/themes/light/images/last_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/last_hover.png
rename to apps/i2psnark/resources/themes/light/images/last_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/next.png b/apps/i2psnark/resources/themes/light/images/next.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/next.png
rename to apps/i2psnark/resources/themes/light/images/next.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/next_hover.png b/apps/i2psnark/resources/themes/light/images/next_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/next_hover.png
rename to apps/i2psnark/resources/themes/light/images/next_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/nopeers.png b/apps/i2psnark/resources/themes/light/images/nopeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/nopeers.png
rename to apps/i2psnark/resources/themes/light/images/nopeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/peer.png b/apps/i2psnark/resources/themes/light/images/peer.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/peer.png
rename to apps/i2psnark/resources/themes/light/images/peer.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/previous.png b/apps/i2psnark/resources/themes/light/images/previous.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/previous.png
rename to apps/i2psnark/resources/themes/light/images/previous.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/previous_hover.png b/apps/i2psnark/resources/themes/light/images/previous_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/previous_hover.png
rename to apps/i2psnark/resources/themes/light/images/previous_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/priority.png b/apps/i2psnark/resources/themes/light/images/priority.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/priority.png
rename to apps/i2psnark/resources/themes/light/images/priority.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/progressbar.gif b/apps/i2psnark/resources/themes/light/images/progressbar.gif
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/progressbar.gif
rename to apps/i2psnark/resources/themes/light/images/progressbar.gif
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/rateme.png b/apps/i2psnark/resources/themes/light/images/rateme.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/rateme.png
rename to apps/i2psnark/resources/themes/light/images/rateme.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/remove.png b/apps/i2psnark/resources/themes/light/images/remove.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/remove.png
rename to apps/i2psnark/resources/themes/light/images/remove.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/remove_hover.png b/apps/i2psnark/resources/themes/light/images/remove_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/remove_hover.png
rename to apps/i2psnark/resources/themes/light/images/remove_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/seeding.png b/apps/i2psnark/resources/themes/light/images/seeding.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/seeding.png
rename to apps/i2psnark/resources/themes/light/images/seeding.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/showpeers.png b/apps/i2psnark/resources/themes/light/images/showpeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/showpeers.png
rename to apps/i2psnark/resources/themes/light/images/showpeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/size.png b/apps/i2psnark/resources/themes/light/images/size.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/size.png
rename to apps/i2psnark/resources/themes/light/images/size.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/snark_add.png b/apps/i2psnark/resources/themes/light/images/snark_add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/snark_add.png
rename to apps/i2psnark/resources/themes/light/images/snark_add.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/snark_create.png b/apps/i2psnark/resources/themes/light/images/snark_create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/snark_create.png
rename to apps/i2psnark/resources/themes/light/images/snark_create.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/stalled.png b/apps/i2psnark/resources/themes/light/images/stalled.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/stalled.png
rename to apps/i2psnark/resources/themes/light/images/stalled.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/start.png b/apps/i2psnark/resources/themes/light/images/start.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/start.png
rename to apps/i2psnark/resources/themes/light/images/start.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/start_all.png b/apps/i2psnark/resources/themes/light/images/start_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/start_all.png
rename to apps/i2psnark/resources/themes/light/images/start_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/start_all_hover.png b/apps/i2psnark/resources/themes/light/images/start_all_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/start_all_hover.png
rename to apps/i2psnark/resources/themes/light/images/start_all_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/start_hover.png b/apps/i2psnark/resources/themes/light/images/start_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/start_hover.png
rename to apps/i2psnark/resources/themes/light/images/start_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/status.png b/apps/i2psnark/resources/themes/light/images/status.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/status.png
rename to apps/i2psnark/resources/themes/light/images/status.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/stop.png b/apps/i2psnark/resources/themes/light/images/stop.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/stop.png
rename to apps/i2psnark/resources/themes/light/images/stop.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/stop_all.png b/apps/i2psnark/resources/themes/light/images/stop_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/stop_all.png
rename to apps/i2psnark/resources/themes/light/images/stop_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/stop_all_hover.png b/apps/i2psnark/resources/themes/light/images/stop_all_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/stop_all_hover.png
rename to apps/i2psnark/resources/themes/light/images/stop_all_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/stop_hover.png b/apps/i2psnark/resources/themes/light/images/stop_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/stop_hover.png
rename to apps/i2psnark/resources/themes/light/images/stop_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/stopped.png b/apps/i2psnark/resources/themes/light/images/stopped.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/stopped.png
rename to apps/i2psnark/resources/themes/light/images/stopped.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/torrent.png b/apps/i2psnark/resources/themes/light/images/torrent.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/torrent.png
rename to apps/i2psnark/resources/themes/light/images/torrent.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/trackererror.png b/apps/i2psnark/resources/themes/light/images/trackererror.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/trackererror.png
rename to apps/i2psnark/resources/themes/light/images/trackererror.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/images/up.png b/apps/i2psnark/resources/themes/light/images/up.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/images/up.png
rename to apps/i2psnark/resources/themes/light/images/up.png
diff --git a/apps/routerconsole/jsp/themes/snark/light/nocollapse.css b/apps/i2psnark/resources/themes/light/nocollapse.css
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/light/nocollapse.css
rename to apps/i2psnark/resources/themes/light/nocollapse.css
diff --git a/apps/routerconsole/jsp/themes/snark/light/snark.css b/apps/i2psnark/resources/themes/light/snark.css
similarity index 99%
rename from apps/routerconsole/jsp/themes/snark/light/snark.css
rename to apps/i2psnark/resources/themes/light/snark.css
index 33dfa1497500e5debc3d24539424c13c5a4663eb..b9958f1ef9727d58339da4a53d8bd747699e9993 100644
--- a/apps/routerconsole/jsp/themes/snark/light/snark.css
+++ b/apps/i2psnark/resources/themes/light/snark.css
@@ -1661,7 +1661,7 @@ code, tt {
 .trackerconfig th:first-child {
      border-radius: 2px 0 0 2px;
      border-left: 1px solid #339;
-     background: url(/themes/snark/light/images/delete.png) center right 8px no-repeat, linear-gradient(to bottom, #fff 50%, #eef 51%, #eef 100%);
+     background: url(images/delete.png) center right 8px no-repeat, linear-gradient(to bottom, #fff 50%, #eef 51%, #eef 100%);
 }
 
 .trackerconfig th:last-child {
@@ -1957,15 +1957,15 @@ hr.debug:last-child {
 }
 
 .priorityHigh {
-     background: url(/themes/snark/light/images/icons/clock_red.png) left 24px center no-repeat;
+     background: url(images/icons/clock_red.png) left 24px center no-repeat;
 }
 
 .priorityNormal {
-     background: url(/themes/snark/light/images/icons/clock.png) left 24px center no-repeat;
+     background: url(images/icons/clock.png) left 24px center no-repeat;
 }
 
 .prioritySkip {
-     background: url(/themes/snark/light/images/icons/cancel.png) left 22px center no-repeat;
+     background: url(images/icons/cancel.png) left 22px center no-repeat;
 }
 
 /* end priorities */
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/favicon.ico b/apps/i2psnark/resources/themes/ubergine/favicon.ico
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/favicon.ico
rename to apps/i2psnark/resources/themes/ubergine/favicon.ico
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/accept.png b/apps/i2psnark/resources/themes/ubergine/images/accept.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/accept.png
rename to apps/i2psnark/resources/themes/ubergine/images/accept.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/add.png b/apps/i2psnark/resources/themes/ubergine/images/add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/add.png
rename to apps/i2psnark/resources/themes/ubergine/images/add.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/author.png b/apps/i2psnark/resources/themes/ubergine/images/author.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/author.png
rename to apps/i2psnark/resources/themes/ubergine/images/author.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/btn_stop.png b/apps/i2psnark/resources/themes/ubergine/images/btn_stop.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/btn_stop.png
rename to apps/i2psnark/resources/themes/ubergine/images/btn_stop.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/bullet.png b/apps/i2psnark/resources/themes/ubergine/images/bullet.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/bullet.png
rename to apps/i2psnark/resources/themes/ubergine/images/bullet.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum.png b/apps/i2psnark/resources/themes/ubergine/images/button_forum.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_forum.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_active.png b/apps/i2psnark/resources/themes/ubergine/images/button_forum_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_active.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_forum_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_hover.png b/apps/i2psnark/resources/themes/ubergine/images/button_forum_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_forum_hover.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_forum_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark.png b/apps/i2psnark/resources/themes/ubergine/images/button_snark.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_snark.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_active.png b/apps/i2psnark/resources/themes/ubergine/images/button_snark_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_active.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_snark_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_hover.png b/apps/i2psnark/resources/themes/ubergine/images/button_snark_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_snark_hover.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_snark_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker.png b/apps/i2psnark/resources/themes/ubergine/images/button_tracker.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_tracker.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_active.png b/apps/i2psnark/resources/themes/ubergine/images/button_tracker_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_active.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_tracker_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_hover.png b/apps/i2psnark/resources/themes/ubergine/images/button_tracker_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/button_tracker_hover.png
rename to apps/i2psnark/resources/themes/ubergine/images/button_tracker_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/cancel.png b/apps/i2psnark/resources/themes/ubergine/images/cancel.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/cancel.png
rename to apps/i2psnark/resources/themes/ubergine/images/cancel.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/clock.png b/apps/i2psnark/resources/themes/ubergine/images/clock.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/clock.png
rename to apps/i2psnark/resources/themes/ubergine/images/clock.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/comment.png b/apps/i2psnark/resources/themes/ubergine/images/comment.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/comment.png
rename to apps/i2psnark/resources/themes/ubergine/images/comment.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/complete.png b/apps/i2psnark/resources/themes/ubergine/images/complete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/complete.png
rename to apps/i2psnark/resources/themes/ubergine/images/complete.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/config.png b/apps/i2psnark/resources/themes/ubergine/images/config.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/config.png
rename to apps/i2psnark/resources/themes/ubergine/images/config.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/configuration.png b/apps/i2psnark/resources/themes/ubergine/images/configuration.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/configuration.png
rename to apps/i2psnark/resources/themes/ubergine/images/configuration.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/create.png b/apps/i2psnark/resources/themes/ubergine/images/create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/create.png
rename to apps/i2psnark/resources/themes/ubergine/images/create.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/debug.png b/apps/i2psnark/resources/themes/ubergine/images/debug.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/debug.png
rename to apps/i2psnark/resources/themes/ubergine/images/debug.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/delete.png b/apps/i2psnark/resources/themes/ubergine/images/delete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/delete.png
rename to apps/i2psnark/resources/themes/ubergine/images/delete.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/details.png b/apps/i2psnark/resources/themes/ubergine/images/details.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/details.png
rename to apps/i2psnark/resources/themes/ubergine/images/details.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/downloading.png b/apps/i2psnark/resources/themes/ubergine/images/downloading.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/downloading.png
rename to apps/i2psnark/resources/themes/ubergine/images/downloading.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown.png b/apps/i2psnark/resources/themes/ubergine/images/dropdown.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown.png
rename to apps/i2psnark/resources/themes/ubergine/images/dropdown.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown_hover.png b/apps/i2psnark/resources/themes/ubergine/images/dropdown_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/dropdown_hover.png
rename to apps/i2psnark/resources/themes/ubergine/images/dropdown_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/eta.png b/apps/i2psnark/resources/themes/ubergine/images/eta.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/eta.png
rename to apps/i2psnark/resources/themes/ubergine/images/eta.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/file.png b/apps/i2psnark/resources/themes/ubergine/images/file.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/file.png
rename to apps/i2psnark/resources/themes/ubergine/images/file.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/first.png b/apps/i2psnark/resources/themes/ubergine/images/first.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/first.png
rename to apps/i2psnark/resources/themes/ubergine/images/first.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/graytile.png b/apps/i2psnark/resources/themes/ubergine/images/graytile.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/graytile.png
rename to apps/i2psnark/resources/themes/ubergine/images/graytile.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/head_rx.png b/apps/i2psnark/resources/themes/ubergine/images/head_rx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/head_rx.png
rename to apps/i2psnark/resources/themes/ubergine/images/head_rx.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/head_rxspeed.png b/apps/i2psnark/resources/themes/ubergine/images/head_rxspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/head_rxspeed.png
rename to apps/i2psnark/resources/themes/ubergine/images/head_rxspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/head_tx.png b/apps/i2psnark/resources/themes/ubergine/images/head_tx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/head_tx.png
rename to apps/i2psnark/resources/themes/ubergine/images/head_tx.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/head_txspeed.png b/apps/i2psnark/resources/themes/ubergine/images/head_txspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/head_txspeed.png
rename to apps/i2psnark/resources/themes/ubergine/images/head_txspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/hidepeers.png b/apps/i2psnark/resources/themes/ubergine/images/hidepeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/hidepeers.png
rename to apps/i2psnark/resources/themes/ubergine/images/hidepeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/infocircle.png b/apps/i2psnark/resources/themes/ubergine/images/infocircle.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/infocircle.png
rename to apps/i2psnark/resources/themes/ubergine/images/infocircle.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/last.png b/apps/i2psnark/resources/themes/ubergine/images/last.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/last.png
rename to apps/i2psnark/resources/themes/ubergine/images/last.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/next.png b/apps/i2psnark/resources/themes/ubergine/images/next.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/next.png
rename to apps/i2psnark/resources/themes/ubergine/images/next.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/nopeers.png b/apps/i2psnark/resources/themes/ubergine/images/nopeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/nopeers.png
rename to apps/i2psnark/resources/themes/ubergine/images/nopeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/nuke.png b/apps/i2psnark/resources/themes/ubergine/images/nuke.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/nuke.png
rename to apps/i2psnark/resources/themes/ubergine/images/nuke.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/peer.png b/apps/i2psnark/resources/themes/ubergine/images/peer.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/peer.png
rename to apps/i2psnark/resources/themes/ubergine/images/peer.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/previous.png b/apps/i2psnark/resources/themes/ubergine/images/previous.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/previous.png
rename to apps/i2psnark/resources/themes/ubergine/images/previous.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/priority.png b/apps/i2psnark/resources/themes/ubergine/images/priority.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/priority.png
rename to apps/i2psnark/resources/themes/ubergine/images/priority.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/progressbar.gif b/apps/i2psnark/resources/themes/ubergine/images/progressbar.gif
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/progressbar.gif
rename to apps/i2psnark/resources/themes/ubergine/images/progressbar.gif
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/rateme.png b/apps/i2psnark/resources/themes/ubergine/images/rateme.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/rateme.png
rename to apps/i2psnark/resources/themes/ubergine/images/rateme.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/recheck.png b/apps/i2psnark/resources/themes/ubergine/images/recheck.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/recheck.png
rename to apps/i2psnark/resources/themes/ubergine/images/recheck.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/remove.png b/apps/i2psnark/resources/themes/ubergine/images/remove.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/remove.png
rename to apps/i2psnark/resources/themes/ubergine/images/remove.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/restore.png b/apps/i2psnark/resources/themes/ubergine/images/restore.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/restore.png
rename to apps/i2psnark/resources/themes/ubergine/images/restore.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/seeding.png b/apps/i2psnark/resources/themes/ubergine/images/seeding.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/seeding.png
rename to apps/i2psnark/resources/themes/ubergine/images/seeding.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/showpeers.png b/apps/i2psnark/resources/themes/ubergine/images/showpeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/showpeers.png
rename to apps/i2psnark/resources/themes/ubergine/images/showpeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/size.png b/apps/i2psnark/resources/themes/ubergine/images/size.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/size.png
rename to apps/i2psnark/resources/themes/ubergine/images/size.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/snark_add.png b/apps/i2psnark/resources/themes/ubergine/images/snark_add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/snark_add.png
rename to apps/i2psnark/resources/themes/ubergine/images/snark_add.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/snark_create.png b/apps/i2psnark/resources/themes/ubergine/images/snark_create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/snark_create.png
rename to apps/i2psnark/resources/themes/ubergine/images/snark_create.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav.png b/apps/i2psnark/resources/themes/ubergine/images/snarknav.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav.png
rename to apps/i2psnark/resources/themes/ubergine/images/snarknav.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_lowlight.png b/apps/i2psnark/resources/themes/ubergine/images/snarknav_lowlight.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_lowlight.png
rename to apps/i2psnark/resources/themes/ubergine/images/snarknav_lowlight.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_on.png b/apps/i2psnark/resources/themes/ubergine/images/snarknav_on.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/snarknav_on.png
rename to apps/i2psnark/resources/themes/ubergine/images/snarknav_on.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/stalled.png b/apps/i2psnark/resources/themes/ubergine/images/stalled.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/stalled.png
rename to apps/i2psnark/resources/themes/ubergine/images/stalled.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/start.png b/apps/i2psnark/resources/themes/ubergine/images/start.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/start.png
rename to apps/i2psnark/resources/themes/ubergine/images/start.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/start_all.png b/apps/i2psnark/resources/themes/ubergine/images/start_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/start_all.png
rename to apps/i2psnark/resources/themes/ubergine/images/start_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/status.png b/apps/i2psnark/resources/themes/ubergine/images/status.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/status.png
rename to apps/i2psnark/resources/themes/ubergine/images/status.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/stop.png b/apps/i2psnark/resources/themes/ubergine/images/stop.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/stop.png
rename to apps/i2psnark/resources/themes/ubergine/images/stop.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/stop_all.png b/apps/i2psnark/resources/themes/ubergine/images/stop_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/stop_all.png
rename to apps/i2psnark/resources/themes/ubergine/images/stop_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/stopped.png b/apps/i2psnark/resources/themes/ubergine/images/stopped.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/stopped.png
rename to apps/i2psnark/resources/themes/ubergine/images/stopped.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/tile2.png b/apps/i2psnark/resources/themes/ubergine/images/tile2.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/tile2.png
rename to apps/i2psnark/resources/themes/ubergine/images/tile2.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/torrent.png b/apps/i2psnark/resources/themes/ubergine/images/torrent.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/torrent.png
rename to apps/i2psnark/resources/themes/ubergine/images/torrent.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/trackererror.png b/apps/i2psnark/resources/themes/ubergine/images/trackererror.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/trackererror.png
rename to apps/i2psnark/resources/themes/ubergine/images/trackererror.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/images/up.png b/apps/i2psnark/resources/themes/ubergine/images/up.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/images/up.png
rename to apps/i2psnark/resources/themes/ubergine/images/up.png
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/nocollapse.css b/apps/i2psnark/resources/themes/ubergine/nocollapse.css
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/ubergine/nocollapse.css
rename to apps/i2psnark/resources/themes/ubergine/nocollapse.css
diff --git a/apps/routerconsole/jsp/themes/snark/ubergine/snark.css b/apps/i2psnark/resources/themes/ubergine/snark.css
similarity index 99%
rename from apps/routerconsole/jsp/themes/snark/ubergine/snark.css
rename to apps/i2psnark/resources/themes/ubergine/snark.css
index f6eff1ce22ce8cfcb6c4ca54cba9541597b26f95..3217e9c67793f387c23281d6e52cc108f7f4eb97 100644
--- a/apps/routerconsole/jsp/themes/snark/ubergine/snark.css
+++ b/apps/i2psnark/resources/themes/ubergine/snark.css
@@ -2920,7 +2920,7 @@ _:-ms-lang(x), .snarkNav:link, .snarkNav:visited {
      background-size: 15px auto, 100% 100% !important;
 }
 
-img[src="/themes/snark/ubergine/images/details.png"] {
+img[src="images/details.png"] {
      width: 14px;
      height: 14px;
 }
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/favicon.ico b/apps/i2psnark/resources/themes/vanilla/favicon.ico
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/favicon.ico
rename to apps/i2psnark/resources/themes/vanilla/favicon.ico
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/accept.png b/apps/i2psnark/resources/themes/vanilla/images/accept.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/accept.png
rename to apps/i2psnark/resources/themes/vanilla/images/accept.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/add.png b/apps/i2psnark/resources/themes/vanilla/images/add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/add.png
rename to apps/i2psnark/resources/themes/vanilla/images/add.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/author.png b/apps/i2psnark/resources/themes/vanilla/images/author.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/author.png
rename to apps/i2psnark/resources/themes/vanilla/images/author.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/btn_stop.png b/apps/i2psnark/resources/themes/vanilla/images/btn_stop.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/btn_stop.png
rename to apps/i2psnark/resources/themes/vanilla/images/btn_stop.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/bullet.png b/apps/i2psnark/resources/themes/vanilla/images/bullet.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/bullet.png
rename to apps/i2psnark/resources/themes/vanilla/images/bullet.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum.png b/apps/i2psnark/resources/themes/vanilla/images/button_forum.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_forum.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_active.png b/apps/i2psnark/resources/themes/vanilla/images/button_forum_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_active.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_forum_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_hover.png b/apps/i2psnark/resources/themes/vanilla/images/button_forum_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_forum_hover.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_forum_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark.png b/apps/i2psnark/resources/themes/vanilla/images/button_snark.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_snark.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_active.png b/apps/i2psnark/resources/themes/vanilla/images/button_snark_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_active.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_snark_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_hover.png b/apps/i2psnark/resources/themes/vanilla/images/button_snark_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_snark_hover.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_snark_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker.png b/apps/i2psnark/resources/themes/vanilla/images/button_tracker.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_tracker.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_active.png b/apps/i2psnark/resources/themes/vanilla/images/button_tracker_active.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_active.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_tracker_active.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_hover.png b/apps/i2psnark/resources/themes/vanilla/images/button_tracker_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/button_tracker_hover.png
rename to apps/i2psnark/resources/themes/vanilla/images/button_tracker_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/clock.png b/apps/i2psnark/resources/themes/vanilla/images/clock.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/clock.png
rename to apps/i2psnark/resources/themes/vanilla/images/clock.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/comment.png b/apps/i2psnark/resources/themes/vanilla/images/comment.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/comment.png
rename to apps/i2psnark/resources/themes/vanilla/images/comment.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/complete.png b/apps/i2psnark/resources/themes/vanilla/images/complete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/complete.png
rename to apps/i2psnark/resources/themes/vanilla/images/complete.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/config.png b/apps/i2psnark/resources/themes/vanilla/images/config.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/config.png
rename to apps/i2psnark/resources/themes/vanilla/images/config.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/configuration.png b/apps/i2psnark/resources/themes/vanilla/images/configuration.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/configuration.png
rename to apps/i2psnark/resources/themes/vanilla/images/configuration.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/create.png b/apps/i2psnark/resources/themes/vanilla/images/create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/create.png
rename to apps/i2psnark/resources/themes/vanilla/images/create.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/debug.png b/apps/i2psnark/resources/themes/vanilla/images/debug.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/debug.png
rename to apps/i2psnark/resources/themes/vanilla/images/debug.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/delete.png b/apps/i2psnark/resources/themes/vanilla/images/delete.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/delete.png
rename to apps/i2psnark/resources/themes/vanilla/images/delete.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/details.png b/apps/i2psnark/resources/themes/vanilla/images/details.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/details.png
rename to apps/i2psnark/resources/themes/vanilla/images/details.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/downloading.png b/apps/i2psnark/resources/themes/vanilla/images/downloading.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/downloading.png
rename to apps/i2psnark/resources/themes/vanilla/images/downloading.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown.png b/apps/i2psnark/resources/themes/vanilla/images/dropdown.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown.png
rename to apps/i2psnark/resources/themes/vanilla/images/dropdown.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown_hover.png b/apps/i2psnark/resources/themes/vanilla/images/dropdown_hover.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/dropdown_hover.png
rename to apps/i2psnark/resources/themes/vanilla/images/dropdown_hover.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/eta.png b/apps/i2psnark/resources/themes/vanilla/images/eta.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/eta.png
rename to apps/i2psnark/resources/themes/vanilla/images/eta.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/file.png b/apps/i2psnark/resources/themes/vanilla/images/file.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/file.png
rename to apps/i2psnark/resources/themes/vanilla/images/file.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/first.png b/apps/i2psnark/resources/themes/vanilla/images/first.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/first.png
rename to apps/i2psnark/resources/themes/vanilla/images/first.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/head_rx.png b/apps/i2psnark/resources/themes/vanilla/images/head_rx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/head_rx.png
rename to apps/i2psnark/resources/themes/vanilla/images/head_rx.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/head_rxspeed.png b/apps/i2psnark/resources/themes/vanilla/images/head_rxspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/head_rxspeed.png
rename to apps/i2psnark/resources/themes/vanilla/images/head_rxspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/head_tx.png b/apps/i2psnark/resources/themes/vanilla/images/head_tx.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/head_tx.png
rename to apps/i2psnark/resources/themes/vanilla/images/head_tx.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/head_txspeed.png b/apps/i2psnark/resources/themes/vanilla/images/head_txspeed.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/head_txspeed.png
rename to apps/i2psnark/resources/themes/vanilla/images/head_txspeed.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/hidepeers.png b/apps/i2psnark/resources/themes/vanilla/images/hidepeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/hidepeers.png
rename to apps/i2psnark/resources/themes/vanilla/images/hidepeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/infocircle.png b/apps/i2psnark/resources/themes/vanilla/images/infocircle.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/infocircle.png
rename to apps/i2psnark/resources/themes/vanilla/images/infocircle.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/last.png b/apps/i2psnark/resources/themes/vanilla/images/last.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/last.png
rename to apps/i2psnark/resources/themes/vanilla/images/last.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/next.png b/apps/i2psnark/resources/themes/vanilla/images/next.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/next.png
rename to apps/i2psnark/resources/themes/vanilla/images/next.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/nopeers.png b/apps/i2psnark/resources/themes/vanilla/images/nopeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/nopeers.png
rename to apps/i2psnark/resources/themes/vanilla/images/nopeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/nuke.png b/apps/i2psnark/resources/themes/vanilla/images/nuke.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/nuke.png
rename to apps/i2psnark/resources/themes/vanilla/images/nuke.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/peer.png b/apps/i2psnark/resources/themes/vanilla/images/peer.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/peer.png
rename to apps/i2psnark/resources/themes/vanilla/images/peer.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/previous.png b/apps/i2psnark/resources/themes/vanilla/images/previous.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/previous.png
rename to apps/i2psnark/resources/themes/vanilla/images/previous.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/priority.png b/apps/i2psnark/resources/themes/vanilla/images/priority.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/priority.png
rename to apps/i2psnark/resources/themes/vanilla/images/priority.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/progressbar.gif b/apps/i2psnark/resources/themes/vanilla/images/progressbar.gif
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/progressbar.gif
rename to apps/i2psnark/resources/themes/vanilla/images/progressbar.gif
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/rateme.png b/apps/i2psnark/resources/themes/vanilla/images/rateme.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/rateme.png
rename to apps/i2psnark/resources/themes/vanilla/images/rateme.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/recheck.png b/apps/i2psnark/resources/themes/vanilla/images/recheck.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/recheck.png
rename to apps/i2psnark/resources/themes/vanilla/images/recheck.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/remove.png b/apps/i2psnark/resources/themes/vanilla/images/remove.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/remove.png
rename to apps/i2psnark/resources/themes/vanilla/images/remove.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/restore.png b/apps/i2psnark/resources/themes/vanilla/images/restore.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/restore.png
rename to apps/i2psnark/resources/themes/vanilla/images/restore.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/seeding.png b/apps/i2psnark/resources/themes/vanilla/images/seeding.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/seeding.png
rename to apps/i2psnark/resources/themes/vanilla/images/seeding.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/showpeers.png b/apps/i2psnark/resources/themes/vanilla/images/showpeers.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/showpeers.png
rename to apps/i2psnark/resources/themes/vanilla/images/showpeers.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/size.png b/apps/i2psnark/resources/themes/vanilla/images/size.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/size.png
rename to apps/i2psnark/resources/themes/vanilla/images/size.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/snark_add.png b/apps/i2psnark/resources/themes/vanilla/images/snark_add.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/snark_add.png
rename to apps/i2psnark/resources/themes/vanilla/images/snark_add.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/snark_create.png b/apps/i2psnark/resources/themes/vanilla/images/snark_create.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/snark_create.png
rename to apps/i2psnark/resources/themes/vanilla/images/snark_create.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/stalled.png b/apps/i2psnark/resources/themes/vanilla/images/stalled.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/stalled.png
rename to apps/i2psnark/resources/themes/vanilla/images/stalled.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/start.png b/apps/i2psnark/resources/themes/vanilla/images/start.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/start.png
rename to apps/i2psnark/resources/themes/vanilla/images/start.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/start_all.png b/apps/i2psnark/resources/themes/vanilla/images/start_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/start_all.png
rename to apps/i2psnark/resources/themes/vanilla/images/start_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/status.png b/apps/i2psnark/resources/themes/vanilla/images/status.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/status.png
rename to apps/i2psnark/resources/themes/vanilla/images/status.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/stop.png b/apps/i2psnark/resources/themes/vanilla/images/stop.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/stop.png
rename to apps/i2psnark/resources/themes/vanilla/images/stop.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/stop_all.png b/apps/i2psnark/resources/themes/vanilla/images/stop_all.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/stop_all.png
rename to apps/i2psnark/resources/themes/vanilla/images/stop_all.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/stopped.png b/apps/i2psnark/resources/themes/vanilla/images/stopped.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/stopped.png
rename to apps/i2psnark/resources/themes/vanilla/images/stopped.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/tile2.png b/apps/i2psnark/resources/themes/vanilla/images/tile2.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/tile2.png
rename to apps/i2psnark/resources/themes/vanilla/images/tile2.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/torrent.png b/apps/i2psnark/resources/themes/vanilla/images/torrent.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/torrent.png
rename to apps/i2psnark/resources/themes/vanilla/images/torrent.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/torrent0.png b/apps/i2psnark/resources/themes/vanilla/images/torrent0.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/torrent0.png
rename to apps/i2psnark/resources/themes/vanilla/images/torrent0.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/trackererror.png b/apps/i2psnark/resources/themes/vanilla/images/trackererror.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/trackererror.png
rename to apps/i2psnark/resources/themes/vanilla/images/trackererror.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/images/up.png b/apps/i2psnark/resources/themes/vanilla/images/up.png
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/images/up.png
rename to apps/i2psnark/resources/themes/vanilla/images/up.png
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/nocollapse.css b/apps/i2psnark/resources/themes/vanilla/nocollapse.css
similarity index 100%
rename from apps/routerconsole/jsp/themes/snark/vanilla/nocollapse.css
rename to apps/i2psnark/resources/themes/vanilla/nocollapse.css
diff --git a/apps/routerconsole/jsp/themes/snark/vanilla/snark.css b/apps/i2psnark/resources/themes/vanilla/snark.css
similarity index 99%
rename from apps/routerconsole/jsp/themes/snark/vanilla/snark.css
rename to apps/i2psnark/resources/themes/vanilla/snark.css
index 04198dfc9598aa4983fc8c0dae2ce38f2d5dce70..5340a9219fa8041e6828ec81a140c93354ef1500 100644
--- a/apps/routerconsole/jsp/themes/snark/vanilla/snark.css
+++ b/apps/i2psnark/resources/themes/vanilla/snark.css
@@ -1769,8 +1769,8 @@ img[src$="details.png"] {
 }
 
 .configsectionpanel {
-     background: #dfd7d1 url(/themes/snark/ubergine/images/configuration.png) no-repeat scroll right center;
-     background: url(/themes/snark/ubergine/images/configuration.png) no-repeat scroll right center, linear-gradient(to bottom, #dfd7d1, #cfc7c2);
+     background: #dfd7d1 url(images/configuration.png) no-repeat scroll right center;
+     background: url(images/configuration.png) no-repeat scroll right center, linear-gradient(to bottom, #dfd7d1, #cfc7c2);
      background-size: 84px 82px, 100% 100%;
 }