diff --git a/Gruntfile.js b/Gruntfile.js
index ffa321b8..97a5c40c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -161,7 +161,7 @@ module.exports = function(grunt) {
           ]
         },
         files: [
-          {expand: true, flatten: true, src: ['src/piskel-boot-0.1.0.js'], dest: 'dest/'}
+          {src: ['src/piskel-boot.js'], dest: 'dest/piskel-boot.js'}
         ]
       },
       editor: {
@@ -170,6 +170,9 @@ module.exports = function(grunt) {
             {
               match: /templates\//g,
               replacement: "../templates"+version+"/"
+            },{
+              match: /piskel-boot.js/g,
+              replacement: "../piskel-boot"+version+".js"
             },{
               match: /^(.|[\r\n])*<!--body-main-start-->/,
               replacement: "",
@@ -194,6 +197,7 @@ module.exports = function(grunt) {
       main: {
         files: [
           {src: ['dest/js/piskel-packaged-min.js'], dest: 'dest/js/piskel-packaged-min' + version + '.js'},
+          {src: ['dest/piskel-boot.js'], dest: 'dest/piskel-boot' + version + '.js'},
           {src: ['src/logo.png'], dest: 'dest/logo.png'},
           {src: ['src/js/lib/iframeLoader-0.1.0.js'], dest: 'dest/js/lib/iframeLoader-0.1.0.js'},
           {src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/js/lib/gif/gif.ie.worker.js'},
@@ -246,7 +250,7 @@ module.exports = function(grunt) {
         },
         src: [
           'src/js/**/*.js',
-          'src/piskel-boot-0.1.0.js',
+          'src/piskel-boot.js',
           'src/piskel-script-list.js',
           '!src/js/lib/**/*.js'
         ],
diff --git a/src/index.html b/src/index.html
index ad7ae0f9..99b1e0e7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -75,10 +75,11 @@
 
   <iframe src="templates/cheatsheet.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
   <iframe src="templates/misc-templates.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
+
+  <script type="text/javascript" src="piskel-boot.js"></script>
   <!--body-main-end-->
   <!-- the comment above indicates the end of the markup reused by the editor integrated in piskelapp.com -->
   <!-- do not delete, do not move :) -->
 
-  <script type="text/javascript" src="piskel-boot-0.1.0.js"></script>
 </body>
 </html>
diff --git a/src/piskel-boot-0.1.0.js b/src/piskel-boot.js
similarity index 100%
rename from src/piskel-boot-0.1.0.js
rename to src/piskel-boot.js
diff --git a/src/templates/settings/save.html b/src/templates/settings/save.html
index 1dbc9821..65ac903a 100644
--- a/src/templates/settings/save.html
+++ b/src/templates/settings/save.html
@@ -4,7 +4,7 @@
     <div class="settings-item">
       <div class="settings-form-section" style="overflow:hidden">
         <label class="row" style="float:left;line-height:28px;">Title : </label>
-        <input id="save-name" type="text" class="save-field textfield" style="float:left;width:200px;margin-left:10px;"/>
+        <input id="save-name" type="text" class="save-field textfield" style="float:left;width:198px;margin-left:10px;"/>
       </div>
       <div class="settings-form-section">
         <textarea id="save-description" class="save-field textfield" placeholder="Description ..."></textarea>