diff --git a/desktop/sources/scripts/dotgrid.js b/desktop/sources/scripts/dotgrid.js
index 965983d..5363544 100644
--- a/desktop/sources/scripts/dotgrid.js
+++ b/desktop/sources/scripts/dotgrid.js
@@ -48,7 +48,7 @@ function Dotgrid () {
     window.addEventListener('drop', this.drag)
 
     this.acels.set('File', 'New', 'CmdOrCtrl+N', () => { this.source.new() })
-    this.acels.set('File', 'Save', 'CmdOrCtrl+S', () => { this.source.save('export.grid', this.commander._input.value, 'text/plain') })
+    this.acels.set('File', 'Save', 'CmdOrCtrl+S', () => { this.source.save('export.grid', dotgrid.tool.export(), 'text/plain') })
     this.acels.set('File', 'Export Image', 'CmdOrCtrl+E', () => { this.source.download('export.png', this.surface.el.toDataURL('image/png', 1.0), 'image/png') })
     this.acels.set('File', 'Open', 'CmdOrCtrl+O', () => { this.source.open('grid', this.whenOpen) })
     this.acels.set('File', 'Revert', 'CmdOrCtrl+W', () => { this.source.revert() })
diff --git a/index.html b/index.html
index 4f37fa8..47b4fbe 100644
--- a/index.html
+++ b/index.html
@@ -22,6 +22,7 @@
     <script type="text/javascript" src="desktop/sources/scripts/lib/acels.js"></script>
     <script type="text/javascript" src="desktop/sources/scripts/lib/theme.js"></script>
     <script type="text/javascript" src="desktop/sources/scripts/lib/history.js"></script>
+    <script type="text/javascript" src="desktop/sources/scripts/lib/source.js"></script>
     <!-- Dotgrid -->
     <script type="text/javascript" src="desktop/sources/scripts/dotgrid.js"></script>
     <script type="text/javascript" src="desktop/sources/scripts/manager.js"></script>
@@ -31,7 +32,6 @@
     <script type="text/javascript" src="desktop/sources/scripts/tool.js"></script>
     <script type="text/javascript" src="desktop/sources/scripts/generator.js"></script>
     <script type="text/javascript" src="desktop/sources/scripts/picker.js"></script>
-    <script type="text/javascript" src="desktop/sources/scripts/source.js"></script>
     <!-- Styles -->
     <link rel="stylesheet" type="text/css" href="desktop/sources/links/reset.css"/>
     <link rel="stylesheet" type="text/css" href="desktop/sources/links/fonts.css"/>