diff --git a/Controller/ManagerController.php b/Controller/ManagerController.php
index 3da00fd..db625d8 100644
--- a/Controller/ManagerController.php
+++ b/Controller/ManagerController.php
@@ -35,30 +35,43 @@
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Exception;
 
 /**
  * @author Arthur Gribet <a.gribet@gmail.com>
  */
-class ManagerController extends AbstractController {
+class ManagerController extends AbstractController
+{
 
     private FileManager $fileManager;
 
     /**
      * ManagerController constructor.
      */
-    public function __construct(private FilemanagerService $filemanagerService, private EventDispatcherInterface $dispatcher, private TranslatorInterface $translator, private RouterInterface $router, private FormFactoryInterface $formFactory) {
+    public function __construct(private FilemanagerService $filemanagerService, private EventDispatcherInterface $dispatcher, private TranslatorInterface $translator, private RouterInterface $router, private FormFactoryInterface $formFactory)
+    {
     }
 
     #[Route('/', name: 'file_manager')]
-    public function indexAction(Request $request, FileTypeService $fileTypeService): JsonResponse|Response {
+    public function indexAction(Request $request, FileTypeService $fileTypeService, SessionInterface $session): JsonResponse|Response
+    {
         $queryParameters = $request->query->all();
         $isJson = $request->get('json');
         if ($isJson) {
             unset($queryParameters['json']);
         }
+
+        // Remember Last Path - 31.08.2024
+        if (isset($this->getParameter('artgris_file_manager')['conf'][$queryParameters['conf']]['remember_last_path'])
+            && $this->getParameter('artgris_file_manager')['conf'][$queryParameters['conf']]['remember_last_path']
+        ) {
+            $queryParameters = $this->rememberLastPath($queryParameters, $session);
+        }
+
         $fileManager = $this->newFileManager($queryParameters);
 
+
         // Folder search
         $directoriesArbo = $this->retrieveSubDirectories($fileManager, $fileManager->getDirName(), \DIRECTORY_SEPARATOR, $fileManager->getBaseName());
 
@@ -159,6 +172,7 @@ public function indexAction(Request $request, FileTypeService $fileTypeService):
                 'label' => false,
                 'data' => $this->translator->trans('input.default'),
             ])
+            ->add('defined_parent_path', HiddenType::class, [])
             ->add('send', SubmitType::class, [
                 'attr' => [
                     'class' => 'btn btn-primary',
@@ -171,11 +185,20 @@ public function indexAction(Request $request, FileTypeService $fileTypeService):
         $form->handleRequest($request);
         /** @var Form $formRename */
         $formRename = $this->createRenameForm();
+        $formRenameFolder = $this->createRenameFolderForm();
+
 
         if ($form->isSubmitted() && $form->isValid()) {
             $data = $form->getData();
+
             $fs = new Filesystem();
-            $directory = $directorytmp = $fileManager->getCurrentPath().\DIRECTORY_SEPARATOR.$data['name'];
+
+            if ($data['defined_parent_path']) {
+                $directory = $directorytmp = $fileManager->getConfiguration()['dir'] . $data['defined_parent_path'] . \DIRECTORY_SEPARATOR . $data['name'];
+            } else {
+                $directory = $directorytmp = $fileManager->getCurrentPath() . \DIRECTORY_SEPARATOR . $data['name'];
+            }
+
             $i = 1;
 
             while ($fs->exists($directorytmp)) {
@@ -195,37 +218,39 @@ public function indexAction(Request $request, FileTypeService $fileTypeService):
         }
         $parameters['form'] = $form->createView();
         $parameters['formRename'] = $formRename->createView();
+        $parameters['formRenameFolder'] = $formRenameFolder->createView();
 
         return $this->render('@ArtgrisFileManager/manager.html.twig', $parameters);
     }
 
     #[Route("/rename/{fileName}", name: 'file_manager_rename')]
-    public function renameFileAction(Request $request, string $fileName): RedirectResponse {
+    public function renameFileAction(Request $request, string $fileName): RedirectResponse
+    {
         $queryParameters = $request->query->all();
         $formRename = $this->createRenameForm();
         /* @var Form $formRename */
         $formRename->handleRequest($request);
         if ($formRename->isSubmitted() && $formRename->isValid()) {
             $data = $formRename->getData();
-            $extension = $data['extension'] ? '.'.$data['extension'] : '';
-            $newfileName = $data['name'].$extension;
+            $extension = $data['extension'] ? '.' . $data['extension'] : '';
+            $newfileName = $data['name'] . $extension;
             if ($newfileName !== $fileName && isset($data['name'])) {
                 $fileManager = $this->newFileManager($queryParameters);
-                $newfilePath = $fileManager->getCurrentPath().\DIRECTORY_SEPARATOR.$newfileName;
-                $oldfilePath = realpath($fileManager->getCurrentPath().\DIRECTORY_SEPARATOR.$fileName);
+                $newfilePath = $fileManager->getCurrentPath() . \DIRECTORY_SEPARATOR . $newfileName;
+                $oldfilePath = realpath($fileManager->getCurrentPath() . \DIRECTORY_SEPARATOR . $fileName);
                 if (0 !== mb_strpos($newfilePath, $fileManager->getCurrentPath())) {
                     $this->addFlash('danger', $this->translator->trans('file.renamed.unauthorized'));
                 } else {
                     $fs = new Filesystem();
                     try {
-                        $this->dispatch(FileManagerEvents::RENAME_FILE, ['oldFile'=> $oldfilePath,'newFile'=> $newfilePath]);
+                        $this->dispatch(FileManagerEvents::RENAME_FILE, ['oldFile' => $oldfilePath, 'newFile' => $newfilePath]);
                         $fs->rename($oldfilePath, $newfilePath);
                         $this->addFlash('success', $this->translator->trans('file.renamed.success'));
                         //File has been renamed successfully
                     } catch (IOException $exception) {
                         $this->addFlash('danger', $this->translator->trans('file.renamed.danger'));
                     } catch (Exception $exception) {
-                        $this->addFlash('danger', $exception->getMessage() );
+                        $this->addFlash('danger', $exception->getMessage());
                     }
                 }
             } else {
@@ -236,12 +261,49 @@ public function renameFileAction(Request $request, string $fileName): RedirectRe
         return $this->redirectToRoute('file_manager', $queryParameters);
     }
 
+    #[Route("/renamefolder/", name: 'file_manager_rename_folder')]
+    public function renameFolderAction(Request $request): RedirectResponse
+    {
+        $queryParameters = $request->query->all();
+        $formRenameFolder = $this->createRenameFolderForm();
+        /* @var Form $formRenameFolder */
+        $formRenameFolder->handleRequest($request);
+        if ($formRenameFolder->isSubmitted() && $formRenameFolder->isValid()) {
+            $data = $formRenameFolder->getData();
+            $fs = new Filesystem();
+            $fileManager = $this->newFileManager($queryParameters);
+            $dirname = $fileManager->getConfiguration()['dir'];
+
+            if (!$data['oldpath'] || '\\' === $data['oldpath'] || !$fs->exists($dirname . $data['oldpath'])) {
+                $this->addFlash('danger', 'folder.rename.unauthorized');
+            } else {
+                try {
+                    $this->dispatch(FileManagerEvents::RENAME_FOLDER, ['oldFolderName' => $data['oldname'], 'newFolderName' => $data['name']]);
+                    $newFolderPath = $dirname . substr($data['oldpath'], 0, strrpos($data['oldpath'], '\\')) . \DIRECTORY_SEPARATOR . $data['name'];
+                    $fs->rename($dirname . $data['oldpath'], $newFolderPath);
+                    $this->addFlash('success', $this->translator->trans('folder.rename.success'));
+                } catch (IOException $exception) {
+                    $this->addFlash('danger', $this->translator->trans('folder.rename.danger', ['%message%' => $data['name']]));
+                } catch (Exception $exception) {
+                    $this->addFlash('danger', $exception->getMessage());
+                }
+            }
+        }
+
+        if(!$fs->exists($fileManager->getConfiguration()['dir']. $fileManager->getRoute())){
+            unset($queryParameters['route']);
+        }
+
+        return $this->redirectToRoute('file_manager', $queryParameters);
+    }
+
     #[Route("/upload/", name: 'file_manager_upload')]
-    public function uploadFileAction(Request $request): JsonResponse|Response {
+    public function uploadFileAction(Request $request): JsonResponse|Response
+    {
         $fileManager = $this->newFileManager($request->query->all());
 
         $options = [
-            'upload_dir' => $fileManager->getCurrentPath().\DIRECTORY_SEPARATOR,
+            'upload_dir' => $fileManager->getCurrentPath() . \DIRECTORY_SEPARATOR,
             'upload_url' => implode('/', array_map('rawurlencode', explode('/', $fileManager->getImagePath()))),
             'accept_file_types' => $fileManager->getRegex(),
             'print_response' => false,
@@ -275,11 +337,12 @@ public function uploadFileAction(Request $request): JsonResponse|Response {
     }
 
     #[Route("/file/{fileName}", name: 'file_manager_file')]
-    public function binaryFileResponseAction(Request $request, string $fileName): BinaryFileResponse {
+    public function binaryFileResponseAction(Request $request, string $fileName): BinaryFileResponse
+    {
         $fileManager = $this->newFileManager($request->query->all());
         $configuredDirectory = $fileManager->getConfiguration()['dir'];
 
-        $file = $fileManager->getCurrentPath().\DIRECTORY_SEPARATOR.urldecode($fileName);
+        $file = $fileManager->getCurrentPath() . \DIRECTORY_SEPARATOR . urldecode($fileName);
         $realFilePath = realpath($file);
         if (false === $realFilePath) {
             throw new FileNotFoundException($file);
@@ -293,7 +356,8 @@ public function binaryFileResponseAction(Request $request, string $fileName): Bi
     }
 
     #[Route("/delete/", name: 'file_manager_delete')]
-    public function deleteAction(Request $request): RedirectResponse {
+    public function deleteAction(Request $request): RedirectResponse
+    {
         $form = $this->createDeleteForm();
         $form->handleRequest($request);
         $queryParameters = $request->query->all();
@@ -304,11 +368,11 @@ public function deleteAction(Request $request): RedirectResponse {
             if (isset($queryParameters['delete'])) {
                 $is_delete = false;
                 foreach ($queryParameters['delete'] as $fileName) {
-                    $filePath = realpath($fileManager->getCurrentPath().\DIRECTORY_SEPARATOR.$fileName);
+                    $filePath = realpath($fileManager->getCurrentPath() . \DIRECTORY_SEPARATOR . $fileName);
                     if (0 !== mb_strpos($filePath, $fileManager->getCurrentPath())) {
                         $this->addFlash('danger', 'file.deleted.danger');
                     } else {
-                         try {
+                        try {
                             $this->dispatch(FileManagerEvents::PRE_DELETE_FILE);
                             $fs->remove($filePath);
                             $is_delete = true;
@@ -316,7 +380,7 @@ public function deleteAction(Request $request): RedirectResponse {
                         } catch (IOException $exception) {
                             $this->addFlash('danger', 'file.deleted.unauthorized');
                         } catch (Exception $exception) {
-                            $this->addFlash('danger', $exception->getMessage() );
+                            $this->addFlash('danger', $exception->getMessage());
                         }
                     }
                 }
@@ -325,20 +389,29 @@ public function deleteAction(Request $request): RedirectResponse {
                 }
                 unset($queryParameters['delete']);
             } else {
-                
                 try {
                     $this->dispatch(FileManagerEvents::PRE_DELETE_FOLDER);
-                    $fs->remove($fileManager->getCurrentPath());
-                    $this->addFlash('success', 'folder.deleted.success');
+                    if ( $form->getData()['defined_parent_path'] == '\\' ) {
+                        throw new \Exception('folder.deleted.unauthorized');
+                    } else {
+                        if ($form->getData()['defined_parent_path']) { // Tree Contextmenu Folder delete action
+                            if ($fs->exists($fileManager->getConfiguration()['dir'] . $form->getData()['defined_parent_path'])) {
+                                $fs->remove($fileManager->getConfiguration()['dir'] . $form->getData()['defined_parent_path']);
+                            } else {
+                                throw new \Exception('folder.deleted.unauthorized');
+                            }
+                        }
+                        $this->addFlash('success', 'folder.deleted.success');
+                    }
                 } catch (IOException $exception) {
                     $this->addFlash('danger', 'folder.deleted.unauthorized');
                 } catch (Exception $exception) {
-                    $this->addFlash('danger', $exception->getMessage() );
+                    $this->addFlash('danger', $exception->getMessage());
                 }
 
                 $this->dispatch(FileManagerEvents::POST_DELETE_FOLDER);
                 $queryParameters['route'] = \dirname($fileManager->getRoute());
-                if ($queryParameters['route'] == '/') {
+                if ($queryParameters['route'] == '/' || !$fs->exists($fileManager->getConfiguration()['dir'] . $queryParameters['route'])) {
                     unset($queryParameters['route']);
                 }
 
@@ -349,8 +422,10 @@ public function deleteAction(Request $request): RedirectResponse {
         return $this->redirectToRoute('file_manager', $queryParameters);
     }
 
-    private function createDeleteForm(): FormInterface|Form {
+    private function createDeleteForm(): FormInterface|Form
+    {
         return $this->formFactory->createNamedBuilder('delete_f')
+            ->add('defined_parent_path', HiddenType::class, [])
             ->add('DELETE', SubmitType::class, [
                 'translation_domain' => 'messages',
                 'attr' => [
@@ -361,7 +436,8 @@ private function createDeleteForm(): FormInterface|Form {
             ->getForm();
     }
 
-    private function createRenameForm(): FormInterface|Form {
+    private function createRenameForm(): FormInterface|Form
+    {
         return $this->formFactory->createNamedBuilder('rename_f')
             ->add('name', TextType::class, [
                 'constraints' => [
@@ -378,7 +454,28 @@ private function createRenameForm(): FormInterface|Form {
             ->getForm();
     }
 
-    private function retrieveSubDirectories(FileManager $fileManager, string $path, ?string $parent = \DIRECTORY_SEPARATOR, ?string $baseFolderName = null): ?array {
+    private function createRenameFolderForm(): FormInterface|Form
+    {
+        return $this->formFactory->createNamedBuilder('rename_folder')
+            ->add('name', TextType::class, [
+                'constraints' => [
+                    new NotBlank(),
+                ],
+                'label' => false,
+            ])
+            ->add('oldpath', HiddenType::class)
+            ->add('oldname', HiddenType::class)
+            ->add('send', SubmitType::class, [
+                'attr' => [
+                    'class' => 'btn btn-primary',
+                ],
+                'label' => 'button.rename.action',
+            ])
+            ->getForm();
+    }
+
+    private function retrieveSubDirectories(FileManager $fileManager, string $path, ?string $parent = \DIRECTORY_SEPARATOR, ?string $baseFolderName = null): ?array
+    {
         $directories = new Finder();
         $directories->in($path)->ignoreUnreadableDirs()->directories()->depth(0)->sortByType()->filter(function (SplFileInfo $file) {
             return $file->isReadable();
@@ -394,7 +491,7 @@ private function retrieveSubDirectories(FileManager $fileManager, string $path,
         foreach ($directories as $directory) {
             /** @var SplFileInfo $directory */
             $directoryFileName = $directory->getFilename();
-            $fileName = $baseFolderName ? '' : $parent.$directoryFileName;
+            $fileName = $baseFolderName ? '' : $parent . $directoryFileName;
 
             $queryParameters = $fileManager->getQueryParameters();
             $queryParameters['route'] = $fileName;
@@ -409,18 +506,35 @@ private function retrieveSubDirectories(FileManager $fileManager, string $path,
 
             if ($fileName === '' && isset($fileManager->getConfiguration()['root_name'])) {
                 $directoryFileName = $fileManager->getConfiguration()['root_name'];
+
+            }
+
+                $queryParametersRoute['route'] ?? $queryParametersRoute['route'] = '\\';
+//            $queryParametersRoute['route'] = '\\';
+
+            $selected_directory = false;
+            if ($fileName === '' && $fileManager->getRoute() === null) {
+                $selected_directory = true;
+            } else {
+                if ($fileManager->getRoute() === $fileName) {
+                    $selected_directory = true;
+                } else {
+                    $selected_directory = false;
+                }
             }
 
             $directoriesList[] = [
-                'text' => $directoryFileName.$fileSpan,
-                'icon' => 'far fa-folder-open',
-                'children' => $this->retrieveSubDirectories($fileManager, $directory->getPathname(), $fileName.\DIRECTORY_SEPARATOR),
+                'text' => $directoryFileName . $fileSpan,
+//                'icon' => 'far fa-folder-open',
+                'children' => $this->retrieveSubDirectories($fileManager, $directory->getPathname(), $fileName . \DIRECTORY_SEPARATOR),
                 'a_attr' => [
                     'href' => $fileName ? $this->generateUrl('file_manager', $queryParameters) : $this->generateUrl('file_manager', $queryParametersRoute),
                 ],
                 'state' => [
-                    'selected' => $fileManager->getRoute() === $fileName,
+//                    'selected' => $fileManager->getRoute() === $fileName,
+                    'selected' => $selected_directory,
                     'opened' => true,
+                    'test' => $fileManager->getRoute(),
                 ],
             ];
         }
@@ -431,7 +545,8 @@ private function retrieveSubDirectories(FileManager $fileManager, string $path,
     /**
      * Tree Iterator.
      */
-    private function retrieveFilesNumber(string $path,string $regex): int {
+    private function retrieveFilesNumber(string $path, string $regex): int
+    {
         $files = new Finder();
         $files->in($path)->files()->depth(0)->name($regex);
         $this->dispatch(FileManagerEvents::POST_FILE_FILTER_CONFIGURATION, ['finder' => $files]);
@@ -439,7 +554,8 @@ private function retrieveFilesNumber(string $path,string $regex): int {
         return iterator_count($files);
     }
 
-    private function newFileManager(array $queryParameters): FileManager {
+    private function newFileManager(array $queryParameters): FileManager
+    {
         if (!isset($queryParameters['conf'])) {
             throw new \RuntimeException('Please define a conf parameter in your route');
         }
@@ -449,7 +565,8 @@ private function newFileManager(array $queryParameters): FileManager {
         return $this->fileManager;
     }
 
-    protected function dispatch(string $eventName, array $arguments = []) {
+    protected function dispatch(string $eventName, array $arguments = [])
+    {
         $arguments = array_replace([
             'filemanager' => $this->fileManager,
         ], $arguments);
@@ -458,4 +575,34 @@ protected function dispatch(string $eventName, array $arguments = []) {
         $event = new GenericEvent($subject, $arguments);
         $this->dispatcher->dispatch($event, $eventName);
     }
+
+    private function rememberLastPath(array $queryParameters, $session): array
+    {
+        // GET Last Path -> iEntegre
+        if ($session->has('file_manager_last_path') && empty($queryParameters['route'])) {
+
+            $fileSystem = new Filesystem();
+            $last_path = $this->getParameter('artgris_file_manager')['conf'][$queryParameters['conf']]['dir'] . $session->get('file_manager_last_path');
+            $exist = $fileSystem->exists($last_path);
+
+            if (false === $exist) {
+                unset($queryParameters['route']); // if directory not exit return home and clear session
+                if ($session->has('file_manager_last_path')) {
+                    $session->remove('file_manager_last_path');
+                }
+            } else {
+                $queryParameters['route'] = $session->get('file_manager_last_path');
+            }
+        }
+
+        // SET Last Path -> iEntegre
+        if (isset($queryParameters['route'])) {
+            if ($session->has('file_manager_last_path')) {
+                $session->remove('file_manager_last_path');
+            }
+            $session->set('file_manager_last_path', $queryParameters['route']);
+        }
+
+        return $queryParameters;
+    }
 }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 9a20e15..900a210 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -32,6 +32,7 @@ public function getConfigTreeBuilder(): TreeBuilder {
                         ->children()
                             ->scalarNode('dir')->end()
                             ->enumNode('type')->values(['file', 'image', 'media'])->end()
+                            ->booleanNode('remember_last_path')->defaultValue(true)->end()
                             ->booleanNode('tree')->end()
                             ->booleanNode('show_file_count')->defaultValue(true)->end()
                             ->scalarNode('root_name')->defaultValue(null)->end()
diff --git a/Event/FileManagerEvents.php b/Event/FileManagerEvents.php
index c3a6f90..7c60374 100644
--- a/Event/FileManagerEvents.php
+++ b/Event/FileManagerEvents.php
@@ -22,6 +22,8 @@ final class FileManagerEvents {
     public const PRE_DELETE_FOLDER = ' file_manager.pre_delete_folder';
     /** @Event("Symfony\Component\EventDispatcher\GenericEvent") */
     public const POST_DELETE_FOLDER = 'file_manager.post_delete_folder';
+    /** @Event("Symfony\Component\EventDispatcher\GenericEvent") */
+    public const RENAME_FOLDER = 'file_manager.post_rename_folder';
 
     /** @Event("Symfony\Component\EventDispatcher\GenericEvent") */
     public const POST_DIRECTORY_FILTER_CONFIGURATION = 'file_manager.post_directory_filter_configuration';
diff --git a/Helpers/FileManager.php b/Helpers/FileManager.php
index 26ffd3b..610dad6 100644
--- a/Helpers/FileManager.php
+++ b/Helpers/FileManager.php
@@ -7,6 +7,7 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -75,6 +76,7 @@ public function getParent(): ?string
                 $queryParentParameters['route'] = \dirname($this->getRoute());
             } else {
                 unset($queryParentParameters['route']);
+//                $queryParentParameters['route'] = '/';
             }
 
             $parentRoute = $this->router->generate('file_manager', $queryParentParameters);
diff --git a/README.md b/README.md
index a3c28b8..e52047c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,10 @@ FileManagerBundle
 
 FileManager is a simple Multilingual File Manager Bundle for Symfony
 
-<img src="https://raw.githubusercontent.com/artgris/FileManagerBundle/master/Resources/doc/images/filemanager-promo.png" alt="Symfony Filemanager created with FileManagerBundle" align="center" />
+**Main Window**
+![filemanager](https://github.com/user-attachments/assets/b1be19f7-d66f-44f3-958c-e6c5063b7dc4)
+**Tree Context Menu**
+![tree_context_menu](https://github.com/user-attachments/assets/794352ab-512e-4ef8-a148-f5bbde85e06d)
 
 * [Documentation](#documentation)
 * [Installation](#installation)
@@ -13,8 +16,8 @@ FileManager is a simple Multilingual File Manager Bundle for Symfony
 
 
 **Features**
-*  Upload, delete (multiple), rename, download and sort files
-*  Create, rename and delete folders
+*  Upload, delete (_multiple_), rename, download and sort files
+*  Create, rename, Filter (_search_) and delete folders (_on tree contextmenu_)
 *  Manage **Public** and **Private** folders
 *  File Names **Sanitizer** / **Slugger** ([Look Documentation](Resources/doc/book/1-basic-configuration.md))
 *  **Multilingual** (English, French, Catalan, German, Spanish, Dutch, Portuguese, Romanian, Russian, Turkish)
diff --git a/Resources/doc/book/filemanager.png b/Resources/doc/book/filemanager.png
new file mode 100644
index 0000000..a460e83
Binary files /dev/null and b/Resources/doc/book/filemanager.png differ
diff --git a/Resources/doc/book/tree_context_menu.png b/Resources/doc/book/tree_context_menu.png
new file mode 100644
index 0000000..d5abd39
Binary files /dev/null and b/Resources/doc/book/tree_context_menu.png differ
diff --git a/Resources/doc/tutorials/input-button.md b/Resources/doc/tutorials/input-button.md
index e128e7b..0f1d90d 100644
--- a/Resources/doc/tutorials/input-button.md
+++ b/Resources/doc/tutorials/input-button.md
@@ -49,7 +49,7 @@ artgris_file_manager:
                 </div>
                 <div class="modal-body">
                     <iframe id="myframe" src="{{ path('file_manager', {module:1, conf:'button'}) }}" width="100%" height="500"
-                            frameborder="0"></iframe>
+                            frameborder="0" scrolling="no"></iframe>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/Resources/doc/tutorials/integrate-tinymce.md b/Resources/doc/tutorials/integrate-tinymce.md
index c42036f..1059df4 100644
--- a/Resources/doc/tutorials/integrate-tinymce.md
+++ b/Resources/doc/tutorials/integrate-tinymce.md
@@ -92,7 +92,7 @@ TinyMCE v5
                     type: 'panel',
                     items: [{
                         type: 'htmlpanel',
-                        html: windowManagerCSS + '<iframe src="' + cmsURL + '"  frameborder="0" style="width:100%; height:100%"></iframe>'
+                        html: windowManagerCSS + '<iframe src="' + cmsURL + '"  frameborder="0" style="width:100%; height:100%" scrolling="no"></iframe>'
                     }]
                 },
                 buttons: [],
diff --git a/Resources/public/css/manager.css b/Resources/public/css/manager.css
index 6492513..b5faf37 100644
--- a/Resources/public/css/manager.css
+++ b/Resources/public/css/manager.css
@@ -8,7 +8,12 @@ body {
 
 .thead-default th {
     color: #464a4c;
-    background-color: #eceeef;
+    background-color: #f7f8f9;
+    border-bottom: 0 !important;
+    font-size: 12px !important;
+    position: sticky;
+    top: 0;
+    z-index: 1;
 }
 
 .bar {
@@ -23,7 +28,7 @@ body {
 }
 
 .top-bar {
-    padding: 10px 0;
+    padding: 7px 0;
     margin: 3px 0;
 }
 
@@ -52,14 +57,23 @@ body {
 }
 
 .label {
-    font-size: 70% !important;
+    /*font-size: 70% !important;*/
     line-height: 24px !important;
-    vertical-align: middle;
+    /*vertical-align: middle;*/
 }
 
 .jstree {
     background-color: #f9f9f9;
-    padding: 10px 5px;
+    padding: 5px 5px;
+    font-size: 12px;
+    height: 470px;
+    padding-bottom: 25px;
+    overflow: hidden;
+}
+
+.jstree:hover{
+    overflow-y: scroll;
+    scrollbar-width: thin;
 }
 
 .thumbnail {
@@ -148,3 +162,97 @@ button i {
 
 }
 
+.jstree-default .jstree-striped{
+    background: none;
+}
+
+.list-blk, .thumbnail-blk{
+    font-size: 13px !important;
+    overflow-y:scroll;
+    scrollbar-width: thin;
+    height:500px;
+}
+
+div.select-all{
+    background-color: #f7f8f9;
+    position: sticky !important;
+    z-index: 1 !important;
+    top: 10px !important;
+    box-shadow: rgba(50, 50, 93, 0.25) 0px 2px 5px -1px, rgba(0, 0, 0, 0.3) 0px 1px 3px -1px;
+    padding-top: 3px;
+}
+
+.filemanager-sort-icon{
+    padding-left: 5px;
+}
+
+.jstree-default .jstree-search {
+    font-style: italic;
+    color: #CD5C5C;
+    font-weight: normal;
+}
+
+
+
+/* Context Menu Theme */
+
+.vakata-context,
+.vakata-context ul {
+    padding:.5rem 0;
+    min-width:150px;
+    font-size:1.3rem;
+    background: #ffffff;
+    box-shadow:0px 0px 50px 0px rgba(82, 63, 105, 0.15);
+    border:0;
+    border-radius:.475rem;
+}
+
+.vakata-context li,
+.vakata-context ul li {
+    padding:0;
+    border:0
+}
+.vakata-context li a,
+.vakata-context ul li a {
+    padding:0 1.2rem;
+    border:0
+}
+.vakata-context li a i,
+.vakata-context ul li a i {
+    display:none
+}
+
+.vakata-context li a ins,
+.vakata-context li a span,
+.vakata-context ul li a ins,
+.vakata-context ul li a span {
+    display:none;
+    border:0!important
+}
+.vakata-context .vakata-context-hover>a,
+.vakata-context li a:hover,
+.vakata-context ul .vakata-context-hover>a,
+.vakata-context ul li a:hover {
+    margin:0;
+    background-color:#F9F9F9;
+    color:#1B84FF;
+    box-shadow:none
+}
+.vakata-context .vakata-context-hover>a .ins,
+.vakata-context .vakata-context-hover>a .span,
+.vakata-context li a:hover .ins,
+.vakata-context li a:hover .span,
+.vakata-context ul .vakata-context-hover>a .ins,
+.vakata-context ul .vakata-context-hover>a .span,
+.vakata-context ul li a:hover .ins,
+.vakata-context ul li a:hover .span {
+    border:0!important
+}
+.vakata-context .vakata-context-separator a,
+.vakata-context-rtl .vakata-context-separator a {
+    margin:0;
+    border:0;
+    height:2px;
+    background-color:#F1F1F4;
+}
+
diff --git a/Resources/public/js/manager.js b/Resources/public/js/manager.js
index 4a99c22..5c93685 100644
--- a/Resources/public/js/manager.js
+++ b/Resources/public/js/manager.js
@@ -1,298 +1,350 @@
 $(function () {
 
-    var $renameModal = $('#js-confirm-rename');
-    var $deleteModal = $('#js-confirm-delete');
-    var $displayModal = $('#js-display-image');
-    var callback = function (key, opt) {
-        switch (key) {
-            case 'edit':
-                var $renameModalButton = opt.$trigger.find(".js-rename-modal")
-                renameFile($renameModalButton)
-                $renameModal.modal("show");
-                break;
-            case 'delete':
-                var $deleteModalButton = opt.$trigger.find(".js-delete-modal")
-                deleteFile($deleteModalButton)
-                $deleteModal.modal("show");
-                break;
-            case 'download':
-                var $downloadButton = opt.$trigger.find(".js-download")
-                downloadFile($downloadButton)
-                break;
-            case 'preview':
-                var $previewModalButton = opt.$trigger.find(".js-open-modal")
-                previewFile($previewModalButton)
-                $displayModal.modal("show");
-                break;
-        }
-    };
-
-    $.contextMenu({
-        selector: '.file',
-        callback: callback,
-        items: {
-            "delete": {name: deleteMessage, icon: "far fa-trash-alt"},
-            "edit": {name: renameMessage, icon: "far fa-edit"},
-            "download": {name: downloadMessage, icon: "fas fa-download"},
+        var $renameModal = $('#js-confirm-rename');
+        var $deleteModal = $('#js-confirm-delete');
+        var $displayModal = $('#js-display-image');
+        var callback = function (key, opt) {
+            switch (key) {
+                case 'edit':
+                    var $renameModalButton = opt.$trigger.find(".js-rename-modal")
+                    renameFile($renameModalButton)
+                    $renameModal.modal("show");
+                    break;
+                case 'delete':
+                    var $deleteModalButton = opt.$trigger.find(".js-delete-modal")
+                    deleteFile($deleteModalButton)
+                    $deleteModal.modal("show");
+                    break;
+                case 'download':
+                    var $downloadButton = opt.$trigger.find(".js-download")
+                    downloadFile($downloadButton)
+                    break;
+                case 'preview':
+                    var $previewModalButton = opt.$trigger.find(".js-open-modal")
+                    previewFile($previewModalButton)
+                    $displayModal.modal("show");
+                    break;
+            }
+        };
+
+        $.contextMenu({
+            selector: '.file',
+            callback: callback,
+            items: {
+                "delete": {name: deleteMessage, icon: "far fa-trash-alt"},
+                "edit": {name: renameMessage, icon: "far fa-edit"},
+                "download": {name: downloadMessage, icon: "fas fa-download"},
+            }
+        });
+        $.contextMenu({
+            selector: '.img',
+            callback: callback,
+            items: {
+                "delete": {name: deleteMessage, icon: "far fa-trash-alt"},
+                "edit": {name: renameMessage, icon: "far fa-edit"},
+                "download": {name: downloadMessage, icon: "fas fa-download"},
+                "preview": {name: previewMessage, icon: "fas fa-eye"},
+            }
+        });
+        $.contextMenu({
+            selector: '.dir',
+            callback: callback,
+            items: {
+                "delete": {name: deleteMessage, icon: "far fa-trash-alt"},
+                "edit": {name: renameMessage, icon: "far fa-edit"},
+            }
+        });
+
+        function renameFile($renameModalButton) {
+            $('#rename_f_name').val($renameModalButton.data('name'));
+            $('#rename_f_extension').val($renameModalButton.data('extension'));
+            $renameModal.find('form').attr('action', $renameModalButton.data('href'))
         }
-    });
-    $.contextMenu({
-        selector: '.img',
-        callback: callback,
-        items: {
-            "delete": {name: deleteMessage, icon: "far fa-trash-alt"},
-            "edit": {name: renameMessage, icon: "far fa-edit"},
-            "download": {name: downloadMessage, icon: "fas fa-download"},
-            "preview": {name: previewMessage, icon: "fas fa-eye"},
+
+        function deleteFile($deleteModalButton) {
+            $('#js-confirm-delete').find('form').attr('action', $deleteModalButton.data('href'));
         }
-    });
-    $.contextMenu({
-        selector: '.dir',
-        callback: callback,
-        items: {
-            "delete": {name: deleteMessage, icon: "far fa-trash-alt"},
-            "edit": {name: renameMessage, icon: "far fa-edit"},
+
+        function previewFile($previewModalButton) {
+            var href = addParameterToURL($previewModalButton.data('href'), 'time=' + new Date().getTime());
+            $('#js-display-image').find('img').attr('src', href);
         }
-    });
 
-    function renameFile($renameModalButton) {
-        $('#rename_f_name').val($renameModalButton.data('name'));
-        $('#rename_f_extension').val($renameModalButton.data('extension'));
-        $renameModal.find('form').attr('action', $renameModalButton.data('href'))
-    }
+        function addParameterToURL(_url, param) {
+            _url += (_url.split('?')[1] ? '&' : '?') + param;
+            return _url;
+        }
 
-    function deleteFile($deleteModalButton) {
-        $('#js-confirm-delete').find('form').attr('action', $deleteModalButton.data('href'));
-    }
+        function downloadFile($downloadButton) {
+            $downloadButton[0].click();
+        }
 
-    function previewFile($previewModalButton) {
-        var href = addParameterToURL($previewModalButton.data('href'), 'time=' + new Date().getTime());
-        $('#js-display-image').find('img').attr('src', href);
-    }
+        function initTree(treedata) {
+            $('#tree').jstree({
+                'core': {
+                    'data': treedata,
+                    "check_callback": true,
+                    "themes": {"stripes": true}
+                },
+                'search': {
+                    'case_insensitive': true,
+                    'show_only_matches': true
+                },
+                "contextmenu": {
+                    items: function ($node) {
+                        return {
+                            "create_folder": {
+                                "seperator_after": true,
+                                "label": newFolderMessage,
+                                "action": function (data) {
+                                    $('#addFolder').modal('show');
+                                    var $a_href = data.reference[0].getAttribute("href");
+                                    $a_href_folder = new URLSearchParams($a_href.split('?')[1]).get('route');
+                                    document.getElementById('rename_defined_parent_path').value = $a_href_folder;
+                                }
+                            },
+                            "delete_folder": {
+                                "separator_before": true,
+                                "seperator_after": true,
+                                "label": deleteMessage,
+                                "action": function (data) {
+                                    document.querySelector('.js-delete-modal').click();
+                                    var $a_href = data.reference[0].getAttribute("href");
+                                    $a_href_folder = new URLSearchParams($a_href.split('?')[1]).get('route');
+                                    document.getElementById('delete_f_defined_parent_path').value = $a_href_folder;
+                                }
+                            },
+                            "rename_folder": {
+                                "label": renameMessage,
+                                "action": function (data) {
+                                    $('#js-confirm-folder-rename').modal('show');
+                                    var $old_name = data.reference[0].innerText;
+                                    document.getElementById('rename_folder_name').value = $old_name;
+                                    document.getElementById('rename_folder_oldname').value = $old_name;
+                                    var $a_href = data.reference[0].getAttribute("href");
+                                    $a_href_folder = new URLSearchParams($a_href.split('?')[1]).get('route');
+                                    document.getElementById('rename_folder_oldpath').value = $a_href_folder;
+                                }
+                            },
+                        }
+                    },
+                    select_node:
+                        false,
+                },
+                'plugins': ['search', 'contextmenu','dnd']
+            }).bind("changed.jstree", function (e, data) {
+                if (data.node) {
+                    document.location = data.node.a_attr.href;
+                }
+            }).on('search.jstree', function (nodes, str, res) {
+                if (str.nodes.length === 0) {
+                    $('#jstree-folder-search').jstree(true).hide_all();
+                }
+            });
+        }
 
-    function addParameterToURL(_url, param) {
-        _url += (_url.split('?')[1] ? '&' : '?') + param;
-        return _url;
-    }
+        if (tree === true) {
 
-    function downloadFile($downloadButton) {
-        $downloadButton[0].click();
-    }
+            // sticky kit
+            $("#tree-block").stick_in_parent();
 
-    function initTree(treedata) {
-        $('#tree').jstree({
-            'core': {
-                'data': treedata,
-                "check_callback": true
-            }
-        }).bind("changed.jstree", function (e, data) {
-            if (data.node) {
-                document.location = data.node.a_attr.href;
-            }
+            initTree(treedata);
+        }
+        $(document)
+            // checkbox select all
+            .on('click', '#select-all', function () {
+                var checkboxes = $('#form-multiple-delete').find(':checkbox')
+                if ($(this).is(':checked')) {
+                    checkboxes.prop('checked', true);
+                } else {
+                    checkboxes.prop('checked', false);
+                }
+            })
+            // delete modal buttons
+            .on('click', '.js-delete-modal', function () {
+                    deleteFile($(this));
+                }
+            )
+            // preview modal buttons
+            .on('click', '.js-open-modal', function () {
+                    previewFile($(this));
+                }
+            )
+            // rename modal buttons
+            .on('click', '.js-rename-modal', function () {
+                    renameFile($(this));
+                }
+            )
+            // multiple delete modal button
+            .on('click', '#js-delete-multiple-modal', function () {
+                var $multipleDelete = $('#form-multiple-delete').serialize();
+                if ($multipleDelete) {
+                    var href = urldelete + '&' + $multipleDelete;
+                    $('#js-confirm-delete').find('form').attr('action', href);
+                }
+            })
+            // checkbox
+            .on('click', '#form-multiple-delete :checkbox', function () {
+                var $jsDeleteMultipleModal = $('#js-delete-multiple-modal');
+                if ($(".checkbox").is(':checked')) {
+                    $jsDeleteMultipleModal.removeClass('disabled');
+                } else {
+                    $jsDeleteMultipleModal.addClass('disabled');
+                }
+            });
+
+        // preselected
+        $renameModal.on('shown.bs.modal', function () {
+            $('#form_name').select().mouseup(function () {
+                $('#form_name').unbind("mouseup");
+                return false;
+            });
         });
-    }
-
-    if (tree === true) {
-
-        // sticky kit
-        $("#tree-block").stick_in_parent();
-
-        initTree(treedata);
-    }
-    $(document)
-        // checkbox select all
-        .on('click', '#select-all', function () {
-            var checkboxes = $('#form-multiple-delete').find(':checkbox')
-            if ($(this).is(':checked')) {
-                checkboxes.prop('checked', true);
-            } else {
-                checkboxes.prop('checked', false);
-            }
-        })
-        // delete modal buttons
-        .on('click', '.js-delete-modal', function () {
-                deleteFile($(this));
-            }
-        )
-        // preview modal buttons
-        .on('click', '.js-open-modal', function () {
-                previewFile($(this));
-            }
-        )
-        // rename modal buttons
-        .on('click', '.js-rename-modal', function () {
-                renameFile($(this));
-            }
-        )
-        // multiple delete modal button
-        .on('click', '#js-delete-multiple-modal', function () {
-            var $multipleDelete = $('#form-multiple-delete').serialize();
-            if ($multipleDelete) {
-                var href = urldelete + '&' + $multipleDelete;
-                $('#js-confirm-delete').find('form').attr('action', href);
-            }
-        })
-        // checkbox
-        .on('click', '#form-multiple-delete :checkbox', function () {
-            var $jsDeleteMultipleModal = $('#js-delete-multiple-modal');
-            if ($(".checkbox").is(':checked')) {
-                $jsDeleteMultipleModal.removeClass('disabled');
-            } else {
-                $jsDeleteMultipleModal.addClass('disabled');
-            }
+        $('#addFolder').on('shown.bs.modal', function () {
+            $('#rename_name').select().mouseup(function () {
+                $('#rename_name').unbind("mouseup");
+                return false;
+            });
         });
 
-    // preselected
-    $renameModal.on('shown.bs.modal', function () {
-        $('#form_name').select().mouseup(function () {
-            $('#form_name').unbind("mouseup");
-            return false;
-        });
-    });
-    $('#addFolder').on('shown.bs.modal', function () {
-        $('#rename_name').select().mouseup(function () {
-            $('#rename_name').unbind("mouseup");
-            return false;
-        });
-    });
 
+        // Module Tiny
+        if (moduleName === 'tiny') {
 
-    // Module Tiny
-    if (moduleName === 'tiny') {
+            $('#form-multiple-delete').on('click', '.select', function () {
 
-        $('#form-multiple-delete').on('click', '.select', function () {
 
+                var windowManager = top != undefined && top.tinymceWindowManager != undefined ? top.tinymceWindowManager : '';
 
-            var windowManager = top != undefined && top.tinymceWindowManager != undefined ? top.tinymceWindowManager : '';
+                // tinymce 5
+                if (windowManager != '') {
+                    if (top.tinymceCallBackURL != undefined)
+                        top.tinymceCallBackURL = $(this).attr("data-path");
+                    windowManager.close();
+                } else {
+                    // tinymce 4
+                    var args = top.tinymce.activeEditor.windowManager.getParams();
+                    var input = args.input;
+                    var document = args.window.document;
+                    var divInputSplit = document.getElementById(input).parentNode.id.split("_");
 
-            // tinymce 5
-            if (windowManager != '') {
-                if (top.tinymceCallBackURL != undefined)
-                    top.tinymceCallBackURL = $(this).attr("data-path");
-                windowManager.close();
-            } else {
-                // tinymce 4
-                var args = top.tinymce.activeEditor.windowManager.getParams();
-                var input = args.input;
-                var document = args.window.document;
-                var divInputSplit = document.getElementById(input).parentNode.id.split("_");
+                    // set url
+                    document.getElementById(input).value = $(this).attr("data-path");
 
-                // set url
-                document.getElementById(input).value = $(this).attr("data-path");
+                    // set width and height
+                    var baseId = divInputSplit[0] + '_';
+                    var baseInt = parseInt(divInputSplit[1], 10);
 
-                // set width and height
-                var baseId = divInputSplit[0] + '_';
-                var baseInt = parseInt(divInputSplit[1], 10);
+                    divWidth = baseId + (baseInt + 3);
+                    divHeight = baseId + (baseInt + 5);
 
-                divWidth = baseId + (baseInt + 3);
-                divHeight = baseId + (baseInt + 5);
+                    document.getElementById(divWidth).value = $(this).attr("data-width");
+                    document.getElementById(divHeight).value = $(this).attr("data-height");
 
-                document.getElementById(divWidth).value = $(this).attr("data-width");
-                document.getElementById(divHeight).value = $(this).attr("data-height");
+                    top.tinymce.activeEditor.windowManager.close();
+                }
 
-                top.tinymce.activeEditor.windowManager.close();
-            }
+            });
+        }
 
-        });
-    }
+        // Module CKEditor
+        if (moduleName === 'ckeditor') {
+            $('#form-multiple-delete').on('click', '.select', function () {
+                var regex = new RegExp("[\\?&]CKEditorFuncNum=([^&#]*)");
+                var funcNum = regex.exec(location.search)[1];
+                var fileUrl = $(this).attr("data-path");
+                window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl);
+                window.close();
+            });
+        }
 
-    // Module CKEditor
-    if (moduleName === 'ckeditor') {
-        $('#form-multiple-delete').on('click', '.select', function () {
-            var regex = new RegExp("[\\?&]CKEditorFuncNum=([^&#]*)");
-            var funcNum = regex.exec(location.search)[1];
-            var fileUrl = $(this).attr("data-path");
-            window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl);
-            window.close();
-        });
-    }
+        // Global functions
+        // display error alert
+        function displayError(msg) {
+            displayAlert('danger', msg)
+        }
 
-    // Global functions
-    // display error alert
-    function displayError(msg) {
-        displayAlert('danger', msg)
-    }
+        // display success alert
+        function displaySuccess(msg) {
+            displayAlert('success', msg)
+        }
 
-    // display success alert
-    function displaySuccess(msg) {
-        displayAlert('success', msg)
-    }
+        // file upload
+        $('#fileupload').fileupload({
+            dataType: 'json',
+            processQueue: false,
+            dropZone: $('#dropzone')
+        }).on('fileuploaddone', function (e, data) {
+            $.each(data.result.files, function (index, file) {
+                const fileName = $("<strong>").text(file.name).html();
+                if (file.url) {
+                    displaySuccess(fileName + ' ' + successMessage)
+                    // Ajax update view
+                    $.ajax({
+                        dataType: "json",
+                        url: url,
+                        type: 'GET'
+                    }).done(function (data) {
+                        // update file list
+                        $('#form-multiple-delete').html(data.data);
+
+                        lazy();
+
+                        if (tree === true) {
+                            $('#tree').data('jstree', false).empty();
+                            initTree(data.treeData);
+                        }
+
+                        $('#select-all').prop('checked', false);
+                        $('#js-delete-multiple-modal').addClass('disabled');
+
+                    }).fail(function (jqXHR, textStatus, errorThrown) {
+                        displayError('<strong>Ajax call error :</strong> ' + jqXHR.status + ' ' + errorThrown)
+                    });
+
+                } else if (file.error) {
+                    displayError(fileName + ' ' + file.error)
+                }
+            });
+        }).on('fileuploadfail', function (e, data) {
+            $.each(data.files, function (index, file) {
+                displayError('File upload failed.')
+            });
+        }).on('fileuploadprogressall', function (e, data) {
+
+            if (e.isDefaultPrevented()) {
+                return false;
+            }
+            var progress = Math.floor((data.loaded / data.total) * 100);
+
+            $('.progress-bar')
+                .removeClass("notransition")
+                .attr('aria-valuenow', progress)
+                .css('width', progress + '%');
 
-    // file upload
-    $('#fileupload').fileupload({
-        dataType: 'json',
-        processQueue: false,
-        dropZone: $('#dropzone')
-    }).on('fileuploaddone', function (e, data) {
-        $.each(data.result.files, function (index, file) {
-            const fileName = $("<strong>").text(file.name).html();
-            if (file.url) {
-                displaySuccess(fileName+' ' + successMessage)
-                // Ajax update view
-                $.ajax({
-                    dataType: "json",
-                    url: url,
-                    type: 'GET'
-                }).done(function (data) {
-                    // update file list
-                    $('#form-multiple-delete').html(data.data);
-
-                    lazy();
-
-                    if (tree === true) {
-                        $('#tree').data('jstree', false).empty();
-                        initTree(data.treeData);
-                    }
-
-                    $('#select-all').prop('checked', false);
-                    $('#js-delete-multiple-modal').addClass('disabled');
-
-                }).fail(function (jqXHR, textStatus, errorThrown) {
-                    displayError('<strong>Ajax call error :</strong> ' + jqXHR.status + ' ' + errorThrown)
-                });
-
-            } else if (file.error) {
-                displayError(fileName+' ' + file.error)
+        }).on('fileuploadstop', function (e) {
+            if (e.isDefaultPrevented()) {
+                return false;
             }
+            $('.progress-bar')
+                .addClass("notransition")
+                .attr('aria-valuenow', 0)
+                .css('width', 0 + '%');
         });
-    }).on('fileuploadfail', function (e, data) {
-        $.each(data.files, function (index, file) {
-            displayError('File upload failed.')
-        });
-    }).on('fileuploadprogressall', function (e, data) {
 
-        if (e.isDefaultPrevented()) {
-            return false;
+        function lazy() {
+            $('.lazy').Lazy({});
         }
-        var progress = Math.floor((data.loaded / data.total) * 100);
-
-        $('.progress-bar')
-            .removeClass("notransition")
-            .attr('aria-valuenow', progress)
-            .css('width', progress + '%');
 
-    }).on('fileuploadstop', function (e) {
-        if (e.isDefaultPrevented()) {
-            return false;
-        }
-        $('.progress-bar')
-            .addClass("notransition")
-            .attr('aria-valuenow', 0)
-            .css('width', 0 + '%');
-    });
-
-    function lazy() {
-        $('.lazy').Lazy({});
-    }
+        lazy();
 
-    lazy();
+        $('#search').on("keyup", function () {
+            var value = $(this).val().toLowerCase();
+            $('#form-multiple-delete .file-wrapper').filter(function () {
+                $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
+            });
 
-    $('#search').on("keyup", function() {
-        var value = $(this).val().toLowerCase();
-        $('#form-multiple-delete .file-wrapper').filter(function() {
-            $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1);
         });
-
-    });
-})
+    }
+)
 ;
\ No newline at end of file
diff --git a/Resources/public/libs/jstree/dist/jstree.js b/Resources/public/libs/jstree/dist/jstree.js
index f48bbc0..d89a396 100644
--- a/Resources/public/libs/jstree/dist/jstree.js
+++ b/Resources/public/libs/jstree/dist/jstree.js
@@ -12,20 +12,20 @@
 	}
 }(function ($, undefined) {
 	"use strict";
-/*!
- * jsTree 3.3.4
- * http://jstree.com/
- *
- * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
- *
- * Licensed same as jquery - under the terms of the MIT License
- *   http://www.opensource.org/licenses/mit-license.php
- */
-/*!
- * if using jslint please allow for the jQuery global and use following options:
- * jslint: loopfunc: true, browser: true, ass: true, bitwise: true, continue: true, nomen: true, plusplus: true, regexp: true, unparam: true, todo: true, white: true
- */
-/*jshint -W083 */
+	/*!
+     * jsTree 3.3.17
+     * http://jstree.com/
+     *
+     * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
+     *
+     * Licensed same as jquery - under the terms of the MIT License
+     *   http://www.opensource.org/licenses/mit-license.php
+     */
+	/*!
+     * if using jslint please allow for the jQuery global and use following options:
+     * jslint: loopfunc: true, browser: true, ass: true, bitwise: true, continue: true, nomen: true, plusplus: true, regexp: true, unparam: true, todo: true, white: true
+     */
+	/*jshint -W083 */
 
 	// prevent another load? maybe there is a better way?
 	if($.jstree) {
@@ -36,7 +36,7 @@
 	 * ### jsTree core functionality
 	 */
 
-	// internal variables
+		// internal variables
 	var instance_counter = 0,
 		ccp_node = false,
 		ccp_mode = false,
@@ -45,6 +45,15 @@
 		src = $('script:last').attr('src'),
 		document = window.document; // local variable is always faster to access then a global
 
+	var setImmediate = window.setImmediate;
+	var Promise = window.Promise;
+	if (!setImmediate && Promise) {
+		// Good enough approximation of setImmediate
+		setImmediate = function (cb, arg) {
+			Promise.resolve(arg).then(cb);
+		};
+	}
+
 	/**
 	 * holds all jstree related functions and variables, including the actual class and methods to create, access and manipulate instances.
 	 * @name $.jstree
@@ -54,7 +63,7 @@
 		 * specifies the jstree version in use
 		 * @name $.jstree.version
 		 */
-		version : '3.3.4',
+		version : '3.3.17',
 		/**
 		 * holds all the default options used when creating new instances
 		 * @name $.jstree.defaults
@@ -75,7 +84,7 @@
 		idregex : /[\\:&!^|()\[\]<>@*'+~#";.,=\- \/${}%?`]/g,
 		root : '#'
 	};
-	
+
 	/**
 	 * creates a jstree instance
 	 * @name $.jstree.create(el [, options])
@@ -265,7 +274,7 @@
 		 * You can also pass in a HTML string or a JSON array here.
 		 *
 		 * It is possible to pass in a standard jQuery-like AJAX config and jstree will automatically determine if the response is JSON or HTML and use that to populate the tree.
-		 * In addition to the standard jQuery ajax options here you can suppy functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node is being loaded, the return value of those functions will be used.
+		 * In addition to the standard jQuery ajax options here you can supply functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node is being loaded, the return value of those functions will be used.
 		 *
 		 * The last option is to specify a function, that function will receive the node being loaded as argument and a second param which is a function which should be called with the result.
 		 *
@@ -430,10 +439,101 @@
 		 */
 		force_text : false,
 		/**
-		 * Should the node should be toggled if the text is double clicked . Defaults to `true`
+		 * Should the node be toggled if the text is double clicked. Defaults to `true`
 		 * @name $.jstree.defaults.core.dblclick_toggle
 		 */
-		dblclick_toggle : true
+		dblclick_toggle : true,
+		/**
+		 * Should the loaded nodes be part of the state. Defaults to `false`
+		 * @name $.jstree.defaults.core.loaded_state
+		 */
+		loaded_state : false,
+		/**
+		 * Should the last active node be focused when the tree container is blurred and the focused again. This helps working with screen readers. Defaults to `true`
+		 * @name $.jstree.defaults.core.restore_focus
+		 */
+		restore_focus : true,
+		/**
+		 * Force to compute and set "aria-setsize" and "aria-posinset" explicitly for each treeitem.
+		 * Some browsers may compute incorrect elements position and produce wrong announcements for screen readers. Defaults to `false`
+		 * @name $.jstree.defaults.core.compute_elements_positions
+		 */
+		compute_elements_positions : false,
+		/**
+		 * Default keyboard shortcuts (an object where each key is the button name or combo - like 'enter', 'ctrl-space', 'p', etc and the value is the function to execute in the instance's scope)
+		 * @name $.jstree.defaults.core.keyboard
+		 */
+		keyboard : {
+			'ctrl-space': function (e) {
+				// aria defines space only with Ctrl
+				e.type = "click";
+				$(e.currentTarget).trigger(e);
+			},
+			'enter': function (e) {
+				// enter
+				e.type = "click";
+				$(e.currentTarget).trigger(e);
+			},
+			'left': function (e) {
+				// left
+				e.preventDefault();
+				if(this.is_open(e.currentTarget)) {
+					this.close_node(e.currentTarget);
+				}
+				else {
+					var o = this.get_parent(e.currentTarget);
+					if(o && o.id !== $.jstree.root) { this.get_node(o, true).children('.jstree-anchor').trigger('focus'); }
+				}
+			},
+			'up': function (e) {
+				// up
+				e.preventDefault();
+				var o = this.get_prev_dom(e.currentTarget);
+				if(o && o.length) { o.children('.jstree-anchor').trigger('focus'); }
+			},
+			'right': function (e) {
+				// right
+				e.preventDefault();
+				if(this.is_closed(e.currentTarget)) {
+					this.open_node(e.currentTarget, function (o) { this.get_node(o, true).children('.jstree-anchor').trigger('focus'); });
+				}
+				else if (this.is_open(e.currentTarget)) {
+					var o = this.get_node(e.currentTarget, true).children('.jstree-children')[0];
+					if(o) { $(this._firstChild(o)).children('.jstree-anchor').trigger('focus'); }
+				}
+			},
+			'down': function (e) {
+				// down
+				e.preventDefault();
+				var o = this.get_next_dom(e.currentTarget);
+				if(o && o.length) { o.children('.jstree-anchor').trigger('focus'); }
+			},
+			'*': function (e) {
+				// aria defines * on numpad as open_all - not very common
+				this.open_all();
+			},
+			'home': function (e) {
+				// home
+				e.preventDefault();
+				var o = this._firstChild(this.get_container_ul()[0]);
+				if(o) { $(o).children('.jstree-anchor').filter(':visible').trigger('focus'); }
+			},
+			'end': function (e) {
+				// end
+				e.preventDefault();
+				this.element.find('.jstree-anchor').filter(':visible').last().trigger('focus');
+			},
+			'f2': function (e) {
+				// f2 - safe to include - if check_callback is false it will fail
+				e.preventDefault();
+				this.edit(e.currentTarget);
+			}
+		},
+		/**
+		 * Should reselecting an already selected node trigger the select and changed callbacks
+		 * @name $.jstree.defaults.core.allow_reselect
+		 */
+		allow_reselect : false
 	};
 	$.jstree.core.prototype = {
 		/**
@@ -510,10 +610,10 @@
 			this._data.core.original_container_html
 				.find("li").addBack()
 				.contents().filter(function() {
-					return this.nodeType === 3 && (!this.nodeValue || /^\s+$/.test(this.nodeValue));
-				})
+				return this.nodeType === 3 && (!this.nodeValue || /^\s+$/.test(this.nodeValue));
+			})
 				.remove();
-			this.element.html("<"+"ul class='jstree-container-ul jstree-children' role='group'><"+"li id='j"+this._id+"_loading' class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='tree-item'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
+			this.element.html("<"+"ul class='jstree-container-ul jstree-children' role='group'><"+"li id='j"+this._id+"_loading' class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='none'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' role='treeitem' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
 			this.element.attr('aria-activedescendant','j' + this._id + '_loading');
 			this._data.core.li_height = this.get_container_ul().children("li").first().outerHeight() || 24;
 			this._data.core.node = this._create_prototype_node();
@@ -548,11 +648,13 @@
 			this.teardown();
 		},
 		/**
-		 * Create prototype node
+		 * Create a prototype node
+		 * @name _create_prototype_node()
+		 * @return {DOMElement}
 		 */
 		_create_prototype_node : function () {
 			var _node = document.createElement('LI'), _temp1, _temp2;
-			_node.setAttribute('role', 'treeitem');
+			_node.setAttribute('role', 'none');
 			_temp1 = document.createElement('I');
 			_temp1.className = 'jstree-icon jstree-ocl';
 			_temp1.setAttribute('role', 'presentation');
@@ -561,6 +663,7 @@
 			_temp1.className = 'jstree-anchor';
 			_temp1.setAttribute('href','#');
 			_temp1.setAttribute('tabindex','-1');
+			_temp1.setAttribute('role', 'treeitem');
 			_temp2 = document.createElement('I');
 			_temp2.className = 'jstree-icon jstree-themeicon';
 			_temp2.setAttribute('role', 'presentation');
@@ -570,6 +673,51 @@
 
 			return _node;
 		},
+		_kbevent_to_func : function (e) {
+			var keys = {
+				8: "Backspace", 9: "Tab", 13: "Enter", 19: "Pause", 27: "Esc",
+				32: "Space", 33: "PageUp", 34: "PageDown", 35: "End", 36: "Home",
+				37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "Print", 45: "Insert",
+				46: "Delete", 96: "Numpad0", 97: "Numpad1", 98: "Numpad2", 99 : "Numpad3",
+				100: "Numpad4", 101: "Numpad5", 102: "Numpad6", 103: "Numpad7",
+				104: "Numpad8", 105: "Numpad9", '-13': "NumpadEnter", 112: "F1",
+				113: "F2", 114: "F3", 115: "F4", 116: "F5", 117: "F6", 118: "F7",
+				119: "F8", 120: "F9", 121: "F10", 122: "F11", 123: "F12", 144: "Numlock",
+				145: "Scrolllock", 16: 'Shift', 17: 'Ctrl', 18: 'Alt',
+				48: '0',  49: '1',  50: '2',  51: '3',  52: '4', 53:  '5',
+				54: '6',  55: '7',  56: '8',  57: '9',  59: ';',  61: '=', 65:  'a',
+				66: 'b',  67: 'c',  68: 'd',  69: 'e',  70: 'f',  71: 'g', 72:  'h',
+				73: 'i',  74: 'j',  75: 'k',  76: 'l',  77: 'm',  78: 'n', 79:  'o',
+				80: 'p',  81: 'q',  82: 'r',  83: 's',  84: 't',  85: 'u', 86:  'v',
+				87: 'w',  88: 'x',  89: 'y',  90: 'z', 107: '+', 109: '-', 110: '.',
+				186: ';', 187: '=', 188: ',', 189: '-', 190: '.', 191: '/', 192: '`',
+				219: '[', 220: '\\',221: ']', 222: "'", 111: '/', 106: '*', 173: '-'
+			};
+			var parts = [];
+			if (e.ctrlKey) { parts.push('ctrl'); }
+			if (e.altKey) { parts.push('alt'); }
+			if (e.shiftKey) { parts.push('shift'); }
+			parts.push(keys[e.which] ? keys[e.which].toLowerCase() : e.which);
+			parts = parts.sort().join('-').toLowerCase();
+			if (parts === 'shift-shift' || parts === 'ctrl-ctrl' || parts === 'alt-alt') {
+				return null;
+			}
+
+			var kb = this.settings.core.keyboard, i, tmp;
+			for (i in kb) {
+				if (kb.hasOwnProperty(i)) {
+					tmp = i;
+					if (tmp !== '-' && tmp !== '+') {
+						tmp = tmp.replace('--', '-MINUS').replace('+-', '-MINUS').replace('++', '-PLUS').replace('-+', '-PLUS');
+						tmp = tmp.split(/-|\+/).sort().join('-').replace('MINUS', '-').replace('PLUS', '+').toLowerCase();
+					}
+					if (tmp === parts) {
+						return kb[i];
+					}
+				}
+			}
+			return null;
+		},
 		/**
 		 * part of the destroying of an instance. Used internally.
 		 * @private
@@ -581,8 +729,8 @@
 				.removeClass('jstree')
 				.removeData('jstree')
 				.find("[class^='jstree']")
-					.addBack()
-					.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });
+				.addBack()
+				.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });
 			this.element = null;
 		},
 		/**
@@ -596,269 +744,204 @@
 				was_click = 0;
 			this.element
 				.on("dblclick.jstree", function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(document.selection && document.selection.empty) {
-							document.selection.empty();
-						}
-						else {
-							if(window.getSelection) {
-								var sel = window.getSelection();
-								try {
-									sel.removeAllRanges();
-									sel.collapse();
-								} catch (ignore) { }
-							}
-						}
-					})
-				.on("mousedown.jstree", $.proxy(function (e) {
-						if(e.target === this.element[0]) {
-							e.preventDefault(); // prevent losing focus when clicking scroll arrows (FF, Chrome)
-							was_click = +(new Date()); // ie does not allow to prevent losing focus
+					if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+					if(document.selection && document.selection.empty) {
+						document.selection.empty();
+					}
+					else {
+						if(window.getSelection) {
+							var sel = window.getSelection();
+							try {
+								sel.removeAllRanges();
+								sel.collapse();
+							} catch (ignore) { }
 						}
-					}, this))
+					}
+				})
+				.on("mousedown.jstree", function (e) {
+					if(e.target === this.element[0]) {
+						e.preventDefault(); // prevent losing focus when clicking scroll arrows (FF, Chrome)
+						was_click = +(new Date()); // ie does not allow to prevent losing focus
+					}
+				}.bind(this))
 				.on("mousedown.jstree", ".jstree-ocl", function (e) {
-						e.preventDefault(); // prevent any node inside from losing focus when clicking the open/close icon
-					})
-				.on("click.jstree", ".jstree-ocl", $.proxy(function (e) {
+					e.preventDefault(); // prevent any node inside from losing focus when clicking the open/close icon
+				})
+				.on("click.jstree", ".jstree-ocl", function (e) {
+					this.toggle_node(e.target);
+				}.bind(this))
+				.on("dblclick.jstree", ".jstree-anchor", function (e) {
+					if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+					if(this.settings.core.dblclick_toggle) {
 						this.toggle_node(e.target);
-					}, this))
-				.on("dblclick.jstree", ".jstree-anchor", $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(this.settings.core.dblclick_toggle) {
-							this.toggle_node(e.target);
-						}
-					}, this))
-				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
-						e.preventDefault();
-						if(e.currentTarget !== document.activeElement) { $(e.currentTarget).focus(); }
-						this.activate_node(e.currentTarget, e);
-					}, this))
-				.on('keydown.jstree', '.jstree-anchor', $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(e.which !== 32 && e.which !== 13 && (e.shiftKey || e.ctrlKey || e.altKey || e.metaKey)) { return true; }
-						var o = null;
-						if(this._data.core.rtl) {
-							if(e.which === 37) { e.which = 39; }
-							else if(e.which === 39) { e.which = 37; }
-						}
-						switch(e.which) {
-							case 32: // aria defines space only with Ctrl
-								if(e.ctrlKey) {
-									e.type = "click";
-									$(e.currentTarget).trigger(e);
-								}
-								break;
-							case 13: // enter
-								e.type = "click";
-								$(e.currentTarget).trigger(e);
-								break;
-							case 37: // left
-								e.preventDefault();
-								if(this.is_open(e.currentTarget)) {
-									this.close_node(e.currentTarget);
-								}
-								else {
-									o = this.get_parent(e.currentTarget);
-									if(o && o.id !== $.jstree.root) { this.get_node(o, true).children('.jstree-anchor').focus(); }
-								}
-								break;
-							case 38: // up
-								e.preventDefault();
-								o = this.get_prev_dom(e.currentTarget);
-								if(o && o.length) { o.children('.jstree-anchor').focus(); }
-								break;
-							case 39: // right
-								e.preventDefault();
-								if(this.is_closed(e.currentTarget)) {
-									this.open_node(e.currentTarget, function (o) { this.get_node(o, true).children('.jstree-anchor').focus(); });
-								}
-								else if (this.is_open(e.currentTarget)) {
-									o = this.get_node(e.currentTarget, true).children('.jstree-children')[0];
-									if(o) { $(this._firstChild(o)).children('.jstree-anchor').focus(); }
-								}
-								break;
-							case 40: // down
-								e.preventDefault();
-								o = this.get_next_dom(e.currentTarget);
-								if(o && o.length) { o.children('.jstree-anchor').focus(); }
-								break;
-							case 106: // aria defines * on numpad as open_all - not very common
-								this.open_all();
-								break;
-							case 36: // home
-								e.preventDefault();
-								o = this._firstChild(this.get_container_ul()[0]);
-								if(o) { $(o).children('.jstree-anchor').filter(':visible').focus(); }
-								break;
-							case 35: // end
-								e.preventDefault();
-								this.element.find('.jstree-anchor').filter(':visible').last().focus();
-								break;
-							case 113: // f2 - safe to include - if check_callback is false it will fail
-								e.preventDefault();
-								this.edit(e.currentTarget);
-								break;
-							default:
-								break;
-							/*!
-							// delete
-							case 46:
-								e.preventDefault();
-								o = this.get_node(e.currentTarget);
-								if(o && o.id && o.id !== $.jstree.root) {
-									o = this.is_selected(o) ? this.get_selected() : o;
-									this.delete_node(o);
-								}
-								break;
-
-							*/
+					}
+				}.bind(this))
+				.on("click.jstree", ".jstree-anchor", function (e) {
+					e.preventDefault();
+					if(e.currentTarget !== document.activeElement) { $(e.currentTarget).trigger('focus'); }
+					this.activate_node(e.currentTarget, e);
+				}.bind(this))
+				.on('keydown.jstree', '.jstree-anchor', function (e) {
+					if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+					if(this._data.core.rtl) {
+						if(e.which === 37) { e.which = 39; }
+						else if(e.which === 39) { e.which = 37; }
+					}
+					var f = this._kbevent_to_func(e);
+					if (f) {
+						var r = f.call(this, e);
+						if (r === false || r === true) {
+							return r;
 						}
-					}, this))
-				.on("load_node.jstree", $.proxy(function (e, data) {
-						if(data.status) {
-							if(data.node.id === $.jstree.root && !this._data.core.loaded) {
-								this._data.core.loaded = true;
-								if(this._firstChild(this.get_container_ul()[0])) {
-									this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
-								}
-								/**
-								 * triggered after the root node is loaded for the first time
-								 * @event
-								 * @name loaded.jstree
-								 */
-								this.trigger("loaded");
+					}
+				}.bind(this))
+				.on("load_node.jstree", function (e, data) {
+					if(data.status) {
+						if(data.node.id === $.jstree.root && !this._data.core.loaded) {
+							this._data.core.loaded = true;
+							if(this._firstChild(this.get_container_ul()[0])) {
+								this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
 							}
-							if(!this._data.core.ready) {
-								setTimeout($.proxy(function() {
-									if(this.element && !this.get_container_ul().find('.jstree-loading').length) {
-										this._data.core.ready = true;
-										if(this._data.core.selected.length) {
-											if(this.settings.core.expand_selected_onload) {
-												var tmp = [], i, j;
-												for(i = 0, j = this._data.core.selected.length; i < j; i++) {
-													tmp = tmp.concat(this._model.data[this._data.core.selected[i]].parents);
-												}
-												tmp = $.vakata.array_unique(tmp);
-												for(i = 0, j = tmp.length; i < j; i++) {
-													this.open_node(tmp[i], false, 0);
-												}
+							/**
+							 * triggered after the root node is loaded for the first time
+							 * @event
+							 * @name loaded.jstree
+							 */
+							this.trigger("loaded");
+						}
+						if(!this._data.core.ready) {
+							setTimeout(function() {
+								if(this.element && !this.get_container_ul().find('.jstree-loading').length) {
+									this._data.core.ready = true;
+									if(this._data.core.selected.length) {
+										if(this.settings.core.expand_selected_onload) {
+											var tmp = [], i, j;
+											for(i = 0, j = this._data.core.selected.length; i < j; i++) {
+												tmp = tmp.concat(this._model.data[this._data.core.selected[i]].parents);
+											}
+											tmp = $.vakata.array_unique(tmp);
+											for(i = 0, j = tmp.length; i < j; i++) {
+												this.open_node(tmp[i], false, 0);
 											}
-											this.trigger('changed', { 'action' : 'ready', 'selected' : this._data.core.selected });
 										}
-										/**
-										 * triggered after all nodes are finished loading
-										 * @event
-										 * @name ready.jstree
-										 */
-										this.trigger("ready");
+										this.trigger('changed', { 'action' : 'ready', 'selected' : this._data.core.selected });
 									}
-								}, this), 0);
-							}
-						}
-					}, this))
-				// quick searching when the tree is focused
-				.on('keypress.jstree', $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(tout) { clearTimeout(tout); }
-						tout = setTimeout(function () {
-							word = '';
-						}, 500);
-
-						var chr = String.fromCharCode(e.which).toLowerCase(),
-							col = this.element.find('.jstree-anchor').filter(':visible'),
-							ind = col.index(document.activeElement) || 0,
-							end = false;
-						word += chr;
-
-						// match for whole word from current node down (including the current node)
-						if(word.length > 1) {
-							col.slice(ind).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().indexOf(word) === 0) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-
-							// match for whole word from the beginning of the tree
-							col.slice(0, ind).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().indexOf(word) === 0) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-						}
-						// list nodes that start with that letter (only if word consists of a single char)
-						if(new RegExp('^' + chr.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + '+$').test(word)) {
-							// search for the next node starting with that letter
-							col.slice(ind + 1).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().charAt(0) === chr) {
-									$(v).focus();
-									end = true;
-									return false;
+									/**
+									 * triggered after all nodes are finished loading
+									 * @event
+									 * @name ready.jstree
+									 */
+									this.trigger("ready");
 								}
-							}, this));
-							if(end) { return; }
-
-							// search from the beginning
-							col.slice(0, ind + 1).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().charAt(0) === chr) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-						}
-					}, this))
-				// THEME RELATED
-				.on("init.jstree", $.proxy(function () {
-						var s = this.settings.core.themes;
-						this._data.core.themes.dots			= s.dots;
-						this._data.core.themes.stripes		= s.stripes;
-						this._data.core.themes.icons		= s.icons;
-						this._data.core.themes.ellipsis		= s.ellipsis;
-						this.set_theme(s.name || "default", s.url);
-						this.set_theme_variant(s.variant);
-					}, this))
-				.on("loading.jstree", $.proxy(function () {
-						this[ this._data.core.themes.dots ? "show_dots" : "hide_dots" ]();
-						this[ this._data.core.themes.icons ? "show_icons" : "hide_icons" ]();
-						this[ this._data.core.themes.stripes ? "show_stripes" : "hide_stripes" ]();
-						this[ this._data.core.themes.ellipsis ? "show_ellipsis" : "hide_ellipsis" ]();
-					}, this))
-				.on('blur.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this._data.core.focused = null;
-						$(e.currentTarget).filter('.jstree-hovered').mouseleave();
-						this.element.attr('tabindex', '0');
-					}, this))
-				.on('focus.jstree', '.jstree-anchor', $.proxy(function (e) {
-						var tmp = this.get_node(e.currentTarget);
-						if(tmp && tmp.id) {
-							this._data.core.focused = tmp.id;
+							}.bind(this), 0);
 						}
-						this.element.find('.jstree-hovered').not(e.currentTarget).mouseleave();
-						$(e.currentTarget).mouseenter();
-						this.element.attr('tabindex', '-1');
-					}, this))
-				.on('focus.jstree', $.proxy(function () {
-						if(+(new Date()) - was_click > 500 && !this._data.core.focused) {
-							was_click = 0;
-							var act = this.get_node(this.element.attr('aria-activedescendant'), true);
-							if(act) {
-								act.find('> .jstree-anchor').focus();
+					}
+				}.bind(this))
+				// quick searching when the tree is focused
+				.on('keypress.jstree', function (e) {
+					if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+					if(tout) { clearTimeout(tout); }
+					tout = setTimeout(function () {
+						word = '';
+					}, 500);
+
+					var chr = String.fromCharCode(e.which).toLowerCase(),
+						col = this.element.find('.jstree-anchor').filter(':visible'),
+						ind = col.index(document.activeElement) || 0,
+						end = false;
+					word += chr;
+
+					// match for whole word from current node down (including the current node)
+					if(word.length > 1) {
+						col.slice(ind).each(function (i, v) {
+							if($(v).text().toLowerCase().indexOf(word) === 0) {
+								$(v).trigger('focus');
+								end = true;
+								return false;
+							}
+						}.bind(this));
+						if(end) { return; }
+
+						// match for whole word from the beginning of the tree
+						col.slice(0, ind).each(function (i, v) {
+							if($(v).text().toLowerCase().indexOf(word) === 0) {
+								$(v).trigger('focus');
+								end = true;
+								return false;
+							}
+						}.bind(this));
+						if(end) { return; }
+					}
+					// list nodes that start with that letter (only if word consists of a single char)
+					if(new RegExp('^' + chr.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + '+$').test(word)) {
+						// search for the next node starting with that letter
+						col.slice(ind + 1).each(function (i, v) {
+							if($(v).text().toLowerCase().charAt(0) === chr) {
+								$(v).trigger('focus');
+								end = true;
+								return false;
+							}
+						}.bind(this));
+						if(end) { return; }
+
+						// search from the beginning
+						col.slice(0, ind + 1).each(function (i, v) {
+							if($(v).text().toLowerCase().charAt(0) === chr) {
+								$(v).trigger('focus');
+								end = true;
+								return false;
 							}
+						}.bind(this));
+						if(end) { return; }
+					}
+				}.bind(this))
+				// THEME RELATED
+				.on("init.jstree", function () {
+					var s = this.settings.core.themes;
+					this._data.core.themes.dots			= s.dots;
+					this._data.core.themes.stripes		= s.stripes;
+					this._data.core.themes.icons		= s.icons;
+					this._data.core.themes.ellipsis		= s.ellipsis;
+					this.set_theme(s.name || "default", s.url);
+					this.set_theme_variant(s.variant);
+				}.bind(this))
+				.on("loading.jstree", function () {
+					this[ this._data.core.themes.dots ? "show_dots" : "hide_dots" ]();
+					this[ this._data.core.themes.icons ? "show_icons" : "hide_icons" ]();
+					this[ this._data.core.themes.stripes ? "show_stripes" : "hide_stripes" ]();
+					this[ this._data.core.themes.ellipsis ? "show_ellipsis" : "hide_ellipsis" ]();
+				}.bind(this))
+				.on('blur.jstree', '.jstree-anchor', function (e) {
+					this._data.core.focused = null;
+					$(e.currentTarget).filter('.jstree-hovered').trigger('mouseleave');
+					this.element.attr('tabindex', '0');
+					$(e.currentTarget).attr('tabindex', '-1');
+				}.bind(this))
+				.on('focus.jstree', '.jstree-anchor', function (e) {
+					var tmp = this.get_node(e.currentTarget);
+					if(tmp && (tmp.id || tmp.id === 0)) {
+						this._data.core.focused = tmp.id;
+					}
+					this.element.find('.jstree-hovered').not(e.currentTarget).trigger('mouseleave');
+					$(e.currentTarget).trigger('mouseenter');
+					this.element.attr('tabindex', '-1');
+					$(e.currentTarget).attr('tabindex', '0');
+				}.bind(this))
+				.on('focus.jstree', function () {
+					if(+(new Date()) - was_click > 500 && !this._data.core.focused && this.settings.core.restore_focus) {
+						was_click = 0;
+						var act = this.get_node(this.element.attr('aria-activedescendant'), true);
+						if(act) {
+							act.find('> .jstree-anchor').trigger('focus');
 						}
-					}, this))
-				.on('mouseenter.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this.hover_node(e.currentTarget);
-					}, this))
-				.on('mouseleave.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this.dehover_node(e.currentTarget);
-					}, this));
+					}
+				}.bind(this))
+				.on('mouseenter.jstree', '.jstree-anchor', function (e) {
+					this.hover_node(e.currentTarget);
+				}.bind(this))
+				.on('mouseleave.jstree', '.jstree-anchor', function (e) {
+					this.dehover_node(e.currentTarget);
+				}.bind(this));
 		},
 		/**
 		 * part of the destroying of an instance. Used internally.
@@ -909,7 +992,7 @@
 		 */
 		get_string : function (key) {
 			var a = this.settings.core.strings;
-			if($.isFunction(a)) { return a.call(this, key); }
+			if($.vakata.is_function(a)) { return a.call(this, key); }
 			if(a && a[key]) { return a[key]; }
 			return key;
 		},
@@ -963,9 +1046,12 @@
 		 * @return {Object|jQuery}
 		 */
 		get_node : function (obj, as_dom) {
-			if(obj && obj.id) {
+			if(obj && (obj.id || obj.id === 0)) {
 				obj = obj.id;
 			}
+			if (obj instanceof $ && obj.length && obj[0].id) {
+				obj = obj[0].id;
+			}
 			var dom;
 			try {
 				if(this._model.data[obj]) {
@@ -977,10 +1063,10 @@
 				else if(typeof obj === "string" && (dom = $('#' + obj.replace($.jstree.idregex,'\\$&'), this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
 					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
 				}
-				else if((dom = $(obj, this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
+				else if((dom = this.element.find(obj)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
 					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
 				}
-				else if((dom = $(obj, this.element)).length && dom.hasClass('jstree')) {
+				else if((dom = this.element.find(obj)).length && dom.hasClass('jstree')) {
 					obj = this._model.data[$.jstree.root];
 				}
 				else {
@@ -1114,7 +1200,7 @@
 			return obj.parent;
 		},
 		/**
-		 * get a jQuery collection of all the children of a node (node must be rendered)
+		 * get a jQuery collection of all the children of a node (node must be rendered), returns false on error
 		 * @name get_children_dom(obj)
 		 * @param  {mixed} obj
 		 * @return {jQuery}
@@ -1197,8 +1283,8 @@
 		 * @trigger load_node.jstree
 		 */
 		load_node : function (obj, callback) {
-			var k, l, i, j, c;
-			if($.isArray(obj)) {
+			var dom = this.get_node(obj, true), k, l, i, j, c;
+			if($.vakata.is_array(obj)) {
 				this._load_nodes(obj.slice(), callback);
 				return true;
 			}
@@ -1234,8 +1320,13 @@
 			}
 			obj.state.failed = false;
 			obj.state.loading = true;
-			this.get_node(obj, true).addClass("jstree-loading").attr('aria-busy',true);
-			this._load_node(obj, $.proxy(function (status) {
+			if (obj.id !== $.jstree.root) {
+				dom.children(".jstree-anchor").attr('aria-busy', true);
+			} else {
+				dom.attr('aria-busy', true);
+			}
+			dom.addClass("jstree-loading");
+			this._load_node(obj, function (status) {
 				obj = this._model.data[obj.id];
 				obj.state.loading = false;
 				obj.state.loaded = status;
@@ -1258,7 +1349,12 @@
 						}
 					}
 				}
-				dom.removeClass("jstree-loading").attr('aria-busy',false);
+				if (obj.id !== $.jstree.root) {
+					dom.children(".jstree-anchor").attr('aria-busy', false);
+				} else {
+					dom.attr('aria-busy', false);
+				}
+				dom.removeClass("jstree-loading");
 				/**
 				 * triggered after a node is loaded
 				 * @event
@@ -1270,11 +1366,11 @@
 				if(callback) {
 					callback.call(this, obj, status);
 				}
-			}, this));
+			}.bind(this));
 			return true;
 		},
 		/**
-		 * load an array of nodes (will also load unavailable nodes as soon as the appear in the structure). Used internally.
+		 * load an array of nodes (will also load unavailable nodes as soon as they appear in the structure). Used internally.
 		 * @private
 		 * @name _load_nodes(nodes [, callback])
 		 * @param  {array} nodes
@@ -1368,8 +1464,8 @@
 				}
 				// return callback.call(this, obj.id === $.jstree.root ? this._append_html_data(obj, this._data.core.original_container_html.clone(true)) : false);
 			}
-			if($.isFunction(s)) {
-				return s.call(this, obj, $.proxy(function (d) {
+			if($.vakata.is_function(s)) {
+				return s.call(this, obj, function (d) {
 					if(d === false) {
 						callback.call(this, false);
 					}
@@ -1379,39 +1475,39 @@
 						});
 					}
 					// return d === false ? callback.call(this, false) : callback.call(this, this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $(d) : d));
-				}, this));
+				}.bind(this));
 			}
 			if(typeof s === 'object') {
 				if(s.url) {
 					s = $.extend(true, {}, s);
-					if($.isFunction(s.url)) {
+					if($.vakata.is_function(s.url)) {
 						s.url = s.url.call(this, obj);
 					}
-					if($.isFunction(s.data)) {
+					if($.vakata.is_function(s.data)) {
 						s.data = s.data.call(this, obj);
 					}
 					return $.ajax(s)
-						.done($.proxy(function (d,t,x) {
-								var type = x.getResponseHeader('Content-Type');
-								if((type && type.indexOf('json') !== -1) || typeof d === "object") {
-									return this._append_json_data(obj, d, function (status) { callback.call(this, status); });
-									//return callback.call(this, this._append_json_data(obj, d));
-								}
-								if((type && type.indexOf('html') !== -1) || typeof d === "string") {
-									return this._append_html_data(obj, $($.parseHTML(d)).filter(notTextOrCommentNode), function (status) { callback.call(this, status); });
-									// return callback.call(this, this._append_html_data(obj, $(d)));
-								}
-								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : x }) };
-								this.settings.core.error.call(this, this._data.core.last_error);
-								return callback.call(this, false);
-							}, this))
-						.fail($.proxy(function (f) {
-								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : f }) };
-								callback.call(this, false);
-								this.settings.core.error.call(this, this._data.core.last_error);
-							}, this));
-				}
-				if ($.isArray(s)) {
+						.done(function (d,t,x) {
+							var type = x.getResponseHeader('Content-Type');
+							if((type && type.indexOf('json') !== -1) || typeof d === "object") {
+								return this._append_json_data(obj, d, function (status) { callback.call(this, status); });
+								//return callback.call(this, this._append_json_data(obj, d));
+							}
+							if((type && type.indexOf('html') !== -1) || typeof d === "string") {
+								return this._append_html_data(obj, $($.parseHTML(d)).filter(notTextOrCommentNode), function (status) { callback.call(this, status); });
+								// return callback.call(this, this._append_html_data(obj, $(d)));
+							}
+							this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : x }) };
+							this.settings.core.error.call(this, this._data.core.last_error);
+							return callback.call(this, false);
+						}.bind(this))
+						.fail(function (f) {
+							this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : f }) };
+							callback.call(this, false);
+							this.settings.core.error.call(this, this._data.core.last_error);
+						}.bind(this));
+				}
+				if ($.vakata.is_array(s)) {
 					t = $.extend(true, [], s);
 				} else if ($.isPlainObject(s)) {
 					t = $.extend(true, {}, s);
@@ -1453,7 +1549,7 @@
 		 */
 		_node_changed : function (obj) {
 			obj = this.get_node(obj);
-			if(obj) {
+			if (obj && $.inArray(obj.id, this._model.changed) === -1) {
 				this._model.changed.push(obj.id);
 			}
 		},
@@ -1477,7 +1573,7 @@
 				p = m[par],
 				s = this._data.core.selected.length,
 				tmp, i, j;
-			dat.each($.proxy(function (i, v) {
+			dat.each(function (i, v) {
 				tmp = this._parse_model_from_html($(v), par, p.parents.concat());
 				if(tmp) {
 					chd.push(tmp);
@@ -1486,7 +1582,7 @@
 						dpc = dpc.concat(m[tmp].children_d);
 					}
 				}
-			}, this));
+			}.bind(this));
 			p.children = chd;
 			p.children_d = dpc;
 			for(i = 0, j = p.parents.length; i < j; i++) {
@@ -1534,7 +1630,7 @@
 					data = JSON.parse(data);
 				}
 			}
-			if(!$.isArray(data)) { data = [data]; }
+			if(!$.vakata.is_array(data)) { data = [data]; }
 			var w = null,
 				args = {
 					'df'	: this._model.default_state,
@@ -1545,6 +1641,7 @@
 					't_cnt'	: this._cnt,
 					'sel'	: this._data.core.selected
 				},
+				inst = this,
 				func = function (data, undefined) {
 					if(data.data) { data = data.data; }
 					var dat = data.dat,
@@ -1674,7 +1771,7 @@
 									tmp.state[i] = df[i];
 								}
 							}
-							if(d && d.id) { tmp.id = d.id.toString(); }
+							if(d && (d.id || d.id === 0)) { tmp.id = d.id.toString(); }
 							if(d && d.text) { tmp.text = d.text; }
 							if(d && d.data && d.data.jstree && d.data.jstree.icon) {
 								tmp.icon = d.data.jstree.icon;
@@ -1706,10 +1803,10 @@
 									}
 								}
 							}
-							if(tmp.li_attr.id && !tmp.id) {
+							if(tmp.li_attr.id && !(tmp.id || tmp.id === 0)) {
 								tmp.id = tmp.li_attr.id.toString();
 							}
-							if(!tmp.id) {
+							if(!(tmp.id || tmp.id === 0)) {
 								tmp.id = tid;
 							}
 							if(!tmp.li_attr.id) {
@@ -1755,10 +1852,21 @@
 							if(!dat[i].children) {
 								dat[i].children = [];
 							}
+							if(!dat[i].state) {
+								dat[i].state = {};
+							}
 							m[dat[i].id.toString()] = dat[i];
 						}
 						// 2) populate children (foreach)
 						for(i = 0, j = dat.length; i < j; i++) {
+							if (!m[dat[i].parent.toString()]) {
+								if (typeof inst !== "undefined") {
+									inst._data.core.last_error = { 'error' : 'parse', 'plugin' : 'core', 'id' : 'core_07', 'reason' : 'Node with invalid parent', 'data' : JSON.stringify({ 'id' : dat[i].id.toString(), 'parent' : dat[i].parent.toString() }) };
+									inst.settings.core.error.call(inst, inst._data.core.last_error);
+								}
+								continue;
+							}
+
 							m[dat[i].parent.toString()].children.push(dat[i].id.toString());
 							// populate parent.children_d
 							p.children_d.push(dat[i].id.toString());
@@ -1863,7 +1971,16 @@
 					if(rslt.add.length) {
 						this.trigger('changed', { 'action' : 'model', 'selected' : this._data.core.selected });
 					}
-					cb.call(this, true);
+
+					// If no worker, try to mimic worker behavioour, by invoking cb asynchronously
+					if (!worker && setImmediate) {
+						setImmediate(function(){
+							cb.call(inst, true);
+						});
+					}
+					else {
+						cb.call(inst, true);
+					}
 				};
 			if(this.settings.core.worker && window.Blob && window.URL && window.Worker) {
 				try {
@@ -1878,7 +1995,7 @@
 					if(!this._data.core.working || force_processing) {
 						this._data.core.working = true;
 						w = new window.Worker(this._wrk);
-						w.onmessage = $.proxy(function (e) {
+						w.onmessage = function (e) {
 							rslt.call(this, e.data, true);
 							try { w.terminate(); w = null; } catch(ignore) { }
 							if(this._data.core.worker_queue.length) {
@@ -1887,7 +2004,16 @@
 							else {
 								this._data.core.working = false;
 							}
-						}, this);
+						}.bind(this);
+						w.onerror = function (e) {
+							rslt.call(this, func(args), false);
+							if(this._data.core.worker_queue.length) {
+								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
+							}
+							else {
+								this._data.core.working = false;
+							}
+						}.bind(this);
 						if(!args.par) {
 							if(this._data.core.worker_queue.length) {
 								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
@@ -1953,7 +2079,7 @@
 			}
 			tmp = $.vakata.attributes(d, true);
 			$.each(tmp, function (i, v) {
-				v = $.trim(v);
+				v = $.vakata.trim(v);
 				if(!v.length) { return true; }
 				data.li_attr[i] = v;
 				if(i === 'id') {
@@ -1964,7 +2090,7 @@
 			if(tmp.length) {
 				tmp = $.vakata.attributes(tmp, true);
 				$.each(tmp, function (i, v) {
-					v = $.trim(v);
+					v = $.vakata.trim(v);
 					if(v.length) {
 						data.a_attr[i] = v;
 					}
@@ -1973,7 +2099,7 @@
 			tmp = d.children("a").first().length ? d.children("a").first().clone() : d.clone();
 			tmp.children("ins, i, ul").remove();
 			tmp = tmp.html();
-			tmp = $('<div />').html(tmp);
+			tmp = $('<div></div>').html(tmp);
 			data.text = this.settings.core.force_text ? tmp.text() : tmp.html();
 			tmp = d.data();
 			data.data = tmp ? $.extend(true, {}, tmp) : null;
@@ -2003,14 +2129,14 @@
 			} while(m[tid]);
 			data.id = data.li_attr.id ? data.li_attr.id.toString() : tid;
 			if(tmp.length) {
-				tmp.each($.proxy(function (i, v) {
+				tmp.each(function (i, v) {
 					c = this._parse_model_from_html($(v), data.id, ps);
 					e = this._model.data[c];
 					data.children.push(c);
 					if(e.children_d.length) {
 						data.children_d = data.children_d.concat(e.children_d);
 					}
-				}, this));
+				}.bind(this));
 				data.children_d = data.children_d.concat(data.children);
 			}
 			else {
@@ -2165,7 +2291,7 @@
 					tmp.state[i] = df[i];
 				}
 			}
-			if(d && d.id) { tmp.id = d.id.toString(); }
+			if(d && (d.id || d.id === 0)) { tmp.id = d.id.toString(); }
 			if(d && d.text) { tmp.text = d.text; }
 			if(d && d.data && d.data.jstree && d.data.jstree.icon) {
 				tmp.icon = d.data.jstree.icon;
@@ -2197,10 +2323,10 @@
 					}
 				}
 			}
-			if(tmp.li_attr.id && !tmp.id) {
+			if(tmp.li_attr.id && !(tmp.id || tmp.id === 0)) {
 				tmp.id = tmp.li_attr.id.toString();
 			}
-			if(!tmp.id) {
+			if(!(tmp.id || tmp.id === 0)) {
 				tmp.id = tid;
 			}
 			if(!tmp.li_attr.id) {
@@ -2222,7 +2348,7 @@
 						tmp.children_d = tmp.children_d.concat(e.children_d);
 					}
 				}
-				tmp.children_d = tmp.children_d.concat(tmp.children);
+				tmp.children_d = tmp.children.concat(tmp.children_d);
 			}
 			if(d && d.children && d.children === true) {
 				tmp.state.loaded = false;
@@ -2255,14 +2381,14 @@
 			}
 			if(this._model.force_full_redraw) {
 				f.className = this.get_container_ul()[0].className;
-				f.setAttribute('role','group');
+				f.setAttribute('role','presentation');
 				this.element.empty().append(f);
 				//this.get_container_ul()[0].appendChild(f);
 			}
-			if(fe !== null) {
+			if(fe !== null && this.settings.core.restore_focus) {
 				tmp = this.get_node(fe, true);
 				if(tmp && tmp.length && tmp.children('.jstree-anchor')[0] !== document.activeElement) {
-					tmp.children('.jstree-anchor').focus();
+					tmp.children('.jstree-anchor').trigger('focus');
 				}
 				else {
 					this._data.core.focused = null;
@@ -2403,11 +2529,14 @@
 			if(!obj.a_attr.id) {
 				obj.a_attr.id = obj.id + '_anchor';
 			}
-			node.setAttribute('aria-selected', !!obj.state.selected);
-			node.setAttribute('aria-level', obj.parents.length);
-			node.setAttribute('aria-labelledby', obj.a_attr.id);
+			node.childNodes[1].setAttribute('aria-selected', !!obj.state.selected);
+			node.childNodes[1].setAttribute('aria-level', obj.parents.length);
+			if(this.settings.core.compute_elements_positions) {
+				node.childNodes[1].setAttribute('aria-setsize', m[obj.parent].children.length);
+				node.childNodes[1].setAttribute('aria-posinset', m[obj.parent].children.indexOf(obj.id) + 1);
+			}
 			if(obj.state.disabled) {
-				node.setAttribute('aria-disabled', true);
+				node.childNodes[1].setAttribute('aria-disabled', true);
 			}
 
 			for(i = 0, j = obj.children.length; i < j; i++) {
@@ -2435,12 +2564,15 @@
 			if(obj.state.hidden) {
 				c += ' jstree-hidden';
 			}
+			if (obj.state.loading) {
+				c += ' jstree-loading';
+			}
 			if(obj.state.loaded && !has_children) {
 				c += ' jstree-leaf';
 			}
 			else {
 				c += obj.state.opened && obj.state.loaded ? ' jstree-open' : ' jstree-closed';
-				node.setAttribute('aria-expanded', (obj.state.opened && obj.state.loaded) );
+				node.childNodes[1].setAttribute('aria-expanded', (obj.state.opened && obj.state.loaded) );
 			}
 			if(last_sibling === obj.id) {
 				c += ' jstree-last';
@@ -2532,14 +2664,14 @@
 			}
 			if(obj.state.opened && !obj.state.loaded) {
 				obj.state.opened = false;
-				setTimeout($.proxy(function () {
+				setTimeout(function () {
 					this.open_node(obj.id, false, 0);
-				}, this), 0);
+				}.bind(this), 0);
 			}
 			return node;
 		},
 		/**
-		 * opens a node, revaling its children. If the node is not loaded it will be loaded and opened once ready.
+		 * opens a node, revealing its children. If the node is not loaded it will be loaded and opened once ready.
 		 * @name open_node(obj [, callback, animation])
 		 * @param {mixed} obj the node to open
 		 * @param {Function} callback a function to execute once the node is opened
@@ -2548,7 +2680,7 @@
 		 */
 		open_node : function (obj, callback, animation) {
 			var t1, t2, d, t;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.open_node(obj[t1], callback, animation);
@@ -2568,9 +2700,9 @@
 			}
 			if(!this.is_loaded(obj)) {
 				if(this.is_loading(obj)) {
-					return setTimeout($.proxy(function () {
+					return setTimeout(function () {
 						this.open_node(obj, callback, animation);
-					}, this), 500);
+					}.bind(this), 500);
 				}
 				this.load_node(obj, function (o, ok) {
 					return ok ? this.open_node(o, callback, animation) : (callback ? callback.call(this, o, false) : false);
@@ -2590,20 +2722,21 @@
 					if(!animation) {
 						this.trigger('before_open', { "node" : obj });
 						d[0].className = d[0].className.replace('jstree-closed', 'jstree-open');
-						d[0].setAttribute("aria-expanded", true);
+						d[0].childNodes[1].setAttribute("aria-expanded", true);
 					}
 					else {
 						this.trigger('before_open', { "node" : obj });
 						d
 							.children(".jstree-children").css("display","none").end()
-							.removeClass("jstree-closed").addClass("jstree-open").attr("aria-expanded", true)
+							.removeClass("jstree-closed").addClass("jstree-open")
+							.children('.jstree-anchor').attr("aria-expanded", true).end()
 							.children(".jstree-children").stop(true, true)
-								.slideDown(animation, function () {
-									this.style.display = "";
-									if (t.element) {
-										t.trigger("after_open", { "node" : obj });
-									}
-								});
+							.slideDown(animation, function () {
+								this.style.display = "";
+								if (t.element) {
+									t.trigger("after_open", { "node" : obj });
+								}
+							});
 					}
 				}
 				obj.state.opened = true;
@@ -2666,7 +2799,7 @@
 		 */
 		close_node : function (obj, animation) {
 			var t1, t2, t, d;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.close_node(obj[t1], animation);
@@ -2704,20 +2837,22 @@
 			else {
 				if(!animation) {
 					d[0].className = d[0].className.replace('jstree-open', 'jstree-closed');
-					d.attr("aria-expanded", false).children('.jstree-children').remove();
+					d.children('.jstree-anchor').attr("aria-expanded", false);
+					d.children('.jstree-children').remove();
 					this.trigger("after_close", { "node" : obj });
 				}
 				else {
 					d
 						.children(".jstree-children").attr("style","display:block !important").end()
-						.removeClass("jstree-open").addClass("jstree-closed").attr("aria-expanded", false)
+						.removeClass("jstree-open").addClass("jstree-closed")
+						.children('.jstree-anchor').attr("aria-expanded", false).end()
 						.children(".jstree-children").stop(true, true).slideUp(animation, function () {
-							this.style.display = "";
-							d.children('.jstree-children').remove();
-							if (t.element) {
-								t.trigger("after_close", { "node" : obj });
-							}
-						});
+						this.style.display = "";
+						d.children('.jstree-children').remove();
+						if (t.element) {
+							t.trigger("after_close", { "node" : obj });
+						}
+					});
 				}
 			}
 		},
@@ -2728,7 +2863,7 @@
 		 */
 		toggle_node : function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.toggle_node(obj[t1]);
@@ -2743,7 +2878,7 @@
 			}
 		},
 		/**
-		 * opens all nodes within a node (or the tree), revaling their children. If the node is not loaded it will be loaded and opened once ready.
+		 * opens all nodes within a node (or the tree), revealing their children. If the node is not loaded it will be loaded and opened once ready.
 		 * @name open_all([obj, animation, original_obj])
 		 * @param {mixed} obj the node to open recursively, omit to open all nodes in the tree
 		 * @param {Number} animation the animation duration in milliseconds when opening the nodes, the default is no animation
@@ -2784,7 +2919,7 @@
 			}
 		},
 		/**
-		 * closes all nodes within a node (or the tree), revaling their children
+		 * closes all nodes within a node (or the tree), revealing their children
 		 * @name close_all([obj, animation])
 		 * @param {mixed} obj the node to close recursively, omit to close all nodes in the tree
 		 * @param {Number} animation the animation duration in milliseconds when closing the nodes, the default is no animation
@@ -2829,7 +2964,7 @@
 		 */
 		enable_node : function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.enable_node(obj[t1]);
@@ -2858,7 +2993,7 @@
 		 */
 		disable_node : function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.disable_node(obj[t1]);
@@ -2897,7 +3032,7 @@
 		 */
 		hide_node : function (obj, skip_redraw) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.hide_node(obj[t1], true);
@@ -2935,7 +3070,7 @@
 		 */
 		show_node : function (obj, skip_redraw) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.show_node(obj[t1], true);
@@ -3042,8 +3177,10 @@
 					this.deselect_node(obj, false, e);
 				}
 				else {
-					this.deselect_all(true);
-					this.select_node(obj, false, false, e);
+					if (this.settings.core.allow_reselect || !this.is_selected(obj) || this._data.core.selected.length !== 1) {
+						this.deselect_all(true);
+						this.select_node(obj, false, false, e);
+					}
 					this._data.core.last_clicked = this.get_node(obj);
 				}
 			}
@@ -3068,13 +3205,18 @@
 							}
 						}
 						else {
-							this.deselect_node(p[i], true, e);
+							if (!e.ctrlKey) {
+								this.deselect_node(p[i], true, e);
+							}
 						}
 					}
 					this.trigger('changed', { 'action' : 'select_node', 'node' : this.get_node(obj), 'selected' : this._data.core.selected, 'event' : e });
 				}
 				else {
 					if(!this.is_selected(obj)) {
+						if (e.ctrlKey) {
+							this._data.core.last_clicked = this.get_node(obj);
+						}
 						this.select_node(obj, false, false, e);
 					}
 					else {
@@ -3147,7 +3289,7 @@
 		 */
 		select_node : function (obj, supress_event, prevent_open, e) {
 			var dom, t1, t2, th;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.select_node(obj[t1], supress_event, prevent_open, e);
@@ -3166,7 +3308,7 @@
 					dom = this._open_to(obj);
 				}
 				if(dom && dom.length) {
-					dom.attr('aria-selected', true).children('.jstree-anchor').addClass('jstree-clicked');
+					dom.children('.jstree-anchor').addClass('jstree-clicked').attr('aria-selected', true);
 				}
 				/**
 				 * triggered when an node is selected
@@ -3200,7 +3342,7 @@
 		 */
 		deselect_node : function (obj, supress_event, e) {
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.deselect_node(obj[t1], supress_event, e);
@@ -3216,7 +3358,7 @@
 				obj.state.selected = false;
 				this._data.core.selected = $.vakata.array_remove_item(this._data.core.selected, obj.id);
 				if(dom.length) {
-					dom.attr('aria-selected', false).children('.jstree-anchor').removeClass('jstree-clicked');
+					dom.children('.jstree-anchor').removeClass('jstree-clicked').attr('aria-selected', false);
 				}
 				/**
 				 * triggered when an node is deselected
@@ -3272,7 +3414,7 @@
 				}
 			}
 			this._data.core.selected = [];
-			this.element.find('.jstree-clicked').removeClass('jstree-clicked').parent().attr('aria-selected', false);
+			this.element.find('.jstree-clicked').removeClass('jstree-clicked').attr('aria-selected', false);
 			/**
 			 * triggered when all nodes are deselected
 			 * @event
@@ -3305,7 +3447,7 @@
 		 * @return {Array}
 		 */
 		get_selected : function (full) {
-			return full ? $.map(this._data.core.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.core.selected.slice();
+			return full ? $.map(this._data.core.selected, function (i) { return this.get_node(i); }.bind(this)) : this._data.core.selected.slice();
 		},
 		/**
 		 * get an array of all top level selected nodes (ignoring children of selected nodes)
@@ -3332,7 +3474,7 @@
 					tmp.push(i);
 				}
 			}
-			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
+			return full ? $.map(tmp, function (i) { return this.get_node(i); }.bind(this)) : tmp;
 		},
 		/**
 		 * get an array of all bottom level selected nodes (ignoring selected parents)
@@ -3348,7 +3490,7 @@
 					obj.push(tmp[i].id);
 				}
 			}
-			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
+			return full ? $.map(obj, function (i) { return this.get_node(i); }.bind(this)) : obj;
 		},
 		/**
 		 * gets the current state of the tree so that it can be restored later with `set_state(state)`. Used internally.
@@ -3360,6 +3502,7 @@
 			var state	= {
 				'core' : {
 					'open' : [],
+					'loaded' : [],
 					'scroll' : {
 						'left' : this.element.scrollLeft(),
 						'top' : this.element.scrollTop()
@@ -3377,6 +3520,9 @@
 			for(i in this._model.data) {
 				if(this._model.data.hasOwnProperty(i)) {
 					if(i !== $.jstree.root) {
+						if(this._model.data[i].state.loaded && this.settings.core.loaded_state) {
+							state.core.loaded.push(i);
+						}
 						if(this._model.data[i].state.opened) {
 							state.core.open.push(i);
 						}
@@ -3403,8 +3549,21 @@
 				}
 				if(state.core) {
 					var res, n, t, _this, i;
+					if(state.core.loaded) {
+						if(!this.settings.core.loaded_state || !$.vakata.is_array(state.core.loaded) || !state.core.loaded.length) {
+							delete state.core.loaded;
+							this.set_state(state, callback);
+						}
+						else {
+							this._load_nodes(state.core.loaded, function (nodes) {
+								delete state.core.loaded;
+								this.set_state(state, callback);
+							});
+						}
+						return false;
+					}
 					if(state.core.open) {
-						if(!$.isArray(state.core.open) || !state.core.open.length) {
+						if(!$.vakata.is_array(state.core.open) || !state.core.open.length) {
 							delete state.core.open;
 							this.set_state(state, callback);
 						}
@@ -3478,7 +3637,7 @@
 		 */
 		refresh : function (skip_loading, forget_state) {
 			this._data.core.state = forget_state === true ? {} : this.get_state();
-			if(forget_state && $.isFunction(forget_state)) { this._data.core.state = forget_state.call(this, this._data.core.state); }
+			if(forget_state && $.vakata.is_function(forget_state)) { this._data.core.state = forget_state.call(this, this._data.core.state); }
 			this._cnt = 0;
 			this._model.data = {};
 			this._model.data[$.jstree.root] = {
@@ -3495,7 +3654,7 @@
 
 			var c = this.get_container_ul()[0].className;
 			if(!skip_loading) {
-				this.element.html("<"+"ul class='"+c+"' role='group'><"+"li class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='treeitem' id='j"+this._id+"_loading'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
+				this.element.html("<"+"ul class='"+c+"' role='group'><"+"li class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='none' id='j"+this._id+"_loading'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' role='treeitem' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
 				this.element.attr('aria-activedescendant','j'+this._id+'_loading');
 			}
 			this.load_node($.jstree.root, function (o, s) {
@@ -3529,7 +3688,7 @@
 			to_load.push(obj.id);
 			if(obj.state.opened === true) { opened.push(obj.id); }
 			this.get_node(obj, true).find('.jstree-open').each(function() { to_load.push(this.id); opened.push(this.id); });
-			this._load_nodes(to_load, $.proxy(function (nodes) {
+			this._load_nodes(to_load, function (nodes) {
 				this.open_node(opened, false, 0);
 				this.select_node(s);
 				/**
@@ -3540,7 +3699,7 @@
 				 * @param {Array} nodes - an array of the IDs of the nodes that were reloaded
 				 */
 				this.trigger('refresh_node', { 'node' : obj, 'nodes' : nodes });
-			}, this), false, true);
+			}.bind(this), false, true);
 		},
 		/**
 		 * set (change) the ID of a node
@@ -3612,7 +3771,7 @@
 		 */
 		set_text : function (obj, val) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.set_text(obj[t1], val);
@@ -3660,7 +3819,7 @@
 				'li_attr' : $.extend(true, {}, obj.li_attr),
 				'a_attr' : $.extend(true, {}, obj.a_attr),
 				'state' : {},
-				'data' : options && options.no_data ? false : $.extend(true, $.isArray(obj.data)?[]:{}, obj.data)
+				'data' : options && options.no_data ? false : $.extend(true, $.vakata.is_array(obj.data)?[]:{}, obj.data)
 				//( this.get_node(obj, true).length ? this.get_node(obj, true).data() : obj.data ),
 			}, i, j;
 			if(options && options.flat) {
@@ -3763,7 +3922,7 @@
 					break;
 			}
 			if(pos > par.children.length) { pos = par.children.length; }
-			if(!node.id) { node.id = true; }
+			if(node.id === undefined) { node.id = true; }
 			if(!this.check("create_node", node, par, pos)) {
 				this.settings.core.error.call(this, this._data.core.last_error);
 				return false;
@@ -3812,7 +3971,7 @@
 		 */
 		rename_node : function (obj, val) {
 			var t1, t2, old;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.rename_node(obj[t1], val);
@@ -3847,7 +4006,7 @@
 		 */
 		delete_node : function (obj) {
 			var t1, t2, par, pos, tmp, i, j, k, l, c, top, lft;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.delete_node(obj[t1]);
@@ -3904,11 +4063,11 @@
 				lft = this.element[0].scrollLeft;
 				if(par.id === $.jstree.root) {
 					if (this._model.data[$.jstree.root].children[0]) {
-						this.get_node(this._model.data[$.jstree.root].children[0], true).children('.jstree-anchor').focus();
+						this.get_node(this._model.data[$.jstree.root].children[0], true).children('.jstree-anchor').trigger('focus');
 					}
 				}
 				else {
-					this.get_node(par, true).children('.jstree-anchor').focus();
+					this.get_node(par, true).children('.jstree-anchor').trigger('focus');
 				}
 				this.element[0].scrollTop  = top;
 				this.element[0].scrollLeft = lft;
@@ -3930,9 +4089,13 @@
 		check : function (chk, obj, par, pos, more) {
 			obj = obj && obj.id ? obj : this.get_node(obj);
 			par = par && par.id ? par : this.get_node(par);
-			var tmp = chk.match(/^move_node|copy_node|create_node$/i) ? par : obj,
+			var tmp = chk.match(/^(move_node|copy_node|create_node)$/i) ? par : obj,
 				chc = this.settings.core.check_callback;
 			if(chk === "move_node" || chk === "copy_node") {
+				if((!more || !more.is_multi) && (chk === "move_node" && $.inArray(obj.id, par.children) === pos)) {
+					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_08', 'reason' : 'Moving node to its current position', 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					return false;
+				}
 				if((!more || !more.is_multi) && (obj.id === par.id || (chk === "move_node" && $.inArray(obj.id, par.children) === pos) || $.inArray(par.id, obj.children_d) !== -1)) {
 					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_01', 'reason' : 'Moving parent inside child', 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
 					return false;
@@ -3945,7 +4108,7 @@
 				}
 				return tmp.functions[chk];
 			}
-			if(chc === false || ($.isFunction(chc) && chc.call(this, chk, obj, par, pos, more) === false) || (chc && chc[chk] === false)) {
+			if(chc === false || ($.vakata.is_function(chc) && chc.call(this, chk, obj, par, pos, more) === false) || (chc && chc[chk] === false)) {
 				this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_03', 'reason' : 'User config for core.check_callback prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
 				return false;
 			}
@@ -3981,7 +4144,7 @@
 				return this.load_node(par, function () { this.move_node(obj, par, pos, callback, true, false, origin); });
 			}
 
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				if(obj.length === 1) {
 					obj = obj[0];
 				}
@@ -3997,7 +4160,7 @@
 					return true;
 				}
 			}
-			obj = obj && obj.id ? obj : this.get_node(obj);
+			obj = obj && (obj.id !== undefined) ? obj : this.get_node(obj);
 
 			if(!obj || obj.id === $.jstree.root) { return false; }
 
@@ -4154,7 +4317,7 @@
 				return this.load_node(par, function () { this.copy_node(obj, par, pos, callback, true, false, origin); });
 			}
 
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				if(obj.length === 1) {
 					obj = obj[0];
 				}
@@ -4170,7 +4333,7 @@
 					return true;
 				}
 			}
-			obj = obj && obj.id ? obj : this.get_node(obj);
+			obj = obj && (obj.id !== undefined) ? obj : this.get_node(obj);
 			if(!obj || obj.id === $.jstree.root) { return false; }
 
 			old_par = (obj.parent || $.jstree.root).toString();
@@ -4269,12 +4432,12 @@
 		 */
 		cut : function (obj) {
 			if(!obj) { obj = this._data.core.selected.concat(); }
-			if(!$.isArray(obj)) { obj = [obj]; }
+			if(!$.vakata.is_array(obj)) { obj = [obj]; }
 			if(!obj.length) { return false; }
 			var tmp = [], o, t1, t2;
 			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 				o = this.get_node(obj[t1]);
-				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
+				if(o && (o.id || o.id === 0) && o.id !== $.jstree.root) { tmp.push(o); }
 			}
 			if(!tmp.length) { return false; }
 			ccp_node = tmp;
@@ -4296,12 +4459,12 @@
 		 */
 		copy : function (obj) {
 			if(!obj) { obj = this._data.core.selected.concat(); }
-			if(!$.isArray(obj)) { obj = [obj]; }
+			if(!$.vakata.is_array(obj)) { obj = [obj]; }
 			if(!obj.length) { return false; }
 			var tmp = [], o, t1, t2;
 			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 				o = this.get_node(obj[t1]);
-				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
+				if(o && (o.id !== undefined) && o.id !== $.jstree.root) { tmp.push(o); }
 			}
 			if(!tmp.length) { return false; }
 			ccp_node = tmp;
@@ -4377,7 +4540,7 @@
 		 * @name edit(obj [, default_text, callback])
 		 * @param  {mixed} obj
 		 * @param  {String} default_text the text to populate the input with (if omitted or set to a non-string value the node's text value is used)
-		 * @param  {Function} callback a function to be called once the text box is blurred, it is called in the instance's scope and receives the node, a status parameter (true if the rename is successful, false otherwise) and a boolean indicating if the user cancelled the edit. You can access the node's title using .text
+		 * @param  {Function} callback a function to be called once the text box is blurred, it is called in the instance's scope and receives the node, a status parameter (true if the rename is successful, false otherwise), a boolean indicating if the user cancelled the edit and the original unescaped value provided by the user. You can also access the node's title using .text
 		 */
 		edit : function (obj, default_text, callback) {
 			var rtl, w, a, s, t, h1, h2, fn, tmp, cancel = false;
@@ -4396,8 +4559,8 @@
 			rtl = this._data.core.rtl;
 			w  = this.element.width();
 			this._data.core.focused = tmp.id;
-			a  = obj.children('.jstree-anchor').focus();
-			s  = $('<span>');
+			a  = obj.children('.jstree-anchor').trigger('focus');
+			s  = $('<span></span>');
 			/*!
 			oi = obj.children("i:visible"),
 			ai = a.children("i:visible"),
@@ -4405,90 +4568,93 @@
 			w2 = ai.width() * ai.length,
 			*/
 			t  = default_text;
-			h1 = $("<"+"div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body");
+			h1 = $("<"+"div></div>", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo(document.body);
 			h2 = $("<"+"input />", {
-						"value" : t,
-						"class" : "jstree-rename-input",
-						// "size" : t.length,
-						"css" : {
-							"padding" : "0",
-							"border" : "1px solid silver",
-							"box-sizing" : "border-box",
-							"display" : "inline-block",
-							"height" : (this._data.core.li_height) + "px",
-							"lineHeight" : (this._data.core.li_height) + "px",
-							"width" : "150px" // will be set a bit further down
-						},
-						"blur" : $.proxy(function (e) {
+				"value" : t,
+				"class" : "jstree-rename-input",
+				// "size" : t.length,
+				"css" : {
+					"padding" : "0",
+					"border" : "1px solid silver",
+					"box-sizing" : "border-box",
+					"display" : "inline-block",
+					"height" : (this._data.core.li_height) + "px",
+					"lineHeight" : (this._data.core.li_height) + "px",
+					"width" : "150px" // will be set a bit further down
+				},
+				"on" : {
+					"blur" : function (e) {
+						e.stopImmediatePropagation();
+						e.preventDefault();
+						var i = s.children(".jstree-rename-input"),
+							v = i.val(),
+							f = this.settings.core.force_text,
+							nv;
+						if(v === "") { v = t; }
+						h1.remove();
+						s.replaceWith(a);
+						s.remove();
+						t = f ? t : $('<div></div>').append($.parseHTML(t)).html();
+						obj = this.get_node(obj);
+						this.set_text(obj, t);
+						nv = !!this.rename_node(obj, f ? $('<div></div>').text(v).text() : $('<div></div>').append($.parseHTML(v)).html());
+						if(!nv) {
+							this.set_text(obj, t); // move this up? and fix #483
+						}
+						this._data.core.focused = tmp.id;
+						setTimeout(function () {
+							var node = this.get_node(tmp.id, true);
+							if(node.length) {
+								this._data.core.focused = tmp.id;
+								node.children('.jstree-anchor').trigger('focus');
+							}
+						}.bind(this), 0);
+						if(callback) {
+							callback.call(this, tmp, nv, cancel, v);
+						}
+						h2 = null;
+					}.bind(this),
+					"keydown" : function (e) {
+						var key = e.which;
+						if(key === 27) {
+							cancel = true;
+							this.value = t;
+						}
+						if(key === 27 || key === 13 || key === 37 || key === 38 || key === 39 || key === 40 || key === 32) {
 							e.stopImmediatePropagation();
+						}
+						if(key === 27 || key === 13) {
 							e.preventDefault();
-							var i = s.children(".jstree-rename-input"),
-								v = i.val(),
-								f = this.settings.core.force_text,
-								nv;
-							if(v === "") { v = t; }
-							h1.remove();
-							s.replaceWith(a);
-							s.remove();
-							t = f ? t : $('<div></div>').append($.parseHTML(t)).html();
-							this.set_text(obj, t);
-							nv = !!this.rename_node(obj, f ? $('<div></div>').text(v).text() : $('<div></div>').append($.parseHTML(v)).html());
-							if(!nv) {
-								this.set_text(obj, t); // move this up? and fix #483
-							}
-							this._data.core.focused = tmp.id;
-							setTimeout($.proxy(function () {
-								var node = this.get_node(tmp.id, true);
-								if(node.length) {
-									this._data.core.focused = tmp.id;
-									node.children('.jstree-anchor').focus();
-								}
-							}, this), 0);
-							if(callback) {
-								callback.call(this, tmp, nv, cancel);
-							}
-							h2 = null;
-						}, this),
-						"keydown" : function (e) {
-							var key = e.which;
-							if(key === 27) {
-								cancel = true;
-								this.value = t;
-							}
-							if(key === 27 || key === 13 || key === 37 || key === 38 || key === 39 || key === 40 || key === 32) {
-								e.stopImmediatePropagation();
-							}
-							if(key === 27 || key === 13) {
-								e.preventDefault();
-								this.blur();
-							}
-						},
-						"click" : function (e) { e.stopImmediatePropagation(); },
-						"mousedown" : function (e) { e.stopImmediatePropagation(); },
-						"keyup" : function (e) {
-							h2.width(Math.min(h1.text("pW" + this.value).width(),w));
-						},
-						"keypress" : function(e) {
-							if(e.which === 13) { return false; }
+							this.blur();
 						}
-					});
-				fn = {
-						fontFamily		: a.css('fontFamily')		|| '',
-						fontSize		: a.css('fontSize')			|| '',
-						fontWeight		: a.css('fontWeight')		|| '',
-						fontStyle		: a.css('fontStyle')		|| '',
-						fontStretch		: a.css('fontStretch')		|| '',
-						fontVariant		: a.css('fontVariant')		|| '',
-						letterSpacing	: a.css('letterSpacing')	|| '',
-						wordSpacing		: a.css('wordSpacing')		|| ''
-				};
+					},
+					"click" : function (e) { e.stopImmediatePropagation(); },
+					"mousedown" : function (e) { e.stopImmediatePropagation(); },
+					"keyup" : function (e) {
+						h2.width(Math.min(h1.text("pW" + this.value).width(),w));
+					},
+					"keypress" : function(e) {
+						if(e.which === 13) { return false; }
+					}
+				}
+			});
+			fn = {
+				fontFamily		: a.css('fontFamily')		|| '',
+				fontSize		: a.css('fontSize')			|| '',
+				fontWeight		: a.css('fontWeight')		|| '',
+				fontStyle		: a.css('fontStyle')		|| '',
+				fontStretch		: a.css('fontStretch')		|| '',
+				fontVariant		: a.css('fontVariant')		|| '',
+				letterSpacing	: a.css('letterSpacing')	|| '',
+				wordSpacing		: a.css('wordSpacing')		|| ''
+			};
 			s.attr('class', a.attr('class')).append(a.contents().clone()).append(h2);
 			a.replaceWith(s);
 			h1.css(fn);
 			h2.css(fn).width(Math.min(h1.text("pW" + h2[0].value).width(),w))[0].select();
 			$(document).one('mousedown.jstree touchstart.jstree dnd_start.vakata', function (e) {
 				if (h2 && e.target !== h2) {
-					$(h2).blur();
+					$(h2).trigger('blur');
 				}
 			});
 		},
@@ -4692,7 +4858,7 @@
 		 */
 		set_icon : function (obj, icon) {
 			var t1, t2, dom, old;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.set_icon(obj[t1], icon);
@@ -4705,6 +4871,7 @@
 			obj.icon = icon === true || icon === null || icon === undefined || icon === '' ? true : icon;
 			dom = this.get_node(obj, true).children(".jstree-anchor").children(".jstree-themeicon");
 			if(icon === false) {
+				dom.removeClass('jstree-themeicon-custom ' + old).css("background","").removeAttr("rel");
 				this.hide_icon(obj);
 			}
 			else if(icon === true || icon === null || icon === undefined || icon === '') {
@@ -4740,7 +4907,7 @@
 		 */
 		hide_icon : function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.hide_icon(obj[t1]);
@@ -4760,7 +4927,7 @@
 		 */
 		show_icon : function (obj) {
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.show_icon(obj[t1]);
@@ -4786,7 +4953,7 @@
 		if(node && node.attributes) {
 			$.each(node.attributes, function (i, v) {
 				if($.inArray(v.name.toLowerCase(),['style','contenteditable','hasfocus','tabindex']) !== -1) { return; }
-				if(v.value !== null && $.trim(v.value) !== '') {
+				if(v.value !== null && $.vakata.trim(v.value) !== '') {
 					if(with_values) { attr[v.name] = v.value; }
 					else { attr.push(v.name); }
 				}
@@ -4830,13 +4997,41 @@
 		}
 		return d;
 	};
+	$.vakata.trim = function (text) {
+		return String.prototype.trim ?
+			String.prototype.trim.call(text.toString()) :
+			text.toString().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+	};
+	$.vakata.is_function = function(obj) {
+		return typeof obj === "function" && typeof obj.nodeType !== "number";
+	};
+	$.vakata.is_array = Array.isArray || function (obj) {
+		return Object.prototype.toString.call(obj) === "[object Array]";
+	};
+
+	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_objects/Function/bind#polyfill
+	if (!Function.prototype.bind) {
+		Function.prototype.bind = function () {
+			var thatFunc = this, thatArg = arguments[0];
+			var args = Array.prototype.slice.call(arguments, 1);
+			if (typeof thatFunc !== 'function') {
+				// closest thing possible to the ECMAScript 5
+				// internal IsCallable function
+				throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
+			}
+			return function(){
+				var funcArgs = args.concat(Array.prototype.slice.call(arguments));
+				return thatFunc.apply(thatArg, funcArgs);
+			};
+		};
+	}
 
 
-/**
- * ### Changed plugin
- *
- * This plugin adds more information to the `changed.jstree` event. The new data is contained in the `changed` event data property, and contains a lists of `selected` and `deselected` nodes.
- */
+	/**
+	 * ### Changed plugin
+	 *
+	 * This plugin adds more information to the `changed.jstree` event. The new data is contained in the `changed` event data property, and contains a lists of `selected` and `deselected` nodes.
+	 */
 
 	$.jstree.plugins.changed = function (options, parent) {
 		var last = [];
@@ -4885,12 +5080,12 @@
 		};
 	};
 
-/**
- * ### Checkbox plugin
- *
- * This plugin renders checkbox icons in front of each node, making multiple selection much easier.
- * It also supports tri-state behavior, meaning that if a node has a few of its children checked it will be rendered as undetermined, and state will be propagated up.
- */
+	/**
+	 * ### Checkbox plugin
+	 *
+	 * This plugin renders checkbox icons in front of each node, making multiple selection much easier.
+	 * It also supports tri-state behavior, meaning that if a node has a few of its children checked it will be rendered as undetermined, and state will be propagated up.
+	 */
 
 	var _i = document.createElement('I');
 	_i.className = 'jstree-icon jstree-checkbox';
@@ -4963,29 +5158,29 @@
 				this.settings.checkbox.cascade = 'up+down+undetermined';
 			}
 			this.element
-				.on("init.jstree", $.proxy(function () {
-						this._data.checkbox.visible = this.settings.checkbox.visible;
-						if(!this.settings.checkbox.keep_selected_style) {
-							this.element.addClass('jstree-checkbox-no-clicked');
-						}
-						if(this.settings.checkbox.tie_selection) {
-							this.element.addClass('jstree-checkbox-selection');
-						}
-					}, this))
-				.on("loading.jstree", $.proxy(function () {
-						this[ this._data.checkbox.visible ? 'show_checkboxes' : 'hide_checkboxes' ]();
-					}, this));
+				.on("init.jstree", function () {
+					this._data.checkbox.visible = this.settings.checkbox.visible;
+					if(!this.settings.checkbox.keep_selected_style) {
+						this.element.addClass('jstree-checkbox-no-clicked');
+					}
+					if(this.settings.checkbox.tie_selection) {
+						this.element.addClass('jstree-checkbox-selection');
+					}
+				}.bind(this))
+				.on("loading.jstree", function () {
+					this[ this._data.checkbox.visible ? 'show_checkboxes' : 'hide_checkboxes' ]();
+				}.bind(this));
 			if(this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
 				this.element
-					.on('changed.jstree uncheck_node.jstree check_node.jstree uncheck_all.jstree check_all.jstree move_node.jstree copy_node.jstree redraw.jstree open_node.jstree', $.proxy(function () {
-							// only if undetermined is in setting
-							if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
-							this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
-						}, this));
+					.on('changed.jstree uncheck_node.jstree check_node.jstree uncheck_all.jstree check_all.jstree move_node.jstree copy_node.jstree redraw.jstree open_node.jstree', function () {
+						// only if undetermined is in setting
+						if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
+						this._data.checkbox.uto = setTimeout(this._undetermined.bind(this), 50);
+					}.bind(this));
 			}
 			if(!this.settings.checkbox.tie_selection) {
 				this.element
-					.on('model.jstree', $.proxy(function (e, data) {
+					.on('model.jstree', function (e, data) {
 						var m = this._model.data,
 							p = m[data.parent],
 							dpc = data.nodes,
@@ -4996,187 +5191,216 @@
 								this._data.checkbox.selected.push(dpc[i]);
 							}
 						}
-					}, this));
+					}.bind(this));
 			}
 			if(this.settings.checkbox.cascade.indexOf('up') !== -1 || this.settings.checkbox.cascade.indexOf('down') !== -1) {
 				this.element
-					.on('model.jstree', $.proxy(function (e, data) {
-							var m = this._model.data,
-								p = m[data.parent],
-								dpc = data.nodes,
-								chd = [],
-								c, i, j, k, l, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
-
-							if(s.indexOf('down') !== -1) {
-								// apply down
-								if(p.state[ t ? 'selected' : 'checked' ]) {
-									for(i = 0, j = dpc.length; i < j; i++) {
-										m[dpc[i]].state[ t ? 'selected' : 'checked' ] = true;
-									}
+					.on('model.jstree', function (e, data) {
+						var m = this._model.data,
+							p = m[data.parent],
+							dpc = data.nodes,
+							chd = [],
+							c, i, j, k, l, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
 
-									this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(dpc);
-								}
-								else {
-									for(i = 0, j = dpc.length; i < j; i++) {
-										if(m[dpc[i]].state[ t ? 'selected' : 'checked' ]) {
-											for(k = 0, l = m[dpc[i]].children_d.length; k < l; k++) {
-												m[m[dpc[i]].children_d[k]].state[ t ? 'selected' : 'checked' ] = true;
-											}
-											this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(m[dpc[i]].children_d);
-										}
-									}
+						if(s.indexOf('down') !== -1) {
+							// apply down
+							if(p.state[ t ? 'selected' : 'checked' ]) {
+								for(i = 0, j = dpc.length; i < j; i++) {
+									m[dpc[i]].state[ t ? 'selected' : 'checked' ] = true;
 								}
-							}
 
-							if(s.indexOf('up') !== -1) {
-								// apply up
-								for(i = 0, j = p.children_d.length; i < j; i++) {
-									if(!m[p.children_d[i]].children.length) {
-										chd.push(m[p.children_d[i]].parent);
-									}
-								}
-								chd = $.vakata.array_unique(chd);
-								for(k = 0, l = chd.length; k < l; k++) {
-									p = m[chd[k]];
-									while(p && p.id !== $.jstree.root) {
-										c = 0;
-										for(i = 0, j = p.children.length; i < j; i++) {
-											c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-										}
-										if(c === j) {
-											p.state[ t ? 'selected' : 'checked' ] = true;
-											this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-											tmp = this.get_node(p, true);
-											if(tmp && tmp.length) {
-												tmp.attr('aria-selected', true).children('.jstree-anchor').addClass( t ? 'jstree-clicked' : 'jstree-checked');
-											}
-										}
-										else {
-											break;
+								this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(dpc);
+							}
+							else {
+								for(i = 0, j = dpc.length; i < j; i++) {
+									if(m[dpc[i]].state[ t ? 'selected' : 'checked' ]) {
+										for(k = 0, l = m[dpc[i]].children_d.length; k < l; k++) {
+											m[m[dpc[i]].children_d[k]].state[ t ? 'selected' : 'checked' ] = true;
 										}
-										p = this.get_node(p.parent);
+										this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(m[dpc[i]].children_d);
 									}
 								}
 							}
+						}
 
-							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected);
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'select_node.jstree' : 'check_node.jstree', $.proxy(function (e, data) {
-							var self = this,
-								obj = data.node,
-								m = this._model.data,
-								par = this.get_node(obj.parent),
-								i, j, c, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection,
-								sel = {}, cur = this._data[ t ? 'core' : 'checkbox' ].selected;
-
-							for (i = 0, j = cur.length; i < j; i++) {
-								sel[cur[i]] = true;
-							}
-
-							// apply down
-							if(s.indexOf('down') !== -1) {
-								//this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected.concat(obj.children_d));
-								var selectedIds = this._cascade_new_checked_state(obj.id, true);
-                                obj.children_d.concat(obj.id).forEach(function(id) {
-                                    if (selectedIds.indexOf(id) > -1) {
-                                        sel[id] = true;
-                                    }
-                                    else {
-                                        delete sel[id];
-                                    }
-                                });
-							}
-
+						if(s.indexOf('up') !== -1) {
 							// apply up
-							if(s.indexOf('up') !== -1) {
-								while(par && par.id !== $.jstree.root) {
+							for(i = 0, j = p.children_d.length; i < j; i++) {
+								if(!m[p.children_d[i]].children.length) {
+									chd.push(m[p.children_d[i]].parent);
+								}
+							}
+							chd = $.vakata.array_unique(chd);
+							for(k = 0, l = chd.length; k < l; k++) {
+								p = m[chd[k]];
+								while(p && p.id !== $.jstree.root) {
 									c = 0;
-									for(i = 0, j = par.children.length; i < j; i++) {
-										c += m[par.children[i]].state[ t ? 'selected' : 'checked' ];
+									for(i = 0, j = p.children.length; i < j; i++) {
+										c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
 									}
 									if(c === j) {
-										par.state[ t ? 'selected' : 'checked' ] = true;
-										sel[par.id] = true;
-										//this._data[ t ? 'core' : 'checkbox' ].selected.push(par.id);
-										tmp = this.get_node(par, true);
+										p.state[ t ? 'selected' : 'checked' ] = true;
+										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+										tmp = this.get_node(p, true);
 										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+											tmp.children('.jstree-anchor').attr('aria-selected', true).addClass( t ? 'jstree-clicked' : 'jstree-checked');
 										}
 									}
 									else {
 										break;
 									}
-									par = this.get_node(par.parent);
+									p = this.get_node(p.parent);
 								}
 							}
+						}
+
+						this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected);
+					}.bind(this))
+					.on(this.settings.checkbox.tie_selection ? 'select_node.jstree' : 'check_node.jstree', function (e, data) {
+						var self = this,
+							obj = data.node,
+							m = this._model.data,
+							par = this.get_node(obj.parent),
+							i, j, c, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection,
+							sel = {}, cur = this._data[ t ? 'core' : 'checkbox' ].selected;
+
+						for (i = 0, j = cur.length; i < j; i++) {
+							sel[cur[i]] = true;
+						}
 
-							cur = [];
-							for (i in sel) {
-								if (sel.hasOwnProperty(i)) {
-									cur.push(i);
+						// apply down
+						if(s.indexOf('down') !== -1) {
+							//this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected.concat(obj.children_d));
+							var selectedIds = this._cascade_new_checked_state(obj.id, true);
+							var temp = obj.children_d.concat(obj.id);
+							for (i = 0, j = temp.length; i < j; i++) {
+								if (selectedIds.indexOf(temp[i]) > -1) {
+									sel[temp[i]] = true;
 								}
-							}
-							this._data[ t ? 'core' : 'checkbox' ].selected = cur;
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'deselect_all.jstree' : 'uncheck_all.jstree', $.proxy(function (e, data) {
-							var obj = this.get_node($.jstree.root),
-								m = this._model.data,
-								i, j, tmp;
-							for(i = 0, j = obj.children_d.length; i < j; i++) {
-								tmp = m[obj.children_d[i]];
-								if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-									tmp.original.state.undetermined = false;
+								else {
+									delete sel[temp[i]];
 								}
 							}
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'deselect_node.jstree' : 'uncheck_node.jstree', $.proxy(function (e, data) {
-							var self = this,
-								obj = data.node,
-								dom = this.get_node(obj, true),
-								i, j, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection,
-								cur = this._data[ t ? 'core' : 'checkbox' ].selected, sel = {},
-								stillSelectedIds = [],
-								allIds = obj.children_d.concat(obj.id);
-
-							// apply down
-							if(s.indexOf('down') !== -1) {
-								var selectedIds = this._cascade_new_checked_state(obj.id, false);
-
-								cur = cur.filter(function(id) {
-									return allIds.indexOf(id) === -1 || selectedIds.indexOf(id) > -1;
-								});
-							}
+						}
 
-							// only apply up if cascade up is enabled and if this node is not selected
-							// (if all child nodes are disabled and cascade_to_disabled === false then this node will till be selected).
-							if(s.indexOf('up') !== -1 && cur.indexOf(obj.id) === -1) {
-								for(i = 0, j = obj.parents.length; i < j; i++) {
-									tmp = this._model.data[obj.parents[i]];
-									tmp.state[ t ? 'selected' : 'checked' ] = false;
-									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-										tmp.original.state.undetermined = false;
-									}
-									tmp = this.get_node(obj.parents[i], true);
+						// apply up
+						if(s.indexOf('up') !== -1) {
+							while(par && par.id !== $.jstree.root) {
+								c = 0;
+								for(i = 0, j = par.children.length; i < j; i++) {
+									c += m[par.children[i]].state[ t ? 'selected' : 'checked' ];
+								}
+								if(c === j) {
+									par.state[ t ? 'selected' : 'checked' ] = true;
+									sel[par.id] = true;
+									//this._data[ t ? 'core' : 'checkbox' ].selected.push(par.id);
+									tmp = this.get_node(par, true);
 									if(tmp && tmp.length) {
-										tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+										tmp.children('.jstree-anchor').attr('aria-selected', true).addClass(t ? 'jstree-clicked' : 'jstree-checked');
 									}
 								}
+								else {
+									break;
+								}
+								par = this.get_node(par.parent);
+							}
+						}
 
-								cur = cur.filter(function(id) {
-									return obj.parents.indexOf(id) === -1;
-								});
+						cur = [];
+						for (i in sel) {
+							if (sel.hasOwnProperty(i)) {
+								cur.push(i);
 							}
+						}
+						this._data[ t ? 'core' : 'checkbox' ].selected = cur;
+					}.bind(this))
+					.on(this.settings.checkbox.tie_selection ? 'deselect_all.jstree' : 'uncheck_all.jstree', function (e, data) {
+						var obj = this.get_node($.jstree.root),
+							m = this._model.data,
+							i, j, tmp;
+						for(i = 0, j = obj.children_d.length; i < j; i++) {
+							tmp = m[obj.children_d[i]];
+							if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+								tmp.original.state.undetermined = false;
+							}
+						}
+					}.bind(this))
+					.on(this.settings.checkbox.tie_selection ? 'deselect_node.jstree' : 'uncheck_node.jstree', function (e, data) {
+						var self = this,
+							obj = data.node,
+							dom = this.get_node(obj, true),
+							i, j, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection,
+							cur = this._data[ t ? 'core' : 'checkbox' ].selected, sel = {},
+							stillSelectedIds = [],
+							allIds = obj.children_d.concat(obj.id);
+
+						// apply down
+						if(s.indexOf('down') !== -1) {
+							var selectedIds = this._cascade_new_checked_state(obj.id, false);
+
+							cur = $.vakata.array_filter(cur, function(id) {
+								return allIds.indexOf(id) === -1 || selectedIds.indexOf(id) > -1;
+							});
+						}
 
-							this._data[ t ? 'core' : 'checkbox' ].selected = cur;
-						}, this));
+						// only apply up if cascade up is enabled and if this node is not selected
+						// (if all child nodes are disabled and cascade_to_disabled === false then this node will till be selected).
+						if(s.indexOf('up') !== -1 && cur.indexOf(obj.id) === -1) {
+							for(i = 0, j = obj.parents.length; i < j; i++) {
+								tmp = this._model.data[obj.parents[i]];
+								tmp.state[ t ? 'selected' : 'checked' ] = false;
+								if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+									tmp.original.state.undetermined = false;
+								}
+								tmp = this.get_node(obj.parents[i], true);
+								if(tmp && tmp.length) {
+									tmp.children('.jstree-anchor').attr('aria-selected', false).removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+								}
+							}
+
+							cur = $.vakata.array_filter(cur, function(id) {
+								return obj.parents.indexOf(id) === -1;
+							});
+						}
+
+						this._data[ t ? 'core' : 'checkbox' ].selected = cur;
+					}.bind(this));
 			}
 			if(this.settings.checkbox.cascade.indexOf('up') !== -1) {
 				this.element
-					.on('delete_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
-							var p = this.get_node(data.parent),
-								m = this._model.data,
-								i, j, c, tmp, t = this.settings.checkbox.tie_selection;
+					.on('delete_node.jstree', function (e, data) {
+						// apply up (whole handler)
+						var p = this.get_node(data.parent),
+							m = this._model.data,
+							i, j, c, tmp, t = this.settings.checkbox.tie_selection;
+						while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
+							c = 0;
+							for(i = 0, j = p.children.length; i < j; i++) {
+								c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+							}
+							if(j > 0 && c === j) {
+								p.state[ t ? 'selected' : 'checked' ] = true;
+								this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+								tmp = this.get_node(p, true);
+								if(tmp && tmp.length) {
+									tmp.children('.jstree-anchor').attr('aria-selected', true).addClass(t ? 'jstree-clicked' : 'jstree-checked');
+								}
+							}
+							else {
+								break;
+							}
+							p = this.get_node(p.parent);
+						}
+					}.bind(this))
+					.on('move_node.jstree', function (e, data) {
+						// apply up (whole handler)
+						var is_multi = data.is_multi,
+							old_par = data.old_parent,
+							new_par = this.get_node(data.parent),
+							m = this._model.data,
+							p, c, i, j, tmp, t = this.settings.checkbox.tie_selection;
+						if(!is_multi) {
+							p = this.get_node(old_par);
 							while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
 								c = 0;
 								for(i = 0, j = p.children.length; i < j; i++) {
@@ -5187,7 +5411,7 @@
 									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
 									tmp = this.get_node(p, true);
 									if(tmp && tmp.length) {
-										tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+										tmp.children('.jstree-anchor').attr('aria-selected', true).addClass(t ? 'jstree-clicked' : 'jstree-checked');
 									}
 								}
 								else {
@@ -5195,79 +5419,53 @@
 								}
 								p = this.get_node(p.parent);
 							}
-						}, this))
-					.on('move_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
-							var is_multi = data.is_multi,
-								old_par = data.old_parent,
-								new_par = this.get_node(data.parent),
-								m = this._model.data,
-								p, c, i, j, tmp, t = this.settings.checkbox.tie_selection;
-							if(!is_multi) {
-								p = this.get_node(old_par);
-								while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
-									c = 0;
-									for(i = 0, j = p.children.length; i < j; i++) {
-										c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-									}
-									if(j > 0 && c === j) {
-										p.state[ t ? 'selected' : 'checked' ] = true;
-										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
-									}
-									else {
-										break;
+						}
+						p = new_par;
+						while(p && p.id !== $.jstree.root) {
+							c = 0;
+							for(i = 0, j = p.children.length; i < j; i++) {
+								c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+							}
+							if(c === j) {
+								if(!p.state[ t ? 'selected' : 'checked' ]) {
+									p.state[ t ? 'selected' : 'checked' ] = true;
+									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+									tmp = this.get_node(p, true);
+									if(tmp && tmp.length) {
+										tmp.children('.jstree-anchor').attr('aria-selected', true).addClass(t ? 'jstree-clicked' : 'jstree-checked');
 									}
-									p = this.get_node(p.parent);
 								}
 							}
-							p = new_par;
-							while(p && p.id !== $.jstree.root) {
-								c = 0;
-								for(i = 0, j = p.children.length; i < j; i++) {
-									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-								}
-								if(c === j) {
-									if(!p.state[ t ? 'selected' : 'checked' ]) {
-										p.state[ t ? 'selected' : 'checked' ] = true;
-										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
+							else {
+								if(p.state[ t ? 'selected' : 'checked' ]) {
+									p.state[ t ? 'selected' : 'checked' ] = false;
+									this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_remove_item(this._data[ t ? 'core' : 'checkbox' ].selected, p.id);
+									tmp = this.get_node(p, true);
+									if(tmp && tmp.length) {
+										tmp.children('.jstree-anchor').attr('aria-selected', false).removeClass(t ? 'jstree-clicked' : 'jstree-checked');
 									}
 								}
 								else {
-									if(p.state[ t ? 'selected' : 'checked' ]) {
-										p.state[ t ? 'selected' : 'checked' ] = false;
-										this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_remove_item(this._data[ t ? 'core' : 'checkbox' ].selected, p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
-									}
-									else {
-										break;
-									}
+									break;
 								}
-								p = this.get_node(p.parent);
 							}
-						}, this));
+							p = this.get_node(p.parent);
+						}
+					}.bind(this));
 			}
 		};
-
 		/**
-		 * set the undetermined state where and if necessary. Used internally.
-		 * @private
-		 * @name _undetermined()
+		 * get an array of all nodes whose state is "undetermined"
+		 * @name get_undetermined([full])
+		 * @param  {boolean} full: if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+		 * @return {Array}
 		 * @plugin checkbox
 		 */
-		this._undetermined = function () {
-			if(this.element === null) { return; }
-			var i, j, k, l, o = {}, m = this._model.data, t = this.settings.checkbox.tie_selection, s = this._data[ t ? 'core' : 'checkbox' ].selected, p = [], tt = this;
+		this.get_undetermined = function (full) {
+			if (this.settings.checkbox.cascade.indexOf('undetermined') === -1) {
+				return [];
+			}
+			var i, j, k, l, o = {}, m = this._model.data, t = this.settings.checkbox.tie_selection, s = this._data[ t ? 'core' : 'checkbox' ].selected, p = [], tt = this, r = [];
 			for(i = 0, j = s.length; i < j; i++) {
 				if(m[s[i]] && m[s[i]].parents) {
 					for(k = 0, l = m[s[i]].parents.length; k < l; k++) {
@@ -5285,9 +5483,9 @@
 			this.element.find('.jstree-closed').not(':has(.jstree-children)')
 				.each(function () {
 					var tmp = tt.get_node(this), tmp2;
-					
+
 					if(!tmp) { return; }
-					
+
 					if(!tmp.state.loaded) {
 						if(tmp.original && tmp.original.state && tmp.original.state.undetermined && tmp.original.state.undetermined === true) {
 							if(o[tmp.id] === undefined && tmp.id !== $.jstree.root) {
@@ -5320,14 +5518,28 @@
 						}
 					}
 				});
+			for (i = 0, j = p.length; i < j; i++) {
+				if(!m[p[i]].state[ t ? 'selected' : 'checked' ]) {
+					r.push(full ? m[p[i]] : p[i]);
+				}
+			}
+			return r;
+		};
+		/**
+		 * set the undetermined state where and if necessary. Used internally.
+		 * @private
+		 * @name _undetermined()
+		 * @plugin checkbox
+		 */
+		this._undetermined = function () {
+			if(this.element === null) { return; }
+			var p = this.get_undetermined(false), i, j, s;
 
 			this.element.find('.jstree-undetermined').removeClass('jstree-undetermined');
-			for(i = 0, j = p.length; i < j; i++) {
-				if(!m[p[i]].state[ t ? 'selected' : 'checked' ]) {
-					s = this.get_node(p[i], true);
-					if(s && s.length) {
-						s.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-undetermined');
-					}
+			for (i = 0, j = p.length; i < j; i++) {
+				s = this.get_node(p[i], true);
+				if(s && s.length) {
+					s.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-undetermined');
 				}
 			}
 		};
@@ -5350,7 +5562,7 @@
 			}
 			if(!is_callback && this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
 				if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
-				this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
+				this._data.checkbox.uto = setTimeout(this._undetermined.bind(this), 50);
 			}
 			return obj;
 		};
@@ -5403,7 +5615,7 @@
 		 */
 		this.disable_checkbox = function (obj) {
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.disable_checkbox(obj[t1]);
@@ -5432,14 +5644,14 @@
 		};
 		/**
 		 * enable a node's checkbox
-		 * @name disable_checkbox(obj)
+		 * @name enable_checkbox(obj)
 		 * @param {mixed} obj an array can be used too
 		 * @trigger enable_checkbox.jstree
 		 * @plugin checkbox
 		 */
 		this.enable_checkbox = function (obj) {
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.enable_checkbox(obj[t1]);
@@ -5488,65 +5700,90 @@
 			}
 			this.trigger('activate_node', { 'node' : this.get_node(obj) });
 		};
+		this.delete_node = function (obj) {
+			if(this.settings.checkbox.tie_selection || $.vakata.is_array(obj)) {
+				return parent.delete_node.call(this, obj);
+			}
+			var tmp, k, l, c = false;
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			tmp = obj.children_d.concat([]);
+			tmp.push(obj.id);
+			for(k = 0, l = tmp.length; k < l; k++) {
+				if(this._model.data[tmp[k]].state.checked) {
+					c = true;
+					break;
+				}
+			}
+			if (c) {
+				this._data.checkbox.selected = $.vakata.array_filter(this._data.checkbox.selected, function (v) {
+					return $.inArray(v, tmp) === -1;
+				});
+			}
+			return parent.delete_node.call(this, obj);
+		};
 
 		/**
-		 * Unchecks a node and all its descendants. This function does NOT affect hidden and disabled nodes (or their descendants).
+		 * Cascades checked state to a node and all its descendants. This function does NOT affect hidden and disabled nodes (or their descendants).
 		 * However if these unaffected nodes are already selected their ids will be included in the returned array.
-		 * @param id
-		 * @param checkedState
+		 * @private
+		 * @name _cascade_new_checked_state(id, checkedState)
+		 * @param {string} id the node ID
+		 * @param {bool} checkedState should the nodes be checked or not
 		 * @returns {Array} Array of all node id's (in this tree branch) that are checked.
 		 */
-		this._cascade_new_checked_state = function(id, checkedState) {
+		this._cascade_new_checked_state = function (id, checkedState) {
 			var self = this;
 			var t = this.settings.checkbox.tie_selection;
 			var node = this._model.data[id];
 			var selectedNodeIds = [];
-			var selectedChildrenIds = [];
+			var selectedChildrenIds = [], i, j, selectedChildIds;
 
 			if (
 				(this.settings.checkbox.cascade_to_disabled || !node.state.disabled) &&
 				(this.settings.checkbox.cascade_to_hidden || !node.state.hidden)
 			) {
-                //First try and check/uncheck the children
-                if (node.children) {
-					node.children.forEach(function(childId) {
-						var selectedChildIds = self._cascade_new_checked_state(childId, checkedState);
+				//First try and check/uncheck the children
+				if (node.children) {
+					for (i = 0, j = node.children.length; i < j; i++) {
+						var childId = node.children[i];
+						selectedChildIds = self._cascade_new_checked_state(childId, checkedState);
 						selectedNodeIds = selectedNodeIds.concat(selectedChildIds);
 						if (selectedChildIds.indexOf(childId) > -1) {
 							selectedChildrenIds.push(childId);
 						}
-					});
+					}
 				}
 
 				var dom = self.get_node(node, true);
 
-                //A node's state is undetermined if some but not all of it's children are checked/selected .
+				//A node's state is undetermined if some but not all of it's children are checked/selected .
 				var undetermined = selectedChildrenIds.length > 0 && selectedChildrenIds.length < node.children.length;
 
 				if(node.original && node.original.state && node.original.state.undetermined) {
 					node.original.state.undetermined = undetermined;
 				}
 
-                //If a node is undetermined then remove selected class
+				//If a node is undetermined then remove selected class
 				if (undetermined) {
-                    node.state[ t ? 'selected' : 'checked' ] = false;
-                    dom.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+					node.state[ t ? 'selected' : 'checked' ] = false;
+					dom.children('.jstree-anchor').attr('aria-selected', false).removeClass(t ? 'jstree-clicked' : 'jstree-checked');
 				}
-                //Otherwise, if the checkedState === true (i.e. the node is being checked now) and all of the node's children are checked (if it has any children),
-                //check the node and style it correctly.
+					//Otherwise, if the checkedState === true (i.e. the node is being checked now) and all of the node's children are checked (if it has any children),
+				//check the node and style it correctly.
 				else if (checkedState && selectedChildrenIds.length === node.children.length) {
-                    node.state[ t ? 'selected' : 'checked' ] = checkedState;
+					node.state[ t ? 'selected' : 'checked' ] = checkedState;
 					selectedNodeIds.push(node.id);
 
-					dom.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+					dom.children('.jstree-anchor').attr('aria-selected', true).addClass(t ? 'jstree-clicked' : 'jstree-checked');
 				}
 				else {
-                    node.state[ t ? 'selected' : 'checked' ] = false;
-					dom.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+					node.state[ t ? 'selected' : 'checked' ] = false;
+					dom.children('.jstree-anchor').attr('aria-selected', false).removeClass(t ? 'jstree-clicked' : 'jstree-checked');
 				}
 			}
 			else {
-				var selectedChildIds = this.get_checked_descendants(id);
+				selectedChildIds = this.get_checked_descendants(id);
 
 				if (node.state[ t ? 'selected' : 'checked' ]) {
 					selectedChildIds.push(node.id);
@@ -5560,14 +5797,17 @@
 
 		/**
 		 * Gets ids of nodes selected in branch (of tree) specified by id (does not include the node specified by id)
-		 * @param id
+		 * @name get_checked_descendants(obj)
+		 * @param {string} id the node ID
+		 * @return {Array} array of IDs
+		 * @plugin checkbox
 		 */
-		this.get_checked_descendants = function(id) {
+		this.get_checked_descendants = function (id) {
 			var self = this;
 			var t = self.settings.checkbox.tie_selection;
 			var node = self._model.data[id];
 
-			return node.children_d.filter(function(_id) {
+			return $.vakata.array_filter(node.children_d, function(_id) {
 				return self._model.data[_id].state[ t ? 'selected' : 'checked' ];
 			});
 		};
@@ -5582,7 +5822,7 @@
 		this.check_node = function (obj, e) {
 			if(this.settings.checkbox.tie_selection) { return this.select_node(obj, false, true, e); }
 			var dom, t1, t2, th;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.check_node(obj[t1], e);
@@ -5622,7 +5862,7 @@
 		this.uncheck_node = function (obj, e) {
 			if(this.settings.checkbox.tie_selection) { return this.deselect_node(obj, false, e); }
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.uncheck_node(obj[t1], e);
@@ -5652,7 +5892,7 @@
 				this.trigger('uncheck_node', { 'node' : obj, 'selected' : this._data.checkbox.selected, 'event' : e });
 			}
 		};
-		
+
 		/**
 		 * checks all nodes in the tree (only if tie_selection in checkbox settings is false, otherwise select_all will be called internally)
 		 * @name check_all()
@@ -5726,7 +5966,7 @@
 		 */
 		this.get_checked = function (full) {
 			if(this.settings.checkbox.tie_selection) { return this.get_selected(full); }
-			return full ? $.map(this._data.checkbox.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.checkbox.selected;
+			return full ? $.map(this._data.checkbox.selected, function (i) { return this.get_node(i); }.bind(this)) : this._data.checkbox.selected.slice();
 		};
 		/**
 		 * get an array of all top level checked nodes (ignoring children of checked nodes) (if tie_selection is on in the settings this function will return the same as get_top_selected)
@@ -5755,7 +5995,7 @@
 					tmp.push(i);
 				}
 			}
-			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
+			return full ? $.map(tmp, function (i) { return this.get_node(i); }.bind(this)) : tmp;
 		};
 		/**
 		 * get an array of all bottom level checked nodes (ignoring selected parents) (if tie_selection is on in the settings this function will return the same as get_bottom_selected)
@@ -5773,11 +6013,11 @@
 					obj.push(tmp[i].id);
 				}
 			}
-			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
+			return full ? $.map(obj, function (i) { return this.get_node(i); }.bind(this)) : obj;
 		};
 		this.load_node = function (obj, callback) {
 			var k, l, i, j, c, tmp;
-			if(!$.isArray(obj) && !this.settings.checkbox.tie_selection) {
+			if(!$.vakata.is_array(obj) && !this.settings.checkbox.tie_selection) {
 				tmp = this.get_node(obj);
 				if(tmp && tmp.state.loaded) {
 					for(k = 0, l = tmp.children_d.length; k < l; k++) {
@@ -5813,7 +6053,7 @@
 			return res;
 		};
 		this.refresh = function (skip_loading, forget_state) {
-			if(!this.settings.checkbox.tie_selection) {
+			if(this.settings.checkbox.tie_selection) {
 				this._data.checkbox.selected = [];
 			}
 			return parent.refresh.apply(this, arguments);
@@ -5824,11 +6064,11 @@
 	// $.jstree.defaults.plugins.push("checkbox");
 
 
-/**
- * ### Conditionalselect plugin
- *
- * This plugin allows defining a callback to allow or deny node selection by user input (activate node method).
- */
+	/**
+	 * ### Conditionalselect plugin
+	 *
+	 * This plugin allows defining a callback to allow or deny node selection by user input (activate node method).
+	 */
 
 	/**
 	 * a callback (function) which is invoked in the instance's scope and receives two arguments - the node and the event that triggered the `activate_node` call. Returning false prevents working with the node, returning true allows invoking activate_node. Defaults to returning `true`.
@@ -5840,17 +6080,17 @@
 		// own function
 		this.activate_node = function (obj, e) {
 			if(this.settings.conditionalselect.call(this, this.get_node(obj), e)) {
-				parent.activate_node.call(this, obj, e);
+				return parent.activate_node.call(this, obj, e);
 			}
 		};
 	};
 
 
-/**
- * ### Contextmenu plugin
- *
- * Shows a context menu when a node is right-clicked.
- */
+	/**
+	 * ### Contextmenu plugin
+	 *
+	 * Shows a context menu when a node is right-clicked.
+	 */
 
 	/**
 	 * stores all defaults for the contextmenu plugin
@@ -5880,7 +6120,7 @@
 		 * * `_disabled` - a boolean indicating if this action should be disabled
 		 * * `label` - a string - the name of the action (could be a function returning a string)
 		 * * `title` - a string - an optional tooltip for the item
-		 * * `action` - a function to be executed if this item is chosen, the function will receive 
+		 * * `action` - a function to be executed if this item is chosen, the function will receive
 		 * * `icon` - a string, can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
 		 * * `shortcut` - keyCode which will trigger the action if the menu is open (for example `113` for rename, which equals F2)
 		 * * `shortcut_label` - shortcut label (like for example `F2` for rename)
@@ -6005,51 +6245,52 @@
 
 			var last_ts = 0, cto = null, ex, ey;
 			this.element
-				.on("init.jstree loading.jstree ready.jstree", $.proxy(function () {
-						this.get_container_ul().addClass('jstree-contextmenu');
-					}, this))
-				.on("contextmenu.jstree", ".jstree-anchor", $.proxy(function (e, data) {
-						if (e.target.tagName.toLowerCase() === 'input') {
-							return;
-						}
-						e.preventDefault();
-						last_ts = e.ctrlKey ? +new Date() : 0;
-						if(data || cto) {
-							last_ts = (+new Date()) + 10000;
-						}
-						if(cto) {
-							clearTimeout(cto);
-						}
-						if(!this.is_loading(e.currentTarget)) {
-							this.show_contextmenu(e.currentTarget, e.pageX, e.pageY, e);
-						}
-					}, this))
-				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
-						if(this._data.contextmenu.visible && (!last_ts || (+new Date()) - last_ts > 250)) { // work around safari & macOS ctrl+click
-							$.vakata.context.hide();
-						}
-						last_ts = 0;
-					}, this))
+				.on("init.jstree loading.jstree ready.jstree", function () {
+					this.get_container_ul().addClass('jstree-contextmenu');
+				}.bind(this))
+				.on("contextmenu.jstree", ".jstree-anchor", function (e, data) {
+					if (e.target.tagName.toLowerCase() === 'input') {
+						return;
+					}
+					e.preventDefault();
+					last_ts = e.ctrlKey ? +new Date() : 0;
+					if(data || cto) {
+						last_ts = (+new Date()) + 10000;
+					}
+					if(cto) {
+						clearTimeout(cto);
+					}
+					if(!this.is_loading(e.currentTarget)) {
+						this.show_contextmenu(e.currentTarget, e.pageX, e.pageY, e);
+					}
+				}.bind(this))
+				.on("click.jstree", ".jstree-anchor", function (e) {
+					if(this._data.contextmenu.visible && (!last_ts || (+new Date()) - last_ts > 250)) { // work around safari & macOS ctrl+click
+						$.vakata.context.hide();
+					}
+					last_ts = 0;
+				}.bind(this))
 				.on("touchstart.jstree", ".jstree-anchor", function (e) {
-						if(!e.originalEvent || !e.originalEvent.changedTouches || !e.originalEvent.changedTouches[0]) {
-							return;
-						}
-						ex = e.originalEvent.changedTouches[0].clientX;
-						ey = e.originalEvent.changedTouches[0].clientY;
-						cto = setTimeout(function () {
-							$(e.currentTarget).trigger('contextmenu', true);
-						}, 750);
-					})
+					if(!e.originalEvent || !e.originalEvent.changedTouches || !e.originalEvent.changedTouches[0]) {
+						return;
+					}
+					ex = e.originalEvent.changedTouches[0].clientX;
+					ey = e.originalEvent.changedTouches[0].clientY;
+					cto = setTimeout(function () {
+						$(e.currentTarget).trigger('contextmenu', true);
+					}, 750);
+				})
 				.on('touchmove.vakata.jstree', function (e) {
-						if(cto && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0] && (Math.abs(ex - e.originalEvent.changedTouches[0].clientX) > 50 || Math.abs(ey - e.originalEvent.changedTouches[0].clientY) > 50)) {
-							clearTimeout(cto);
-						}
-					})
+					if(cto && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0] && (Math.abs(ex - e.originalEvent.changedTouches[0].clientX) > 10 || Math.abs(ey - e.originalEvent.changedTouches[0].clientY) > 10)) {
+						clearTimeout(cto);
+						$.vakata.context.hide();
+					}
+				})
 				.on('touchend.vakata.jstree', function (e) {
-						if(cto) {
-							clearTimeout(cto);
-						}
-					});
+					if(cto) {
+						clearTimeout(cto);
+					}
+				});
 
 			/*!
 			if(!('oncontextmenu' in document.body) && ('ontouchstart' in document.body)) {
@@ -6072,15 +6313,16 @@
 					});
 			}
 			*/
-			$(document).on("context_hide.vakata.jstree", $.proxy(function (e, data) {
+			$(document).on("context_hide.vakata.jstree", function (e, data) {
 				this._data.contextmenu.visible = false;
 				$(data.reference).removeClass('jstree-context');
-			}, this));
+			}.bind(this));
 		};
 		this.teardown = function () {
 			if(this._data.contextmenu.visible) {
 				$.vakata.context.hide();
 			}
+			$(document).off("context_hide.vakata.jstree");
 			parent.teardown.call(this);
 		};
 
@@ -6112,10 +6354,10 @@
 			}
 
 			i = s.items;
-			if($.isFunction(i)) {
-				i = i.call(this, obj, $.proxy(function (i) {
+			if($.vakata.is_function(i)) {
+				i = i.call(this, obj, function (i) {
 					this._show_contextmenu(obj, x, y, i);
-				}, this));
+				}.bind(this));
 			}
 			if($.isPlainObject(i)) {
 				this._show_contextmenu(obj, x, y, i);
@@ -6135,11 +6377,11 @@
 		this._show_contextmenu = function (obj, x, y, i) {
 			var d = this.get_node(obj, true),
 				a = d.children(".jstree-anchor");
-			$(document).one("context_show.vakata.jstree", $.proxy(function (e, data) {
+			$(document).one("context_show.vakata.jstree", function (e, data) {
 				var cls = 'jstree-contextmenu jstree-' + this.get_theme() + '-contextmenu';
 				$(data.element).addClass(cls);
 				a.addClass('jstree-context');
-			}, this));
+			}.bind(this));
 			this._data.contextmenu.visible = true;
 			$.vakata.context.show(a, { 'x' : x, 'y' : y }, i);
 			/**
@@ -6185,15 +6427,15 @@
 			},
 			_execute : function (i) {
 				i = vakata_context.items[i];
-				return i && (!i._disabled || ($.isFunction(i._disabled) && !i._disabled({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }))) && i.action ? i.action.call(null, {
-							"item"		: i,
-							"reference"	: vakata_context.reference,
-							"element"	: vakata_context.element,
-							"position"	: {
-								"x" : vakata_context.position_x,
-								"y" : vakata_context.position_y
-							}
-						}) : false;
+				return i && (!i._disabled || ($.vakata.is_function(i._disabled) && !i._disabled({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }))) && i.action ? i.action.call(null, {
+					"item"		: i,
+					"reference"	: vakata_context.reference,
+					"element"	: vakata_context.element,
+					"position"	: {
+						"x" : vakata_context.position_x,
+						"y" : vakata_context.position_y
+					}
+				}) : false;
 			},
 			_parse : function (o, is_callback) {
 				if(!o) { return false; }
@@ -6210,10 +6452,10 @@
 					if(!val) { return true; }
 					vakata_context.items.push(val);
 					if(!sep && val.separator_before) {
-						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
+						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'class="vakata-context-no-icons"') + ">&#160;<"+"/a><"+"/li>";
 					}
 					sep = false;
-					str += "<"+"li class='" + (val._class || "") + (val._disabled === true || ($.isFunction(val._disabled) && val._disabled({ "item" : val, "reference" : vakata_context.reference, "element" : vakata_context.element })) ? " vakata-contextmenu-disabled " : "") + "' "+(val.shortcut?" data-shortcut='"+val.shortcut+"' ":'')+">";
+					str += "<"+"li class='" + (val._class || "") + (val._disabled === true || ($.vakata.is_function(val._disabled) && val._disabled({ "item" : val, "reference" : vakata_context.reference, "element" : vakata_context.element })) ? " vakata-contextmenu-disabled " : "") + "' "+(val.shortcut?" data-shortcut='"+val.shortcut+"' ":'')+">";
 					str += "<"+"a href='#' rel='" + (vakata_context.items.length - 1) + "' " + (val.title ? "title='" + val.title + "'" : "") + ">";
 					if($.vakata.context.settings.icons) {
 						str += "<"+"i ";
@@ -6223,14 +6465,14 @@
 						}
 						str += "><"+"/i><"+"span class='vakata-contextmenu-sep'>&#160;<"+"/span>";
 					}
-					str += ($.isFunction(val.label) ? val.label({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }) : val.label) + (val.shortcut?' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-'+val.shortcut+'">'+ (val.shortcut_label || '') +'</span>':'') + "<"+"/a>";
+					str += ($.vakata.is_function(val.label) ? val.label({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }) : val.label) + (val.shortcut?' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-'+val.shortcut+'">'+ (val.shortcut_label || '') +'</span>':'') + "<"+"/a>";
 					if(val.submenu) {
 						tmp = $.vakata.context._parse(val.submenu, true);
 						if(tmp) { str += tmp; }
 					}
 					str += "<"+"/li>";
 					if(val.separator_after) {
-						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
+						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'class="vakata-context-no-icons"') + ">&#160;<"+"/a><"+"/li>";
 						sep = true;
 					}
 				});
@@ -6314,7 +6556,7 @@
 					vakata_context.element.html(vakata_context.html);
 				}
 				if(vakata_context.items.length) {
-					vakata_context.element.appendTo("body");
+					vakata_context.element.appendTo(document.body);
 					e = vakata_context.element;
 					x = vakata_context.position_x;
 					y = vakata_context.position_y;
@@ -6338,7 +6580,7 @@
 					vakata_context.element
 						.css({ "left" : x, "top" : y })
 						.show()
-						.find('a').first().focus().parent().addClass("vakata-context-hover");
+						.find('a').first().trigger('focus').parent().addClass("vakata-context-hover");
 					vakata_context.is_visible = true;
 					/**
 					 * triggered on the document when the contextmenu is shown
@@ -6354,7 +6596,7 @@
 			},
 			hide : function () {
 				if(vakata_context.is_visible) {
-					vakata_context.element.hide().find("ul").hide().end().find(':focus').blur().end().detach();
+					vakata_context.element.hide().find("ul").hide().end().find(':focus').trigger('blur').end().detach();
 					vakata_context.is_visible = false;
 					/**
 					 * triggered on the document when the contextmenu is hidden
@@ -6370,7 +6612,7 @@
 			}
 		};
 		$(function () {
-			right_to_left = $("body").css("direction") === "rtl";
+			right_to_left = $(document.body).css("direction") === "rtl";
 			var to = false;
 
 			vakata_context.element = $("<ul class='vakata-context'></ul>");
@@ -6408,67 +6650,67 @@
 				})
 				.on("click", "a", function (e) {
 					e.preventDefault();
-				//})
-				//.on("mouseup", "a", function (e) {
-					if(!$(this).blur().parent().hasClass("vakata-context-disabled") && $.vakata.context._execute($(this).attr("rel")) !== false) {
+					//})
+					//.on("mouseup", "a", function (e) {
+					if(!$(this).trigger('blur').parent().hasClass("vakata-context-disabled") && $.vakata.context._execute($(this).attr("rel")) !== false) {
 						$.vakata.context.hide();
 					}
 				})
 				.on('keydown', 'a', function (e) {
-						var o = null;
-						switch(e.which) {
-							case 13:
-							case 32:
-								e.type = "click";
+					var o = null;
+					switch(e.which) {
+						case 13:
+						case 32:
+							e.type = "click";
+							e.preventDefault();
+							$(e.currentTarget).trigger(e);
+							break;
+						case 37:
+							if(vakata_context.is_visible) {
+								vakata_context.element.find(".vakata-context-hover").last().closest("li").first().find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children('a').trigger('focus');
+								e.stopImmediatePropagation();
 								e.preventDefault();
-								$(e.currentTarget).trigger(e);
-								break;
-							case 37:
-								if(vakata_context.is_visible) {
-									vakata_context.element.find(".vakata-context-hover").last().closest("li").first().find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 38:
-								if(vakata_context.is_visible) {
-									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first();
-									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last(); }
-									o.addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 39:
-								if(vakata_context.is_visible) {
-									vakata_context.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 40:
-								if(vakata_context.is_visible) {
-									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first();
-									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first(); }
-									o.addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 27:
-								$.vakata.context.hide();
+							}
+							break;
+						case 38:
+							if(vakata_context.is_visible) {
+								o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first();
+								if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last(); }
+								o.addClass("vakata-context-hover").children('a').trigger('focus');
+								e.stopImmediatePropagation();
 								e.preventDefault();
-								break;
-							default:
-								//console.log(e.which);
-								break;
-						}
-					})
+							}
+							break;
+						case 39:
+							if(vakata_context.is_visible) {
+								vakata_context.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children('a').trigger('focus');
+								e.stopImmediatePropagation();
+								e.preventDefault();
+							}
+							break;
+						case 40:
+							if(vakata_context.is_visible) {
+								o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first();
+								if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first(); }
+								o.addClass("vakata-context-hover").children('a').trigger('focus');
+								e.stopImmediatePropagation();
+								e.preventDefault();
+							}
+							break;
+						case 27:
+							$.vakata.context.hide();
+							e.preventDefault();
+							break;
+						default:
+							//console.log(e.which);
+							break;
+					}
+				})
 				.on('keydown', function (e) {
 					e.preventDefault();
 					var a = vakata_context.element.find('.vakata-contextmenu-shortcut-' + e.which).parent();
 					if(a.parent().not('.vakata-context-disabled')) {
-						a.click();
+						a.trigger('click');
 					}
 				});
 
@@ -6491,11 +6733,11 @@
 	// $.jstree.defaults.plugins.push("contextmenu");
 
 
-/**
- * ### Drag'n'drop plugin
- *
- * Enables dragging and dropping of nodes in the tree, resulting in a move or copy operations.
- */
+	/**
+	 * ### Drag'n'drop plugin
+	 *
+	 * Enables dragging and dropping of nodes in the tree, resulting in a move or copy operations.
+	 */
 
 	/**
 	 * stores all defaults for the drag'n'drop plugin
@@ -6569,7 +6811,13 @@
 		 * @name $.jstree.defaults.dnd.use_html5
 		 * @plugin dnd
 		 */
-		use_html5: false
+		use_html5: false,
+		/**
+		 * controls whether items can be dropped anywhere on the tree.
+		 * @name $.jstree.defaults.dnd.blank_space_drop
+		 * @plugin dnd
+		 */
+		blank_space_drop: false
 	};
 	var drg, elm;
 	// TODO: now check works by checking for each node individually, how about max_children, unique, etc?
@@ -6582,49 +6830,49 @@
 			parent.bind.call(this);
 
 			this.element
-				.on(this.settings.dnd.use_html5 ? 'dragstart.jstree' : 'mousedown.jstree touchstart.jstree', this.settings.dnd.large_drag_target ? '.jstree-node' : '.jstree-anchor', $.proxy(function (e) {
-						if(this.settings.dnd.large_drag_target && $(e.target).closest('.jstree-node')[0] !== e.currentTarget) {
-							return true;
-						}
-						if(e.type === "touchstart" && (!this.settings.dnd.touch || (this.settings.dnd.touch === 'selected' && !$(e.currentTarget).closest('.jstree-node').children('.jstree-anchor').hasClass('jstree-clicked')))) {
-							return true;
-						}
-						var obj = this.get_node(e.target),
-							mlt = this.is_selected(obj) && this.settings.dnd.drag_selection ? this.get_top_selected().length : 1,
-							txt = (mlt > 1 ? mlt + ' ' + this.get_string('nodes') : this.get_text(e.currentTarget));
-						if(this.settings.core.force_text) {
-							txt = $.vakata.html.escape(txt);
-						}
-						if(obj && obj.id && obj.id !== $.jstree.root && (e.which === 1 || e.type === "touchstart" || e.type === "dragstart") &&
-							(this.settings.dnd.is_draggable === true || ($.isFunction(this.settings.dnd.is_draggable) && this.settings.dnd.is_draggable.call(this, (mlt > 1 ? this.get_top_selected(true) : [obj]), e)))
-						) {
-							drg = { 'jstree' : true, 'origin' : this, 'obj' : this.get_node(obj,true), 'nodes' : mlt > 1 ? this.get_top_selected() : [obj.id] };
-							elm = e.currentTarget;
-							if (this.settings.dnd.use_html5) {
-								$.vakata.dnd._trigger('start', e, { 'helper': $(), 'element': elm, 'data': drg });
-							} else {
-								this.element.trigger('mousedown.jstree');
-								return $.vakata.dnd.start(e, drg, '<div id="jstree-dnd" class="jstree-' + this.get_theme() + ' jstree-' + this.get_theme() + '-' + this.get_theme_variant() + ' ' + ( this.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ) + '"><i class="jstree-icon jstree-er"></i>' + txt + '<ins class="jstree-copy" style="display:none;">+</ins></div>');
-							}
+				.on(this.settings.dnd.use_html5 ? 'dragstart.jstree' : 'mousedown.jstree touchstart.jstree', this.settings.dnd.large_drag_target ? '.jstree-node' : '.jstree-anchor', function (e) {
+					if(this.settings.dnd.large_drag_target && $(e.target).closest('.jstree-node')[0] !== e.currentTarget) {
+						return true;
+					}
+					if(e.type === "touchstart" && (!this.settings.dnd.touch || (this.settings.dnd.touch === 'selected' && !$(e.currentTarget).closest('.jstree-node').children('.jstree-anchor').hasClass('jstree-clicked')))) {
+						return true;
+					}
+					var obj = this.get_node(e.target),
+						mlt = this.is_selected(obj) && this.settings.dnd.drag_selection ? this.get_top_selected().length : 1,
+						txt = (mlt > 1 ? mlt + ' ' + this.get_string('nodes') : this.get_text(e.currentTarget));
+					if(this.settings.core.force_text) {
+						txt = $.vakata.html.escape(txt);
+					}
+					if(obj && (obj.id || obj.id === 0) && obj.id !== $.jstree.root && (e.which === 1 || e.type === "touchstart" || e.type === "dragstart") &&
+						(this.settings.dnd.is_draggable === true || ($.vakata.is_function(this.settings.dnd.is_draggable) && this.settings.dnd.is_draggable.call(this, (mlt > 1 ? this.get_top_selected(true) : [obj]), e)))
+					) {
+						drg = { 'jstree' : true, 'origin' : this, 'obj' : this.get_node(obj,true), 'nodes' : mlt > 1 ? this.get_top_selected() : [obj.id] };
+						elm = e.currentTarget;
+						if (this.settings.dnd.use_html5) {
+							$.vakata.dnd._trigger('start', e, { 'helper': $(), 'element': elm, 'data': drg });
+						} else {
+							this.element.trigger('mousedown.jstree');
+							return $.vakata.dnd.start(e, drg, '<div id="jstree-dnd" class="jstree-' + this.get_theme() + ' jstree-' + this.get_theme() + '-' + this.get_theme_variant() + ' ' + ( this.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ) + '"><i class="jstree-icon jstree-er"></i>' + txt + '<ins class="jstree-copy">+</ins></div>');
 						}
-					}, this));
+					}
+				}.bind(this));
 			if (this.settings.dnd.use_html5) {
 				this.element
 					.on('dragover.jstree', function (e) {
-							e.preventDefault();
-							$.vakata.dnd._trigger('move', e, { 'helper': $(), 'element': elm, 'data': drg });
-							return false;
-						})
+						e.preventDefault();
+						$.vakata.dnd._trigger('move', e, { 'helper': $(), 'element': elm, 'data': drg });
+						return false;
+					})
 					//.on('dragenter.jstree', this.settings.dnd.large_drop_target ? '.jstree-node' : '.jstree-anchor', $.proxy(function (e) {
 					//		e.preventDefault();
 					//		$.vakata.dnd._trigger('move', e, { 'helper': $(), 'element': elm, 'data': drg });
 					//		return false;
 					//	}, this))
-					.on('drop.jstree', $.proxy(function (e) {
-							e.preventDefault();
-							$.vakata.dnd._trigger('stop', e, { 'helper': $(), 'element': elm, 'data': drg });
-							return false;
-						}, this));
+					.on('drop.jstree', function (e) {
+						e.preventDefault();
+						$.vakata.dnd._trigger('stop', e, { 'helper': $(), 'element': elm, 'data': drg });
+						return false;
+					}.bind(this));
 			}
 		};
 		this.redraw_node = function(obj, deep, callback, force_render) {
@@ -6658,11 +6906,23 @@
 			marker = $('<div id="jstree-marker">&#160;</div>').hide(); //.appendTo('body');
 
 		$(document)
+			.on('dragover.vakata.jstree', function (e) {
+				if (elm) {
+					$.vakata.dnd._trigger('move', e, { 'helper': $(), 'element': elm, 'data': drg });
+				}
+			})
+			.on('drop.vakata.jstree', function (e) {
+				if (elm) {
+					$.vakata.dnd._trigger('stop', e, { 'helper': $(), 'element': elm, 'data': drg });
+					elm = null;
+					drg = null;
+				}
+			})
 			.on('dnd_start.vakata.jstree', function (e, data) {
 				lastmv = false;
 				lastev = false;
 				if(!data || !data.data || !data.data.jstree) { return; }
-				marker.appendTo('body'); //.show();
+				marker.appendTo(document.body); //.show();
 			})
 			.on('dnd_move.vakata.jstree', function (e, data) {
 				var isDifferentNode = data.event.target !== lastev.target;
@@ -6683,7 +6943,7 @@
 					ref = false,
 					off = false,
 					rel = false,
-					tmp, l, t, h, p, i, o, ok, t1, t2, op, ps, pr, ip, tm, is_copy, pn;
+					tmp, l, t, h, p, i, o, ok, t1, t2, op, ps, pr, ip, tm, is_copy, pn, c;
 				// if we are over an instance
 				if(ins && ins._data && ins._data.dnd) {
 					marker.attr('class', 'jstree-' + ins.get_theme() + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ));
@@ -6694,7 +6954,7 @@
 
 					// if are hovering the container itself add a new root node
 					//console.log(data.event);
-					if( (data.event.target === ins.element[0] || data.event.target === ins.get_container_ul()[0]) && ins.get_container_ul().children().length === 0) {
+					if( (data.event.target === ins.element[0] || data.event.target === ins.get_container_ul()[0]) && (ins.get_container_ul().children().length === 0 || ins.settings.dnd.blank_space_drop)) {
 						ok = true;
 						for(t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
 							ok = ok && ins.check( (data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey)) ) ? "copy_node" : "move_node"), (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), $.jstree.root, 'last', { 'dnd' : true, 'ref' : ins.get_node($.jstree.root), 'pos' : 'i', 'origin' : data.data.origin, 'is_multi' : (data.data.origin && data.data.origin !== ins), 'is_foreign' : (!data.data.origin) });
@@ -6713,6 +6973,7 @@
 					else {
 						// if we are hovering a tree node
 						ref = ins.settings.dnd.large_drop_target ? $(data.event.target).closest('.jstree-node').children('.jstree-anchor') : $(data.event.target).closest('.jstree-anchor');
+
 						if(ref && ref.length && ref.parent().is('.jstree-closed, .jstree-open, .jstree-leaf')) {
 							off = ref.offset();
 							rel = (data.event.pageY !== undefined ? data.event.pageY : data.event.originalEvent.pageY) - off.top;
@@ -6733,6 +6994,7 @@
 										t = off.top;
 										p = ins.get_parent(ref);
 										i = ref.parent().index();
+										c = 'jstree-below';
 										break;
 									case 'i':
 										ip = ins.settings.dnd.inside_pos;
@@ -6741,12 +7003,14 @@
 										t = off.top + h / 2 + 1;
 										p = tm.id;
 										i = ip === 'first' ? 0 : (ip === 'last' ? tm.children.length : Math.min(ip, tm.children.length));
+										c = 'jstree-inside';
 										break;
 									case 'a':
 										l = off.left - 6;
 										t = off.top + h;
 										p = ins.get_parent(ref);
 										i = ref.parent().index() + 1;
+										c = 'jstree-above';
 										break;
 								}
 								ok = true;
@@ -6779,6 +7043,7 @@
 									}
 									lastmv = { 'ins' : ins, 'par' : p, 'pos' : v === 'i' && ip === 'last' && i === 0 && !ins.is_loaded(tm) ? 'last' : i };
 									marker.css({ 'left' : l + 'px', 'top' : t + 'px' }).show();
+									marker.removeClass('jstree-above jstree-inside jstree-below').addClass(c);
 									data.helper.find('.jstree-icon').first().removeClass('jstree-er').addClass('jstree-ok');
 									if (data.event.originalEvent && data.event.originalEvent.dataTransfer) {
 										data.event.originalEvent.dataTransfer.dropEffect = is_copy ? 'copy' : 'move';
@@ -6796,7 +7061,7 @@
 				lastmv = false;
 				data.helper.find('.jstree-icon').removeClass('jstree-ok').addClass('jstree-er');
 				if (data.event.originalEvent && data.event.originalEvent.dataTransfer) {
-					data.event.originalEvent.dataTransfer.dropEffect = 'none';
+					//data.event.originalEvent.dataTransfer.dropEffect = 'none';
 				}
 				marker.hide();
 			})
@@ -6857,7 +7122,7 @@
 	// helpers
 	(function ($) {
 		$.vakata.html = {
-			div : $('<div />'),
+			div : $('<div></div>'),
 			escape : function (str) {
 				return $.vakata.html.div.text(str).html();
 			},
@@ -6889,7 +7154,7 @@
 				helper_left			: 5,
 				helper_top			: 10,
 				threshold			: 5,
-				threshold_touch		: 50
+				threshold_touch		: 10
 			},
 			_trigger : function (event_name, e, data) {
 				if (data === undefined) {
@@ -6924,6 +7189,7 @@
 					scroll_i: false,
 					is_touch: false
 				};
+				elm = null;
 				$(document).off("mousemove.vakata.jstree touchmove.vakata.jstree", $.vakata.dnd.drag);
 				$(document).off("mouseup.vakata.jstree touchend.vakata.jstree", $.vakata.dnd.stop);
 			},
@@ -7007,7 +7273,7 @@
 						Math.abs(e.pageY - vakata_dnd.init_y) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold)
 					) {
 						if(vakata_dnd.helper) {
-							vakata_dnd.helper.appendTo("body");
+							vakata_dnd.helper.appendTo(document.body);
 							vakata_dnd.helper_w = vakata_dnd.helper.outerWidth();
 						}
 						vakata_dnd.is_drag = true;
@@ -7038,8 +7304,8 @@
 				vakata_dnd.scroll_e = false;
 				$($(e.target).parentsUntil("body").addBack().get().reverse())
 					.filter(function () {
-						return	(/^auto|scroll$/).test($(this).css("overflow")) &&
-								(this.scrollHeight > this.offsetHeight || this.scrollWidth > this.offsetWidth);
+						return	this.ownerDocument && (/^auto|scroll$/).test($(this).css("overflow")) &&
+							(this.scrollHeight > this.offsetHeight || this.scrollWidth > this.offsetWidth);
 					})
 					.each(function () {
 						var t = $(this), o = t.offset();
@@ -7119,7 +7385,7 @@
 				}
 				else {
 					if(e.type === "touchend" && e.target === vakata_dnd.target) {
-						var to = setTimeout(function () { $(e.target).click(); }, 100);
+						var to = setTimeout(function () { $(e.target).trigger('click'); }, 100);
 						$(e.target).one('click', function() { if(to) { clearTimeout(to); } });
 					}
 				}
@@ -7133,11 +7399,11 @@
 	// $.jstree.defaults.plugins.push("dnd");
 
 
-/**
- * ### Massload plugin
- *
- * Adds massload functionality to jsTree, so that multiple nodes can be loaded in a single request (only useful with lazy loading).
- */
+	/**
+	 * ### Massload plugin
+	 *
+	 * Adds massload functionality to jsTree, so that multiple nodes can be loaded in a single request (only useful with lazy loading).
+	 */
 
 	/**
 	 * massload configuration
@@ -7153,7 +7419,7 @@
 	 *		"id1" : [{ "text" : "Child of ID1", "id" : "c1" }, { "text" : "Another child of ID1", "id" : "c2" }],
 	 *		"id2" : [{ "text" : "Child of ID2", "id" : "c3" }]
 	 *	}
-	 * 
+	 *
 	 * @name $.jstree.defaults.massload
 	 * @plugin massload
 	 */
@@ -7165,7 +7431,6 @@
 		};
 		this._load_nodes = function (nodes, callback, is_callback, force_reload) {
 			var s = this.settings.massload,
-				nodesString = JSON.stringify(nodes),
 				toLoad = [],
 				m = this._model.data,
 				i, j, dom;
@@ -7181,8 +7446,8 @@
 				}
 				this._data.massload = {};
 				if (toLoad.length) {
-					if($.isFunction(s)) {
-						return s.call(this, toLoad, $.proxy(function (data) {
+					if($.vakata.is_function(s)) {
+						return s.call(this, toLoad, function (data) {
 							var i, j;
 							if(data) {
 								for(i in data) {
@@ -7198,37 +7463,37 @@
 								}
 							}
 							parent._load_nodes.call(this, nodes, callback, is_callback, force_reload);
-						}, this));
+						}.bind(this));
 					}
 					if(typeof s === 'object' && s && s.url) {
 						s = $.extend(true, {}, s);
-						if($.isFunction(s.url)) {
+						if($.vakata.is_function(s.url)) {
 							s.url = s.url.call(this, toLoad);
 						}
-						if($.isFunction(s.data)) {
+						if($.vakata.is_function(s.data)) {
 							s.data = s.data.call(this, toLoad);
 						}
 						return $.ajax(s)
-							.done($.proxy(function (data,t,x) {
-									var i, j;
-									if(data) {
-										for(i in data) {
-											if(data.hasOwnProperty(i)) {
-												this._data.massload[i] = data[i];
-											}
+							.done(function (data,t,x) {
+								var i, j;
+								if(data) {
+									for(i in data) {
+										if(data.hasOwnProperty(i)) {
+											this._data.massload[i] = data[i];
 										}
 									}
-									for(i = 0, j = nodes.length; i < j; i++) {
-										dom = this.get_node(nodes[i], true);
-										if (dom && dom.length) {
-											dom.removeClass("jstree-loading").attr('aria-busy',false);
-										}
+								}
+								for(i = 0, j = nodes.length; i < j; i++) {
+									dom = this.get_node(nodes[i], true);
+									if (dom && dom.length) {
+										dom.removeClass("jstree-loading").attr('aria-busy',false);
 									}
-									parent._load_nodes.call(this, nodes, callback, is_callback, force_reload);
-								}, this))
-							.fail($.proxy(function (f) {
-									parent._load_nodes.call(this, nodes, callback, is_callback, force_reload);
-								}, this));
+								}
+								parent._load_nodes.call(this, nodes, callback, is_callback, force_reload);
+							}.bind(this))
+							.fail(function (f) {
+								parent._load_nodes.call(this, nodes, callback, is_callback, force_reload);
+							}.bind(this));
 					}
 				}
 			}
@@ -7254,11 +7519,12 @@
 		};
 	};
 
-/**
- * ### Search plugin
- *
- * Adds search functionality to jsTree.
- */
+
+	/**
+	 * ### Search plugin
+	 *
+	 * Adds search functionality to jsTree.
+	 */
 
 	/**
 	 * stores all defaults for the search plugin
@@ -7335,34 +7601,34 @@
 			this._data.search.hdn = [];
 
 			this.element
-				.on("search.jstree", $.proxy(function (e, data) {
-						if(this._data.search.som && data.res.length) {
-							var m = this._model.data, i, j, p = [], k, l;
-							for(i = 0, j = data.res.length; i < j; i++) {
-								if(m[data.res[i]] && !m[data.res[i]].state.hidden) {
-									p.push(data.res[i]);
-									p = p.concat(m[data.res[i]].parents);
-									if(this._data.search.smc) {
-										for (k = 0, l = m[data.res[i]].children_d.length; k < l; k++) {
-											if (m[m[data.res[i]].children_d[k]] && !m[m[data.res[i]].children_d[k]].state.hidden) {
-												p.push(m[data.res[i]].children_d[k]);
-											}
+				.on("search.jstree", function (e, data) {
+					if(this._data.search.som && data.res.length) {
+						var m = this._model.data, i, j, p = [], k, l;
+						for(i = 0, j = data.res.length; i < j; i++) {
+							if(m[data.res[i]] && !m[data.res[i]].state.hidden) {
+								p.push(data.res[i]);
+								p = p.concat(m[data.res[i]].parents);
+								if(this._data.search.smc) {
+									for (k = 0, l = m[data.res[i]].children_d.length; k < l; k++) {
+										if (m[m[data.res[i]].children_d[k]] && !m[m[data.res[i]].children_d[k]].state.hidden) {
+											p.push(m[data.res[i]].children_d[k]);
 										}
 									}
 								}
 							}
-							p = $.vakata.array_remove_item($.vakata.array_unique(p), $.jstree.root);
-							this._data.search.hdn = this.hide_all(true);
-							this.show_node(p, true);
-							this.redraw(true);
 						}
-					}, this))
-				.on("clear_search.jstree", $.proxy(function (e, data) {
-						if(this._data.search.som && data.res.length) {
-							this.show_node(this._data.search.hdn, true);
-							this.redraw(true);
-						}
-					}, this));
+						p = $.vakata.array_remove_item($.vakata.array_unique(p), $.jstree.root);
+						this._data.search.hdn = this.hide_all(true);
+						this.show_node(p, true);
+						this.redraw(true);
+					}
+				}.bind(this))
+				.on("clear_search.jstree", function (e, data) {
+					if(this._data.search.som && data.res.length) {
+						this.show_node(this._data.search.hdn, true);
+						this.redraw(true);
+					}
+				}.bind(this));
 		};
 		/**
 		 * used to search the tree nodes for a given string
@@ -7376,11 +7642,11 @@
 		 * @trigger search.jstree
 		 */
 		this.search = function (str, skip_async, show_only_matches, inside, append, show_only_matches_children) {
-			if(str === false || $.trim(str.toString()) === "") {
+			if(str === false || $.vakata.trim(str.toString()) === "") {
 				return this.clear_search();
 			}
 			inside = this.get_node(inside);
-			inside = inside && inside.id ? inside.id : null;
+			inside = inside && (inside.id || inside.id === 0) ? inside.id : null;
 			str = str.toString();
 			var s = this.settings.search,
 				a = s.ajax ? s.ajax : false,
@@ -7398,13 +7664,13 @@
 				show_only_matches_children = s.show_only_matches_children;
 			}
 			if(!skip_async && a !== false) {
-				if($.isFunction(a)) {
-					return a.call(this, str, $.proxy(function (d) {
-							if(d && d.d) { d = d.d; }
-							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
-								this.search(str, true, show_only_matches, inside, append, show_only_matches_children);
-							});
-						}, this), inside);
+				if($.vakata.is_function(a)) {
+					return a.call(this, str, function (d) {
+						if(d && d.d) { d = d.d; }
+						this._load_nodes(!$.vakata.is_array(d) ? [] : $.vakata.array_unique(d), function () {
+							this.search(str, true, show_only_matches, inside, append, show_only_matches_children);
+						});
+					}.bind(this), inside);
 				}
 				else {
 					a = $.extend({}, a);
@@ -7417,16 +7683,16 @@
 						this._data.search.lastRequest.abort();
 					}
 					this._data.search.lastRequest = $.ajax(a)
-						.fail($.proxy(function () {
+						.fail(function () {
 							this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'search', 'id' : 'search_01', 'reason' : 'Could not load search parents', 'data' : JSON.stringify(a) };
 							this.settings.core.error.call(this, this._data.core.last_error);
-						}, this))
-						.done($.proxy(function (d) {
+						}.bind(this))
+						.done(function (d) {
 							if(d && d.d) { d = d.d; }
-							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
+							this._load_nodes(!$.vakata.is_array(d) ? [] : $.vakata.array_unique(d), function () {
 								this.search(str, true, show_only_matches, inside, append, show_only_matches_children);
 							});
-						}, this));
+						}.bind(this));
 					return this._data.search.lastRequest;
 				}
 			}
@@ -7568,7 +7834,7 @@
 				};
 			}
 			search = function (text) {
-				text = options.caseSensitive ? text : text.toLowerCase();
+				text = options.caseSensitive ? text.toString() : text.toString().toLowerCase();
 				if(pattern === text || text.indexOf(pattern) !== -1) {
 					return {
 						isMatch: true,
@@ -7660,11 +7926,11 @@
 	// $.jstree.defaults.plugins.push("search");
 
 
-/**
- * ### Sort plugin
- *
- * Automatically sorts all siblings in the tree according to a sorting function.
- */
+	/**
+	 * ### Sort plugin
+	 *
+	 * Automatically sorts all siblings in the tree according to a sorting function.
+	 */
 
 	/**
 	 * the settings function used to sort the nodes.
@@ -7680,17 +7946,17 @@
 		this.bind = function () {
 			parent.bind.call(this);
 			this.element
-				.on("model.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent, true);
-					}, this))
-				.on("rename_node.jstree create_node.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent || data.node.parent, false);
-						this.redraw_node(data.parent || data.node.parent, true);
-					}, this))
-				.on("move_node.jstree copy_node.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent, false);
-						this.redraw_node(data.parent, true);
-					}, this));
+				.on("model.jstree", function (e, data) {
+					this.sort(data.parent, true);
+				}.bind(this))
+				.on("rename_node.jstree create_node.jstree", function (e, data) {
+					this.sort(data.parent || data.node.parent, false);
+					this.redraw_node(data.parent || data.node.parent, true);
+				}.bind(this))
+				.on("move_node.jstree copy_node.jstree", function (e, data) {
+					this.sort(data.parent, false);
+					this.redraw_node(data.parent, true);
+				}.bind(this));
 		};
 		/**
 		 * used to sort a node's children
@@ -7705,7 +7971,7 @@
 			var i, j;
 			obj = this.get_node(obj);
 			if(obj && obj.children && obj.children.length) {
-				obj.children.sort($.proxy(this.settings.sort, this));
+				obj.children.sort(this.settings.sort.bind(this));
 				if(deep) {
 					for(i = 0, j = obj.children_d.length; i < j; i++) {
 						this.sort(obj.children_d[i], false);
@@ -7718,11 +7984,11 @@
 	// include the sort plugin by default
 	// $.jstree.defaults.plugins.push("sort");
 
-/**
- * ### State plugin
- *
- * Saves the state of the tree (selected nodes, opened nodes) on the user's computer using available options (localStorage, cookies, etc)
- */
+	/**
+	 * ### State plugin
+	 *
+	 * Saves the state of the tree (selected nodes, opened nodes) on the user's computer using available options (localStorage, cookies, etc)
+	 */
 
 	var to = false;
 	/**
@@ -7754,16 +8020,22 @@
 		 * @name $.jstree.defaults.state.filter
 		 * @plugin state
 		 */
-		filter	: false
+		filter	: false,
+		/**
+		 * Should loaded nodes be restored (setting this to true means that it is possible that the whole tree will be loaded for some users - use with caution). Defaults to `false`
+		 * @name $.jstree.defaults.state.preserve_loaded
+		 * @plugin state
+		 */
+		preserve_loaded : false
 	};
 	$.jstree.plugins.state = function (options, parent) {
 		this.bind = function () {
 			parent.bind.call(this);
-			var bind = $.proxy(function () {
-				this.element.on(this.settings.state.events, $.proxy(function () {
+			var bind = function () {
+				this.element.on(this.settings.state.events, function () {
 					if(to) { clearTimeout(to); }
-					to = setTimeout($.proxy(function () { this.save_state(); }, this), 100);
-				}, this));
+					to = setTimeout(function () { this.save_state(); }.bind(this), 100);
+				}.bind(this));
 				/**
 				 * triggered when the state plugin is finished restoring the state (and immediately after ready if there is no state to restore).
 				 * @event
@@ -7771,12 +8043,12 @@
 				 * @plugin state
 				 */
 				this.trigger('state_ready');
-			}, this);
+			}.bind(this);
 			this.element
-				.on("ready.jstree", $.proxy(function (e, data) {
-						this.element.one("restore_state.jstree", bind);
-						if(!this.restore_state()) { bind(); }
-					}, this));
+				.on("ready.jstree", function (e, data) {
+					this.element.one("restore_state.jstree", bind);
+					if(!this.restore_state()) { bind(); }
+				}.bind(this));
 		};
 		/**
 		 * save the state
@@ -7784,7 +8056,11 @@
 		 * @plugin state
 		 */
 		this.save_state = function () {
-			var st = { 'state' : this.get_state(), 'ttl' : this.settings.state.ttl, 'sec' : +(new Date()) };
+			var tm = this.get_state();
+			if (!this.settings.state.preserve_loaded) {
+				delete tm.core.loaded;
+			}
+			var st = { 'state' : tm, 'ttl' : this.settings.state.ttl, 'sec' : +(new Date()) };
 			$.vakata.storage.set(this.settings.state.key, JSON.stringify(st));
 		};
 		/**
@@ -7797,8 +8073,11 @@
 			if(!!k) { try { k = JSON.parse(k); } catch(ex) { return false; } }
 			if(!!k && k.ttl && k.sec && +(new Date()) - k.sec > k.ttl) { return false; }
 			if(!!k && k.state) { k = k.state; }
-			if(!!k && $.isFunction(this.settings.state.filter)) { k = this.settings.state.filter.call(this, k); }
+			if(!!k && $.vakata.is_function(this.settings.state.filter)) { k = this.settings.state.filter.call(this, k); }
 			if(!!k) {
+				if (!this.settings.state.preserve_loaded) {
+					delete k.core.loaded;
+				}
 				this.element.one("set_state.jstree", function (e, data) { data.instance.trigger('restore_state', { 'state' : $.extend(true, {}, k) }); });
 				this.set_state(k);
 				return true;
@@ -7827,11 +8106,11 @@
 	// include the state plugin by default
 	// $.jstree.defaults.plugins.push("state");
 
-/**
- * ### Types plugin
- *
- * Makes it possible to add predefined types for groups of nodes, which make it possible to easily control nesting rules and icon for each group.
- */
+	/**
+	 * ### Types plugin
+	 *
+	 * Makes it possible to add predefined types for groups of nodes, which make it possible to easily control nesting rules and icon for each group.
+	 */
 
 	/**
 	 * An object storing all types as key value pairs, where the key is the type name and the value is an object that could contain following keys (all optional).
@@ -7879,59 +8158,59 @@
 		};
 		this.bind = function () {
 			this.element
-				.on('model.jstree', $.proxy(function (e, data) {
-						var m = this._model.data,
-							dpc = data.nodes,
-							t = this.settings.types,
-							i, j, c = 'default', k;
-						for(i = 0, j = dpc.length; i < j; i++) {
-							c = 'default';
-							if(m[dpc[i]].original && m[dpc[i]].original.type && t[m[dpc[i]].original.type]) {
-								c = m[dpc[i]].original.type;
-							}
-							if(m[dpc[i]].data && m[dpc[i]].data.jstree && m[dpc[i]].data.jstree.type && t[m[dpc[i]].data.jstree.type]) {
-								c = m[dpc[i]].data.jstree.type;
-							}
-							m[dpc[i]].type = c;
-							if(m[dpc[i]].icon === true && t[c].icon !== undefined) {
-								m[dpc[i]].icon = t[c].icon;
-							}
-							if(t[c].li_attr !== undefined && typeof t[c].li_attr === 'object') {
-								for (k in t[c].li_attr) {
-									if (t[c].li_attr.hasOwnProperty(k)) {
-										if (k === 'id') {
-											continue;
-										}
-										else if (m[dpc[i]].li_attr[k] === undefined) {
-											m[dpc[i]].li_attr[k] = t[c].li_attr[k];
-										}
-										else if (k === 'class') {
-											m[dpc[i]].li_attr['class'] = t[c].li_attr['class'] + ' ' + m[dpc[i]].li_attr['class'];
-										}
+				.on('model.jstree', function (e, data) {
+					var m = this._model.data,
+						dpc = data.nodes,
+						t = this.settings.types,
+						i, j, c = 'default', k;
+					for(i = 0, j = dpc.length; i < j; i++) {
+						c = 'default';
+						if(m[dpc[i]].original && m[dpc[i]].original.type && t[m[dpc[i]].original.type]) {
+							c = m[dpc[i]].original.type;
+						}
+						if(m[dpc[i]].data && m[dpc[i]].data.jstree && m[dpc[i]].data.jstree.type && t[m[dpc[i]].data.jstree.type]) {
+							c = m[dpc[i]].data.jstree.type;
+						}
+						m[dpc[i]].type = c;
+						if(m[dpc[i]].icon === true && t[c].icon !== undefined) {
+							m[dpc[i]].icon = t[c].icon;
+						}
+						if(t[c].li_attr !== undefined && typeof t[c].li_attr === 'object') {
+							for (k in t[c].li_attr) {
+								if (t[c].li_attr.hasOwnProperty(k)) {
+									if (k === 'id') {
+										continue;
+									}
+									else if (m[dpc[i]].li_attr[k] === undefined) {
+										m[dpc[i]].li_attr[k] = t[c].li_attr[k];
+									}
+									else if (k === 'class') {
+										m[dpc[i]].li_attr['class'] = t[c].li_attr['class'] + ' ' + m[dpc[i]].li_attr['class'];
 									}
 								}
 							}
-							if(t[c].a_attr !== undefined && typeof t[c].a_attr === 'object') {
-								for (k in t[c].a_attr) {
-									if (t[c].a_attr.hasOwnProperty(k)) {
-										if (k === 'id') {
-											continue;
-										}
-										else if (m[dpc[i]].a_attr[k] === undefined) {
-											m[dpc[i]].a_attr[k] = t[c].a_attr[k];
-										}
-										else if (k === 'href' && m[dpc[i]].a_attr[k] === '#') {
-											m[dpc[i]].a_attr['href'] = t[c].a_attr['href'];
-										}
-										else if (k === 'class') {
-											m[dpc[i]].a_attr['class'] = t[c].a_attr['class'] + ' ' + m[dpc[i]].a_attr['class'];
-										}
+						}
+						if(t[c].a_attr !== undefined && typeof t[c].a_attr === 'object') {
+							for (k in t[c].a_attr) {
+								if (t[c].a_attr.hasOwnProperty(k)) {
+									if (k === 'id') {
+										continue;
+									}
+									else if (m[dpc[i]].a_attr[k] === undefined) {
+										m[dpc[i]].a_attr[k] = t[c].a_attr[k];
+									}
+									else if (k === 'href' && m[dpc[i]].a_attr[k] === '#') {
+										m[dpc[i]].a_attr['href'] = t[c].a_attr['href'];
+									}
+									else if (k === 'class') {
+										m[dpc[i]].a_attr['class'] = t[c].a_attr['class'] + ' ' + m[dpc[i]].a_attr['class'];
 									}
 								}
 							}
 						}
-						m[$.jstree.root].type = $.jstree.root;
-					}, this));
+					}
+					m[$.jstree.root].type = $.jstree.root;
+				}.bind(this));
 			parent.bind.call(this);
 		};
 		this.get_json = function (obj, options, flat) {
@@ -7940,9 +8219,9 @@
 				opt = options ? $.extend(true, {}, options, {no_id:false}) : {},
 				tmp = parent.get_json.call(this, obj, opt, flat);
 			if(tmp === false) { return false; }
-			if($.isArray(tmp)) {
+			if($.vakata.is_array(tmp)) {
 				for(i = 0, j = tmp.length; i < j; i++) {
-					tmp[i].type = tmp[i].id && m[tmp[i].id] && m[tmp[i].id].type ? m[tmp[i].id].type : "default";
+					tmp[i].type = (tmp[i].id || tmp[i].id === 0) && m[tmp[i].id] && m[tmp[i].id].type ? m[tmp[i].id].type : "default";
 					if(options && options.no_id) {
 						delete tmp[i].id;
 						if(tmp[i].li_attr && tmp[i].li_attr.id) {
@@ -7955,7 +8234,7 @@
 				}
 			}
 			else {
-				tmp.type = tmp.id && m[tmp.id] && m[tmp.id].type ? m[tmp.id].type : "default";
+				tmp.type = (tmp.id || tmp.id === 0) && m[tmp.id] && m[tmp.id].type ? m[tmp.id].type : "default";
 				if(options && options.no_id) {
 					tmp = this._delete_ids(tmp);
 				}
@@ -7963,7 +8242,7 @@
 			return tmp;
 		};
 		this._delete_ids = function (tmp) {
-			if($.isArray(tmp)) {
+			if($.vakata.is_array(tmp)) {
 				for(var i = 0, j = tmp.length; i < j; i++) {
 					tmp[i] = this._delete_ids(tmp[i]);
 				}
@@ -7976,16 +8255,16 @@
 			if(tmp.a_attr && tmp.a_attr.id) {
 				delete tmp.a_attr.id;
 			}
-			if(tmp.children && $.isArray(tmp.children)) {
+			if(tmp.children && $.vakata.is_array(tmp.children)) {
 				tmp.children = this._delete_ids(tmp.children);
 			}
 			return tmp;
 		};
 		this.check = function (chk, obj, par, pos, more) {
 			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
-			obj = obj && obj.id ? obj : this.get_node(obj);
-			par = par && par.id ? par : this.get_node(par);
-			var m = obj && obj.id ? (more && more.origin ? more.origin : $.jstree.reference(obj.id)) : null, tmp, d, i, j;
+			obj = obj && (obj.id || obj.id === 0) ? obj : this.get_node(obj);
+			par = par && (par.id || par.id === 0) ? par : this.get_node(par);
+			var m = obj && (obj.id || obj.id === 0) ? (more && more.origin ? more.origin : $.jstree.reference(obj.id)) : null, tmp, d, i, j;
 			m = m && m._model && m._model.data ? m._model.data : null;
 			switch(chk) {
 				case "create_node":
@@ -7994,11 +8273,11 @@
 					if(chk !== 'move_node' || $.inArray(obj.id, par.children) === -1) {
 						tmp = this.get_rules(par);
 						if(tmp.max_children !== undefined && tmp.max_children !== -1 && tmp.max_children === par.children.length) {
-							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_01', 'reason' : 'max_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_01', 'reason' : 'max_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && (obj.id || obj.id === 0) ? obj.id : false, 'par' : par && (par.id || par.id === 0) ? par.id : false }) };
 							return false;
 						}
 						if(tmp.valid_children !== undefined && tmp.valid_children !== -1 && $.inArray((obj.type || 'default'), tmp.valid_children) === -1) {
-							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_02', 'reason' : 'valid_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_02', 'reason' : 'valid_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && (obj.id || obj.id === 0) ? obj.id : false, 'par' : par && (par.id || par.id === 0) ? par.id : false }) };
 							return false;
 						}
 						if(m && obj.children_d && obj.parents) {
@@ -8011,7 +8290,7 @@
 						if(d <= 0 || d === undefined) { d = 1; }
 						do {
 							if(tmp.max_depth !== undefined && tmp.max_depth !== -1 && tmp.max_depth < d) {
-								this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_03', 'reason' : 'max_depth prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+								this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_03', 'reason' : 'max_depth prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && (obj.id || obj.id === 0) ? obj.id : false, 'par' : par && (par.id || par.id === 0) ? par.id : false }) };
 								return false;
 							}
 							par = this.get_node(par.parent);
@@ -8060,7 +8339,7 @@
 		 */
 		this.set_type = function (obj, type) {
 			var m = this._model.data, t, t1, t2, old_type, old_icon, k, d, a;
-			if($.isArray(obj)) {
+			if($.vakata.is_array(obj)) {
 				obj = obj.slice();
 				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.set_type(obj[t1], type);
@@ -8184,11 +8463,11 @@
 	// $.jstree.defaults.plugins.push("types");
 
 
-/**
- * ### Unique plugin
- *
- * Enforces that no nodes with the same name can coexist as siblings.
- */
+	/**
+	 * ### Unique plugin
+	 *
+	 * Enforces that no nodes with the same name can coexist as siblings.
+	 */
 
 	/**
 	 * stores all defaults for the unique plugin
@@ -8203,7 +8482,13 @@
 		 */
 		case_sensitive : false,
 		/**
-		 * A callback executed in the instance's scope when a new node is created and the name is already taken, the two arguments are the conflicting name and the counter. The default will produce results like `New node (2)`.
+		 * Indicates if white space should be trimmed before the comparison. Default is `false`.
+		 * @name $.jstree.defaults.unique.trim_whitespace
+		 * @plugin unique
+		 */
+		trim_whitespace : false,
+		/**
+		 * A callback executed in the instance's scope when a new node is created with no name and a node with the default name already exists, the two arguments are the conflicting name and the counter. The default will produce results like `New node (2)`.
 		 * @name $.jstree.defaults.unique.duplicate
 		 * @plugin unique
 		 */
@@ -8215,49 +8500,65 @@
 	$.jstree.plugins.unique = function (options, parent) {
 		this.check = function (chk, obj, par, pos, more) {
 			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
-			obj = obj && obj.id ? obj : this.get_node(obj);
-			par = par && par.id ? par : this.get_node(par);
+			obj = obj && (obj.id || obj.id === 0) ? obj : this.get_node(obj);
+			par = par && (par.id || par.id === 0) ? par : this.get_node(par);
 			if(!par || !par.children) { return true; }
 			var n = chk === "rename_node" ? pos : obj.text,
 				c = [],
 				s = this.settings.unique.case_sensitive,
-				m = this._model.data, i, j;
+				w = this.settings.unique.trim_whitespace,
+				m = this._model.data, i, j, t;
 			for(i = 0, j = par.children.length; i < j; i++) {
-				c.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
+				t = m[par.children[i]].text;
+				if (!s) {
+					t = t.toLowerCase();
+				}
+				if (w) {
+					t = t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+				}
+				c.push(t);
 			}
 			if(!s) { n = n.toLowerCase(); }
+			if (w) { n = n.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, ''); }
 			switch(chk) {
 				case "delete_node":
 					return true;
 				case "rename_node":
-					i = ($.inArray(n, c) === -1 || (obj.text && obj.text[ s ? 'toString' : 'toLowerCase']() === n));
+					t = obj.text || '';
+					if (!s) {
+						t = t.toLowerCase();
+					}
+					if (w) {
+						t = t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+					}
+					i = ($.inArray(n, c) === -1 || (obj.text && t === n));
 					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_01', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_01', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && (obj.id || obj.id === 0) ? obj.id : false, 'par' : par && (par.id || par.id === 0) ? par.id : false }) };
 					}
 					return i;
 				case "create_node":
 					i = ($.inArray(n, c) === -1);
 					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_04', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_04', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && (obj.id || obj.id === 0) ? obj.id : false, 'par' : par && (par.id || par.id === 0) ? par.id : false }) };
 					}
 					return i;
 				case "copy_node":
 					i = ($.inArray(n, c) === -1);
 					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_02', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_02', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && (obj.id || obj.id === 0) ? obj.id : false, 'par' : par && (par.id || par.id === 0) ? par.id : false }) };
 					}
 					return i;
 				case "move_node":
 					i = ( (obj.parent === par.id && (!more || !more.is_multi)) || $.inArray(n, c) === -1);
 					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_03', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_03', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && (obj.id || obj.id === 0) ? obj.id : false, 'par' : par && (par.id || par.id === 0) ? par.id : false }) };
 					}
 					return i;
 			}
 			return true;
 		};
 		this.create_node = function (par, node, pos, callback, is_loaded) {
-			if(!node || node.text === undefined) {
+			if(!node || (typeof node === 'object' && node.text === undefined)) {
 				if(par === null) {
 					par = $.jstree.root;
 				}
@@ -8270,15 +8571,36 @@
 					return parent.create_node.call(this, par, node, pos, callback, is_loaded);
 				}
 				if(!node) { node = {}; }
-				var tmp, n, dpc, i, j, m = this._model.data, s = this.settings.unique.case_sensitive, cb = this.settings.unique.duplicate;
+				var tmp, n, dpc, i, j, m = this._model.data, s = this.settings.unique.case_sensitive, w = this.settings.unique.trim_whitespace, cb = this.settings.unique.duplicate, t;
 				n = tmp = this.get_string('New node');
 				dpc = [];
 				for(i = 0, j = par.children.length; i < j; i++) {
-					dpc.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
+					t = m[par.children[i]].text;
+					if (!s) {
+						t = t.toLowerCase();
+					}
+					if (w) {
+						t = t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+					}
+					dpc.push(t);
 				}
 				i = 1;
-				while($.inArray(s ? n : n.toLowerCase(), dpc) !== -1) {
+				t = n;
+				if (!s) {
+					t = t.toLowerCase();
+				}
+				if (w) {
+					t = t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+				}
+				while($.inArray(t, dpc) !== -1) {
 					n = cb.call(this, tmp, (++i)).toString();
+					t = n;
+					if (!s) {
+						t = t.toLowerCase();
+					}
+					if (w) {
+						t = t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+					}
 				}
 				node.text = n;
 			}
@@ -8290,11 +8612,11 @@
 	// $.jstree.defaults.plugins.push("unique");
 
 
-/**
- * ### Wholerow plugin
- *
- * Makes each node appear block level. Making selection easier. May cause slow down for large trees in old browsers.
- */
+	/**
+	 * ### Wholerow plugin
+	 *
+	 * Makes each node appear block level. Making selection easier. May cause slow down for large trees in old browsers.
+	 */
 
 	var div = document.createElement('DIV');
 	div.setAttribute('unselectable','on');
@@ -8306,40 +8628,40 @@
 			parent.bind.call(this);
 
 			this.element
-				.on('ready.jstree set_state.jstree', $.proxy(function () {
-						this.hide_dots();
-					}, this))
-				.on("init.jstree loading.jstree ready.jstree", $.proxy(function () {
-						//div.style.height = this._data.core.li_height + 'px';
-						this.get_container_ul().addClass('jstree-wholerow-ul');
-					}, this))
-				.on("deselect_all.jstree", $.proxy(function (e, data) {
-						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
-					}, this))
-				.on("changed.jstree", $.proxy(function (e, data) {
-						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
-						var tmp = false, i, j;
-						for(i = 0, j = data.selected.length; i < j; i++) {
-							tmp = this.get_node(data.selected[i], true);
-							if(tmp && tmp.length) {
-								tmp.children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
-							}
-						}
-					}, this))
-				.on("open_node.jstree", $.proxy(function (e, data) {
-						this.get_node(data.node, true).find('.jstree-clicked').parent().children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
-					}, this))
-				.on("hover_node.jstree dehover_node.jstree", $.proxy(function (e, data) {
-						if(e.type === "hover_node" && this.is_disabled(data.node)) { return; }
-						this.get_node(data.node, true).children('.jstree-wholerow')[e.type === "hover_node"?"addClass":"removeClass"]('jstree-wholerow-hovered');
-					}, this))
-				.on("contextmenu.jstree", ".jstree-wholerow", $.proxy(function (e) {
-						if (this._data.contextmenu) {
-							e.preventDefault();
-							var tmp = $.Event('contextmenu', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey, pageX : e.pageX, pageY : e.pageY });
-							$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp);
+				.on('ready.jstree set_state.jstree', function () {
+					this.hide_dots();
+				}.bind(this))
+				.on("init.jstree loading.jstree ready.jstree", function () {
+					//div.style.height = this._data.core.li_height + 'px';
+					this.get_container_ul().addClass('jstree-wholerow-ul');
+				}.bind(this))
+				.on("deselect_all.jstree", function (e, data) {
+					this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
+				}.bind(this))
+				.on("changed.jstree", function (e, data) {
+					this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
+					var tmp = false, i, j;
+					for(i = 0, j = data.selected.length; i < j; i++) {
+						tmp = this.get_node(data.selected[i], true);
+						if(tmp && tmp.length) {
+							tmp.children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
 						}
-					}, this))
+					}
+				}.bind(this))
+				.on("open_node.jstree", function (e, data) {
+					this.get_node(data.node, true).find('.jstree-clicked').parent().children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
+				}.bind(this))
+				.on("hover_node.jstree dehover_node.jstree", function (e, data) {
+					if(e.type === "hover_node" && this.is_disabled(data.node)) { return; }
+					this.get_node(data.node, true).children('.jstree-wholerow')[e.type === "hover_node"?"addClass":"removeClass"]('jstree-wholerow-hovered');
+				}.bind(this))
+				.on("contextmenu.jstree", ".jstree-wholerow", function (e) {
+					if (this._data.contextmenu) {
+						e.preventDefault();
+						var tmp = $.Event('contextmenu', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey, pageX : e.pageX, pageY : e.pageY });
+						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp);
+					}
+				}.bind(this))
 				/*!
 				.on("mousedown.jstree touchstart.jstree", ".jstree-wholerow", function (e) {
 						if(e.target === e.currentTarget) {
@@ -8350,30 +8672,30 @@
 					})
 				*/
 				.on("click.jstree", ".jstree-wholerow", function (e) {
-						e.stopImmediatePropagation();
-						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
-					})
+					e.stopImmediatePropagation();
+					var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
+					$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).trigger('focus');
+				})
 				.on("dblclick.jstree", ".jstree-wholerow", function (e) {
-						e.stopImmediatePropagation();
-						var tmp = $.Event('dblclick', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
-					})
-				.on("click.jstree", ".jstree-leaf > .jstree-ocl", $.proxy(function (e) {
-						e.stopImmediatePropagation();
-						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
-					}, this))
-				.on("mouseover.jstree", ".jstree-wholerow, .jstree-icon", $.proxy(function (e) {
-						e.stopImmediatePropagation();
-						if(!this.is_disabled(e.currentTarget)) {
-							this.hover_node(e.currentTarget);
-						}
-						return false;
-					}, this))
-				.on("mouseleave.jstree", ".jstree-node", $.proxy(function (e) {
-						this.dehover_node(e.currentTarget);
-					}, this));
+					e.stopImmediatePropagation();
+					var tmp = $.Event('dblclick', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
+					$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).trigger('focus');
+				})
+				.on("click.jstree", ".jstree-leaf > .jstree-ocl", function (e) {
+					e.stopImmediatePropagation();
+					var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
+					$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).trigger('focus');
+				}.bind(this))
+				.on("mouseover.jstree", ".jstree-wholerow, .jstree-icon", function (e) {
+					e.stopImmediatePropagation();
+					if(!this.is_disabled(e.currentTarget)) {
+						this.hover_node(e.currentTarget);
+					}
+					return false;
+				}.bind(this))
+				.on("mouseleave.jstree", ".jstree-node", function (e) {
+					this.dehover_node(e.currentTarget);
+				}.bind(this));
 		};
 		this.teardown = function () {
 			if(this.settings.wholerow) {
@@ -8395,7 +8717,7 @@
 	};
 	// include the wholerow plugin by default
 	// $.jstree.defaults.plugins.push("wholerow");
-	if(document.registerElement && Object && Object.create) {
+	if(window.customElements && Object && Object.create) {
 		var proto = Object.create(HTMLElement.prototype);
 		proto.createdCallback = function () {
 			var c = { core : {}, plugins : [] }, i;
@@ -8416,8 +8738,8 @@
 		};
 		// proto.attributeChangedCallback = function (name, previous, value) { };
 		try {
-			document.registerElement("vakata-jstree", { prototype: proto });
-		} catch(ignore) { }
+			window.customElements.define("vakata-jstree", function() {}, { prototype: proto });
+		} catch (ignore) { }
 	}
 
 }));
\ No newline at end of file
diff --git a/Resources/public/libs/jstree/dist/themes/default/style.css b/Resources/public/libs/jstree/dist/themes/default/style.css
index 674f87c..529dba4 100644
--- a/Resources/public/libs/jstree/dist/themes/default/style.css
+++ b/Resources/public/libs/jstree/dist/themes/default/style.css
@@ -110,6 +110,7 @@
   /* disable selection/Copy of UIWebView */
   -webkit-touch-callout: none;
   /* disable the IOS popup when long-press on a link */
+  user-select: none;
 }
 .vakata-context {
   display: none;
@@ -162,6 +163,9 @@
 .vakata-context li > a:focus {
   outline: 0;
 }
+.vakata-context .vakata-context-no-icons {
+  margin-left: 0;
+}
 .vakata-context .vakata-context-hover > a {
   position: relative;
   background-color: #e8eff7;
@@ -189,6 +193,9 @@
   border: 0;
   box-shadow: 0 0 0;
 }
+.vakata-context .vakata-contextmenu-disabled > a > i {
+  filter: grayscale(100%);
+}
 .vakata-context li > a > i {
   text-decoration: none;
   display: inline-block;
@@ -414,7 +421,7 @@
   background-repeat: repeat-y;
 }
 .jstree-default .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default .jstree-open > .jstree-ocl {
   background-position: -132px -4px;
@@ -485,7 +492,7 @@
   background-repeat: repeat-y;
 }
 .jstree-default.jstree-rtl .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default.jstree-rtl .jstree-open > .jstree-ocl {
   background-position: -132px -36px;
@@ -550,18 +557,15 @@
   overflow: hidden;
 }
 .jstree-default .jstree-ellipsis .jstree-anchor {
-  width: calc(100% - 29px);
+  width: calc(100% - 24px + 5px);
   text-overflow: ellipsis;
   overflow: hidden;
 }
-.jstree-default .jstree-ellipsis.jstree-no-icons .jstree-anchor {
-  width: calc(100% - 5px);
-}
 .jstree-default.jstree-rtl .jstree-node {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
 }
 .jstree-default.jstree-rtl .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default-small .jstree-node {
   min-height: 18px;
@@ -598,7 +602,7 @@
   background-repeat: repeat-y;
 }
 .jstree-default-small .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default-small .jstree-open > .jstree-ocl {
   background-position: -135px -7px;
@@ -669,7 +673,7 @@
   background-repeat: repeat-y;
 }
 .jstree-default-small.jstree-rtl .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default-small.jstree-rtl .jstree-open > .jstree-ocl {
   background-position: -135px -39px;
@@ -734,18 +738,15 @@
   overflow: hidden;
 }
 .jstree-default-small .jstree-ellipsis .jstree-anchor {
-  width: calc(100% - 23px);
+  width: calc(100% - 18px + 5px);
   text-overflow: ellipsis;
   overflow: hidden;
 }
-.jstree-default-small .jstree-ellipsis.jstree-no-icons .jstree-anchor {
-  width: calc(100% - 5px);
-}
 .jstree-default-small.jstree-rtl .jstree-node {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
 }
 .jstree-default-small.jstree-rtl .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default-large .jstree-node {
   min-height: 32px;
@@ -782,7 +783,7 @@
   background-repeat: repeat-y;
 }
 .jstree-default-large .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default-large .jstree-open > .jstree-ocl {
   background-position: -128px 0px;
@@ -853,7 +854,7 @@
   background-repeat: repeat-y;
 }
 .jstree-default-large.jstree-rtl .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 .jstree-default-large.jstree-rtl .jstree-open > .jstree-ocl {
   background-position: -128px -32px;
@@ -918,18 +919,15 @@
   overflow: hidden;
 }
 .jstree-default-large .jstree-ellipsis .jstree-anchor {
-  width: calc(100% - 37px);
+  width: calc(100% - 32px + 5px);
   text-overflow: ellipsis;
   overflow: hidden;
 }
-.jstree-default-large .jstree-ellipsis.jstree-no-icons .jstree-anchor {
-  width: calc(100% - 5px);
-}
 .jstree-default-large.jstree-rtl .jstree-node {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
 }
 .jstree-default-large.jstree-rtl .jstree-last {
-  background: transparent;
+  background-image: none;
 }
 @media (max-width: 768px) {
   #jstree-dnd.jstree-dnd-responsive {
@@ -1012,13 +1010,13 @@
     background: transparent;
   }
   .jstree-default-responsive .jstree-open > .jstree-ocl {
-    background-position: 0 0px !important;
+    background-position: 0 0 !important;
   }
   .jstree-default-responsive .jstree-closed > .jstree-ocl {
     background-position: 0 -40px !important;
   }
   .jstree-default-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
-    background-position: -40px 0px !important;
+    background-position: -40px 0 !important;
   }
   .jstree-default-responsive .jstree-themeicon {
     background-position: -40px -40px;
@@ -1080,7 +1078,7 @@
     background-repeat: repeat-y;
   }
   .jstree-default-responsive .jstree-last {
-    background: transparent;
+    background-image: none;
   }
   .jstree-default-responsive .jstree-leaf > .jstree-ocl {
     background-position: -40px -120px;
@@ -1105,4 +1103,4 @@
     margin-left: 0;
     margin-right: 0;
   }
-}
+}
\ No newline at end of file
diff --git a/Resources/translations/messages.ca.yml b/Resources/translations/messages.ca.yml
index 15c5d09..ac86a33 100644
--- a/Resources/translations/messages.ca.yml
+++ b/Resources/translations/messages.ca.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: "La carpeta s'ha eliminat correctament"
     unauthorized: "La carpeta ja no existeix o no està autoritzat per accedir a aquesta pàgina"
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: "CANCEL·LAR"
   refresh: "Actualitzar"
diff --git a/Resources/translations/messages.de.yml b/Resources/translations/messages.de.yml
index bd32f31..cf7cd9d 100644
--- a/Resources/translations/messages.de.yml
+++ b/Resources/translations/messages.de.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: Das Verzeichnis wurde erfolgreich gelöscht
     unauthorized: Die Datei existiert nicht mehr oder Sie haben keine Zugriffsrechte auf diese Seite
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: ABBRECHEN
   refresh: Neu laden
diff --git a/Resources/translations/messages.en.yml b/Resources/translations/messages.en.yml
index 5e950f4..f460e75 100644
--- a/Resources/translations/messages.en.yml
+++ b/Resources/translations/messages.en.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: Folder has been deleted successfully
     unauthorized: Folder no longer exist or you are not authorized to access this page
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: CANCEL
   refresh: Refresh
diff --git a/Resources/translations/messages.es.yml b/Resources/translations/messages.es.yml
index 3b7b98c..0796ed1 100644
--- a/Resources/translations/messages.es.yml
+++ b/Resources/translations/messages.es.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: La carpeta se ha eliminado correctamente
     unauthorized: La carpeta ya no existe o no está autorizado para acceder a esta página
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: CANCELAR
   refresh: Actualizar
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index bf1126e..737a8a3 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: Le dossier a été supprimé avec succès
     unauthorized: Le dossier n'existe plus ou vous n'êtes pas autorisé à accéder à cette page
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: ANNULER
   refresh: Rafraîchir
diff --git a/Resources/translations/messages.it.yml b/Resources/translations/messages.it.yml
index bfd732f..d6388bb 100644
--- a/Resources/translations/messages.it.yml
+++ b/Resources/translations/messages.it.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: La cartella è stata eliminata correttamente
     unauthorized: La cartella non esiste più o non sei autorizzato ad accedere a questa pagina
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: ANNULLA
   refresh: Aggiorna
diff --git a/Resources/translations/messages.nl.yml b/Resources/translations/messages.nl.yml
index a627ced..134b537 100644
--- a/Resources/translations/messages.nl.yml
+++ b/Resources/translations/messages.nl.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success:  Map is met succes verwijderd.
     unauthorized: Map bestaat niet meer of u bent niet bevoegd om deze pagina te openen.
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: ANULEREN
   refresh: Verversen
diff --git a/Resources/translations/messages.pl.yml b/Resources/translations/messages.pl.yml
index d95a8cf..b91c1e4 100644
--- a/Resources/translations/messages.pl.yml
+++ b/Resources/translations/messages.pl.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: Folder został pomyślnie usunięty
     unauthorized: Folder już nie istnieje lub nie masz uprawnień dostępu do tej strony.
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: Anuluj
   refresh: Odśwież
diff --git a/Resources/translations/messages.pt_BR.yml b/Resources/translations/messages.pt_BR.yml
index 7366d18..7e43e5b 100644
--- a/Resources/translations/messages.pt_BR.yml
+++ b/Resources/translations/messages.pt_BR.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: A pasta excluída com sucesso
     unauthorized: A pasta não existe mais ou você não tem autorização para acessar esta página
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: CANCELAR
   refresh: Atualizar
diff --git a/Resources/translations/messages.ro.yml b/Resources/translations/messages.ro.yml
index f0cea15..55ab0f6 100644
--- a/Resources/translations/messages.ro.yml
+++ b/Resources/translations/messages.ro.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: Directorul a fost sters cu succes
     unauthorized: Directorul nu mai exista sau nu esti autorizat sa accesezi aceasta pagina
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: ANULEAZA
   refresh: Reimprospateaza
diff --git a/Resources/translations/messages.ru.yml b/Resources/translations/messages.ru.yml
index cf16dc5..7cdd69d 100644
--- a/Resources/translations/messages.ru.yml
+++ b/Resources/translations/messages.ru.yml
@@ -17,6 +17,10 @@ folder:
   deleted:
     success: Папка успешно удалена
     unauthorized: Папка больше не существует или у вас недостаточно прав для доступа к этой странице
+  rename:
+    success: Folder has been renamed successfully
+    unauthorized: Folder no longer exist or you are not authorized to access this page
+    danger: Folder could not renamed
 button:
   cancel: ОТМЕНА
   refresh: Обновить
diff --git a/Resources/translations/messages.tr.yml b/Resources/translations/messages.tr.yml
index a562cb4..f9b0e33 100644
--- a/Resources/translations/messages.tr.yml
+++ b/Resources/translations/messages.tr.yml
@@ -17,10 +17,14 @@ folder:
   deleted:
     success: Klasör başarıyla silindi
     unauthorized: Klasör mevcut değil veya bu işlem için yetkiniz yok
+  rename:
+    success: Klasör başarıyla yeniden adlandırıldı
+    unauthorized: Klasör mevcut değil veya bu işlem için yetkiniz yok
+    danger: Klasör yeniden adlandırılamadı
 button:
   cancel: İPTAL
   refresh: Yenile
-  parent: Parent
+  parent: Üst Dizin
   save: KAYDET
   add:
     files: Dosya Yükle...
diff --git a/Resources/views/extension/_order.html.twig b/Resources/views/extension/_order.html.twig
index 41ae9b6..edc3f99 100644
--- a/Resources/views/extension/_order.html.twig
+++ b/Resources/views/extension/_order.html.twig
@@ -1,4 +1,5 @@
 <a class="{{ not islist ? ('btn btn-sm btn-default'~(active ? ' active'))  }}" href="{{ href }}">
+    {#    <span class="{{ active }} {{ islist ? 'pull-right'}} fas fa-sort{{ icon }}"></span>#}
     {{ ('table.'~type)|trans }}
-    <span class="{{ active }} {{ islist ? 'pull-right'}} fas fa-sort{{ icon }}"></span>
+    <span class="{{ active }} filemanager-sort-icon fas fa-sort{{ icon }}"></span>
 </a>
diff --git a/Resources/views/manager.html.twig b/Resources/views/manager.html.twig
index 72b5e33..a5e559b 100644
--- a/Resources/views/manager.html.twig
+++ b/Resources/views/manager.html.twig
@@ -6,6 +6,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="turbo-visit-control" content="reload">
     {% block stylesheets %}
         <link rel="stylesheet"
               href="{{ asset('bundles/artgrisfilemanager/libs/bootstrap/dist/css/bootstrap.min.css') }}">
@@ -59,7 +60,7 @@
                                name="files[]" multiple=""
                                accept="{{ fileManager.configuration.accept is defined ? fileManager.configuration.accept : (fileManager.type ? accept(fileManager.type)) }}">
                 </span>
-                <button type="button" class="btn btn-primary btn-sm btn-action" data-toggle="modal"
+                <button style="display: none" type="button" class="btn btn-primary btn-sm btn-action" data-toggle="modal"
                         data-target="#addFolder">
                     <span class="far fa-folder-open"></span>
                     <span class="bar-action">{{ 'button.add.folder'|trans }}</span>
@@ -67,6 +68,7 @@
                 {% if fileManager.parent %}
                     <button type="button"
                             class="btn btn-sm btn-danger btn-action js-delete-modal"
+                            style="display: none"
                             data-trigger="click"
                             data-container="body"
                             data-toggle="modal"
@@ -94,7 +96,8 @@
             {% block display %}
                 <div class="btn-group pull-right">
                     <input type="search" class="form-control search"
-                           name="search" id="search" placeholder="{{ 'search.placeholder'|trans }}" aria-describedby="search">
+                           name="search" id="search" placeholder="{{ 'search.placeholder'|trans }}"
+                           aria-describedby="search">
 
                     {% if fileManager.view != "list" %}
                         {{ order(fileManager, 'name') }}
@@ -120,6 +123,8 @@
             <div class="col-xs-12  col-sm-4 col-md-3 col-lg-2">
                 {% block tree %}
                     <div class="table-responsive">
+                        <div class="w-100"><input class="form-control input-sm" id="jstree-folder-search"
+                                                  placeholder="{{ 'search.placeholder'|trans }}"/></div>
                         <div id="tree"></div>
                     </div>
                 {% endblock %}
@@ -163,8 +168,15 @@
         var renameMessage = "{{ 'title.rename.file'|trans }}"
         var downloadMessage = "{{ 'title.download'|trans }}"
         var previewMessage = "{{ 'title.preview.file'|trans }}"
+        var newFolderMessage = "{{ 'button.add.folder'|trans }}"
     </script>
     <script>
+        // Folder Search
+        $('#jstree-folder-search').keyup(function () {
+            $('#tree').jstree(true).show_all();
+            $('#tree').jstree('search', $(this).val());
+        });
+
         // display alert
         function displayAlert(type, msg) {
             $.notify({
diff --git a/Resources/views/views/_modals.html.twig b/Resources/views/views/_modals.html.twig
index a4e12f0..0253b18 100644
--- a/Resources/views/views/_modals.html.twig
+++ b/Resources/views/views/_modals.html.twig
@@ -45,6 +45,30 @@
         </div>
     </div>
 {% endblock %}
+{% block rename_folder_modal %}
+    <div class="modal fade" id="js-confirm-folder-rename" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                {{ form_start(formRenameFolder, {'action': path('file_manager_rename_folder', fileManager.queryParameters)}) }}
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                                aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">{{ 'title.rename.file'|trans }}</h4>
+                </div>
+                <div class="modal-body">
+                    {{ form_widget(formRenameFolder.name) }}
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left"
+                            data-dismiss="modal">{{ 'button.cancel'|trans }}
+                    </button>
+                    {{ form_row(formRenameFolder.send) }}
+                </div>
+                {{ form_end(formRenameFolder) }}
+            </div>
+        </div>
+    </div>
+{% endblock %}
 {% block add_modal %}
     <div class="modal fade" id="addFolder" tabindex="-1" role="dialog" aria-hidden="true">
         <div class="modal-dialog">
@@ -57,6 +81,7 @@
                 </div>
                 <div class="modal-body">
                     {{ form_row(form.name) }}
+                    {{ form_row(form.defined_parent_path) }}
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default pull-left"
diff --git a/composer.json b/composer.json
index d1fb89a..9dee445 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
     "symfony/translation": "^6.0||^7.0",
     "symfony/twig-bridge": "^6.0||^7.0",
     "symfony/twig-bundle": "^6.0||^7.0",
-    "symfony/validator": "^6.0||^7.0"
+    "symfony/validator": "^6.0||^7.0",
+    "symfony/http-foundation": "^6.0||^7.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 730d1dc..07c239d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,45 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="Tests/bootstrap.php"
->
-
-    <testsuites>
-        <testsuite name="File Manager Bundle test suite">
-            <directory suffix="Test.php">Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <php>
-        <server name="KERNEL_DIR" value="./Tests/Fixtures/App"/>
-        <server name="KERNEL_CLASS" value="AppKernel"/>
-        <ini name="error_reporting" value="E_ALL"/>
-        <ini name="display_errors" value="1"/>
-        <ini name="display_startup_errors" value="1"/>
-        <ini name="memory_limit" value="-1"/>
-        <ini name="zend.enable_gc" value="1"/>
-
-        <!-- ###+ symfony/framework-bundle ### -->
-        <env name="APP_ENV" value="dev"/>
-        <env name="APP_SECRET" value="357429e9e5a459780a823191a4c349ec"/>
-        <!-- ###- symfony/framework-bundle ### -->
-    </php>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./Controller</directory>
-            <directory suffix=".php">./Resources</directory>
-            <exclude>
-                <directory>./build</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="Tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./Controller</directory>
+      <directory suffix=".php">./Resources</directory>
+    </include>
+    <exclude>
+      <directory>./build</directory>
+      <directory>./Tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="File Manager Bundle test suite">
+      <directory suffix="Test.php">Tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <server name="KERNEL_DIR" value="./Tests/Fixtures/App"/>
+    <server name="KERNEL_CLASS" value="AppKernel"/>
+    <ini name="error_reporting" value="E_ALL"/>
+    <ini name="display_errors" value="1"/>
+    <ini name="display_startup_errors" value="1"/>
+    <ini name="memory_limit" value="-1"/>
+    <ini name="zend.enable_gc" value="1"/>
+    <!-- ###+ symfony/framework-bundle ### -->
+    <env name="APP_ENV" value="dev"/>
+    <env name="APP_SECRET" value="357429e9e5a459780a823191a4c349ec"/>
+    <!-- ###- symfony/framework-bundle ### -->
+  </php>
 </phpunit>