6.5.2 (fixes #82)

2018-10-15 02:00:35 +02:00 · 2018-10-15 02:00:35 +02:00 · 597a73dde3
commit 597a73dde3
parent 134f1f6321
10 changed files with 22669 additions and 116 deletions
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@ -50,6 +50,9 @@
 	"optionsUserscriptsSubtitle": {
 		"message": "Es wäre nett, wenn du funktionierende Umgehungen auf GitHub einreichen würdest, damit Andere auch davon profitieren können: "
 	},
+	"optionsUserscriptsUntitled": {
+		"message": "Unbenannte Umgehung"
+	},
 	"optionsUserscriptsName": {
 		"message": "Name. Mit einem leeren Namen, wird diese Umgehung gelöscht."
 	},
@ -59,6 +62,9 @@
 	"optionsUserscriptsDelete": {
 		"message": "Umgehung löschen"
 	},
+	"optionsUserscriptsDeleteConfirm": {
+		"message": "Möchtest du diese Umgehung wirklich löschen?"
+	},
 	"blockedTitle": {
 		"message": "Universal Bypass hat deine IP vor einem Logger geschützt."
 	},
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@ -50,6 +50,9 @@
 	"optionsUserscriptsSubtitle": {
 		"message": "It would be nice if you could submit working bypasses to GitHub, so others can benefit from it: "
 	},
+	"optionsUserscriptsUntitled": {
+		"message": "Untitled Bypass"
+	},
 	"optionsUserscriptsName": {
 		"message": "Name. With an empty name, this bypass will be deleted."
 	},
@ -59,6 +62,9 @@
 	"optionsUserscriptsDelete": {
 		"message": "Delete Bypass"
 	},
+	"optionsUserscriptsDeleteConfirm": {
+		"message": "Do you really want to delete this bypass?"
+	},
 	"blockedTitle": {
 		"message": "Universal Bypass prevented your IP from being logged."
 	},
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@ -50,6 +50,9 @@
 	"optionsUserscriptsSubtitle": {
 		"message": "Ce serait bien si vous pouviez soumettre des dérivations de travail à GitHub, afin que d'autres puissent en bénéficier: "
 	},
+	"optionsUserscriptsUntitled": {
+		"message": "Contournement non nommé"
+	},
 	"optionsUserscriptsName": {
 		"message": "Nom. Avec un nom vide, ce contournements sera supprimé."
 	},
@ -59,6 +62,9 @@
 	"optionsUserscriptsDelete": {
 		"message": "Supprimer Bypass"
 	},
+	"optionsUserscriptsDeleteConfirm": {
+		"message": "Voulez-vous vraiment supprimer ce contournement?"
+	},
 	"blockedTitle": {
 		"message": "Universal Bypass empêche l’enregistrement de votre IP."
 	},
--- a/content_script.js
+++ b/content_script.js
@ -50,25 +50,25 @@ if(document instanceof HTMLDocument)
 				func()
 			else document.addEventListener("DOMContentLoaded",()=>sT(func,1))
 		},
-		crowdOptIn=false,
-		crowdBypass=callback=>ensureDomLoaded(()=>{
-			if(location.href.substr(location.href.length-18)=="#ignoreCrowdBypass")
+	crowdOptIn=false,
+	crowdBypass=callback=>ensureDomLoaded(()=>{
+		if(location.href.substr(location.href.length-18)=="#ignoreCrowdBypass")
+		{
+			let fs=document.querySelectorAll("form[action]")
+			for(let i=0;i<fs.length;i++)
+				fs[i].action+="#ignoreCrowdBypass"
+			let ls=document.querySelectorAll("a[href]")
+			for(let i=0;i<ls.length;i++)
+				ls[i].href+="#ignoreCrowdBypass"
+			history.pushState({},document.querySelector("title").textContent,location.href.substr(0,location.href.length-18))
+			callback()
+			return
+		}
+		let xhr=new XMLHttpRequest()
+		xhr.onreadystatechange=()=>{
+			if(xhr.readyState==4&&xhr.status==200&&xhr.responseText!="")
 			{
-				let fs=document.querySelectorAll("form[action]")
-				for(let i=0;i<fs.length;i++)
-					fs[i].action+="#ignoreCrowdBypass"
-				let ls=document.querySelectorAll("a[href]")
-				for(let i=0;i<ls.length;i++)
-					ls[i].href+="#ignoreCrowdBypass"
-				history.pushState({},document.querySelector("title").textContent,location.href.substr(0,location.href.length-18))
-				callback()
-				return
-			}
-			let xhr=new XMLHttpRequest()
-			xhr.onreadystatechange=()=>{
-				if(xhr.readyState==4&&xhr.status==200&&xhr.responseText!="")
-				{
-					debugger
+				debugger
 					location.href="https://universal-bypass.org/crowd-bypassed?target="+encodeURIComponent(xhr.responseText)+"&back="+encodeURIComponent(location.href)//The background script will intercept the request and redirect to html/crowd-bypassed.html because we can't redirect to extension urls in this scope.
 				}
 				else if(crowdOptIn)
@ -78,36 +78,36 @@ if(document instanceof HTMLDocument)
 			xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded")
 			xhr.send("domain="+encodeURIComponent(domain)+"&path="+encodeURIComponent(location.pathname.toString().substr(1)))
 		}),
-		contributeAndNavigate=target=>{
-			if(navigated||!isGoodLink(target))
-				return
-			if(!crowdOptIn)
+	contributeAndNavigate=target=>{
+		if(navigated||!isGoodLink(target))
+			return
+		if(!crowdOptIn)
+		{
+			navigated=true
+			debugger
+			location.href=target
+			return
+		}
+		let xhr=new XMLHttpRequest()
+		xhr.onreadystatechange=()=>{
+			if(xhr.readyState==4)
 			{
 				navigated=true
 				debugger
 				location.href=target
-				return
 			}
-			let xhr=new XMLHttpRequest()
-			xhr.onreadystatechange=()=>{
-				if(xhr.readyState==4)
-				{
-					navigated=true
-					debugger
-					location.href=target
-				}
-			}
-			xhr.open("POST","https://universal-bypass.org/crowd/contribute_v1",true)
-			xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded")
-			xhr.send("domain="+encodeURIComponent(domain)+"&path="+encodeURIComponent(location.pathname.toString().substr(1))+"&target="+encodeURIComponent(target))
-		},
-		domain=location.hostname
-		if(domain.substr(0,4)=="www.")
-			domain=domain.substr(4)
-		ODP(this,"blurred",{
-			value:false,
-			writable:false
-		})
+		}
+		xhr.open("POST","https://universal-bypass.org/crowd/contribute_v1",true)
+		xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded")
+		xhr.send("domain="+encodeURIComponent(domain)+"&path="+encodeURIComponent(location.pathname.toString().substr(1))+"&target="+encodeURIComponent(target))
+	},
+	domain=location.hostname
+	if(domain.substr(0,4)=="www.")
+		domain=domain.substr(4)
+	ODP(this,"blurred",{
+		value:false,
+		writable:false
+	})
 		ODP(this,"ysmm",//Adf.ly
 		{
 			set:r=>{
@ -580,7 +580,7 @@ if(document instanceof HTMLDocument)
 							})
 						else contributeAndNavigate(t)
 					}
-				},50)
+			},50)
 				return setBypassed()
 			}
 			//GemPixel Premium URL Shortener
