diff --git a/mindplot/src/main/javascript/DesignerKeyboard.js b/mindplot/src/main/javascript/DesignerKeyboard.js
index d20c3915..1bff8d4b 100644
--- a/mindplot/src/main/javascript/DesignerKeyboard.js
+++ b/mindplot/src/main/javascript/DesignerKeyboard.js
@@ -94,6 +94,17 @@ mindplot.DesignerKeyboard = new Class({
                 designer.changeFontWeight();
             },
 
+            'ctrl+s' : function(event) {
+                event.preventDefault();
+                designer.save(null, true);
+
+            },
+
+            'meta+s' : function(event) {
+                event.preventDefault();
+                designer.save(null, true);
+            },
+
             'ctrl+i' : function() {
                 designer.changeFontStyle();
             },
diff --git a/mindplot/src/main/javascript/Workspace.js b/mindplot/src/main/javascript/Workspace.js
index 89fe5d2c..32c909aa 100644
--- a/mindplot/src/main/javascript/Workspace.js
+++ b/mindplot/src/main/javascript/Workspace.js
@@ -127,7 +127,7 @@ mindplot.Workspace = new Class({
         this._screenManager.setScale(zoom);
 
         // Some changes in the screen. Let's fire an update event...
-        this._screenManager.fireEvent('update', new Event());
+        this._screenManager.fireEvent('update');
     },
 
     getScreenManager: function() {
@@ -180,7 +180,7 @@ mindplot.Workspace = new Class({
                         event.preventDefault();
 
                         // Fire drag event ...
-                        screenManager.fireEvent('update', new Event());
+                        screenManager.fireEvent('update');
                         wasDragged = true;
 
 
@@ -202,7 +202,7 @@ mindplot.Workspace = new Class({
                         mWorkspace.enableWorkspaceEvents(true);
 
                         if (!wasDragged) {
-                            screenManager.fireEvent('click', new Event());
+                            screenManager.fireEvent('click');
                         }
                     };
                     screenManager.addEvent('mouseup', workspace._mouseUpListener);
diff --git a/wise-doc/src/main/webapp/html/editor.html b/wise-doc/src/main/webapp/html/editor.html
index ce64f3f4..09d22cec 100644
--- a/wise-doc/src/main/webapp/html/editor.html
+++ b/wise-doc/src/main/webapp/html/editor.html
@@ -13,9 +13,12 @@
 
     <!--<script type='text/javascript' src='../js/wiseLibrary.js'></script>-->
 
-    <script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
+    <script type='text/javascript'
+            src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
     <script type='text/javascript' src='../js/mootools-more-1.3.2.1-yui.js'></script>
 
+    <!--<script type='text/javascript' src='../js/mootools-more-1.3.2.1-yui.js'></script>-->
+
     <!--<script type='text/javascript' src='../js/common.js'></script>-->
     <!--<script type='text/javascript' src='../js/windoo.js'></script>-->
 
@@ -25,8 +28,8 @@
     <script type="text/javascript">
         //Google-Brix framework load callback function
         collabOnLoad = function() {
-            isGoogleBrix=true;
-            if(typeof mindplot != "undefined"){
+            isGoogleBrix = true;
+            if (typeof mindplot != "undefined") {
                 mindplot.collaboration.frameworks.brix.BrixFramework.instanciate();
             }
         };