diff --git a/lib/functions/output/function.buildNavigation.php b/lib/functions/output/function.buildNavigation.php
index 7e88925b..14cfe7a8 100644
--- a/lib/functions/output/function.buildNavigation.php
+++ b/lib/functions/output/function.buildNavigation.php
@@ -28,6 +28,8 @@
 
 function buildNavigation($navigation, $userinfo)
 {
+	global $theme;
+
 	$returnvalue = '';
 	
 	foreach($navigation as $box)
diff --git a/templates/Classic/js/excanvas.min.js b/templates/Classic/assets/js/excanvas.min.js
similarity index 100%
rename from templates/Classic/js/excanvas.min.js
rename to templates/Classic/assets/js/excanvas.min.js
diff --git a/templates/Classic/js/jquery-ui-1.8.13.min.js b/templates/Classic/assets/js/jquery-ui-1.8.13.min.js
similarity index 100%
rename from templates/Classic/js/jquery-ui-1.8.13.min.js
rename to templates/Classic/assets/js/jquery-ui-1.8.13.min.js
diff --git a/templates/Classic/js/jquery-ui.min.js b/templates/Classic/assets/js/jquery-ui.min.js
similarity index 100%
rename from templates/Classic/js/jquery-ui.min.js
rename to templates/Classic/assets/js/jquery-ui.min.js
diff --git a/templates/Classic/js/jquery.jqplot.min.js b/templates/Classic/assets/js/jquery.jqplot.min.js
similarity index 100%
rename from templates/Classic/js/jquery.jqplot.min.js
rename to templates/Classic/assets/js/jquery.jqplot.min.js
diff --git a/templates/Classic/js/jquery.min.js b/templates/Classic/assets/js/jquery.min.js
similarity index 100%
rename from templates/Classic/js/jquery.min.js
rename to templates/Classic/assets/js/jquery.min.js
diff --git a/templates/Classic/js/jquery.tablesorter.min.js b/templates/Classic/assets/js/jquery.tablesorter.min.js
similarity index 100%
rename from templates/Classic/js/jquery.tablesorter.min.js
rename to templates/Classic/assets/js/jquery.tablesorter.min.js
diff --git a/templates/Classic/js/main.js b/templates/Classic/assets/js/main.js
similarity index 100%
rename from templates/Classic/js/main.js
rename to templates/Classic/assets/js/main.js
diff --git a/templates/Classic/js/plugins/jqplot.BezierCurveRenderer.js b/templates/Classic/assets/js/plugins/jqplot.BezierCurveRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.BezierCurveRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.BezierCurveRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.BezierCurveRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.BezierCurveRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.BezierCurveRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.BezierCurveRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.barRenderer.js b/templates/Classic/assets/js/plugins/jqplot.barRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.barRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.barRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.barRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.barRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.barRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.barRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.blockRenderer.js b/templates/Classic/assets/js/plugins/jqplot.blockRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.blockRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.blockRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.blockRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.blockRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.blockRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.blockRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.bubbleRenderer.js b/templates/Classic/assets/js/plugins/jqplot.bubbleRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.bubbleRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.bubbleRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.bubbleRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.bubbleRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.bubbleRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.bubbleRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasAxisLabelRenderer.js b/templates/Classic/assets/js/plugins/jqplot.canvasAxisLabelRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasAxisLabelRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasAxisLabelRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasAxisLabelRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.canvasAxisLabelRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasAxisLabelRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasAxisLabelRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasAxisTickRenderer.js b/templates/Classic/assets/js/plugins/jqplot.canvasAxisTickRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasAxisTickRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasAxisTickRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasAxisTickRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.canvasAxisTickRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasAxisTickRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasAxisTickRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasOverlay.js b/templates/Classic/assets/js/plugins/jqplot.canvasOverlay.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasOverlay.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasOverlay.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasOverlay.min.js b/templates/Classic/assets/js/plugins/jqplot.canvasOverlay.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasOverlay.min.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasOverlay.min.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasTextRenderer.js b/templates/Classic/assets/js/plugins/jqplot.canvasTextRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasTextRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasTextRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.canvasTextRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.canvasTextRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.canvasTextRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.canvasTextRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.categoryAxisRenderer.js b/templates/Classic/assets/js/plugins/jqplot.categoryAxisRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.categoryAxisRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.categoryAxisRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.categoryAxisRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.categoryAxisRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.categoryAxisRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.categoryAxisRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.ciParser.js b/templates/Classic/assets/js/plugins/jqplot.ciParser.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.ciParser.js
rename to templates/Classic/assets/js/plugins/jqplot.ciParser.js
diff --git a/templates/Classic/js/plugins/jqplot.ciParser.min.js b/templates/Classic/assets/js/plugins/jqplot.ciParser.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.ciParser.min.js
rename to templates/Classic/assets/js/plugins/jqplot.ciParser.min.js
diff --git a/templates/Classic/js/plugins/jqplot.cursor.js b/templates/Classic/assets/js/plugins/jqplot.cursor.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.cursor.js
rename to templates/Classic/assets/js/plugins/jqplot.cursor.js
diff --git a/templates/Classic/js/plugins/jqplot.cursor.min.js b/templates/Classic/assets/js/plugins/jqplot.cursor.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.cursor.min.js
rename to templates/Classic/assets/js/plugins/jqplot.cursor.min.js
diff --git a/templates/Classic/js/plugins/jqplot.dateAxisRenderer.js b/templates/Classic/assets/js/plugins/jqplot.dateAxisRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.dateAxisRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.dateAxisRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.dateAxisRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.dateAxisRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.dateAxisRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.dateAxisRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.donutRenderer.js b/templates/Classic/assets/js/plugins/jqplot.donutRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.donutRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.donutRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.donutRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.donutRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.donutRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.donutRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.dragable.js b/templates/Classic/assets/js/plugins/jqplot.dragable.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.dragable.js
rename to templates/Classic/assets/js/plugins/jqplot.dragable.js
diff --git a/templates/Classic/js/plugins/jqplot.dragable.min.js b/templates/Classic/assets/js/plugins/jqplot.dragable.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.dragable.min.js
rename to templates/Classic/assets/js/plugins/jqplot.dragable.min.js
diff --git a/templates/Classic/js/plugins/jqplot.enhancedLegendRenderer.js b/templates/Classic/assets/js/plugins/jqplot.enhancedLegendRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.enhancedLegendRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.enhancedLegendRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.enhancedLegendRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.enhancedLegendRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.enhancedLegendRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.enhancedLegendRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.funnelRenderer.js b/templates/Classic/assets/js/plugins/jqplot.funnelRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.funnelRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.funnelRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.funnelRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.funnelRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.funnelRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.funnelRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.highlighter.js b/templates/Classic/assets/js/plugins/jqplot.highlighter.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.highlighter.js
rename to templates/Classic/assets/js/plugins/jqplot.highlighter.js
diff --git a/templates/Classic/js/plugins/jqplot.highlighter.min.js b/templates/Classic/assets/js/plugins/jqplot.highlighter.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.highlighter.min.js
rename to templates/Classic/assets/js/plugins/jqplot.highlighter.min.js
diff --git a/templates/Classic/js/plugins/jqplot.json2.js b/templates/Classic/assets/js/plugins/jqplot.json2.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.json2.js
rename to templates/Classic/assets/js/plugins/jqplot.json2.js
diff --git a/templates/Classic/js/plugins/jqplot.json2.min.js b/templates/Classic/assets/js/plugins/jqplot.json2.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.json2.min.js
rename to templates/Classic/assets/js/plugins/jqplot.json2.min.js
diff --git a/templates/Classic/js/plugins/jqplot.logAxisRenderer.js b/templates/Classic/assets/js/plugins/jqplot.logAxisRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.logAxisRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.logAxisRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.logAxisRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.logAxisRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.logAxisRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.logAxisRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.mekkoAxisRenderer.js b/templates/Classic/assets/js/plugins/jqplot.mekkoAxisRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.mekkoAxisRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.mekkoAxisRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.mekkoAxisRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.mekkoAxisRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.mekkoAxisRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.mekkoAxisRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.mekkoRenderer.js b/templates/Classic/assets/js/plugins/jqplot.mekkoRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.mekkoRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.mekkoRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.mekkoRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.mekkoRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.mekkoRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.mekkoRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.meterGaugeRenderer.js b/templates/Classic/assets/js/plugins/jqplot.meterGaugeRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.meterGaugeRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.meterGaugeRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.meterGaugeRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.meterGaugeRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.meterGaugeRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.meterGaugeRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.ohlcRenderer.js b/templates/Classic/assets/js/plugins/jqplot.ohlcRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.ohlcRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.ohlcRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.ohlcRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.ohlcRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.ohlcRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.ohlcRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.pieRenderer.js b/templates/Classic/assets/js/plugins/jqplot.pieRenderer.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.pieRenderer.js
rename to templates/Classic/assets/js/plugins/jqplot.pieRenderer.js
diff --git a/templates/Classic/js/plugins/jqplot.pieRenderer.min.js b/templates/Classic/assets/js/plugins/jqplot.pieRenderer.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.pieRenderer.min.js
rename to templates/Classic/assets/js/plugins/jqplot.pieRenderer.min.js
diff --git a/templates/Classic/js/plugins/jqplot.pointLabels.js b/templates/Classic/assets/js/plugins/jqplot.pointLabels.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.pointLabels.js
rename to templates/Classic/assets/js/plugins/jqplot.pointLabels.js
diff --git a/templates/Classic/js/plugins/jqplot.pointLabels.min.js b/templates/Classic/assets/js/plugins/jqplot.pointLabels.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.pointLabels.min.js
rename to templates/Classic/assets/js/plugins/jqplot.pointLabels.min.js
diff --git a/templates/Classic/js/plugins/jqplot.trendline.js b/templates/Classic/assets/js/plugins/jqplot.trendline.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.trendline.js
rename to templates/Classic/assets/js/plugins/jqplot.trendline.js
diff --git a/templates/Classic/js/plugins/jqplot.trendline.min.js b/templates/Classic/assets/js/plugins/jqplot.trendline.min.js
similarity index 100%
rename from templates/Classic/js/plugins/jqplot.trendline.min.js
rename to templates/Classic/assets/js/plugins/jqplot.trendline.min.js
diff --git a/templates/Classic/js/traffic.js b/templates/Classic/assets/js/traffic.js
similarity index 100%
rename from templates/Classic/js/traffic.js
rename to templates/Classic/assets/js/traffic.js