diff --git a/dbd/sql/mysql/data/basic_locale_string.sql b/dbd/sql/mysql/data/basic_locale_string.sql
index bfc9318..798c60d 100644
--- a/dbd/sql/mysql/data/basic_locale_string.sql
+++ b/dbd/sql/mysql/data/basic_locale_string.sql
@@ -10,6 +10,7 @@ INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('b
 INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_locale', 1, 'Locale', 'Sprache');
 INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_admin_rights', 1, 'Admin Rights', 'Admin Rechte');
 INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_cancel', 1, 'Cancel', 'Abbrechen');
+INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_close', 1, 'Close', 'Schließen');
 
 INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_text_logout', 1, 'Logout before you leave!', 'Loggen Sie sie sich aus bevor Sie gehen!');
 INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_text_login', 1, 'Login to your Website.', 'Loggen Sie sich in ihre Website ein.');
diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.js b/sai/modules/saimod_sys_locale/saimod_sys_locale.js
index c70adbf..300d909 100644
--- a/sai/modules/saimod_sys_locale/saimod_sys_locale.js
+++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.js
@@ -51,21 +51,29 @@ function init__SYSTEM_SAI_saimod_sys_locale() {
         $('#'+cData.lang).addClass('active');
         saimod_sys_locale_loadcontent(cData.lang, cData.group);
         if (cData.editmode === true){
+            console.log("now i am true");
             saimod_sys_locale_loadsinglecontent(cData.id, cData.lang);
-            cData.editmode = false;
         }});
     
     $('#changetext').click(function(){
         saimod_sys_locale_savecontent(cData.id, cData.lang);});
     
     $('#del_text').click(function(){
-        saimod_sys_locale_delete($('#modaltitle').html());});
+        saimod_sys_locale_delete($('#modaltitle').html());
+        cData.editmode = false;});
     $(document).keyup(function(e) {
         if (e.keyCode === 27) { $('#addtext').show(); }   // esc
       });
+    //tiny mce modal fix
+    $(document).on('focusin', function(e) {
+        if ($(e.target).closest(".mce-window").length) {
+            e.stopImmediatePropagation();
+        }
+    });
 }
 
 function saimod_sys_locale_newtext(){
+    cData.editmode = true;
     $('#modaltitle').hide();
     $('#modaltextarea').hide();
     $('#del_text').hide();
@@ -165,6 +173,7 @@ function saimod_sys_locale_loadsinglecontent(id, lang){
 }
 
 function saimod_sys_locale_loadcontent(id, group){
+    cData.editmode = true;
     $('#tab-content').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_locale&action=load&id='+id+'&group='+group, function(){
         $('.tableentry').click(function(){
             cData.editmode = true;
@@ -185,7 +194,7 @@ function saimod_sys_locale_delete(buttonID){
 
 function init_tinymce(){
     tinymce.init({ // General options
-        mode : "textareas",
+        /*mode : "textareas",
         theme : "modern",
         
         formats : {
@@ -204,6 +213,47 @@ function init_tinymce(){
         height: "250px",
 
         // Example content CSS (should be your site CSS)
-        content_css : "../../page/index.css"
+        content_css : "../../page/index.css"*/
+        // General options
+        mode : "textareas",
+        //theme : "advanced",
+        theme : "modern",
+        plugins : "autolink,lists,pagebreak,layer,table,save,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,template,code",
+        //xhtmlxtras,emotions,advimage,advlink,iespell,inlinepopups,advhr,style,spellchecker,
+
+        // Theme options
+        theme_modern_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
+        theme_modern_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
+        theme_modern_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
+        theme_modern_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage",
+        theme_modern_toolbar_location : "top",
+        theme_modern_toolbar_align : "left",
+        theme_modern_statusbar_location : "bottom",
+        theme_modern_resizing : true,
+
+        // Skin options
+        //skin : "o2k7",
+        //skin_variant : "silver",
+        width: "100%",
+        height: "250px",
+
+        // Example content CSS (should be your site CSS)
+        //content_css : "css/example.css",
+        //content_css : "../../page/index.css"
+
+        // Drop lists for link/image/media/template dialogs
+        template_external_list_url : "js/template_list.js",
+        external_link_list_url : "js/link_list.js",
+        external_image_list_url : "js/image_list.js",
+        media_external_list_url : "js/media_list.js",
+        forced_root_block : "", 
+        force_br_newlines : true,
+        force_p_newlines : false,
+
+        // Replace values for the template plugin
+        template_replace_values : {
+                username : "Some User",
+                staffid : "991234"
+        }
 });
 }