diff --git a/static/application.css b/static/application.css
index 063e63a..8698c59 100644
--- a/static/application.css
+++ b/static/application.css
@@ -71,7 +71,7 @@ textarea {
 
 #box code {
 	padding: 0px;
-	background: transparent !important; /* don't hide hastebox */
+	/*background: transparent !important; /* don't hide hastebox */
 }
 
 /* key */
diff --git a/static/application.js b/static/application.js
index 63c7850..ff1ad4f 100644
--- a/static/application.js
+++ b/static/application.js
@@ -171,6 +171,16 @@ haste.prototype.lookupTypeByExtension = function(ext) {
 // For the specified number of lines
 haste.prototype.addLineNumbers = function(lineCount) {
   removeElementsByClass('linenumber');
+
+  if(window.location.hash) {
+    const hash = window.location.hash.substring(1);
+    highlightNew(getLineElement(hash));
+
+    /*document.getElementById('line' + hash).scrollIntoView({
+      behavior: 'smooth',
+      block: 'center'
+    });*/
+  }
   /*for (var i = 0; i < lineCount; i++) {
     let div = document.createElement('a');
     div.classList.add('linenumber');
@@ -272,7 +282,19 @@ haste.prototype.lockDocument = function() {
       _this.showMessage(err.message, 'error');
     }
     else if (ret) {
-      _this.$code.html(htmlEscape(ret.value));
+      //_this.$code.html(htmlEscape(ret.value));
+      var lines = ret.value.split(/\r\n|\r|\n/);
+      for (var i = 0; i < lines.length; i++) {
+        let code = document.createElement('code');
+        code.innerHTML = lines[i];
+        let pre = document.getElementById("box");
+        pre.appendChild(code);
+
+        code.onclick = function() {
+          highlightNew(code);
+        }
+      }
+
       _this.setTitle(ret.key);
       var file = '/' + ret.key;
       window.history.pushState(null, _this.appName + '-' + ret.key, file);
@@ -285,6 +307,25 @@ haste.prototype.lockDocument = function() {
   });
 };
 
+function highlightNew(code) {
+  const codes = document.getElementsByTagName("code");
+  let maxWidth = 0;
+  for (let i = 0; i < codes.length; i++) {
+    if (codes[i].offsetWidth > maxWidth) {
+      maxWidth = codes[i].offsetWidth;
+    }
+    codes[i].style.removeProperty("background-color");
+  }
+  for (let i = 0; i < codes.length; i++) {
+    codes[i].style.width = maxWidth + 'px';
+  }
+  code.style.backgroundColor = "rgba(187, 128, 9, 0.25)";
+}
+
+function getLineElement(line) {
+  return document.getElementsByTagName("code")[line - 1];
+}
+
 haste.prototype.configureButtons = function() {
   var _this = this;
   this.buttons = [
diff --git a/static/application.min.js b/static/application.min.js
index 49f7f58..1f18e91 100644
--- a/static/application.min.js
+++ b/static/application.min.js
@@ -1 +1 @@
-const workersUrl="https://api.knx.cool/";var haste_document=function(){this.locked=!1};htmlEscape=function(e){return e.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;")},haste_document.prototype.load=function(e,t,o){var n=this;$.ajax(workersUrl+e,{type:"get",dataType:"json",success:function(s){n.locked=!0,n.key=e,n.data=s.data,t({value:htmlEscape(n.data),key:e,language:o,lineCount:n.data.split("\n").length})},error:function(e,o,n){t(!1)}})},haste_document.prototype.save=function(e,t){if(this.locked)return!1;this.data=e;var o=this;$.ajax(workersUrl+"documents",{type:"put",data:e,dataType:"json",contentType:"text/plain; charset=utf-8",success:function(n){o.locked=!0,o.key=n.key,t(null,{value:e,key:n.key,language:null,lineCount:e.split("\n").length})},error:function(e){try{t($.parseJSON(e.responseText))}catch(e){t({message:"Something went wrong!"})}}})};var haste=function(e,t){this.appName=e,this.$textarea=$("textarea"),this.$box=$("#box"),this.$code=$("#box code"),this.$linenos=$("#linenos"),this.options=t,this.configureShortcuts(),this.configureButtons()};function highlightLine(e){var t=document.getElementById("box");removeElementsByClass("highlight");let o=document.createElement("div");o.classList.add("highlight"),o.style.marginTop=16*(e-1)+"px",t.insertBefore(o,t.firstChild)}function removeElementsByClass(e){const t=document.getElementsByClassName(e);for(;t.length>0;)t[0].parentNode.removeChild(t[0])}haste.prototype.setTitle=function(e){var t=e?this.appName+" - "+e:this.appName;document.title=t},haste.prototype.showMessage=function(e,t){var o=$('<li class="'+(t||"info")+'">'+e+"</li>");$("#messages").prepend(o),setTimeout(function(){o.slideUp("fast",function(){$(this).remove()})},3e3)},haste.prototype.lightKey=function(){this.configureKey(["new","save"])},haste.prototype.fullKey=function(){this.configureKey(["new","duplicate","raw"])},haste.prototype.configureKey=function(e){var t,o=0;$("#box2 .function").each(function(){for(t=$(this),o=0;o<e.length;o++)if(t.hasClass(e[o]))return t.addClass("enabled"),!0;t.removeClass("enabled")})},haste.prototype.newDocument=function(e){this.$box.hide(),this.doc=new haste_document,this.setTitle(),this.lightKey(),this.$textarea.val("").show("fast",function(){this.focus()}),this.removeLineNumbers()},haste.extensionMap={rb:"ruby",py:"python",pl:"perl",php:"php",scala:"scala",go:"go",xml:"xml",html:"xml",htm:"xml",css:"css",js:"javascript",vbs:"vbscript",lua:"lua",pas:"delphi",java:"java",cpp:"cpp",cc:"cpp",m:"objectivec",vala:"vala",sql:"sql",sm:"smalltalk",lisp:"lisp",ini:"ini",diff:"diff",bash:"bash",sh:"bash",tex:"tex",erl:"erlang",hs:"haskell",md:"markdown",txt:"",coffee:"coffee",swift:"swift"},haste.prototype.lookupExtensionByType=function(e){for(var t in haste.extensionMap)if(haste.extensionMap[t]===e)return t;return e},haste.prototype.lookupTypeByExtension=function(e){return haste.extensionMap[e]||e},haste.prototype.addLineNumbers=function(e){removeElementsByClass("linenumber")},haste.prototype.removeLineNumbers=function(){removeElementsByClass("highlight"),removeElementsByClass("linenumber");let e=document.createElement("a");e.classList.add("linenumber");let t=document.createTextNode(">");e.appendChild(t),document.body.appendChild(e)},haste.prototype.loadDocument=function(e){var t=e.split(".",2),o=this;o.doc=new haste_document,o.doc.load(t[0],function(e){if(e){for(var t=e.value.split(/\r\n|\r|\n/),n=0;n<t.length;n++){let e=document.createElement("code");e.innerHTML=t[n],document.getElementById("box").appendChild(e)}o.setTitle(e.key),o.fullKey(),o.$textarea.val("").hide(),o.$box.show().focus(),o.addLineNumbers(e.lineCount)}else o.newDocument()},this.lookupTypeByExtension(t[1]))},haste.prototype.duplicateDocument=function(){if(this.doc.locked){var e=this.doc.data;this.newDocument(),this.$textarea.val(e)}},haste.prototype.lockDocument=function(){var e=this;this.doc.save(this.$textarea.val(),function(t,o){if(t)e.showMessage(t.message,"error");else if(o){e.$code.html(htmlEscape(o.value)),e.setTitle(o.key);var n="/"+o.key;window.history.pushState(null,e.appName+"-"+o.key,n),e.fullKey(),e.$textarea.val("").hide(),e.$box.show().focus(),e.addLineNumbers(o.lineCount)}})},haste.prototype.configureButtons=function(){var e=this;this.buttons=[{$where:$("#box2 .save"),label:"Save",shortcutDescription:"control + s",shortcut:function(e){return e.ctrlKey&&83===e.keyCode},action:function(){""!==e.$textarea.val().replace(/^\s+|\s+$/g,"")&&e.lockDocument()}},{$where:$("#box2 .new"),label:"New",shortcut:function(e){return e.ctrlKey&&78===e.keyCode},shortcutDescription:"control + n",action:function(){e.newDocument(!e.doc.key)}},{$where:$("#box2 .duplicate"),label:"Duplicate & Edit",shortcut:function(t){return e.doc.locked&&t.ctrlKey&&68===t.keyCode},shortcutDescription:"control + d",action:function(){e.duplicateDocument()}},{$where:$("#box2 .raw"),label:"Just Text",shortcut:function(e){return e.ctrlKey&&e.shiftKey&&82===e.keyCode},shortcutDescription:"control + shift + r",action:function(){window.location.href=workersUrl+"raw/"+e.doc.key}}];for(var t=0;t<this.buttons.length;t++)this.configureButton(this.buttons[t])},haste.prototype.configureButton=function(e){e.$where.click(function(t){t.preventDefault(),!e.clickDisabled&&$(this).hasClass("enabled")&&e.action()}),e.$where.mouseenter(function(){$("#box3 .label").text(e.label),$("#box3 .shortcut").text(e.shortcutDescription||""),$("#box3").show(),$(this).append($("#pointer").remove().show())}),e.$where.mouseleave(function(){$("#box3").hide(),$("#pointer").hide()})},haste.prototype.configureShortcuts=function(){var e=this;$(document.body).keydown(function(t){for(var o,n=0;n<e.buttons.length;n++)if((o=e.buttons[n]).shortcut&&o.shortcut(t))return t.preventDefault(),void o.action()})},$(function(){$("textarea").keydown(function(e){if(9===e.keyCode){e.preventDefault();if(document.selection)this.focus(),document.selection.createRange().text="  ",this.focus();else if(this.selectionStart||"0"==this.selectionStart){var t=this.selectionStart,o=this.selectionEnd,n=this.scrollTop;this.value=this.value.substring(0,t)+"  "+this.value.substring(o,this.value.length),this.focus(),this.selectionStart=t+"  ".length,this.selectionEnd=t+"  ".length,this.scrollTop=n}else this.value+="  ",this.focus()}})});
\ No newline at end of file
+const workersUrl="https://api.knx.cool/";var haste_document=function(){this.locked=!1};htmlEscape=function(e){return e.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;")},haste_document.prototype.load=function(e,t,o){var n=this;$.ajax(workersUrl+e,{type:"get",dataType:"json",success:function(s){n.locked=!0,n.key=e,n.data=s.data,t({value:htmlEscape(n.data),key:e,language:o,lineCount:n.data.split("\n").length})},error:function(e,o,n){t(!1)}})},haste_document.prototype.save=function(e,t){if(this.locked)return!1;this.data=e;var o=this;$.ajax(workersUrl+"documents",{type:"put",data:e,dataType:"json",contentType:"text/plain; charset=utf-8",success:function(n){o.locked=!0,o.key=n.key,t(null,{value:e,key:n.key,language:null,lineCount:e.split("\n").length})},error:function(e){try{t($.parseJSON(e.responseText))}catch(e){t({message:"Something went wrong!"})}}})};var haste=function(e,t){this.appName=e,this.$textarea=$("textarea"),this.$box=$("#box"),this.$code=$("#box code"),this.$linenos=$("#linenos"),this.options=t,this.configureShortcuts(),this.configureButtons()};function highlightLine(e){var t=document.getElementById("box");removeElementsByClass("highlight");let o=document.createElement("div");o.classList.add("highlight"),o.style.marginTop=16*(e-1)+"px",t.insertBefore(o,t.firstChild)}function removeElementsByClass(e){const t=document.getElementsByClassName(e);for(;t.length>0;)t[0].parentNode.removeChild(t[0])}function highlightNew(e){const t=document.getElementsByTagName("code");let o=0;for(let e=0;e<t.length;e++)t[e].offsetWidth>o&&(o=t[e].offsetWidth),t[e].style.removeProperty("background-color");for(let e=0;e<t.length;e++)t[e].style.width=o+"px";e.style.backgroundColor="rgba(187, 128, 9, 0.25)"}function getLineElement(e){return document.getElementsByTagName("code")[e-1]}haste.prototype.setTitle=function(e){var t=e?this.appName+" - "+e:this.appName;document.title=t},haste.prototype.showMessage=function(e,t){var o=$('<li class="'+(t||"info")+'">'+e+"</li>");$("#messages").prepend(o),setTimeout(function(){o.slideUp("fast",function(){$(this).remove()})},3e3)},haste.prototype.lightKey=function(){this.configureKey(["new","save"])},haste.prototype.fullKey=function(){this.configureKey(["new","duplicate","raw"])},haste.prototype.configureKey=function(e){var t,o=0;$("#box2 .function").each(function(){for(t=$(this),o=0;o<e.length;o++)if(t.hasClass(e[o]))return t.addClass("enabled"),!0;t.removeClass("enabled")})},haste.prototype.newDocument=function(e){this.$box.hide(),this.doc=new haste_document,this.setTitle(),this.lightKey(),this.$textarea.val("").show("fast",function(){this.focus()}),this.removeLineNumbers()},haste.extensionMap={rb:"ruby",py:"python",pl:"perl",php:"php",scala:"scala",go:"go",xml:"xml",html:"xml",htm:"xml",css:"css",js:"javascript",vbs:"vbscript",lua:"lua",pas:"delphi",java:"java",cpp:"cpp",cc:"cpp",m:"objectivec",vala:"vala",sql:"sql",sm:"smalltalk",lisp:"lisp",ini:"ini",diff:"diff",bash:"bash",sh:"bash",tex:"tex",erl:"erlang",hs:"haskell",md:"markdown",txt:"",coffee:"coffee",swift:"swift"},haste.prototype.lookupExtensionByType=function(e){for(var t in haste.extensionMap)if(haste.extensionMap[t]===e)return t;return e},haste.prototype.lookupTypeByExtension=function(e){return haste.extensionMap[e]||e},haste.prototype.addLineNumbers=function(e){if(removeElementsByClass("linenumber"),window.location.hash){highlightNew(getLineElement(window.location.hash.substring(1)))}},haste.prototype.removeLineNumbers=function(){removeElementsByClass("highlight"),removeElementsByClass("linenumber");let e=document.createElement("a");e.classList.add("linenumber");let t=document.createTextNode(">");e.appendChild(t),document.body.appendChild(e)},haste.prototype.loadDocument=function(e){var t=e.split(".",2),o=this;o.doc=new haste_document,o.doc.load(t[0],function(e){if(e){for(var t=e.value.split(/\r\n|\r|\n/),n=0;n<t.length;n++){let e=document.createElement("code");e.innerHTML=t[n],document.getElementById("box").appendChild(e)}o.setTitle(e.key),o.fullKey(),o.$textarea.val("").hide(),o.$box.show().focus(),o.addLineNumbers(e.lineCount)}else o.newDocument()},this.lookupTypeByExtension(t[1]))},haste.prototype.duplicateDocument=function(){if(this.doc.locked){var e=this.doc.data;this.newDocument(),this.$textarea.val(e)}},haste.prototype.lockDocument=function(){var e=this;this.doc.save(this.$textarea.val(),function(t,o){if(t)e.showMessage(t.message,"error");else if(o){for(var n=o.value.split(/\r\n|\r|\n/),s=0;s<n.length;s++){let e=document.createElement("code");e.innerHTML=n[s],document.getElementById("box").appendChild(e),e.onclick=function(){highlightNew(e)}}e.setTitle(o.key);var i="/"+o.key;window.history.pushState(null,e.appName+"-"+o.key,i),e.fullKey(),e.$textarea.val("").hide(),e.$box.show().focus(),e.addLineNumbers(o.lineCount)}})},haste.prototype.configureButtons=function(){var e=this;this.buttons=[{$where:$("#box2 .save"),label:"Save",shortcutDescription:"control + s",shortcut:function(e){return e.ctrlKey&&83===e.keyCode},action:function(){""!==e.$textarea.val().replace(/^\s+|\s+$/g,"")&&e.lockDocument()}},{$where:$("#box2 .new"),label:"New",shortcut:function(e){return e.ctrlKey&&78===e.keyCode},shortcutDescription:"control + n",action:function(){e.newDocument(!e.doc.key)}},{$where:$("#box2 .duplicate"),label:"Duplicate & Edit",shortcut:function(t){return e.doc.locked&&t.ctrlKey&&68===t.keyCode},shortcutDescription:"control + d",action:function(){e.duplicateDocument()}},{$where:$("#box2 .raw"),label:"Just Text",shortcut:function(e){return e.ctrlKey&&e.shiftKey&&82===e.keyCode},shortcutDescription:"control + shift + r",action:function(){window.location.href=workersUrl+"raw/"+e.doc.key}}];for(var t=0;t<this.buttons.length;t++)this.configureButton(this.buttons[t])},haste.prototype.configureButton=function(e){e.$where.click(function(t){t.preventDefault(),!e.clickDisabled&&$(this).hasClass("enabled")&&e.action()}),e.$where.mouseenter(function(){$("#box3 .label").text(e.label),$("#box3 .shortcut").text(e.shortcutDescription||""),$("#box3").show(),$(this).append($("#pointer").remove().show())}),e.$where.mouseleave(function(){$("#box3").hide(),$("#pointer").hide()})},haste.prototype.configureShortcuts=function(){var e=this;$(document.body).keydown(function(t){for(var o,n=0;n<e.buttons.length;n++)if((o=e.buttons[n]).shortcut&&o.shortcut(t))return t.preventDefault(),void o.action()})},$(function(){$("textarea").keydown(function(e){if(9===e.keyCode){e.preventDefault();if(document.selection)this.focus(),document.selection.createRange().text="  ",this.focus();else if(this.selectionStart||"0"==this.selectionStart){var t=this.selectionStart,o=this.selectionEnd,n=this.scrollTop;this.value=this.value.substring(0,t)+"  "+this.value.substring(o,this.value.length),this.focus(),this.selectionStart=t+"  ".length,this.selectionEnd=t+"  ".length,this.scrollTop=n}else this.value+="  ",this.focus()}})});
\ No newline at end of file
diff --git a/static/index.html b/static/index.html
index 8d0b62a..4f9f8c1 100644
--- a/static/index.html
+++ b/static/index.html
@@ -76,7 +76,7 @@
 			</div>
 		</div>
 
-		<pre id="box" style="display:none;" class="code" tabindex="0"></pre>
+		<pre id="box" class="code" tabindex="0"></pre>
 		<textarea spellcheck="false" style="display:none;"></textarea>
 	</body>
 
diff --git a/static/solarized_dark.css b/static/solarized_dark.css
index e9bff14..4145c5c 100644
--- a/static/solarized_dark.css
+++ b/static/solarized_dark.css
@@ -18,8 +18,10 @@ pre.code {
   padding: 0.5em;
   background: #1E1F22;
   color: #78797A;
-  white-space: pre-wrap;
   margin-left: 8em;
+  white-space: pre;
+  word-break: normal;
+  word-wrap: normal;
 }
 
 pre.code::before {
@@ -34,13 +36,13 @@ pre.code code {
 }
 
 pre.code code::before {
-  content: counter(listing) ". ";
+  content: counter(listing) " ";
   display: inline-block;
   float: left;
-  height: 3em;
-  padding-left: auto;
-  margin-left: auto;
-  text-align: right;
+  height: 16px;
+  padding-left: 0;
+  margin-left: -28px;
+  color: #3D3F41;
 }
 
 .hljs-comment,