diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php
index fd2f8136f1..12fd963e66 100755
--- a/main/admin/add_users_to_usergroup.php
+++ b/main/admin/add_users_to_usergroup.php
@@ -30,7 +30,7 @@ $tool_name = get_lang('SubscribeUsersToClass');
 $htmlHeadXtra[] = '
 <script>
 
-$(document).ready( function() {
+$(function () {
     $("#relation").change(function() {
         window.location = "add_users_to_usergroup.php?id='.$id.'" +"&relation=" + $(this).val();
     });
diff --git a/main/admin/grade_models.php b/main/admin/grade_models.php
index 95cc61393f..d2745e8b62 100755
--- a/main/admin/grade_models.php
+++ b/main/admin/grade_models.php
@@ -204,5 +204,9 @@ switch ($action) {
         $obj->display();
         break;
 }
-echo '<script> $(document).ready(function(){ $("input").removeClass("form-control"); }); </script>';
+echo '<script> 
+$(function () { 
+    $("input").removeClass("form-control"); 
+}); 
+</script>';
 Display::display_footer();
diff --git a/main/admin/languages.php b/main/admin/languages.php
index 28bfa31e64..62381edbfa 100755
--- a/main/admin/languages.php
+++ b/main/admin/languages.php
@@ -54,7 +54,7 @@ $msgLang = isset($_SESSION['disabled_languages']) ? 1 : 0;
 $disabledLang = isset($_SESSION['disabled_languages']) ? $_SESSION['disabled_languages'] : null;
 
 $htmlHeadXtra[] = '<script>
- $(document).ready(function() {
+ $(function () {
     var msgLang = '.$msgLang.';
     var disabledLang = "'.$disabledLang.'"
 
diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index cb58019888..29ed44a018 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -187,7 +187,7 @@ $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')]
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
 $htmlHeadXtra[] = '<script>
-$(document).ready(function(){
+$(function () {
     '.$jqueryReady.'
 });
 </script>';
diff --git a/main/admin/skill_create.php b/main/admin/skill_create.php
index 50ad49cd69..55b26aa0aa 100644
--- a/main/admin/skill_create.php
+++ b/main/admin/skill_create.php
@@ -47,7 +47,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
 if (!empty($jquery_ready_content)) {
     $htmlHeadXtra[] = '<script>
-    $(document).ready(function(){
+    $(function () {
         '.$jquery_ready_content.'
     });
     </script>';
diff --git a/main/admin/skill_edit.php b/main/admin/skill_edit.php
index e3f1ccb2d1..ecc6023122 100644
--- a/main/admin/skill_edit.php
+++ b/main/admin/skill_edit.php
@@ -62,7 +62,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
 // in the $(document).ready javascript function
 if (!empty($jquery_ready_content)) {
     $htmlHeadXtra[] = '<script>
-    $(document).ready(function(){
+    $(function () {
         '.$jquery_ready_content.'
     });
     </script>';
diff --git a/main/admin/sub_language.php b/main/admin/sub_language.php
index 70d3ca58ff..cb5985d24d 100755
--- a/main/admin/sub_language.php
+++ b/main/admin/sub_language.php
@@ -12,7 +12,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
 $htmlHeadXtra[] = '<script>
- $(document).ready(function() {
+ $(function () {
     $(".save").click(function() {
         var button_name=$(this).attr("name");
         var button_array=button_name.split("|");
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index baa3bd1cce..db92f07935 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -324,7 +324,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
 $htmlHeadXtra[] = '<script>
-$(document).ready(function(){
+$(function () {
     '.$jquery_ready_content.'
 });
 </script>';
diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
index 63088664fb..d0d0c1fe92 100755
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
@@ -325,7 +325,7 @@ if ($allowEmailTemplate) {
 
 // the $jqueryReadyContent variable collects all functions that will be load in the
 $htmlHeadXtra[] = '<script>
-$(document).ready(function(){
+$(function () {
     '.$jqueryReadyContent.'
 });
 </script>';
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 9c417b9082..5bc96a5ad9 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -159,7 +159,7 @@ function display_advanced_search_form () {
     }
 }
 
-$(document).ready(function() {
+$(function () {
     var select_val = $("#input_select_extra_data").val();
     if ( document.getElementById(\'extra_data_text\')) {
         if (select_val != 0) {
@@ -1097,7 +1097,7 @@ $data = $extraField->addElements($form, 0, [], true, false, $variablesToShow);
 
 $htmlHeadXtra[] = '
     <script>
-    $(document).ready(function() {
+    $(function () {
         '.$data['jquery_ready_content'].'
     })
     </script>
diff --git a/main/template/default/javascript/editor/elfinder_standalone.html.twig b/main/template/default/javascript/editor/elfinder_standalone.html.twig
new file mode 100644
index 0000000000..5ed57c1467
--- /dev/null
+++ b/main/template/default/javascript/editor/elfinder_standalone.html.twig
@@ -0,0 +1 @@
+{% extends '@ChamiloTheme/Editor/elfinder_standalone.html.twig' %}
\ No newline at end of file
diff --git a/main/template/default/social/skills_block.html.twig b/main/template/default/social/skills_block.html.twig
index a3124d3866..407d81eba1 100644
--- a/main/template/default/social/skills_block.html.twig
+++ b/main/template/default/social/skills_block.html.twig
@@ -1,7 +1,7 @@
 {% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
 
 <script>
-jQuery(document).ready(function(){
+$(function () {
     jQuery('.scrollbar-inner').scrollbar();
 });
 </script>
diff --git a/src/CoreBundle/Component/Editor/Editor.php b/src/CoreBundle/Component/Editor/Editor.php
index f10d5293d4..c17bcb0ffe 100644
--- a/src/CoreBundle/Component/Editor/Editor.php
+++ b/src/CoreBundle/Component/Editor/Editor.php
@@ -157,7 +157,7 @@ class Editor
      */
     public function getEditorStandAloneTemplate()
     {
-        return 'elfinder_standalone.html.twig';
+        return 'javascript/editor/elfinder_standalone.html.twig';
     }
 
     /**
diff --git a/src/PageBundle/Resources/views/base_layout.html.twig b/src/PageBundle/Resources/views/base_layout.html.twig
index 65282f5d28..4756d479b9 100644
--- a/src/PageBundle/Resources/views/base_layout.html.twig
+++ b/src/PageBundle/Resources/views/base_layout.html.twig
@@ -7,7 +7,7 @@
                 {% if sonata_page.isEditor and sonata_page.isInlineEditionOn %}
                     <!-- CMS specific variables -->
                     <script>
-                        jQuery(document).ready(function() {
+                        $(function () {
                             Sonata.Page.init({
                                 url: {
                                     block_save_position: '{{ sonata_admin.objectUrl('sonata.page.admin.page', 'edit', page) }}',
diff --git a/src/ThemeBundle/Resources/views/Document/create.html.twig b/src/ThemeBundle/Resources/views/Document/create.html.twig
index 1f5e21e33a..39ed2b3b28 100644
--- a/src/ThemeBundle/Resources/views/Document/create.html.twig
+++ b/src/ThemeBundle/Resources/views/Document/create.html.twig
@@ -8,7 +8,7 @@
         var $addTagLink = $('<a href="#" class="btn btn-success add_tag_link">Add</a>');
         var $newLinkLi = $('<li></li>').append($addTagLink);
 
-        jQuery(document).ready(function () {
+        $(function () {
             // Get the ul that holds the collection of tags
             $collectionHolder = $('ul.tags');
 
diff --git a/src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig b/src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig
index d904eec305..b9de10889b 100644
--- a/src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig
+++ b/src/ThemeBundle/Resources/views/Editor/elfinder_standalone.html.twig
@@ -19,7 +19,7 @@
         return (match && match.length > 1) ? match[1] : '';
     }
 
-    $().ready(function() {
+    $(function () {
         var winheight = document.documentElement.clientHeight;
         var funcNum = getUrlParam('CKEditorFuncNum');
         var elf = $('#elfinder').elfinder({