diff --git a/source/Ox.UI/js/Form/Editable.js b/source/Ox.UI/js/Form/Editable.js
index 9e2348d9..2b58fb29 100644
--- a/source/Ox.UI/js/Form/Editable.js
+++ b/source/Ox.UI/js/Form/Editable.js
@@ -151,13 +151,13 @@ Ox.Editable = function(options, self) {
                         },
                         submit: submit
                     })
-                    .appendTo(that.$element);
+                    .appendTo(that);
                 self.$input.find('input').css(self.css);
                 self.$test = self.$value.$element.clone()
                     .css(Ox.extend({display: 'inline-block'}, self.css))
                     .html(formatTestValue())
                     .css({background: 'rgb(192, 192, 192)'})
-                    .appendTo(that.$element);
+                    .appendTo(that);
             }
             self.minWidth = 8;
             self.maxWidth = that.parent().width();
diff --git a/source/Ox.UI/js/Form/Input.js b/source/Ox.UI/js/Form/Input.js
index c4729d5a..ad853fe9 100644
--- a/source/Ox.UI/js/Form/Input.js
+++ b/source/Ox.UI/js/Form/Input.js
@@ -285,7 +285,7 @@ Ox.Input = function(options, self) {
         .blur(blur)
         .change(change)
         .focus(focus)
-        .appendTo(that.$element);
+        .appendTo(that);
 
     if (self.options.type == 'textarea') {
         Ox.Log('Form', 'TEXTAREA', self.options.width, self.options.height, '...', that.css('width'), that.css('height'), '...', self.$input.css('width'), self.$input.css('height'), '...', self.$input.css('border'))
@@ -339,7 +339,7 @@ Ox.Input = function(options, self) {
             })
             .val(self.options.placeholder)
             .focus(focus)
-            .appendTo(that.$element);
+            .appendTo(that);
     }
 
     if (self.options.autocomplete && self.options.autocompleteSelect) {
diff --git a/source/Ox.UI/js/Form/Range.js b/source/Ox.UI/js/Form/Range.js
index 1c8d567b..5d16eeaf 100644
--- a/source/Ox.UI/js/Form/Range.js
+++ b/source/Ox.UI/js/Form/Range.js
@@ -97,7 +97,7 @@ Ox.Range = function(options, self) {
                     clickArrow(data, i, false);
                 }
             })
-            .appendTo(that.$element);
+            .appendTo(that);
         });
     }
 
@@ -114,7 +114,7 @@ Ox.Range = function(options, self) {
         }, self.options.changeOnDrag ? {} : {
             dragend: dragendTrack
         }))
-        .appendTo(that.$element);
+        .appendTo(that);
 
     self.trackColors && setTrackColors();
 
