diff --git a/workflow/engine/xmlform/steps/steps_Options.xml b/workflow/engine/xmlform/steps/steps_Options.xml
old mode 100755
new mode 100644
index d0774932d..456ad3abd
--- a/workflow/engine/xmlform/steps/steps_Options.xml
+++ b/workflow/engine/xmlform/steps/steps_Options.xml
@@ -74,8 +74,7 @@
 
   // Additional functions required in triggers
   function triggerEditWizardSource (sUID){
-    //popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1' , 770, 510);
-    //window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1','@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
+    window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1','@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height);
   }
 
   function triggerSave(form)
diff --git a/workflow/engine/xmlform/steps/triggersAfter_List.xml b/workflow/engine/xmlform/steps/triggersAfter_List.xml
old mode 100755
new mode 100644
index 952d4b19b..e4d6ce68f
--- a/workflow/engine/xmlform/steps/triggersAfter_List.xml
+++ b/workflow/engine/xmlform/steps/triggersAfter_List.xml
@@ -13,10 +13,7 @@
 
 <triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
 
-<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="
-/*popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID , 930, 600); */
-window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
-return false;"/>
+<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height); return false;"/>
 
 <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;AFTER&#039;);return false;"/>
 
diff --git a/workflow/engine/xmlform/steps/triggersBefore_List.xml b/workflow/engine/xmlform/steps/triggersBefore_List.xml
old mode 100755
new mode 100644
index 25d6a748b..4de8304fa
--- a/workflow/engine/xmlform/steps/triggersBefore_List.xml
+++ b/workflow/engine/xmlform/steps/triggersBefore_List.xml
@@ -13,10 +13,7 @@
 
 <triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
 
-<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="
-/*popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID , 930, 600); */
-window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
-return false;"/>
+<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height); return false;"/>
 
 <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;);return false;"/>
 
