diff --git a/source/css/Ox.UI.classic.css b/source/css/Ox.UI.classic.css
index 86c29d45..73b225b1 100644
--- a/source/css/Ox.UI.classic.css
+++ b/source/css/Ox.UI.classic.css
@@ -320,16 +320,16 @@ Scrollbars
     background: -webkit-gradient(linear, left top, right top, from(rgb(224, 224, 224)), to(rgb(192, 192, 192)));
 }
 .OxThemeClassic ::-webkit-scrollbar-button:horizontal:decrement {
-    background: url(../png/ox.ui.classic/scrollbarHorizontalDecrement.png);
+    background: url(../png/Ox.UI.classic/scrollbarHorizontalDecrement.png);
 }
 .OxThemeClassic ::-webkit-scrollbar-button:horizontal:increment {
-    background: url(../png/ox.ui.classic/scrollbarHorizontalIncrement.png);
+    background: url(../png/Ox.UI.classic/scrollbarHorizontalIncrement.png);
 }
 .OxThemeClassic ::-webkit-scrollbar-button:vertical:decrement {
-    background: url(../png/ox.ui.classic/scrollbarVerticalDecrement.png);
+    background: url(../png/Ox.UI.classic/scrollbarVerticalDecrement.png);
 }
 .OxThemeClassic ::-webkit-scrollbar-button:vertical:increment {
-    background: url(../png/ox.ui.classic/scrollbarVerticalIncrement.png);
+    background: url(../png/Ox.UI.classic/scrollbarVerticalIncrement.png);
 }
 .OxThemeClassic ::-webkit-scrollbar-corner {
     border-right: 1px solid rgb(176, 176, 176);
diff --git a/source/css/Ox.UI.modern.css b/source/css/Ox.UI.modern.css
index 5f2720b6..bacd914b 100644
--- a/source/css/Ox.UI.modern.css
+++ b/source/css/Ox.UI.modern.css
@@ -329,16 +329,16 @@ Scrollbars
     background: -webkit-gradient(linear, left top, right top, from(rgb(96, 96, 96)), to(rgb(64, 64, 64)));
 }
 .OxThemeModern ::-webkit-scrollbar-button:horizontal:decrement {
-    background: url(../png/ox.ui.modern/scrollbarHorizontalDecrement.png);
+    background: url(../png/Ox.UI.modern/scrollbarHorizontalDecrement.png);
 }
 .OxThemeModern ::-webkit-scrollbar-button:horizontal:increment {
-    background: url(../png/ox.ui.modern/scrollbarHorizontalIncrement.png);
+    background: url(../png/Ox.UI.modern/scrollbarHorizontalIncrement.png);
 }
 .OxThemeModern ::-webkit-scrollbar-button:vertical:decrement {
-    background: url(../png/ox.ui.modern/scrollbarVerticalDecrement.png);
+    background: url(../png/Ox.UI.modern/scrollbarVerticalDecrement.png);
 }
 .OxThemeModern ::-webkit-scrollbar-button:vertical:increment {
-    background: url(../png/ox.ui.modern/scrollbarVerticalIncrement.png);
+    background: url(../png/Ox.UI.modern/scrollbarVerticalIncrement.png);
 }
 .OxThemeModern ::-webkit-scrollbar-corner {
     border-right: 1px solid rgb(48, 48, 48);
diff --git a/source/js/Ox.UI/Core/Ox.Theme.js b/source/js/Ox.UI/Core/Ox.Theme.js
index 199ea017..42fc3f51 100644
--- a/source/js/Ox.UI/Core/Ox.Theme.js
+++ b/source/js/Ox.UI/Core/Ox.Theme.js
@@ -35,7 +35,7 @@ Ox.Theme = function(theme) {
                 var $this = $(this);
                 $this.attr({
                     src: $this.attr('src')
-                        .replace('ox.ui.' + currentTheme, 'ox.ui.' + theme)
+                        .replace('Ox.UI.' + currentTheme, 'Ox.UI.' + theme)
                 });
             });
         }
diff --git a/source/js/Ox.UI/List/Ox.IconItem.js b/source/js/Ox.UI/List/Ox.IconItem.js
index 0ed31020..d3666c61 100644
--- a/source/js/Ox.UI/List/Ox.IconItem.js
+++ b/source/js/Ox.UI/List/Ox.IconItem.js
@@ -21,7 +21,7 @@ Ox.IconItem = function(options, self) {
         height: self.options.size * 1.5,
         lineLength: self.options.size == 64 ? 15 : 23,
         lines: self.options.size == 64 ? 4 : 5,
-        url: Ox.UI.PATH + '/png/ox.ui/transparent.png',
+        url: Ox.PATH + '/png/Ox.UI/transparent.png',
         width: self.options.size
     });
     self.title = formatText(self.options.title, self.lines - 1, self.lineLength);