diff --git a/source/Ox.UI/js/Menu/MainMenu.js b/source/Ox.UI/js/Menu/MainMenu.js
index 7ca974e2..f24df8ab 100644
--- a/source/Ox.UI/js/Menu/MainMenu.js
+++ b/source/Ox.UI/js/Menu/MainMenu.js
@@ -37,7 +37,7 @@ Ox.MainMenu = function(options, self) {
     if (self.options.extras.length) {
         that.extras = $('<div>')
             .addClass('OxExtras')
-            .appendTo(that.$element);
+            .appendTo(that);
         self.options.extras.forEach(function(extra) {
             extra.css({
                 float: 'left' // fixme: need class!
@@ -52,7 +52,7 @@ Ox.MainMenu = function(options, self) {
             .data('position', position);
         if (position == 0) {
             if (that.titles.length == 1) {
-                that.titles[position].appendTo(that.$element);
+                that.titles[position].appendTo(that);
             } else {
                 that.titles[position].insertBefore(that.titles[1]);
             }
diff --git a/source/Ox.UI/js/Menu/Menu.js b/source/Ox.UI/js/Menu/Menu.js
index 05da67ee..f4c8a7be 100644
--- a/source/Ox.UI/js/Menu/Menu.js
+++ b/source/Ox.UI/js/Menu/Menu.js
@@ -87,21 +87,21 @@ Ox.Menu = function(options, self) {
     that.$scrollbars = [];
     that.$top = $('<div>')
         .addClass('OxTop')
-        .appendTo(that.$element);
+        .appendTo(that);
     that.$scrollbars.up = renderScrollbar('up')
-        .appendTo(that.$element);
+        .appendTo(that);
     that.$container = $('<div>')
         .addClass('OxContainer')
-        .appendTo(that.$element);
+        .appendTo(that);
     that.$content = $('<table>')
         .addClass('OxContent')
         .appendTo(that.$container);
     renderItems(self.options.items);
     that.$scrollbars.down = renderScrollbar('down')
-        .appendTo(that.$element);
+        .appendTo(that);
     that.$bottom = $('<div>')
         .addClass('OxBottom')
-        .appendTo(that.$element);
+        .appendTo(that);
 
     function click(event) {
         var item,
diff --git a/source/Ox.UI/js/Video/BlockVideoTimeline.js b/source/Ox.UI/js/Video/BlockVideoTimeline.js
index 6511eefa..106a3a85 100644
--- a/source/Ox.UI/js/Video/BlockVideoTimeline.js
+++ b/source/Ox.UI/js/Video/BlockVideoTimeline.js
@@ -84,7 +84,7 @@ Ox.BlockVideoTimeline = function(options, self) {
             src: Ox.UI.getImageURL('markerPosition')
         })
         .addClass('OxMarkerPosition')
-        .appendTo(that.$element);
+        .appendTo(that);
     setPositionMarker();
 
     if (self.options.showPointMarkers) {
@@ -96,7 +96,7 @@ Ox.BlockVideoTimeline = function(options, self) {
                 .attr({
                     src: Ox.UI.getImageURL('marker' + titlecase)
                 })
-                .appendTo(that.$element);
+                .appendTo(that);
             setPointMarker(point);
         });
     }
@@ -111,7 +111,7 @@ Ox.BlockVideoTimeline = function(options, self) {
                 height: '24px',
                 overflow: 'hidden'
             })
-            .appendTo(that.$element);
+            .appendTo(that);
         self.$images[i] = self.$image.clone()
             .css({
                 position: 'absolute',
diff --git a/source/Ox.UI/js/Video/SmallVideoTimeline.js b/source/Ox.UI/js/Video/SmallVideoTimeline.js
index 63baccf7..485f80e1 100644
--- a/source/Ox.UI/js/Video/SmallVideoTimeline.js
+++ b/source/Ox.UI/js/Video/SmallVideoTimeline.js
@@ -115,14 +115,14 @@ Ox.SmallVideoTimeline = function(options, self) {
         self.$positionMarker = $('<div>')
             .addClass('OxMarkerPlay' + (self.options.paused ? ' OxPaused' : ''))
             .append($('<div>').append($('<div>')))
-            .appendTo(that.$element);
+            .appendTo(that);
     } else {
         self.$positionMarker = $('<img>')
             .addClass('OxMarkerPosition')
             .attr({
                 src: Ox.UI.getImageURL('markerPosition')
             })
-            .appendTo(that.$element);
+            .appendTo(that);
     }
     setPositionMarker();
 
@@ -135,7 +135,7 @@ Ox.SmallVideoTimeline = function(options, self) {
                 .attr({
                     src: Ox.UI.getImageURL('marker' + titlecase)
                 })
-                .appendTo(that.$element);
+                .appendTo(that);
             setPointMarker(point);
         });
     }
diff --git a/source/Ox.UI/js/Video/SmallVideoTimelineImage.js b/source/Ox.UI/js/Video/SmallVideoTimelineImage.js
index 355e5a60..901bb5f0 100644
--- a/source/Ox.UI/js/Video/SmallVideoTimelineImage.js
+++ b/source/Ox.UI/js/Video/SmallVideoTimelineImage.js
@@ -125,7 +125,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
             width: self.options.width + 'px',
             height: self.imageHeight + 'px'
         })
-        .appendTo(that.$element);
+        .appendTo(that);
 
     self.$results = $('<img>')
         .attr({
@@ -137,7 +137,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
             width: self.options.width + 'px',
             height: self.imageHeight + 'px'
         })
-        .appendTo(that.$element);
+        .appendTo(that);
 
     self.$selection = $('<img>')
         .attr({
@@ -149,7 +149,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
             width: self.options.width + 'px',
             height: self.imageHeight + 'px'
         })
-        .appendTo(that.$element);
+        .appendTo(that);
 
     function getImageURL(image, callback) {
         var width = image == 'results' || image == 'selection'
diff --git a/source/Ox.UI/js/Video/VideoEditorPlayer.js b/source/Ox.UI/js/Video/VideoEditorPlayer.js
index f3230989..6487e965 100644
--- a/source/Ox.UI/js/Video/VideoEditorPlayer.js
+++ b/source/Ox.UI/js/Video/VideoEditorPlayer.js
@@ -65,12 +65,12 @@ Ox.VideoEditorPlayer = function(options, self) {
                 height: self.options.height + 'px',
                 width: self.options.width + 'px'
             })
-            .appendTo(that.$element)
+            .appendTo(that);
     }
 
     self.$subtitle = $('<div>')
         .addClass('OxSubtitle')
-        .appendTo(that.$element);
+        .appendTo(that);
 
     setSubtitleSize();
 
@@ -101,7 +101,7 @@ Ox.VideoEditorPlayer = function(options, self) {
                 })
         )
         .hide()
-        .appendTo(that.$element);
+        .appendTo(that);
 
     self.$markerPoint = {};
     ['in', 'out'].forEach(function(point, i) {
@@ -114,7 +114,7 @@ Ox.VideoEditorPlayer = function(options, self) {
                     src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png'
                 })
                 .hide()
-                .appendTo(that.$element);
+                .appendTo(that);
             if (self.options.points[i] == self.options.position) {
                 self.$markerPoint[point][edge].show();
             }
diff --git a/source/Ox.UI/js/Video/VideoElement.js b/source/Ox.UI/js/Video/VideoElement.js
index 52894708..7305037c 100644
--- a/source/Ox.UI/js/Video/VideoElement.js
+++ b/source/Ox.UI/js/Video/VideoElement.js
@@ -157,7 +157,7 @@ Ox.VideoElement = function(options, self) {
                     autoplay: 'autoplay'
                 } : {}))
                 .hide()
-                .appendTo(that.$element);
+                .appendTo(that);
         });
         item.videos = item.$videos.map(function($video) {
             return $video[0];
@@ -168,7 +168,7 @@ Ox.VideoElement = function(options, self) {
                 background: 'rgb(0, 0, 0)',
                 opacity: 0
             })
-            .appendTo(that.$element);
+            .appendTo(that);
         return item;
     }
 
diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js
index 0da8ad08..810345ba 100644
--- a/source/Ox.UI/js/Video/VideoPlayer.js
+++ b/source/Ox.UI/js/Video/VideoPlayer.js
@@ -361,7 +361,7 @@ Ox.VideoPlayer = function(options, self) {
         .css({
             top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0
         })
-        .appendTo(that.$element)
+        .appendTo(that)
 
     if (self.options.type == 'play') {
 
@@ -585,7 +585,7 @@ Ox.VideoPlayer = function(options, self) {
                 opacity: self.options.externalControls ? 1 : 0
             })
             .css(edge, 0)
-            .appendTo(that.$element);
+            .appendTo(that);
 
             self.options['controls' + titleCase].forEach(function(control) {
 
@@ -844,7 +844,7 @@ Ox.VideoPlayer = function(options, self) {
                     })
                     .appendTo(self['$controls' + titleCase]);
 
-                    self.$settings = renderSettings().appendTo(that.$element);
+                    self.$settings = renderSettings().appendTo(that);
 
                 } else if (control == 'size') {
 
@@ -974,7 +974,7 @@ Ox.VideoPlayer = function(options, self) {
             .css({
                 top: self.options.controlsTop.length ? '16px' : 0
             })
-            .appendTo(that.$element);
+            .appendTo(that);
 
         self.$results = Ox.Element({
                 tooltip: 'Results'
@@ -1081,7 +1081,7 @@ Ox.VideoPlayer = function(options, self) {
             .css({
                 bottom: self.options.controlsBottom.length ? '16px' : 0
             })
-            .appendTo(that.$element);
+            .appendTo(that);
 
         self.$hideVolumeButton = Ox.Button({
                 style: 'symbol',
diff --git a/source/Ox.UI/js/Video/VideoPreview.js b/source/Ox.UI/js/Video/VideoPreview.js
index 1c11abd9..178818e2 100644
--- a/source/Ox.UI/js/Video/VideoPreview.js
+++ b/source/Ox.UI/js/Video/VideoPreview.js
@@ -50,7 +50,7 @@ Ox.VideoPreview = function(options, self) {
 
     self.$frameElement = $('<div>')
         .addClass('OxFrame')
-        .appendTo(that.$element)
+        .appendTo(that);
 
     self.$frame = $('<img>')
         .attr({src: self.options.getFrame(self.options.position)})
@@ -62,7 +62,7 @@ Ox.VideoPreview = function(options, self) {
             .addClass('OxTimeline')
             .attr({src: self.options.timeline})
             .css({width: self.options.width + 'px'})
-            .appendTo(that.$element);
+            .appendTo(that);
     }
 
     self.$interface = Ox.Element({
@@ -86,7 +86,7 @@ Ox.VideoPreview = function(options, self) {
                 self.$frame.attr({src: self.options.getFrame(self.options.position)});
             }
         })
-        .appendTo(that.$element);
+        .appendTo(that);
 
     function click(e) {
         that.triggerEvent('click', {
diff --git a/source/Ox.UI/js/Window/Dialog.js b/source/Ox.UI/js/Window/Dialog.js
index b51cb922..f7e7c1d4 100644
--- a/source/Ox.UI/js/Window/Dialog.js
+++ b/source/Ox.UI/js/Window/Dialog.js
@@ -576,7 +576,7 @@ Ox.Dialog = function(options, self) {
                 borderBottomLeftRadius: '8px',
                 borderBottomRightRadius: '8px'
             })
-            .appendTo(that.$element);
+            .appendTo(that);
         !isImage && self.$content.append(
             self.options.content.css(self.hasButtons ? {} : {
                 borderBottomLeftRadius: '8px',