@ -776,11 +776,11 @@ if(document instanceof HTMLDocument)
 			}
 			if(document.querySelector("a[href^='https://linkshrink.net/homepage'] > img.lgo"))//LinkShrink.net
 			{
-				let p=document.getElementById("pause"),s=document.getElementById("skip")
-				if(p&&s)
+				let b=document.getElementById("btd")
+				if(b&&typeof b.onclick=="function")
 				{
-					p.style.display="none"
-					s.style.display="block"
+					window.open=()=>{}
+					b.onclick()
 				}
 			}
 			if(document.querySelector(".img-responsive[alt='Gets URL']")&&typeof x!="undefined")//GetsURL.com
@ -840,7 +840,7 @@ if(document instanceof HTMLDocument)
 			},100)
 			setTimeout(()=>clearInterval(dT),10000)
 		})
-	},
+},
 	//This method of injecting the script is faster than any interfering extensions in most cases
 	injectScript=text=>{
 		let script=document.createElement("script")
@ -853,65 +853,65 @@ if(document instanceof HTMLDocument)
 			func()
 		else document.addEventListener("DOMContentLoaded",()=>func())
 	}
-	injectScript("("+injectionCode.toString()+")()")
-	chrome.storage.sync.get(["crowd_bypass_opt_out"],result=>ensureDomLoaded(()=>document.documentElement.setAttribute("data-crowd-bypass-opt-"+(result&&result.crowd_bypass_opt_out&&result.crowd_bypass_opt_out==="true"?"out":"in"),"")))
-	ensureDomLoaded(()=>{
-		let dT=setInterval(()=>{
-			if(document.documentElement.hasAttribute("data-universal-bypass-adlinkfly-info"))
-			{
-				document.documentElement.removeAttribute("data-universal-bypass-adlinkfly-info")
-				let xhr=new XMLHttpRequest(),t="",iu=location.href
-				xhr.onreadystatechange=()=>{
-					if(xhr.readyState==4)
-					{
-						if(xhr.status==200)
-						{
-							t="crowd"
-							let i=new DOMParser().parseFromString(xhr.responseText,"text/html").querySelector("img[src^='//api.miniature.io']")
-							if(i)
-							{
-								let url=new URL(i.src)
-								if(url.search&&url.search.indexOf("url="))
-									t=decodeURIComponent(url.search.split("url=")[1].split("&")[0])
-							}
-						}
-						document.documentElement.setAttribute("data-universal-bypass-adlinkfly-target",t)
-					}
-				}
-				if(iu.substr(iu.length-1)!="/")
-					iu+="/"
-				xhr.open("GET",iu+"info",true)
-				xhr.send()
-			}
-			if(document.documentElement.hasAttribute("data-universal-bypass-stop-watching"))
-			{
-				clearInterval(dT)
-				document.documentElement.removeAttribute("data-universal-bypass-stop-watching")
-			}
-		},50)
-	})
-	chrome.storage.local.get(["custom_bypasses"],result=>{
-		ensureDomLoaded(()=>{
-			if(result&&result.custom_bypasses)
-			{
-				let customBypasses=JSON.parse(result.custom_bypasses)
-				for(let name in customBypasses)
+injectScript("("+injectionCode.toString()+")()")
+chrome.storage.sync.get(["crowd_bypass_opt_out"],result=>ensureDomLoaded(()=>document.documentElement.setAttribute("data-crowd-bypass-opt-"+(result&&result.crowd_bypass_opt_out&&result.crowd_bypass_opt_out==="true"?"out":"in"),"")))
+ensureDomLoaded(()=>{
+	let dT=setInterval(()=>{
+		if(document.documentElement.hasAttribute("data-universal-bypass-adlinkfly-info"))
+		{
+			document.documentElement.removeAttribute("data-universal-bypass-adlinkfly-info")
+			let xhr=new XMLHttpRequest(),t="",iu=location.href
+			xhr.onreadystatechange=()=>{
+				if(xhr.readyState==4)
 				{
-					let customBypass=customBypasses[name]
-					if(customBypass.domains=="*")
-						injectScript(customBypass.content)
-					else
+					if(xhr.status==200)
 					{
-						let domains=customBypass.domains.split(",")
-						for(let i in domains)
+						t="crowd"
+						let i=new DOMParser().parseFromString(xhr.responseText,"text/html").querySelector("img[src^='//api.miniature.io']")
+						if(i)
 						{
-							let domain=domains[i]
-							if(location.hostname==domain||location.hostname.substr(location.hostname.length-(domain.length+1))=="."+domain)
-								injectScript(customBypass.content)
+							let url=new URL(i.src)
+							if(url.search&&url.search.indexOf("url="))
+								t=decodeURIComponent(url.search.split("url=")[1].split("&")[0])
 						}
 					}
+					document.documentElement.setAttribute("data-universal-bypass-adlinkfly-target",t)
+				}
+			}
+			if(iu.substr(iu.length-1)!="/")
+				iu+="/"
+			xhr.open("GET",iu+"info",true)
+			xhr.send()
+		}
+		if(document.documentElement.hasAttribute("data-universal-bypass-stop-watching"))
+		{
+			clearInterval(dT)
+			document.documentElement.removeAttribute("data-universal-bypass-stop-watching")
+		}
+	},50)
+})
+chrome.storage.local.get(["custom_bypasses"],result=>{
+	ensureDomLoaded(()=>{
+		if(result&&result.custom_bypasses)
+		{
+			let customBypasses=JSON.parse(result.custom_bypasses)
+			for(let name in customBypasses)
+			{
+				let customBypass=customBypasses[name]
+				if(customBypass.domains=="*")
+					injectScript(customBypass.content)
+				else
+				{
+					let domains=customBypass.domains.split(",")
+					for(let i in domains)
+					{
+						let domain=domains[i]
+						if(location.hostname==domain||location.hostname.substr(location.hostname.length-(domain.length+1))=="."+domain)
+							injectScript(customBypass.content)
+					}
 				}
 			}
-		})
+		}
 	})
+})
 }
--- a/html/ace/ace.js
+++ b/html/ace/ace.js
--- a/html/ace/mode-javascript.js
+++ b/html/ace/mode-javascript.js
@ -0,0 +1,797 @@
+ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+	this.$rules = {
+		"start" : [ {
+			token : "comment.doc.tag",
+			regex : "@[\\w\\d_]+" // TODO: fix email addresses
+		}, 
+		DocCommentHighlightRules.getTagRule(),
+		{
+			defaultToken : "comment.doc",
+			caseInsensitive: true
+		}]
+	};
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+DocCommentHighlightRules.getTagRule = function(start) {
+	return {
+		token : "comment.doc.tag.storage.type",
+		regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
+	};
+};
+
+DocCommentHighlightRules.getStartRule = function(start) {
+	return {
+		token : "comment.doc", // doc comment
+		regex : "\\/\\*(?=\\*)",
+		next  : start
+	};
+};
+
+DocCommentHighlightRules.getEndRule = function (start) {
+	return {
+		token : "comment.doc", // closing comment
+		regex : "\\*\\/",
+		next  : start
+	};
+};
+
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+
+ace.define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*";
+
+var JavaScriptHighlightRules = function(options) {
+	var keywordMapper = this.createKeywordMapper({
+		"variable.language":
+			"Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|"  + // Constructors
+			"Namespace|QName|XML|XMLList|"                                             + // E4X
+			"ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|"   +
+			"Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|"                    +
+			"Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|"   + // Errors
+			"SyntaxError|TypeError|URIError|"                                          +
+			"decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" + // Non-constructor functions
+			"isNaN|parseFloat|parseInt|"                                               +
+			"JSON|Math|"                                                               + // Other
+			"this|arguments|prototype|window|document"                                 , // Pseudo
+		"keyword":
+			"const|yield|import|get|set|async|await|" +
+			"break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+			"if|in|of|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|" +
+			"__parent__|__count__|escape|unescape|with|__proto__|" +
+			"class|enum|extends|super|export|implements|private|public|interface|package|protected|static",
+		"storage.type":
+			"const|let|var|function",
+		"constant.language":
+			"null|Infinity|NaN|undefined",
+		"support.function":
+			"alert",
+		"constant.language.boolean": "true|false"
+	}, "identifier");
+	var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void";
+
+	var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
+		"u[0-9a-fA-F]{4}|" + // unicode
+		"u{[0-9a-fA-F]{1,6}}|" + // es6 unicode
+		"[0-2][0-7]{0,2}|" + // oct
+		"3[0-7][0-7]?|" + // oct
+		"[4-7][0-7]?|" + //oct
+		".)";
+	this.$rules = {
+		"no_regex" : [
+			DocCommentHighlightRules.getStartRule("doc-start"),
+			comments("no_regex"),
+			{
+				token : "string",
+				regex : "'(?=.)",
+				next  : "qstring"
+			}, {
+				token : "string",
+				regex : '"(?=.)',
+				next  : "qqstring"
+			}, {
+				token : "constant.numeric", // hexadecimal, octal and binary
+				regex : /0(?:[xX][0-9a-fA-F]+|[oO][0-7]+|[bB][01]+)\b/
+			}, {
+				token : "constant.numeric", // decimal integers and floats
+				regex : /(?:\d\d*(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+\b)?/
+			}, {
+				token : [
+					"storage.type", "punctuation.operator", "support.function",
+					"punctuation.operator", "entity.name.function", "text","keyword.operator"
+				],
+				regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)",
+				next: "function_arguments"
+			}, {
+				token : [
+					"storage.type", "punctuation.operator", "entity.name.function", "text",
+					"keyword.operator", "text", "storage.type", "text", "paren.lparen"
+				],
+				regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
+				next: "function_arguments"
+			}, {
+				token : [
+					"entity.name.function", "text", "keyword.operator", "text", "storage.type",
+					"text", "paren.lparen"
+				],
+				regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
+				next: "function_arguments"
+			}, {
+				token : [
+					"storage.type", "punctuation.operator", "entity.name.function", "text",
+					"keyword.operator", "text",
+					"storage.type", "text", "entity.name.function", "text", "paren.lparen"
+				],
+				regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",
+				next: "function_arguments"
+			}, {
+				token : [
+					"storage.type", "text", "entity.name.function", "text", "paren.lparen"
+				],
+				regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()",
+				next: "function_arguments"
+			}, {
+				token : [
+					"entity.name.function", "text", "punctuation.operator",
+					"text", "storage.type", "text", "paren.lparen"
+				],
+				regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",
+				next: "function_arguments"
+			}, {
+				token : [
+					"text", "text", "storage.type", "text", "paren.lparen"
+				],
+				regex : "(:)(\\s*)(function)(\\s*)(\\()",
+				next: "function_arguments"
+			}, {
+				token : "keyword",
+				regex : "from(?=\\s*('|\"))"
+			}, {
+				token : "keyword",
+				regex : "(?:" + kwBeforeRe + ")\\b",
+				next : "start"
+			}, {
+				token : ["support.constant"],
+				regex : /that\b/
+			}, {
+				token : ["storage.type", "punctuation.operator", "support.function.firebug"],
+				regex : /(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/
+			}, {
+				token : keywordMapper,
+				regex : identifierRe
+			}, {
+				token : "punctuation.operator",
+				regex : /[.](?![.])/,
+				next  : "property"
+			}, {
+				token : "storage.type",
+				regex : /=>/,
+				next  : "start"
+			}, {
+				token : "keyword.operator",
+				regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<+=?|>+=?|!|&&|\|\||\?:|[!$%&*+\-~\/^]=?/,
+				next  : "start"
+			}, {
+				token : "punctuation.operator",
+				regex : /[?:,;.]/,
+				next  : "start"
+			}, {
+				token : "paren.lparen",
+				regex : /[\[({]/,
+				next  : "start"
+			}, {
+				token : "paren.rparen",
+				regex : /[\])}]/
+			}, {
+				token: "comment",
+				regex: /^#!.*$/
+			}
+		],
+		property: [{
+				token : "text",
+				regex : "\\s+"
+			}, {
+				token : [
+					"storage.type", "punctuation.operator", "entity.name.function", "text",
+					"keyword.operator", "text",
+					"storage.type", "text", "entity.name.function", "text", "paren.lparen"
+				],
+				regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(?:(\\s+)(\\w+))?(\\s*)(\\()",
+				next: "function_arguments"
+			}, {
+				token : "punctuation.operator",
+				regex : /[.](?![.])/
+			}, {
+				token : "support.function",
+				regex : /(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
+			}, {
+				token : "support.function.dom",
+				regex : /(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
+			}, {
+				token :  "support.constant",
+				regex : /(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
+			}, {
+				token : "identifier",
+				regex : identifierRe
+			}, {
+				regex: "",
+				token: "empty",
+				next: "no_regex"
+			}
+		],
+		"start": [
+			DocCommentHighlightRules.getStartRule("doc-start"),
+			comments("start"),
+			{
+				token: "string.regexp",
+				regex: "\\/",
+				next: "regex"
+			}, {
+				token : "text",
+				regex : "\\s+|^$",
+				next : "start"
+			}, {
+				token: "empty",
+				regex: "",
+				next: "no_regex"
+			}
+		],
+		"regex": [
+			{
+				token: "regexp.keyword.operator",
+				regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+			}, {
+				token: "string.regexp",
+				regex: "/[sxngimy]*",
+				next: "no_regex"
+			}, {
+				token : "invalid",
+				regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
+			}, {
+				token : "constant.language.escape",
+				regex: /\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
+			}, {
+				token : "constant.language.delimiter",
+				regex: /\|/
+			}, {
+				token: "constant.language.escape",
+				regex: /\[\^?/,
+				next: "regex_character_class"
+			}, {
+				token: "empty",
+				regex: "$",
+				next: "no_regex"
+			}, {
+				defaultToken: "string.regexp"
+			}
+		],
+		"regex_character_class": [
+			{
+				token: "regexp.charclass.keyword.operator",
+				regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+			}, {
+				token: "constant.language.escape",
+				regex: "]",
+				next: "regex"
+			}, {
+				token: "constant.language.escape",
+				regex: "-"
+			}, {
+				token: "empty",
+				regex: "$",
+				next: "no_regex"
+			}, {
+				defaultToken: "string.regexp.charachterclass"
+			}
+		],
+		"function_arguments": [
+			{
+				token: "variable.parameter",
+				regex: identifierRe
+			}, {
+				token: "punctuation.operator",
+				regex: "[, ]+"
+			}, {
+				token: "punctuation.operator",
+				regex: "$"
+			}, {
+				token: "empty",
+				regex: "",
+				next: "no_regex"
+			}
+		],
+		"qqstring" : [
+			{
+				token : "constant.language.escape",
+				regex : escapedRe
+			}, {
+				token : "string",
+				regex : "\\\\$",
+				consumeLineEnd  : true
+			}, {
+				token : "string",
+				regex : '"|$',
+				next  : "no_regex"
+			}, {
+				defaultToken: "string"
+			}
+		],
+		"qstring" : [
+			{
+				token : "constant.language.escape",
+				regex : escapedRe
+			}, {
+				token : "string",
+				regex : "\\\\$",
+				consumeLineEnd  : true
+			}, {
+				token : "string",
+				regex : "'|$",
+				next  : "no_regex"
+			}, {
+				defaultToken: "string"
+			}
+		]
+	};
+
+
+	if (!options || !options.noES6) {
+		this.$rules.no_regex.unshift({
+			regex: "[{}]", onMatch: function(val, state, stack) {
+				this.next = val == "{" ? this.nextState : "";
+				if (val == "{" && stack.length) {
+					stack.unshift("start", state);
+				}
+				else if (val == "}" && stack.length) {
+					stack.shift();
+					this.next = stack.shift();
+					if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)
+						return "paren.quasi.end";
+				}
+				return val == "{" ? "paren.lparen" : "paren.rparen";
+			},
+			nextState: "start"
+		}, {
+			token : "string.quasi.start",
+			regex : /`/,
+			push  : [{
+				token : "constant.language.escape",
+				regex : escapedRe
+			}, {
+				token : "paren.quasi.start",
+				regex : /\${/,
+				push  : "start"
+			}, {
+				token : "string.quasi.end",
+				regex : /`/,
+				next  : "pop"
+			}, {
+				defaultToken: "string.quasi"
+			}]
+		});
+
+		if (!options || options.jsx != false)
+			JSX.call(this);
+	}
+
+	this.embedRules(DocCommentHighlightRules, "doc-",
+		[ DocCommentHighlightRules.getEndRule("no_regex") ]);
+
+	this.normalizeRules();
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+function JSX() {
+	var tagRegex = identifierRe.replace("\\d", "\\d\\-");
+	var jsxTag = {
+		onMatch : function(val, state, stack) {
+			var offset = val.charAt(1) == "/" ? 2 : 1;
+			if (offset == 1) {
+				if (state != this.nextState)
+					stack.unshift(this.next, this.nextState, 0);
+				else
+					stack.unshift(this.next);
+				stack[2]++;
+			} else if (offset == 2) {
+				if (state == this.nextState) {
+					stack[1]--;
+					if (!stack[1] || stack[1] < 0) {
+						stack.shift();
+						stack.shift();
+					}
+				}
+			}
+			return [{
+				type: "meta.tag.punctuation." + (offset == 1 ? "" : "end-") + "tag-open.xml",
+				value: val.slice(0, offset)
+			}, {
+				type: "meta.tag.tag-name.xml",
+				value: val.substr(offset)
+			}];
+		},
+		regex : "</?" + tagRegex + "",
+		next: "jsxAttributes",
+		nextState: "jsx"
+	};
+	this.$rules.start.unshift(jsxTag);
+	var jsxJsRule = {
+		regex: "{",
+		token: "paren.quasi.start",
+		push: "start"
+	};
+	this.$rules.jsx = [
+		jsxJsRule,
+		jsxTag,
+		{include : "reference"},
+		{defaultToken: "string"}
+	];
+	this.$rules.jsxAttributes = [{
+		token : "meta.tag.punctuation.tag-close.xml",
+		regex : "/?>",
+		onMatch : function(value, currentState, stack) {
+			if (currentState == stack[0])
+				stack.shift();
+			if (value.length == 2) {
+				if (stack[0] == this.nextState)
+					stack[1]--;
+				if (!stack[1] || stack[1] < 0) {
+					stack.splice(0, 2);
+				}
+			}
+			this.next = stack[0] || "start";
+			return [{type: this.token, value: value}];
+		},
+		nextState: "jsx"
+	},
+	jsxJsRule,
+	comments("jsxAttributes"),
+	{
+		token : "entity.other.attribute-name.xml",
+		regex : tagRegex
+	}, {
+		token : "keyword.operator.attribute-equals.xml",
+		regex : "="
+	}, {
+		token : "text.tag-whitespace.xml",
+		regex : "\\s+"
+	}, {
+		token : "string.attribute-value.xml",
+		regex : "'",
+		stateName : "jsx_attr_q",
+		push : [
+			{token : "string.attribute-value.xml", regex: "'", next: "pop"},
+			{include : "reference"},
+			{defaultToken : "string.attribute-value.xml"}
+		]
+	}, {
+		token : "string.attribute-value.xml",
+		regex : '"',
+		stateName : "jsx_attr_qq",
+		push : [
+			{token : "string.attribute-value.xml", regex: '"', next: "pop"},
+			{include : "reference"},
+			{defaultToken : "string.attribute-value.xml"}
+		]
+	},
+	jsxTag
+	];
+	this.$rules.reference = [{
+		token : "constant.language.escape.reference.xml",
+		regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
+	}];
+}
+
+function comments(next) {
+	return [
+		{
+			token : "comment", // multi line comment
+			regex : /\/\*/,
+			next: [
+				DocCommentHighlightRules.getTagRule(),
+				{token : "comment", regex : "\\*\\/", next : next || "pop"},
+				{defaultToken : "comment", caseInsensitive: true}
+			]
+		}, {
+			token : "comment",
+			regex : "\\/\\/",
+			next: [
+				DocCommentHighlightRules.getTagRule(),
+				{token : "comment", regex : "$|^", next : next || "pop"},
+				{defaultToken : "comment", caseInsensitive: true}
+			]
+		}
+	];
+}
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+
+ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+	this.checkOutdent = function(line, input) {
+		if (! /^\s+$/.test(line))
+			return false;
+
+		return /^\s*\}/.test(input);
+	};
+
+	this.autoOutdent = function(doc, row) {
+		var line = doc.getLine(row);
+		var match = line.match(/^(\s*\})/);
+
+		if (!match) return 0;
+
+		var column = match[1].length;
+		var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+		if (!openBracePos || openBracePos.row == row) return 0;
+
+		var indent = this.$getIndent(doc.getLine(openBracePos.row));
+		doc.replace(new Range(row, 0, row, column-1), indent);
+	};
+
+	this.$getIndent = function(line) {
+		return line.match(/^\s*/)[0];
+	};
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+
+ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+	if (commentRegex) {
+		this.foldingStartMarker = new RegExp(
+			this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+		);
+		this.foldingStopMarker = new RegExp(
+			this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+		);
+	}
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+	
+	this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+	this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+	this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+	this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+	this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+	this._getFoldWidgetBase = this.getFoldWidget;
+	this.getFoldWidget = function(session, foldStyle, row) {
+		var line = session.getLine(row);
+	
+		if (this.singleLineBlockCommentRe.test(line)) {
+			if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+				return "";
+		}
+	
+		var fw = this._getFoldWidgetBase(session, foldStyle, row);
+	
+		if (!fw && this.startRegionRe.test(line))
+			return "start"; // lineCommentRegionStart
+	
+		return fw;
+	};
+
+	this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+		var line = session.getLine(row);
+		
+		if (this.startRegionRe.test(line))
+			return this.getCommentRegionBlock(session, line, row);
+		
+		var match = line.match(this.foldingStartMarker);
+		if (match) {
+			var i = match.index;
+
+			if (match[1])
+				return this.openingBracketBlock(session, match[1], row, i);
+				
+			var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+			
+			if (range && !range.isMultiLine()) {
+				if (forceMultiline) {
+					range = this.getSectionRange(session, row);
+				} else if (foldStyle != "all")
+					range = null;
+			}
+			
+			return range;
+		}
+
+		if (foldStyle === "markbegin")
+			return;
+
+		var match = line.match(this.foldingStopMarker);
+		if (match) {
+			var i = match.index + match[0].length;
+
+			if (match[1])
+				return this.closingBracketBlock(session, match[1], row, i);
+
+			return session.getCommentFoldRange(row, i, -1);
+		}
+	};
+	
+	this.getSectionRange = function(session, row) {
+		var line = session.getLine(row);
+		var startIndent = line.search(/\S/);
+		var startRow = row;
+		var startColumn = line.length;
+		row = row + 1;
+		var endRow = row;
+		var maxRow = session.getLength();
+		while (++row < maxRow) {
+			line = session.getLine(row);
+			var indent = line.search(/\S/);
+			if (indent === -1)
+				continue;
+			if  (startIndent > indent)
+				break;
+			var subRange = this.getFoldWidgetRange(session, "all", row);
+			
+			if (subRange) {
+				if (subRange.start.row <= startRow) {
+					break;
+				} else if (subRange.isMultiLine()) {
+					row = subRange.end.row;
+				} else if (startIndent == indent) {
+					break;
+				}
+			}
+			endRow = row;
+		}
+		
+		return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+	};
+	this.getCommentRegionBlock = function(session, line, row) {
+		var startColumn = line.search(/\s*$/);
+		var maxRow = session.getLength();
+		var startRow = row;
+		
+		var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+		var depth = 1;
+		while (++row < maxRow) {
+			line = session.getLine(row);
+			var m = re.exec(line);
+			if (!m) continue;
+			if (m[1]) depth--;
+			else depth++;
+
+			if (!depth) break;
+		}
+
+		var endRow = row;
+		if (endRow > startRow) {
+			return new Range(startRow, startColumn, endRow, line.length);
+		}
+	};
+
+}).call(FoldMode.prototype);
+
+});
+
+ace.define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+	this.HighlightRules = JavaScriptHighlightRules;
+	
+	this.$outdent = new MatchingBraceOutdent();
+	this.$behaviour = new CstyleBehaviour();
+	this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+	this.lineCommentStart = "//";
+	this.blockComment = {start: "/*", end: "*/"};
+	this.$quotes = {'"': '"', "'": "'", "`": "`"};
+
+	this.getNextLineIndent = function(state, line, tab) {
+		var indent = this.$getIndent(line);
+
+		var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
+		var tokens = tokenizedLine.tokens;
+		var endState = tokenizedLine.state;
+
+		if (tokens.length && tokens[tokens.length-1].type == "comment") {
+			return indent;
+		}
+
+		if (state == "start" || state == "no_regex") {
+			var match = line.match(/^.*(?:\bcase\b.*:|[\{\(\[])\s*$/);
+			if (match) {
+				indent += tab;
+			}
+		} else if (state == "doc-start") {
+			if (endState == "start" || endState == "no_regex") {
+				return "";
+			}
+			var match = line.match(/^\s*(\/?)\*/);
+			if (match) {
+				if (match[1]) {
+					indent += " ";
+				}
+				indent += "* ";
+			}
+		}
+
+		return indent;
+	};
+
+	this.checkOutdent = function(state, line, input) {
+		return this.$outdent.checkOutdent(line, input);
+	};
+
+	this.autoOutdent = function(state, doc, row) {
+		this.$outdent.autoOutdent(doc, row);
+	};
+
+	this.createWorker = function(session) {
+		var worker = new WorkerClient(["ace"], "ace/mode/javascript_worker", "JavaScriptWorker");
+		worker.attachToDocument(session.getDocument());
+
+		worker.on("annotate", function(results) {
+			session.setAnnotations(results.data);
+		});
+
+		worker.on("terminate", function() {
+			session.clearAnnotations();
+		});
+
+		return worker;
+	};
+
+	this.$id = "ace/mode/javascript";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+				(function() {
+					ace.require(["ace/mode/javascript"], function(m) {
+						if (typeof module == "object" && typeof exports == "object" && module) {
+							module.exports = m;
+						}
+					});
+				})();
+			
--- a/html/ace/theme-monokai.js
+++ b/html/ace/theme-monokai.js
@ -0,0 +1,112 @@
+ace.define("ace/theme/monokai",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
+
+exports.isDark = true;
+exports.cssClass = "ace-monokai";
+exports.cssText = ".ace-monokai .ace_gutter {\
+background: #2F3129;\
+color: #8F908A\
+}\
+.ace-monokai .ace_print-margin {\
+width: 1px;\
+background: #555651\
+}\
+.ace-monokai {\
+background-color: #272822;\
+color: #F8F8F2\
+}\
+.ace-monokai .ace_cursor {\
+color: #F8F8F0\
+}\
+.ace-monokai .ace_marker-layer .ace_selection {\
+background: #49483E\
+}\
+.ace-monokai.ace_multiselect .ace_selection.ace_start {\
+box-shadow: 0 0 3px 0px #272822;\
+}\
+.ace-monokai .ace_marker-layer .ace_step {\
+background: rgb(102, 82, 0)\
+}\
+.ace-monokai .ace_marker-layer .ace_bracket {\
+margin: -1px 0 0 -1px;\
+border: 1px solid #49483E\
+}\
+.ace-monokai .ace_marker-layer .ace_active-line {\
+background: #202020\
+}\
+.ace-monokai .ace_gutter-active-line {\
+background-color: #272727\
+}\
+.ace-monokai .ace_marker-layer .ace_selected-word {\
+border: 1px solid #49483E\
+}\
+.ace-monokai .ace_invisible {\
+color: #52524d\
+}\
+.ace-monokai .ace_entity.ace_name.ace_tag,\
+.ace-monokai .ace_keyword,\
+.ace-monokai .ace_meta.ace_tag,\
+.ace-monokai .ace_storage {\
+color: #F92672\
+}\
+.ace-monokai .ace_punctuation,\
+.ace-monokai .ace_punctuation.ace_tag {\
+color: #fff\
+}\
+.ace-monokai .ace_constant.ace_character,\
+.ace-monokai .ace_constant.ace_language,\
+.ace-monokai .ace_constant.ace_numeric,\
+.ace-monokai .ace_constant.ace_other {\
+color: #AE81FF\
+}\
+.ace-monokai .ace_invalid {\
+color: #F8F8F0;\
+background-color: #F92672\
+}\
+.ace-monokai .ace_invalid.ace_deprecated {\
+color: #F8F8F0;\
+background-color: #AE81FF\
+}\
+.ace-monokai .ace_support.ace_constant,\
+.ace-monokai .ace_support.ace_function {\
+color: #66D9EF\
+}\
+.ace-monokai .ace_fold {\
+background-color: #A6E22E;\
+border-color: #F8F8F2\
+}\
+.ace-monokai .ace_storage.ace_type,\
+.ace-monokai .ace_support.ace_class,\
+.ace-monokai .ace_support.ace_type {\
+font-style: italic;\
+color: #66D9EF\
+}\
+.ace-monokai .ace_entity.ace_name.ace_function,\
+.ace-monokai .ace_entity.ace_other,\
+.ace-monokai .ace_entity.ace_other.ace_attribute-name,\
+.ace-monokai .ace_variable {\
+color: #A6E22E\
+}\
+.ace-monokai .ace_variable.ace_parameter {\
+font-style: italic;\
+color: #FD971F\
+}\
+.ace-monokai .ace_string {\
+color: #E6DB74\
+}\
+.ace-monokai .ace_comment {\
+color: #75715E\
+}\
+.ace-monokai .ace_indent-guide {\
+background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y\
+}";
+
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+});
+(function() {
+	ace.require(["ace/theme/monokai"], function(m) {
+		if (typeof module == "object" && typeof exports == "object" && module) {
+			module.exports = m;
+		}
+	});
+})();
--- a/html/options.html
+++ b/html/options.html
@ -24,7 +24,8 @@
 			<div id="custom-bypass-edit-container">
 				<p><input type="text" id="custom-bypass-name" class="form-control" data-placeholder="optionsUserscriptsName"></p>
 				<p><input type="text" id="custom-bypass-domains" class="form-control" data-placeholder="optionsUserscriptsDomains"></p>
-				<p><textarea id="custom-bypass-editor" class="form-control"></textarea></p>
+				<div id="custom-bypass-editor"></div>
+				<br>
 				<p>
 					<a href="#userscripts" id="save-custom-bypass" class="btn btn-primary" data-message="save"></a>
 					<a href="#" id="delete-custom-bypass" class="btn btn-outline-danger" data-message="optionsUserscriptsDelete"></a>
@ -32,9 +33,12 @@
 			</div>
 		</div>
 	</div>
+	<div id="untitled-name" data-placeholder="optionsUserscriptsUntitled"></div>
+	<div id="delete-confirm" data-placeholder="optionsUserscriptsDeleteConfirm"></div>
 	<hr>
 	<p>Copyright (c) 2018, Tim "timmyRS" Speckhals</p>
 	<script src="translations.js"></script>
+	<script src="ace/ace.js"></script>
 	<script src="options.js"></script>
 </body>
 </html>
--- a/html/options.js
+++ b/html/options.js
@ -1,10 +1,12 @@
 chrome.storage.local.get(["custom_bypasses"],result=>{
-	let customBypasses=(result&&result.custom_bypasses)?JSON.parse(result.custom_bypasses):{},
+	let untitledName=document.getElementById("untitled-name").getAttribute("placeholder"),
+	deleteConfirm=document.getElementById("delete-confirm").getAttribute("placeholder"),
+	customBypasses=(result&&result.custom_bypasses)?JSON.parse(result.custom_bypasses):{},
 	customBypassesList=document.getElementById("custom-bypasses-list"),
 	customBypassName=document.getElementById("custom-bypass-name"),
 	customBypassDomains=document.getElementById("custom-bypass-domains"),
-	bypassEditor=document.getElementById("custom-bypass-editor"),
-	editingBypass="",
+	bypassEditor=ace.edit("custom-bypass-editor",{mode:"ace/mode/javascript",theme:"ace/theme/monokai"}),
+	editingBypass,
 	reloadCustomBypassList=()=>{
 		customBypassesList.innerHTML=""
 		customBypasses["+"]={}
@ -19,26 +21,26 @@ chrome.storage.local.get(["custom_bypasses"],result=>{
 			a.href="#userscripts"
 			a.className="list-group-item list-group-item-action"+(editingBypass==name?" active":"")
 			a.textContent=name
-			a.onclick=function()
-			{
+			a.onclick=()=>{
 				let _active=document.querySelector(".list-group-item.active")
 				if(_active)
 					_active.className="list-group-item list-group-item-action"
-				editingBypass=this.id.substr(14)
+				editingBypass=a.id.substr(14)
 				if(editingBypass=="+")
 				{
-					customBypasses[editingBypass="Untitled Bypass"]={
+					customBypasses[editingBypass=untitledName]={
 						domains:"example.com,example.org",
 						content:'let b=document.querySelector("#button[href]")\nif(b)\n\tlocation.href=b.href\n'
 					}
 				}
 				else
 				{
-					this.className="list-group-item list-group-item-action active"
+					a.className="list-group-item list-group-item-action active"
 				}
 				customBypassName.value=editingBypass
 				customBypassDomains.value=customBypasses[editingBypass].domains
-				bypassEditor.textContent=customBypasses[editingBypass].content
+				bypassEditor.setValue(customBypasses[editingBypass].content)
+				bypassEditor.resize()
 				saveCustomBypass()
 			}
 			customBypassesList.appendChild(a)
@ -56,19 +58,21 @@ chrome.storage.local.get(["custom_bypasses"],result=>{
 			}
 			else
 			{
-				if(confirm("Do you really want to delete this bypass?"))
+				if(confirm(deleteConfirm))
 				{
 					delete customBypasses[editingBypass]
 					editingBypass=""
 				}
 				else
+				{
 					customBypassName.value=editingBypass
+				}
 			}
 		}
-		if(editingBypass!="")
+		if(editingBypass)
 		{
 			customBypasses[editingBypass].domains=customBypassDomains.value
-			customBypasses[editingBypass].content=bypassEditor.value
+			customBypasses[editingBypass].content=bypassEditor.getValue()
 		}
 		chrome.storage.local.set({custom_bypasses:JSON.stringify(customBypasses)},reloadCustomBypassList);
 	}
--- a/manifest.json
+++ b/manifest.json
@ -10,7 +10,7 @@
 	"name": "Universal Bypass",
 	"description": "__MSG_appDesc__",
 	"homepage_url": "https://universal-bypass.org/",
-	"version": "6.5.1",
+	"version": "6.5.2",
 	"author": "Tim \"timmyRS\" Speckhals",
 	"minimum_chrome_version": "41",
 	"options_ui": {