diff --git a/workflow/engine/xmlform/triggers/triggerCopy.xml b/workflow/engine/xmlform/triggers/triggerCopy.xml
index 120f80847..8df76c8b1 100644
--- a/workflow/engine/xmlform/triggers/triggerCopy.xml
+++ b/workflow/engine/xmlform/triggers/triggerCopy.xml
@@ -84,25 +84,6 @@
 
 <JS type="javascript">
     <![CDATA[
-    /*var triggerEditor = CodeMirror.fromTextArea('form[TRI_WEBBOT]', {
-    height: "200px",
-    width: "90%",
-    parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
-    "../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
-    "../contrib/php/js/parsephphtmlmixed.js"],
-    stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "css/phpcolors.css" ],
-    path: "js/", lineNumbers: true, continuousScanning: 500, readOnly:true, parserConfig: { phpOnly:true} });
-    */
-    /*var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WEBBOT]"), {
-	    lineNumbers: true,
-	    matchBrackets: true,
-	    mode: "application/x-httpd-php",
-	    PMEnabled: true,
-	    indentUnit: 2,
-	    indentWithTabs: false,
-	    readOnly: true
-	});
-	triggerEditor.setSize(400,200);*/
 
     function cancel()
     {
@@ -114,8 +95,6 @@
         var triUid = getField("TRIGGER_UID_AUX").value;
 
         if (triUid != triUidPrev) {
-            //triggerEditor.setValue(document.getElementById("form[TRI_WEBBOT]").value);
-            
             triUidPrev = triUid;
             var oRPC = new leimnud.module.rpc.xmlhttp({
                 url : 'processes_TriggersFormatCode',
@@ -142,7 +121,6 @@
         function ()
         {
             txtTgrTitle.value = "";
-            //triggerEditor.setValue("");
             triUidPrev= "";
         }
     );
@@ -157,7 +135,6 @@
                 setTimeout("triggerCheckWebbotTimer()", 100);
             } else {
                 txtTgrTitle.value = "";
-                //triggerEditor.setValue("");
                 triUidPrev= "";
             }
         }
diff --git a/workflow/engine/xmlform/triggers/triggersCustom.xml b/workflow/engine/xmlform/triggers/triggersCustom.xml
old mode 100755
new mode 100644
index 8f9766983..bbfe0c9c5
--- a/workflow/engine/xmlform/triggers/triggersCustom.xml
+++ b/workflow/engine/xmlform/triggers/triggersCustom.xml
@@ -31,29 +31,6 @@
 
 
 <JS type="JavaScript"><![CDATA[
-/*var triggerEditor = CodeMirror.fromTextArea('form[TRI_WEBBOT]', {
-    height: "220px",
-    width: "80%",
-    parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
-    "../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
-    "../contrib/php/js/parsephphtmlmixed.js"],
-    stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "css/phpcolors.css" ],
-    path: "js/", lineNumbers: true, continuousScanning: 500, parserConfig: { phpOnly:true} });*/
-
-/*CodeMirror.commands.autocomplete = function(cm) {
-    CodeMirror.showHint(cm, CodeMirror.phpHint);
-}
-
-var triggerEditor = CodeMirror.fromTextArea(document.getElementById("form[TRI_WEBBOT]"), {
-    lineNumbers: true,
-    matchBrackets: true,
-    mode: "application/x-httpd-php",
-    PMEnabled: true,
-    indentUnit: 2,
-    indentWithTabs: false,
-    extraKeys: {"Ctrl-Space": "autocomplete"}
-});
-triggerEditor.setSize(450,245);*/
 
 getField('TRI_TITLE').form.onsubmit = function() {return false;};
 var _oVarsPanel_;
@@ -90,16 +67,6 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
   oRPC.make();
 };
 
-/*var insertFormVar = function(sFieldName, sValue) {
-    if (triggerEditor.getSelection() == "") {
-	    triggerEditor.replaceRange(sValue, triggerEditor.getCursor());
-    } else {
-        triggerEditor.replaceSelection(sValue);
-    }
-    _oVarsPanel_.remove();
-    triggerEditor.focus();
-};*/
-
 function cancel(){
     currentPopupWindow.remove();
 }
diff --git a/workflow/engine/xmlform/triggers/triggers_Edit.xml b/workflow/engine/xmlform/triggers/triggers_Edit.xml
old mode 100755
new mode 100644
index ca2dcddea..de4f47bf1
--- a/workflow/engine/xmlform/triggers/triggers_Edit.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Edit.xml
@@ -20,16 +20,6 @@
 </SAVE>
 <JS type="JavaScript"><![CDATA[
 
-/*var triggerEditor = CodeMirror.fromTextArea('form[TRI_WEBBOT]', {
-    height: "380px",
-    width: "90%",
-    parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
-    "../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
-    "../contrib/php/js/parsephphtmlmixed.js"],
-    stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "css/phpcolors.css" ],
-    path: "js/", lineNumbers: true, continuousScanning: 500, parserConfig: { phpOnly:true} });
-*/
-
 CodeMirror.commands.autocomplete = function(cm) {
     CodeMirror.showHint(cm, CodeMirror.phpHint);
 }
@@ -90,7 +80,6 @@ var insertFormVar = function(sFieldName, sValue) {
 };
 
 function cancel(){
-    //currentPopupWindow.remove();
     window.close();
 }
 
diff --git a/workflow/engine/xmlform/triggers/triggers_Options.xml b/workflow/engine/xmlform/triggers/triggers_Options.xml
old mode 100755
new mode 100644
index 1c4a5811c..d31ce8561
--- a/workflow/engine/xmlform/triggers/triggers_Options.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Options.xml
@@ -37,32 +37,6 @@
 
 <JS type="javascript" replaceTags="1">
 <![CDATA[
-/*
-	document.onkeypress=function(e){
-	var esIE=(document.all);
-	var esNS=(document.layers);
-	tecla=(esIE) ? event.keyCode : e.which;
-	if(tecla==13){
-		return false;
-	  }
-	}
-*/
-/*
-    //Add css Codemirror
-    var head = document.getElementsByTagName('head')[0];
-    var s = document.createElement('link');
-    s.setAttribute('href', '/js/codemirror/lib/codemirror.css');
-    s.setAttribute('type', 'text/css');
-    s.setAttribute('rel', 'stylesheet');
-    head.appendChild(s);
-
-    var s = document.createElement('link');
-    s.setAttribute('href', '/js/codemirror/addon/hint/show-hint.css');
-    s.setAttribute('type', 'text/css');
-    s.setAttribute('rel', 'stylesheet');
-    head.appendChild(s);
-*/
-
   var windowWidth = 600;
   var windowHeight = 460;
 
@@ -81,7 +55,7 @@
 
   function triggerCopy()
   {
-      popupWindow("@G::LoadTranslation(ID_TRIGGER_COPY_TITLE)", "@G::encryptlink(@#triggerCopy)?PRO_UID=@%PRO_UID" , windowWidth, windowHeight);
+      popupWindow("@G::LoadTranslation(ID_TRIGGER_COPY_TITLE)", "@G::encryptlink(@#triggerCopy)?PRO_UID=@%PRO_UID" , 900, 460);
   }
 
   function triggerFromLibrary() {
@@ -98,8 +72,7 @@
   }
 
   function triggerEdit(sUID) {
-    //popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID , 930, 600);
-    window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=930,height=600,top=85,left=140');
+    window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height);
   }
 
   function triggerProperties( sUID ) {