diff --git a/assets/contenteditor.js b/assets/contenteditor.js
index 0ea5ff1..1cb4eea 100644
--- a/assets/contenteditor.js
+++ b/assets/contenteditor.js
@@ -28,8 +28,8 @@ editor.addEventListener('saved', function (ev) {
 
     for (name in regions) {
         if (regions.hasOwnProperty(name)) {
-            var component = $('*[data-file="' + name + '"]').data('component'); // check for component name
-            $.request(component, {
+            var component = document.querySelector('*[data-file="' + name + '"]').dataset.component; // check for component name
+            oc.ajax(component, {
                 data: {
                     file: name,
                     content: regions[name]
diff --git a/components/ContentEditor.php b/components/ContentEditor.php
index b677c33..4976f29 100644
--- a/components/ContentEditor.php
+++ b/components/ContentEditor.php
@@ -73,8 +73,8 @@ public function onRun()
             // put content tools js + css
             $this->addCss('assets/content-tools.min.css');
             $this->addCss('assets/contenteditor.css');
-            $this->addJs('assets/content-tools.min.js');
-            $this->addJs('assets/contenteditor.js');
+            $this->addJs('assets/content-tools.min.js', ['defer' => true]);
+            $this->addJs('assets/contenteditor.js', ['defer' => true]);
 
             // Add scripts only once
             $this->renderPartial('@scripts.htm');
diff --git a/components/contenteditor/scripts.htm b/components/contenteditor/scripts.htm
index 087dff8..23cedda 100644
--- a/components/contenteditor/scripts.htm
+++ b/components/contenteditor/scripts.htm
@@ -1,24 +1,26 @@
 {% put scripts %}
     <script type="text/javascript">
-    /* CONTENT EDITOR SCRIPT START */
-    ContentTools.StylePalette.add([
-        {% for style in __SELF__.palettes %}
-            new ContentTools.Style('{{ style.name ? style.name : style.class }}', '{{ style.class }}', {{ style.allowed_tags|json_encode()|raw }}),
-        {% endfor %}
-    ]);
-    editor.toolbox().tools([
-                                [
-                                {% for value in __SELF__.buttons %}
-                                    '{{ value }}',
-                                {% endfor %}
-                                ],
-                                [
-                                    'undo',
-                                    'redo',
-                                    'remove'
-                                ]
-                            ]);
-    /* CONTENT EDITOR SCRIPT END */
+        /* CONTENT EDITOR SCRIPT START */
+        document.addEventListener('page:loaded', function() {
+            ContentTools.StylePalette.add([
+                {% for style in __SELF__.palettes %}
+                    new ContentTools.Style('{{ style.name ? style.name : style.class }}', '{{ style.class }}', {{ style.allowed_tags|json_encode()|raw }}),
+                {% endfor %}
+            ]);
+            editor.toolbox().tools([
+                [
+                    {% for value in __SELF__.buttons %}
+                        '{{ value }}',
+                    {% endfor %}
+                ],
+                [
+                    'undo',
+                    'redo',
+                    'remove'
+                ]
+            ]);
+        /* CONTENT EDITOR SCRIPT END */
+        });
     </script>
 {% endput %}
 {% put styles  %}