diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index 09fcf3f6..d6106774 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -8,6 +8,7 @@ require 'stringex'
 require 'json'
 require 'sprockets'
 require 'sprockets-helpers'
+require 'octicons'
 require 'sass'
 require 'pathname'
 
diff --git a/lib/gollum/assets.rb b/lib/gollum/assets.rb
index cd09478e..db26e581 100644
--- a/lib/gollum/assets.rb
+++ b/lib/gollum/assets.rb
@@ -1,6 +1,8 @@
+require 'octicons'
+
 module Precious
   module Assets
-    MANIFEST = %w(app.js app.css criticmarkup.css fileview.css ie7.css print.css *.png *.jpg *.svg *.eot *.ttf *.woff *.woff2)
+    MANIFEST = %w(app.js editor.js app.css criticmarkup.css fileview.css ie7.css print.css *.png *.jpg *.svg *.eot *.ttf *.woff *.woff2)
     ASSET_URL = 'gollum/assets'
     
     def self.sprockets(dir = File.dirname(File.expand_path(__FILE__)))
@@ -17,6 +19,7 @@ module Precious
         def base_url
           self.class.class_variable_get(:@@base_url)
         end
+        include ::Octicons
         include ::Precious::Views::RouteHelpers
         include ::Precious::Views::OcticonHelpers
       end
diff --git a/lib/gollum/public/gollum/javascript/app.js b/lib/gollum/public/gollum/javascript/app.js
index 78a3369b..572adc08 100644
--- a/lib/gollum/public/gollum/javascript/app.js
+++ b/lib/gollum/public/gollum/javascript/app.js
@@ -6,34 +6,4 @@
 //= require gollum.dialog
 //= require gollum.placeholder
 //= require editor/sections
-//= require ace/ace
-//= require ace/mode-markdown
-//= require ace/mode-asciidoc
-//= require ace/mode-text
-//= require ace/mode-rdoc
-//= require ace/mode-textile
-//= require ace/mode-rst
-//= require ace/mode-latex
-//= require ace/theme-tomorrow
-//= require ace/keybinding-vim
-//= require ace/keybinding-emacs
-//= require ace/ext-elastic_tabstops_lite
-//= require ace/ext-error_marker
-//= require ace/ext-keybinding_menu
-//= require ace/ext-language_tools
-//= require ace/ext-linking
-//= require ace/ext-rtl.js
-//= require ace/ext-searchbox
-//= require ace/ext-settings_menu
-//= require ace/ext-spellcheck
-//= require ace/ext-split
-//= require ace/ext-static_highlight
-//= require ace/ext-statusbar
-//= require ace/ext-textarea
-//= require ace/ext-themelist
-//= require ace/ext-whitespace
-//= require editor/modes
-//= require editor/gollum.editor
-//= require editor/langs/default
-//= require_tree ./editor/langs
 //= require jquery.resize
diff --git a/lib/gollum/public/gollum/javascript/editor.js b/lib/gollum/public/gollum/javascript/editor.js
new file mode 100644
index 00000000..60eb7986
--- /dev/null
+++ b/lib/gollum/public/gollum/javascript/editor.js
@@ -0,0 +1,30 @@
+//= require ace/ace
+//= require ace/mode-markdown
+//= require ace/mode-asciidoc
+//= require ace/mode-text
+//= require ace/mode-rdoc
+//= require ace/mode-textile
+//= require ace/mode-rst
+//= require ace/mode-latex
+//= require ace/theme-tomorrow
+//= require ace/keybinding-vim
+//= require ace/keybinding-emacs
+//= require ace/ext-elastic_tabstops_lite
+//= require ace/ext-error_marker
+//= require ace/ext-keybinding_menu
+//= require ace/ext-language_tools
+//= require ace/ext-linking
+//= require ace/ext-rtl.js
+//= require ace/ext-searchbox
+//= require ace/ext-settings_menu
+//= require ace/ext-spellcheck
+//= require ace/ext-split
+//= require ace/ext-static_highlight
+//= require ace/ext-statusbar
+//= require ace/ext-textarea
+//= require ace/ext-themelist
+//= require ace/ext-whitespace
+//= require editor/modes
+//= require editor/gollum.editor
+//= require editor/langs/default
+//= require_tree ./editor/langs
\ No newline at end of file
diff --git a/lib/gollum/templates/create.mustache b/lib/gollum/templates/create.mustache
index 449aa6f6..4c4dae7e 100644
--- a/lib/gollum/templates/create.mustache
+++ b/lib/gollum/templates/create.mustache
@@ -18,7 +18,4 @@
 	</div>
 </div>
 </div>
-<script type="text/javascript">
-var default_markup = '{{default_markup}}';
-</script>
 {{something}}
diff --git a/lib/gollum/templates/layout.mustache b/lib/gollum/templates/layout.mustache
index bcaa5eaf..ae178bb8 100644
--- a/lib/gollum/templates/layout.mustache
+++ b/lib/gollum/templates/layout.mustache
@@ -24,9 +24,15 @@
 	  var pageFullPath = '{{escaped_url_path}}';
     var pageFormat   = '{{format}}';
 	{{/page}}
+  {{#is_create_page}}
+    var default_markup = '{{default_markup}}';
+  {{/is_create_page}}
 
   </script>
   {{#sprockets_javascript_tag}}app{{/sprockets_javascript_tag}}
+  {{#has_editor}}
+  {{#sprockets_javascript_tag}}editor{{/sprockets_javascript_tag}}
+  {{/has_editor}}
   {{#mathjax}}
   {{^mathjax_config}}
   <script type="text/javascript">
diff --git a/lib/gollum/views/editable.rb b/lib/gollum/views/editable.rb
index 6d78392e..45dd08ad 100644
--- a/lib/gollum/views/editable.rb
+++ b/lib/gollum/views/editable.rb
@@ -1,5 +1,9 @@
 module Precious
   module Editable
+    def has_editor
+      true
+    end
+
     def formats(selected = @page.format)
       Gollum::Markup.formats.map do |key, val|
         { :name     => val[:name],
diff --git a/lib/gollum/views/helpers.rb b/lib/gollum/views/helpers.rb
index 77bd39c4..854fe8d4 100644
--- a/lib/gollum/views/helpers.rb
+++ b/lib/gollum/views/helpers.rb
@@ -54,7 +54,7 @@ module Precious
 
         # Well-formed SVG with XMLNS and height/width removed, for use in CSS
         def rocticon_css(symbol, parameters = {})
-          octicon = Octicons::Octicon.new(symbol, parameters.merge({xmlns: 'http://www.w3.org/2000/svg'}))
+          octicon = ::Octicons::Octicon.new(symbol, parameters.merge({xmlns: 'http://www.w3.org/2000/svg'}))
           [:width, :height].each {|option| octicon.options.delete(option)}
           octicon.to_svg
         end
diff --git a/lib/gollum/views/layout.rb b/lib/gollum/views/layout.rb
index f35fc277..cfc63188 100644
--- a/lib/gollum/views/layout.rb
+++ b/lib/gollum/views/layout.rb
@@ -1,5 +1,4 @@
 require 'cgi'
-require 'octicons'
 
 module Precious
   module Views