diff --git a/source/js/Ox.UI/List/Ox.ListMap.js b/source/js/Ox.UI/List/Ox.ListMap.js
index 47067be5..a6cd4b7e 100644
--- a/source/js/Ox.UI/List/Ox.ListMap.js
+++ b/source/js/Ox.UI/List/Ox.ListMap.js
@@ -48,7 +48,7 @@ Ox.ListMap = function(options, self) {
                 return $('<img>')
                     .attr({
                         // fixme: not the right place to do these
-                        src: Ox.UI.PATH + 'svg/ox.map/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg')
+                        src: Ox.PATH + 'svg/ox.map/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg')
                     })
                     .load(function() {
                         $(this).css({
diff --git a/source/js/Ox.UI/Map/Ox.MapImage.js b/source/js/Ox.UI/Map/Ox.MapImage.js
index 4e94a3a1..a2369a21 100644
--- a/source/js/Ox.UI/Map/Ox.MapImage.js
+++ b/source/js/Ox.UI/Map/Ox.MapImage.js
@@ -46,7 +46,7 @@ Ox.MapImage = function(options, self) {
         Ox.forEach(self.markers, function(markers, k) {
             if (markers.length) {
                 self.src += '&markers=icon:' + 'http://dev.pan.do:8000' +
-                    Ox.UI.PATH + 'png/ox.map/marker' +
+                    Ox.PATH + 'png/ox.map/marker' +
                     Ox.toTitleCase(self.options['markerColor' + Ox.toTitleCase(k)]) +
                     '.png|' + markers.join('|')
             }
diff --git a/source/js/Ox.UI/Map/Ox.MapMarker.js b/source/js/Ox.UI/Map/Ox.MapMarker.js
index c538e12a..300d6093 100644
--- a/source/js/Ox.UI/Map/Ox.MapMarker.js
+++ b/source/js/Ox.UI/Map/Ox.MapMarker.js
@@ -77,7 +77,7 @@ Ox.MapMarker = function(options) {
             cursor: that.place.editing ? 'move' : 'pointer',
             draggable: that.place.editing,
             icon: new google.maps.MarkerImage(
-                Ox.UI.PATH + 'png/ox.map/marker' +
+                Ox.PATH + 'png/ox.map/marker' +
                     (that.place.id[0] == '_' ? 'Result' : '') +
                     (that.place.editing ? 'Editing' : (
                         that.place.selected ? 'Selected' : ''
diff --git a/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js b/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js
index c6c08d7f..ce2ffbf4 100644
--- a/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js
+++ b/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js
@@ -17,7 +17,7 @@ Ox.MapRectangleMarker = function(options, self) {
         cursor: that.position + '-resize',
         draggable: true,
         icon: new google.maps.MarkerImage(
-            Ox.UI.PATH + 'png/ox.map/markerResize.png',
+            Ox.PATH + 'png/ox.map/markerResize.png',
             new google.maps.Size(16, 16),
             new google.maps.Point(0, 0),
             new google.maps.Point(8, 8)
diff --git a/source/js/Ox.UI/Ox.UI.js b/source/js/Ox.UI/Ox.UI.js
index 2a996530..2a985d39 100644
--- a/source/js/Ox.UI/Ox.UI.js
+++ b/source/js/Ox.UI/Ox.UI.js
@@ -102,7 +102,7 @@ Ox.load.UI = function(options, callback) {
                 }).join(' ');
             div.addClass('OxError');
             browsers.forEach(function(browser) {
-                browser.src = Ox.PATH + 'png/ox.ui/browser' + browser.name + '128.png';
+                browser.src = Ox.PATH + 'png/Ox.UI/browser' + browser.name + '128.png';
                 Ox.loadFile(browser.src, function() {
                     ++counter == browsers.length && showIcons();
                 });
diff --git a/source/js/Ox.UI/Video/Ox.BlockTimeline.js b/source/js/Ox.UI/Video/Ox.BlockTimeline.js
index b3203ae4..6edc9aca 100644
--- a/source/js/Ox.UI/Video/Ox.BlockTimeline.js
+++ b/source/js/Ox.UI/Video/Ox.BlockTimeline.js
@@ -58,7 +58,7 @@ Ox.BlockTimeline = function(options, self) {
         self.$markerPosition = $('<img>')
             .addClass('OxMarkerPosition')
             .attr({
-                src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png'
+                src: Ox.PATH + 'png/Ox.UI/videoMarkerPlay.png'
             })
             .css({
                 position: 'absolute',
@@ -75,7 +75,7 @@ Ox.BlockTimeline = function(options, self) {
             self.$markerPoint[i] = $('<img>')
                 .addClass('OxMarkerPoint' + titleCase)
                 .attr({
-                    src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png'
+                    src: Ox.PATH + 'png/Ox.UI/videoMarker' + titleCase + '.png'
                 })
                 .appendTo(that.$element);
             setMarkerPoint(i);
diff --git a/source/js/Ox.UI/Video/Ox.LargeTimeline.js b/source/js/Ox.UI/Video/Ox.LargeTimeline.js
index 4fa872da..546d88ed 100644
--- a/source/js/Ox.UI/Video/Ox.LargeTimeline.js
+++ b/source/js/Ox.UI/Video/Ox.LargeTimeline.js
@@ -62,7 +62,7 @@ Ox.LargeTimeline = function(options, self) {
         self.$cuts[i] = $('<img>')
             .addClass('OxCut')
             .attr({
-                src: Ox.UI.PATH + 'png/ox.ui/videoMarkerCut.png'
+                src: Ox.PATH + 'png/Ox.UI/videoMarkerCut.png'
             })
             .css({
                 left: (v * self.fps) + 'px'
@@ -73,7 +73,7 @@ Ox.LargeTimeline = function(options, self) {
     self.$markerPosition = $('<img>')
         .addClass('OxMarkerPosition')
         .attr({
-            src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png'
+            src: Ox.PATH + 'png/Ox.UI/videoMarkerPlay.png'
         })
         .appendTo(that.$element);
     setMarker();
@@ -82,7 +82,7 @@ Ox.LargeTimeline = function(options, self) {
         self.$markerPoint[i] = $('<img>')
             .addClass('OxMarkerPoint' + v)
             .attr({
-                src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + v + '.png'
+                src: Ox.PATH + 'png/Ox.UI/videoMarker' + v + '.png'
             })
             .appendTo(self.$timeline);
         setMarkerPoint(i);
diff --git a/source/js/Ox.UI/Video/Ox.SmallTimeline.js b/source/js/Ox.UI/Video/Ox.SmallTimeline.js
index a6783e6f..2a30b8ef 100644
--- a/source/js/Ox.UI/Video/Ox.SmallTimeline.js
+++ b/source/js/Ox.UI/Video/Ox.SmallTimeline.js
@@ -60,7 +60,7 @@ Ox.SmallTimeline = function(options, self) {
     self.$markerPosition = $('<img>')
         .addClass('OxMarkerPosition')
         .attr({
-            src: Ox.UI.PATH + 'png/ox.ui/videoMarkerPlay.png'
+            src: Ox.PATH + 'png/Ox.UI/videoMarkerPlay.png'
         })
         .css({
             position: 'absolute',
@@ -77,7 +77,7 @@ Ox.SmallTimeline = function(options, self) {
         self.$markerPoint[i] = $('<img>')
             .addClass('OxMarkerPoint' + titleCase)
             .attr({
-                src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png'
+                src: Ox.PATH + 'png/Ox.UI/videoMarker' + titleCase + '.png'
             })
             .appendTo(that.$element);
         setMarkerPoint(i);
diff --git a/source/js/Ox.UI/Video/Ox.VideoEditorPlayer.js b/source/js/Ox.UI/Video/Ox.VideoEditorPlayer.js
index cb131be2..02da7f9c 100644
--- a/source/js/Ox.UI/Video/Ox.VideoEditorPlayer.js
+++ b/source/js/Ox.UI/Video/Ox.VideoEditorPlayer.js
@@ -92,7 +92,7 @@ Ox.VideoEditorPlayer = function(options, self) {
             self.$markerPoint[point][edge] = $('<img>')
                 .addClass('OxMarkerPoint OxMarker' + titleCase)
                 .attr({
-                    src: Ox.UI.PATH + 'png/ox.ui/videoMarker' + titleCase + '.png'
+                    src: Ox.PATH + 'png/Ox.UI/videoMarker' + titleCase + '.png'
                 })
                 .hide()
                 .appendTo(that.$element);