diff --git a/web/css/styles.min.css b/web/css/styles.min.css
index e0a3e112..e2c621fe 100644
--- a/web/css/styles.min.css
+++ b/web/css/styles.min.css
@@ -1169,10 +1169,16 @@ div.l-content > div.l-separator:nth-of-type(4) {
   vertical-align: middle;
 }
 
+.l-sort-toolbar.subtitle  {
+  padding-left: 96px;
+}
+
+
 .l-sort-toolbar td:first-of-type {
   padding-left: 40px;
 }
 
+
 .l-sort-toolbar td.step-right:first-of-type {
   padding-right: 20px;
 }
@@ -1963,18 +1969,18 @@ body.mobile .l-unit-toolbar__col--right {
   background-position: -1px -442px;
 }
 .actions-panel__configure:hover a {
-  background-color: #afafac;
-  color: #fff;
-}
-.actions-panel__configure:active a {
   background-color: #55c9c0;
   color: #fff;
 }
+.actions-panel__configure:active a {
+  background-color: #afafac;
+  color: #fff;
+}
 .actions-panel__configure:hover a i {
-  background-position: -41px -442px;
+  background-position: -81px -442px;
 }
 .actions-panel__configure:active a i {
-  background-position: -81px -442px;
+  background-position: -41px -442px;
 }
 .actions-panel__configure--active a {
   background-color: #55c9c0;
@@ -2524,6 +2530,17 @@ a.vst-text:active b{
 .vst-textinput:disabled {
   background-color: #f1f1f1;
 }
+.vst-textinput.console{
+  font-size: 13px;
+  width: 630px;
+  height: 300px;
+  font-family:"Lucida Console", Monaco, monospace;
+  white-space: pre;
+}
+#advanced-options .console{
+  width: 833px;
+  height: 600px;
+}
 .generate {
   color: #2C9491;
   text-decoration: underline;
diff --git a/web/file_manager/fm_core.php b/web/file_manager/fm_core.php
index 877c54e0..4c552b0c 100644
--- a/web/file_manager/fm_core.php
+++ b/web/file_manager/fm_core.php
@@ -237,9 +237,6 @@ class FileManager {
     }
 
     function renameFile($item, $target_name) {
-//        $item     = $this->formatFullPath($dir . '/' . $item);
-//        $dst_item = $this->formatFullPath($dir . '/' . $target_name);
-
         $item     = $this->formatFullPath($item);
         $dst_item = $this->formatFullPath($target_name);
 
@@ -366,7 +363,7 @@ class FileManager {
                 'owner'         => $info[$this->info_positions['OWNER']],
                 'group'         => $info[$this->info_positions['GROUP']],
                 'size'          => $info[$this->info_positions['SIZE']],
-                'name'          => $info[$this->info_positions['NAME']]
+                'name'          => htmlspecialchars($info[$this->info_positions['NAME']], ENT_QUOTES)
             );
         }
 
diff --git a/web/inc/i18n/ar.php b/web/inc/i18n/ar.php
index fd7b5c46..ceb59c9e 100644
--- a/web/inc/i18n/ar.php
+++ b/web/inc/i18n/ar.php
@@ -285,6 +285,7 @@ $LANG['ar'] = array(
     'DNS Support'  => 'إضافةإلى  بيانات DNS (افتراضي)',
     'Mail Support'  => 'إضافة إلى نطاقات البريد (افتراضي)',
     'Advanced options'  => 'المزيد من الخيارات المتقدمة',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'الأسماء البديلة (تعمل عمل الاسم الرئيسي)',
     'SSL Certificate'  => 'شهادة أمان SSL',
     'SSL Key'  => 'مفتاح شهادة أمان SSL',
diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php
index 2801e41b..fe48e439 100644
--- a/web/inc/i18n/bs.php
+++ b/web/inc/i18n/bs.php
@@ -285,6 +285,7 @@ $LANG['bs'] = array(
     'DNS Support'  => 'DNS podrška',
     'Mail Support'  => 'Mail podrška',
     'Advanced options'  => 'Dodatne opcije',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliasi',
     'SSL Certificate'  => 'SSL certifikat',
     'SSL Key'  => 'SSL Key',
diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php
index 0e3b89cd..1a9075f5 100644
--- a/web/inc/i18n/cn.php
+++ b/web/inc/i18n/cn.php
@@ -285,6 +285,7 @@ $LANG['cn'] = array(
     'DNS Support'  => 'DNS支持',
     'Mail Support'  => 'Mail支持',
     'Advanced options'  => '高级选项',
+    'Basic options'  => 'Basic options',
     'Aliases'  => '别名',
     'SSL Certificate'  => 'SSL证书',
     'SSL Key'  => 'SSL Key',
diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php
index 29e728c9..ed5740be 100644
--- a/web/inc/i18n/cz.php
+++ b/web/inc/i18n/cz.php
@@ -286,6 +286,7 @@ $LANG['cz'] = array(
     'DNS Support'  => 'DNS podpora',
     'Mail Support'  => 'Mail podpora',
     'Advanced options'  => 'Pokročilé nastavení',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliasy',
     'SSL Certificate'  => 'SSL certifikát',
     'SSL Key'  => 'SSL klíč',
diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php
index 2650e694..bc04cf7f 100644
--- a/web/inc/i18n/da.php
+++ b/web/inc/i18n/da.php
@@ -287,6 +287,7 @@ $LANG['da'] = array(
     'DNS Support'  => 'DNS Support',
     'Mail Support'  => 'Mail Support',
     'Advanced options'  => 'Avancerede Indstillinger',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliaser',
     'SSL Certificate'  => 'SSL Certifikat',
     'SSL Key'  => 'SSL Key',
diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php
index 32511012..4012d83e 100644
--- a/web/inc/i18n/de.php
+++ b/web/inc/i18n/de.php
@@ -285,6 +285,7 @@ $LANG['de'] = array(
     'DNS Support'  => 'DNS Unterstützung',
     'Mail Support'  => 'Mail Unterstützung',
     'Advanced options'  => 'Erweiterte Optionen',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliase',
     'SSL Certificate'  => 'SSL Zertifikat',
     'SSL Key'  => 'SSL Schlüssel',
diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php
index 4413cca0..dd402dd1 100644
--- a/web/inc/i18n/el.php
+++ b/web/inc/i18n/el.php
@@ -286,6 +286,7 @@ $LANG['el'] = array(
     'DNS Support'  => 'Υποστήριξη DNS',
     'Mail Support'  => 'Υποστήριξη Mail',
     'Advanced options'  => 'Προχωρημένες επιλογές',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Ψευδώνυμα',
     'SSL Certificate'  => 'Πιστοποιητικό SSL',
     'SSL Key'  => 'Κλειδί SSL',
diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php
index f40283d7..8fc175db 100644
--- a/web/inc/i18n/en.php
+++ b/web/inc/i18n/en.php
@@ -285,6 +285,7 @@ $LANG['en'] = array(
     'DNS Support'  => 'DNS Support',
     'Mail Support'  => 'Mail Support',
     'Advanced options'  => 'Advanced options',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliases',
     'SSL Certificate'  => 'SSL Certificate',
     'SSL Key'  => 'SSL Key',
diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php
index 2e9f7ec9..e56b9cba 100644
--- a/web/inc/i18n/es.php
+++ b/web/inc/i18n/es.php
@@ -285,6 +285,7 @@ $LANG['es'] = array(
     'DNS Support'  => 'Soporte para DNS',
     'Mail Support'  => 'Soporte para Correo',
     'Advanced options'  => 'Opciones Avanzadas',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliases',
     'SSL Certificate'  => 'Certificado SSL',
     'SSL Key'  => 'Llave SSL',
diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php
index 9911a601..d9a4f968 100644
--- a/web/inc/i18n/fa.php
+++ b/web/inc/i18n/fa.php
@@ -287,6 +287,7 @@ $LANG['fa'] = array(
     'DNS Support'  => 'پشتیبانی DNS',
     'Mail Support'  => 'پشتیبانی ایمیل',
     'Advanced options'  => 'گزینه های پیشرفته',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'نام مستعار',
     'SSL Certificate'  => 'گواهینامه SSL',
     'SSL Key'  => 'کلید SSL',
diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php
index 5a16feca..38b5331c 100644
--- a/web/inc/i18n/fi.php
+++ b/web/inc/i18n/fi.php
@@ -286,6 +286,7 @@ $LANG['fi'] = array(
     'DNS Support' => 'Tarvitsee DNS:n',
     'Mail Support' => 'Tarvitsee Sähköpostin',
     'Advanced options' => 'Lisäasetukset',
+    'Basic options'  => 'Basic options',
     'Aliases' => 'Aliakset',
     'SSL Certificate' => 'SSL-sertifikaatti',
     'SSL Key' => 'SSL-avain',
diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php
index f06f61e5..feba9b22 100644
--- a/web/inc/i18n/fr.php
+++ b/web/inc/i18n/fr.php
@@ -285,6 +285,7 @@ $LANG['fr'] = array(
     'DNS Support'  => 'Support DNS',
     'Mail Support'  => 'Support Email',
     'Advanced options'  => 'Options avancées',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Alias',
     'SSL Certificate'  => 'Certificat SSL',
     'SSL Key'  => 'Clé SSL',
diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php
index 1fed0348..694954d4 100644
--- a/web/inc/i18n/hu.php
+++ b/web/inc/i18n/hu.php
@@ -289,6 +289,7 @@ $LANG['hu'] = array(
     'DNS Support'  => 'DNS támogatás',
     'Mail Support'  => 'Mail támogatás',
     'Advanced options'  => 'Haladó beállítások',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliaszok',
     'SSL Certificate'  => 'SSL igazolás',
     'SSL Key'  => 'SSL kulcs',
diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php
index 68343ab7..7f02a01c 100644
--- a/web/inc/i18n/id.php
+++ b/web/inc/i18n/id.php
@@ -288,6 +288,7 @@ $LANG['id'] = array(
     'DNS Support'  => 'Dukungan DNS',
     'Mail Support'  => 'Dukungan Mail',
     'Advanced options'  => 'Opsi lanjutan',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Alias',
     'SSL Certificate'  => 'Sertifikat SSL',
     'SSL Key'  => 'Kunci SSL',
diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php
index 566d4c3c..ce83b301 100644
--- a/web/inc/i18n/it.php
+++ b/web/inc/i18n/it.php
@@ -286,6 +286,7 @@ $LANG['it'] = array(
     'DNS Support'  => 'Supporto DNS',
     'Mail Support'  => 'Supporto Mail',
     'Advanced options'  => 'Opzioni Avanzate',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Alias Dominio',
     'SSL Certificate'  => 'Certificato SSL',
     'SSL Key'  => 'SSL Key',
diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php
index 459f948f..7cc9b0aa 100644
--- a/web/inc/i18n/ja.php
+++ b/web/inc/i18n/ja.php
@@ -285,6 +285,7 @@ $LANG['ja'] = array(
     'DNS Support'  => 'DNSのサポート',
     'Mail Support'  => 'メールのサポート',
     'Advanced options'  => '詳細設定',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'エイリアス',
     'SSL Certificate'  => 'SSL証明書',
     'SSL Key'  => 'SSL鍵',
diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php
index 9cd78966..2e66bde7 100644
--- a/web/inc/i18n/nl.php
+++ b/web/inc/i18n/nl.php
@@ -286,6 +286,7 @@ $LANG['nl'] = array(
     'DNS Support'  => 'DNS Ondersteuning',
     'Mail Support'  => 'Mail Ondersteuning',
     'Advanced options'  => 'Geavanceerde opties',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliassen',
     'SSL Certificate'  => 'SSL Certificaat',
     'SSL Key'  => 'SSL Sleutel',
diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php
index c583d522..a2629681 100644
--- a/web/inc/i18n/no.php
+++ b/web/inc/i18n/no.php
@@ -286,6 +286,7 @@ $LANG['no'] = array(
     'DNS Support'  => 'DNS Støtte',
     'Mail Support'  => 'Mail Støtte',
     'Advanced options'  => 'Avanserte Instillinger',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliaser',
     'SSL Certificate'  => 'SSL Sertifikat',
     'SSL Key'  => 'SSL Nøkkel',
diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php
index 3d4bd28a..25576c6f 100644
--- a/web/inc/i18n/pl.php
+++ b/web/inc/i18n/pl.php
@@ -285,6 +285,7 @@ $LANG['pl'] = array(
     'DNS Support'  => 'Wsparcie dla DNS',
     'Mail Support'  => 'Wsparcie dla poczty email',
     'Advanced options'  => 'Ustawienia zaawansowane',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Aliasy',
     'SSL Certificate'  => 'Certyfikat SSL',
     'SSL Key'  => 'Klucz SSL',
diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php
index 0a4929fa..f073f291 100644
--- a/web/inc/i18n/pt-BR.php
+++ b/web/inc/i18n/pt-BR.php
@@ -285,6 +285,7 @@ $LANG['pt-BR'] = array(
     'DNS Support'  => 'Suporte a DNS',
     'Mail Support'  => 'Suporte a Email',
     'Advanced options'  => 'Opções Avançadas',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Apelidos',
     'SSL Certificate'  => 'Certificado SSL',
     'SSL Key'  => 'Chave SSL',
diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php
index dc78e38a..2d4cebe0 100644
--- a/web/inc/i18n/pt.php
+++ b/web/inc/i18n/pt.php
@@ -285,6 +285,7 @@ $LANG['pt'] = array(
     'DNS Support'  => 'Suporte a DNS',
     'Mail Support'  => 'Suporte a Email',
     'Advanced options'  => 'Opções Avançadas',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Apelidos',
     'SSL Certificate'  => 'Certificado SSL',
     'SSL Key'  => 'Chave SSL',
diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php
index 77e0eb8f..111c721e 100644
--- a/web/inc/i18n/ro.php
+++ b/web/inc/i18n/ro.php
@@ -286,6 +286,7 @@ $LANG['ro'] = array(
     'DNS Support' => 'Support DNS',
     'Mail Support' => 'Support E-mail',
     'Advanced options' => 'Opțiuni avansate',
+    'Basic options'  => 'Basic options',
     'Aliases' => 'Aliasuri',
     'SSL Certificate' => 'Certificat SSL',
     'SSL Key' => 'Cheia SSL',
diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php
index 0055bf0a..83801483 100644
--- a/web/inc/i18n/ru.php
+++ b/web/inc/i18n/ru.php
@@ -286,6 +286,7 @@ $LANG['ru'] = array(
     'DNS Support' => 'Поддержка DNS',
     'Mail Support' => 'Поддержка почты',
     'Advanced options' => 'Дополнительные опции',
+    'Basic options'  => 'Базовые опции',
     'Aliases' => 'Алиасы',
     'SSL Certificate' => 'SSL сертификат',
     'SSL Key' => 'Ключ SSL сертификата',
diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php
index 112ab91e..b8d4d5cd 100644
--- a/web/inc/i18n/se.php
+++ b/web/inc/i18n/se.php
@@ -285,6 +285,7 @@ $LANG['se'] = array(
     'DNS Support'  => 'DNS-stöd',
     'Mail Support'  => 'Mail-stöd',
     'Advanced options'  => 'Avancerade inställningar',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Alias',
     'SSL Certificate'  => 'SSL-certifikat',
     'SSL Key'  => 'SSL-nyckel',
diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php
index 59be3cba..3a849bee 100644
--- a/web/inc/i18n/tr.php
+++ b/web/inc/i18n/tr.php
@@ -286,6 +286,7 @@ $LANG['tr'] = array(
     'DNS Support'  => 'DNS Desteği',
     'Mail Support'  => 'Mail Desteği',
     'Advanced options'  => 'Gelişmiş seçenekler',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Takma adlar (Alias)',
     'SSL Certificate'  => 'SSL Sertifikası',
     'SSL Key'  => 'SSL Anahtarı (Key)',
diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php
index dd04d75f..7386b30f 100644
--- a/web/inc/i18n/tw.php
+++ b/web/inc/i18n/tw.php
@@ -288,6 +288,7 @@ $LANG['tw'] = array(
     'DNS Support'  => 'DNS支援',
     'Mail Support'  => '信箱支援',
     'Advanced options'  => '進階選項',
+    'Basic options'  => 'Basic options',
     'Aliases'  => '次網域',
     'SSL Certificate'  => 'SSL憑證',
     'SSL Key'  => 'SSL密鑰',
diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php
index ec29ed53..4511486b 100644
--- a/web/inc/i18n/ua.php
+++ b/web/inc/i18n/ua.php
@@ -286,6 +286,7 @@ $LANG['ua'] = array(
     'DNS Support' => 'Підтримка DNS',
     'Mail Support' => 'Підтримка пошти',
     'Advanced options' => 'Додаткові опції',
+    'Basic options'  => 'Basic options',
     'Aliases' => 'Аліаси',
     'SSL Certificate' => 'SSL сертификат',
     'SSL Key' => 'Ключ SSL сертифікату',
diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php
index eef37d80..39fd7e06 100644
--- a/web/inc/i18n/vi.php
+++ b/web/inc/i18n/vi.php
@@ -285,6 +285,7 @@ $LANG['vi'] = array(
     'DNS Support'  => 'Hỗ trỡ DNS',
     'Mail Support'  => 'Hỗ trợ email',
     'Advanced options'  => 'Cấu hình nâng cao',
+    'Basic options'  => 'Basic options',
     'Aliases'  => 'Ánh xạ',
     'SSL Certificate'  => 'Chứng chỉ SSL',
     'SSL Key'  => 'SSL Key',
diff --git a/web/js/file_manager.js b/web/js/file_manager.js
index 70a887a1..1692aa8a 100644
--- a/web/js/file_manager.js
+++ b/web/js/file_manager.js
@@ -651,10 +651,13 @@ FM.generate_listing = function(reply, box) {
 
         var t_index = tab + '_' + i;
 
+        o.name = o.name.replace('"', '\"');
+        o.full_path = o.full_path.replace('"', '\"');
+
         var tpl = Tpl.get('entry_line', 'FM');
         tpl.set(':CL_ACTION_1', cl_act);
-        tpl.set(':SOURCE', $.toJSON(o));
         tpl.set(':NAME', o.name);
+        tpl.set(':SOURCE', $.toJSON(o));
         tpl.set(':PERMISSIONS', o.permissions);
         tpl.set(':OWNER', o.owner);
         tpl.set(':SIZE_VALUE', o.type == 'f' ? FM.humanFileSizeValue(o.size) : ' ');
@@ -1265,15 +1268,15 @@ FM.confirmRename = function() {
 
     var src = selected.find('.source').val();
     src = $.parseJSON(src);
-    
+
     var target_name = $('#rename-title').val();
-    
+
     if (target_name.trim().length == 0) {
         return FM.displayError(
             App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY
         );
     }
-    
+
     var action = FM.isItemFile(src) ? 'rename_file' : 'rename_directory';
 
     var params = {
@@ -1281,7 +1284,7 @@ FM.confirmRename = function() {
         target_name: target_name,
         dir:  FM['TAB_' + tab + '_CURRENT_PATH'] + '/'
     };
-    
+
     App.Ajax.request(action, params, function(reply) {
         if (reply.result == true) {
             FM.popupClose();
@@ -1842,7 +1845,6 @@ FM.confirmUnpackItem = function () {
 }
 
 FM.confirmPackItem = function () {
-
     var tab = FM.getTabLetter(FM.CURRENT_TAB);
     var box = FM['TAB_' + tab];
     var selected = $(FM['TAB_' + tab] ).find('.dir.active, .dir.selected');
@@ -1857,13 +1859,12 @@ FM.confirmPackItem = function () {
         src = $.parseJSON(src);
 
         if (FM.isItemPseudo(src)) {
-	    return FM.displayError(
-    		App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
-    	    );
-	}
+            return FM.displayError(
+                App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
+            );
+        }
     }
 
-
     if (selected.length > 0) {
         var files_arr = [];
         $.each(selected, function(i, o) {
@@ -1898,7 +1899,6 @@ FM.confirmPackItem = function () {
         if (reply.result == true) {
             FM.popupClose();
             FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
-///            FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
         }
         else {
             FM.showError('unpack_item', reply.message);
diff --git a/web/js/init.js b/web/js/init.js
index b4f43edb..3ac6175e 100644
--- a/web/js/init.js
+++ b/web/js/init.js
@@ -548,6 +548,10 @@ $(document).ready(function(){
 
             VE.navigation.init();
 
+
+            $('.button').attr('title','ctrl+Enter');
+            $('.button.cancel').attr('title','ctrl+Backspace');
+
             VE.core.register();
             if (location.href.search(/list/) != -1) {
                 var shift_select_ref = $('body').finderSelect({