diff --git a/lib/ice-coder.js b/lib/ice-coder.js
index e75378c..25a0e65 100644
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
@@ -80,79 +80,77 @@ var ICEcoder = {
 
 		// Create our ID aliases
 		for (var i=0;i<aliasArray.length;i++) {
-			ICEcoder[aliasArray[i]] = get(aliasArray[i]);
+			this[aliasArray[i]] = get(aliasArray[i]);
 		}
 	},
 
 	// On load, set the layout and check any nesting is valid
 	init: function() {
-		var screenIcon, sISrc;
-
 		// Contract the file manager if the user has set to have it hidden
-		if (!ICEcoder.lockedNav) {
-			ICEcoder.filesW = ICEcoder.minFilesW;
+		if (!this.lockedNav) {
+			this.filesW = this.minFilesW;
 		}
 
 		// Set layout
-		ICEcoder.setLayout();
+		this.setLayout();
 
-		ICEcoder.overFileFolder('folder', '|');
-		ICEcoder.selectFileFolder('init');
-		ICEcoder.filesFrame.contentWindow.focus();
+		this.overFileFolder('folder', '|');
+		this.selectFileFolder('init');
+		this.filesFrame.contentWindow.focus();
 
 		// Hide the loading screen & auto open last files?
-		ICEcoder.showHide('hide',get('loadingMask'));
-		ICEcoder.autoOpenInt = setInterval(function() {
-			if (ICEcoder.fmReady) {
-				if (ICEcoder.openLastFiles) {ICEcoder.autoOpenFiles();};
-				clearInterval(ICEcoder.autoOpenInt);
+		this.showHide('hide',get('loadingMask'));
+		this.autoOpenInt = setInterval(function(ic) {
+			if (ic.fmReady) {
+				if (ic.openLastFiles) {ic.autoOpenFiles();};
+				clearInterval(ic.autoOpenInt);
 			}
-		}, 4);
+		}, 4, this);
 
 		// Update the nesting indicator every 30ms
-		setInterval(ICEcoder.updateNestingIndicator,30);
+		setInterval(this.updateNestingIndicator,30);
 
 		// Start bug checking
-		ICEcoder.startBugChecking();
+		this.startBugChecking();
 
 		// Set the time since last user interaction
-		ICEcoder.autoLogoutTimer = 0;
+		this.autoLogoutTimer = 0;
 		// Start our interval timer, runs every second
-		ICEcoder.oneSecondInt = setInterval(function() {
-			ICEcoder.autoLogoutTimer++;
+		this.oneSecondInt = setInterval(function(ic) {
+			ic.autoLogoutTimer++;
 			var unsavedFiles = false;
 			// Check if we have any unsaved files
-			for(var i=1;i<=ICEcoder.savedPoints.length;i++) {
-				if (ICEcoder.savedPoints[i-1]!=ICEcoder.getcMInstance(i).changeGeneration()) {
+			for(var i=1;i<=ic.savedPoints.length;i++) {
+				if (ic.savedPoints[i-1]!=ic.getcMInstance(i).changeGeneration()) {
 					unsavedFiles = true;
 				}
 			}
 			// Show an auto-logout warning 60 secs before a logout
-			if(!unsavedFiles && ICEcoder.autoLogoutMins > 1 && ICEcoder.autoLogoutTimer == (ICEcoder.autoLogoutMins*60)-60) {
-				ICEcoder.autoLogoutWarningScreen();
+			if(!unsavedFiles && ic.autoLogoutMins > 1 && ic.autoLogoutTimer == (ic.autoLogoutMins*60)-60) {
+				ic.autoLogoutWarningScreen();
 			}
 			if (get('autoLogoutIFrame') && get('autoLogoutIFrame').contentWindow.document.getElementById('timeRemaning')) {
 				get('autoLogoutIFrame').contentWindow.document.getElementById('timeRemaning').innerHTML =
-					ICEcoder.autoLogoutTimer > 0
-					? (ICEcoder.autoLogoutMins*60) - ICEcoder.autoLogoutTimer
+					ic.autoLogoutTimer > 0
+					? (ic.autoLogoutMins*60) - ic.autoLogoutTimer
 					: 0;
 			}
 			// If there aren't any unsaved files, we have a timeout period > 0 and the time is up, we can logout
-			if(!unsavedFiles && ICEcoder.autoLogoutMins > 0 && ICEcoder.autoLogoutTimer >= ICEcoder.autoLogoutMins*60) {
-				ICEcoder.logout('autoLogout');
+			if(!unsavedFiles && ic.autoLogoutMins > 0 && ic.autoLogoutTimer >= ic.autoLogoutMins*60) {
+				ic.logout('autoLogout');
 			}
 			// Increase number of seconds ICEcoder has been open for by 1
-			ICEcoder.openSeconds++;
+			ic.openSeconds++;
 			// Every 5 mins, ping our file to keep the session alive
-			if (ICEcoder.openSeconds % 300 == 0) {
-				ICEcoder.filesFrame.contentWindow.frames['pingActive'].location.href = iceLoc+"/lib/session-active-ping.php";
+			if (ic.openSeconds % 300 == 0) {
+				ic.filesFrame.contentWindow.frames['pingActive'].location.href = iceLoc+"/lib/session-active-ping.php";
 			}
 			// Every 3 seconds, re-index if we're not already busy
-			if (!ICEcoder.indexing && !ICEcoder.loadingFile && ICEcoder.serverQueueItems.length === 0 && ICEcoder.openSeconds % 3 == 0) {
-				ICEcoder.indexing = true;
-                		// Get new data
-				var timestampExtra = ICEcoder.indexData
-					? "?timestamp="+ICEcoder.indexData.timestamps.indexed+"&csrf="+ICEcoder.csrf
+			if (!ic.indexing && !ic.loadingFile && ic.serverQueueItems.length === 0 && ic.openSeconds % 3 == 0) {
+				ic.indexing = true;
+                // Get new data
+				var timestampExtra = ic.indexData
+					? "?timestamp="+ic.indexData.timestamps.indexed+"&csrf="+ic.csrf
 					: "";
 				fetch(iceLoc+'/lib/indexer.php'+timestampExtra)
 				    .then(function(response) {
@@ -160,23 +158,23 @@ var ICEcoder = {
 				    return response.json();
 				}).then(function(data) {
 					if (data.timestamps.changed) {
-						ICEcoder.indexData = data;
+						ic.indexData = data;
 						// If we have git diff data
 						if (data.gitDiff) {
-							ICEcoder.updateGitDiffPane();
+							ic.updateGitDiffPane();
 						}
 						// If we have git content data
 						if (data.gitContent) {
-							ICEcoder.highlightGitDiffs();
+							ic.highlightGitDiffs();
 						}
 					}
-					ICEcoder.indexing = false;
+					ic.indexing = false;
 				});
 			}
-		},1000);
+		},1000,this);
 
 		// ICEcoder is ready to start using
-		ICEcoder.ready = true;
+		this.ready = true;
 	},
 
 // ==============
@@ -207,50 +205,50 @@ var ICEcoder = {
 			, 10) + "px";
 		this.splitPaneNamesMain.style.left = (parseInt((winW-this.filesW)*0.25,10)-50+this.filesW) - 60 + "px";
 		this.splitPaneNamesDiff.style.left = (parseInt((winW-this.filesW)*0.75,10)-50+this.filesW) - 135 + "px";
-		ICEcoder.setTabWidths();
+		this.setTabWidths();
 
 		// If we need to set the editor sizes
 		if (!dontSetEditor) {
-			this.editor.style.width = ICEcoder.content.style.width = (winW-this.filesW) - 200 + "px";
-			ICEcoder.terminal.style.width = (winW-this.filesW) + "px";
-			ICEcoder.output.style.width = (winW-this.filesW-31) + "px";
-			ICEcoder.database.style.width = (winW-this.filesW) + "px";
-			ICEcoder.git.style.width = (winW-this.filesW-31) + "px";
-			ICEcoder.content.style.height = (winH-headerH-tabsBarH-findBarH-26) + "px";
-			ICEcoder.terminal.style.height = winH + "px";
-			ICEcoder.output.style.height = winH + "px";
-			ICEcoder.database.style.height = winH + "px";
-			ICEcoder.git.style.height = winH + "px";
-			ICEcoder.terminal.style.top = winH + "px";
-			ICEcoder.output.style.top = winH + "px";
-			ICEcoder.database.style.top = winH + "px";
-			ICEcoder.git.style.top = winH + "px";
-			if (ICEcoder.showingTool !== false) {
-				get(ICEcoder.showingTool).style.top = 0;
+			this.editor.style.width = this.content.style.width = (winW-this.filesW) - 200 + "px";
+			this.terminal.style.width = (winW-this.filesW) + "px";
+			this.output.style.width = (winW-this.filesW-31) + "px";
+			this.database.style.width = (winW-this.filesW) + "px";
+			this.git.style.width = (winW-this.filesW-31) + "px";
+			this.content.style.height = (winH-headerH-tabsBarH-findBarH-26) + "px";
+			this.terminal.style.height = winH + "px";
+			this.output.style.height = winH + "px";
+			this.database.style.height = winH + "px";
+			this.git.style.height = winH + "px";
+			this.terminal.style.top = winH + "px";
+			this.output.style.top = winH + "px";
+			this.database.style.top = winH + "px";
+			this.git.style.top = winH + "px";
+			if (this.showingTool !== false) {
+				get(this.showingTool).style.top = 0;
 			}
 
 			// Resize the CodeMirror instances to match the window size
-			setTimeout(function(){
-				for (var i=0;i<ICEcoder.openFiles.length;i++) {
+			setTimeout(function(ic){
+				for (var i=0;i<ic.openFiles.length;i++) {
 					// Done the long way here as we need to call them in specific order to stop showing background and so avoiding a flicker effect
-					if (!ICEcoder.splitPane) {
-						ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setSize(ICEcoder.splitPaneLeftPerc+"%",ICEcoder.content.style.height);
+					if (!ic.splitPane) {
+						ic.content.contentWindow['cM'+ic.cMInstances[i]].setSize(ic.splitPaneLeftPerc+"%",ic.content.style.height);
 					}
-					ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setSize((100-ICEcoder.splitPaneLeftPerc)+"%",ICEcoder.content.style.height);
-					ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].getWrapperElement().style.left = ICEcoder.splitPaneLeftPerc+"%";
-					if (ICEcoder.splitPane) {
-						ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setSize(ICEcoder.splitPaneLeftPerc+"%",ICEcoder.content.style.height);
+					ic.content.contentWindow['cM'+ic.cMInstances[i]+'diff'].setSize((100-ic.splitPaneLeftPerc)+"%",ic.content.style.height);
+					ic.content.contentWindow['cM'+ic.cMInstances[i]+'diff'].getWrapperElement().style.left = ic.splitPaneLeftPerc+"%";
+					if (ic.splitPane) {
+						ic.content.contentWindow['cM'+ic.cMInstances[i]].setSize(ic.splitPaneLeftPerc+"%",ic.content.style.height);
 					}
 				}
 				// Set height of docExplorer
-				this.docExplorer.style.height = ICEcoder.content.style.height;
+				ic.docExplorer.style.height = ic.content.style.height;
 				// Place resultsBar to edge of pane or it's scrollbar
-				if (!ICEcoder.splitPane) {
-					ICEcoder.content.contentWindow.document.getElementById('resultsBar').style.right = !ICEcoder.scrollBarVisible ? "0" : "17px";
+				if (!ic.splitPane) {
+					ic.content.contentWindow.document.getElementById('resultsBar').style.right = !ic.scrollBarVisible ? "0" : "17px";
 				} else {
-					ICEcoder.content.contentWindow.document.getElementById('resultsBar').style.right = !ICEcoder.scrollBarVisible ? parseInt(parseInt(ICEcoder.content.style.width,10)/2,10)+"px" : (parseInt(parseInt(ICEcoder.content.style.width,10)/2,10)+17)+"px";
+					ic.content.contentWindow.document.getElementById('resultsBar').style.right = !ic.scrollBarVisible ? parseInt(parseInt(ic.content.style.width,10)/2,10)+"px" : (parseInt(parseInt(ic.content.style.width,10)/2,10)+17)+"px";
 				}
-			},4);
+			},4,this);
 		}
 	},
 
@@ -258,21 +256,21 @@ var ICEcoder = {
 	setSplitPane: function(onOff) {
 		var cM, cMdiff;
 
-		ICEcoder.splitPane = onOff == "on" ? true : false;
-		get('splitPaneControlsOff').style.opacity = ICEcoder.splitPane ? 0.2 : 0.5;
-		get('splitPaneControlsOn').style.opacity = ICEcoder.splitPane ? 0.5 : 0.2;
-		get('splitPaneNamesMain').style.opacity = get('splitPaneNamesDiff').style.opacity = ICEcoder.splitPane ? 1 : 0;
-		ICEcoder.setLayout();
+		this.splitPane = onOff == "on" ? true : false;
+		get('splitPaneControlsOff').style.opacity = this.splitPane ? 0.2 : 0.5;
+		get('splitPaneControlsOn').style.opacity = this.splitPane ? 0.5 : 0.2;
+		get('splitPaneNamesMain').style.opacity = get('splitPaneNamesDiff').style.opacity = this.splitPane ? 1 : 0;
+		this.setLayout();
 
 		// Also clear marks (if going to a single pane) or redo the marks (if split pane)
-		if (ICEcoder.splitPane) {
-			ICEcoder.updateDiffs();
+		if (this.splitPane) {
+			this.updateDiffs();
 			// Also set the scroll position to match
-			cM = ICEcoder.getcMInstance();
-			ICEcoder.cMonScroll(cM,'cM'+ICEcoder.cMInstances[ICEcoder.selectedTab-1]);
+			cM = this.getcMInstance();
+			this.cMonScroll(cM,'cM'+this.cMInstances[this.selectedTab-1]);
 		} else {
-			cM = ICEcoder.getcMInstance();
-			cMdiff = ICEcoder.getcMdiffInstance();
+			cM = this.getcMInstance();
+			cMdiff = this.getcMdiffInstance();
 
 			if (cM) {
 				// Clear all main pane marks
@@ -290,24 +288,24 @@ var ICEcoder = {
 
 		// Animate in/out the split pane
 		// First, clear any existing split pane interval anim
-		if ("undefined" != typeof ICEcoder.animSplitPaneInt) {
-			clearInterval(ICEcoder.animSplitPaneInt);
+		if ("undefined" != typeof this.animSplitPaneInt) {
+			clearInterval(this.animSplitPaneInt);
 		}
 		// Now set the interval to animate it in/out
-		ICEcoder.animSplitPaneInt = setInterval(function() {
+		this.animSplitPaneInt = setInterval(function(ic) {
 			// Animate split pane in
-			if (ICEcoder.splitPane && ICEcoder.splitPaneLeftPerc > 50.1) {
-				ICEcoder.splitPaneLeftPerc = ((ICEcoder.splitPaneLeftPerc-50)/1.8)+50;
+			if (ic.splitPane && ic.splitPaneLeftPerc > 50.1) {
+				ic.splitPaneLeftPerc = ((ic.splitPaneLeftPerc-50)/1.8)+50;
 			// Animate split pane out
-			} else if (!ICEcoder.splitPane && ICEcoder.splitPaneLeftPerc < 99.9) {
-				ICEcoder.splitPaneLeftPerc = (50-((100-ICEcoder.splitPaneLeftPerc)/1.8))+50;
+			} else if (!ic.splitPane && ic.splitPaneLeftPerc < 99.9) {
+				ic.splitPaneLeftPerc = (50-((100-ic.splitPaneLeftPerc)/1.8))+50;
 			// Finish animating split pane in/out
 			} else {
-				ICEcoder.splitPaneLeftPerc = ICEcoder.splitPane ? 50 : 100;
-				clearInterval(ICEcoder.animSplitPaneInt);
+				ic.splitPaneLeftPerc = ic.splitPane ? 50 : 100;
+				clearInterval(ic.animSplitPaneInt);
 			}
-			ICEcoder.setLayout();
-		},4);
+			ic.setLayout();
+		},4,this);
 	},
 
 	// Tool show/hide toggle
@@ -324,18 +322,18 @@ var ICEcoder = {
 			get('git').style.top = winH + "px";
 
 			// Now set tool requested, out of view, or in view
-			get(tool).style.top = ICEcoder.showingTool === tool ? winH + "px" : 0;
+			get(tool).style.top = this.showingTool === tool ? winH + "px" : 0;
 
 			// Carry out any extras...
 			if (tool === "terminal") {
 				// Focus on command prompt
-				setTimeout(function(){
-					ICEcoder.terminal.contentWindow.document.getElementById('command').focus();
-				},0);
+				setTimeout(function(ic){
+					ic.terminal.contentWindow.document.getElementById('command').focus();
+				},0,this);
 			}
 
 			// Note which tool we're showing
-			ICEcoder.showingTool = ICEcoder.showingTool !== tool ? tool : false;
+			this.showingTool = this.showingTool !== tool ? tool : false;
 		}
 	},
 
@@ -346,53 +344,53 @@ var ICEcoder = {
 		get('miniMap').style.display = item == "miniMap" ? 'block' : 'none';
 		get('functionClassList').style.display = item == "functionClassList" ? 'block' : 'none';
 		if (item == "miniMap") {
-			miniMapInt = setInterval(function(){
+			miniMapInt = setInterval(function(ic){
 				if (get('miniMapContent').getBoundingClientRect().height != 0) {
-					cM = ICEcoder.getcMInstance();
-					ICEcoder.setMinimapLayout(cM);
+					cM = ic.getcMInstance();
+					ic.setMinimapLayout(cM);
 					clearInterval(miniMapInt);
 				}
-			},10);
+			},10,this);
 		}
 	},
 
 	// Set the width of the file manager on demand
 	changeFilesW: function(expandContract) {
-		if (!ICEcoder.lockedNav||ICEcoder.filesW==ICEcoder.minFilesW) {
-			if ("undefined" != typeof ICEcoder.changeFilesInt) {clearInterval(ICEcoder.changeFilesInt)};
-			ICEcoder.changeFilesInt = setInterval(function() {ICEcoder.changeFilesWStep(expandContract)},10);
+		if (!this.lockedNav||this.filesW==this.minFilesW) {
+			if ("undefined" != typeof this.changeFilesInt) {clearInterval(this.changeFilesInt)};
+			this.changeFilesInt = setInterval(function(ic) {ic.changeFilesWStep(expandContract)},10,this);
 		}
 	},
 
 	// Expand/contract the file manager in half-steps
 	changeFilesWStep: function (expandContract) {
 		if (expandContract=="expand") {
-			ICEcoder.filesW < ICEcoder.maxFilesW-1 ? ICEcoder.filesW += Math.ceil((ICEcoder.maxFilesW-ICEcoder.filesW)/2) : ICEcoder.filesW = ICEcoder.maxFilesW;
+			this.filesW < this.maxFilesW-1 ? this.filesW += Math.ceil((this.maxFilesW-this.filesW)/2) : this.filesW = this.maxFilesW;
 		} else {
-			ICEcoder.filesW > ICEcoder.minFilesW+1 ? ICEcoder.filesW -= Math.ceil((ICEcoder.filesW-ICEcoder.minFilesW)/2) : ICEcoder.filesW = ICEcoder.minFilesW;
+			this.filesW > this.minFilesW+1 ? this.filesW -= Math.ceil((this.filesW-this.minFilesW)/2) : this.filesW = this.minFilesW;
 		}
-		if ((expandContract=="expand" && ICEcoder.filesW == ICEcoder.maxFilesW)||(expandContract=="contract" && ICEcoder.filesW == ICEcoder.minFilesW)) {
-			clearInterval(ICEcoder.changeFilesInt);
+		if ((expandContract=="expand" && this.filesW == this.maxFilesW)||(expandContract=="contract" && this.filesW == this.minFilesW)) {
+			clearInterval(this.changeFilesInt);
 		}
 		// Redo the layout to match
-		ICEcoder.setLayout();
+		this.setLayout();
 	},
 
 	// Can click-drag file manager width?
 	canResizeFilesW: function() {
 		// If we have the cursor set we must be able!
-		if (ICEcoder.ready && document.body.style.cursor == "w-resize") {
+		if (this.ready && document.body.style.cursor == "w-resize") {
 			// If our mouse is down (and went down on the CM instance's gutter) and we're within a 250-400px range
-			if (ICEcoder.mouseDown && ICEcoder.mouseDownInCM == "gutter") {
-				ICEcoder.filesW = ICEcoder.maxFilesW = ICEcoder.mouseX >=250 && ICEcoder.mouseX <= 400
-					? ICEcoder.mouseX : ICEcoder.mouseX <250 ? 250 : 400;
+			if (this.mouseDown && this.mouseDownInCM == "gutter") {
+				this.filesW = this.maxFilesW = this.mouseX >=250 && this.mouseX <= 400
+					? this.mouseX : this.mouseX <250 ? 250 : 400;
 				// Set various widths based on the new width
-				ICEcoder.files.style.width = ICEcoder.filesFrame.style.width = ICEcoder.filesW + "px";
-				ICEcoder.setLayout();
-				ICEcoder.draggingFilesW = true;
+				this.files.style.width = this.filesFrame.style.width = this.filesW + "px";
+				this.setLayout();
+				this.draggingFilesW = true;
 			}
 		} else {
-			ICEcoder.draggingFilesW = false;
+			this.draggingFilesW = false;
 		}
 	},
 
@@ -400,9 +398,9 @@ var ICEcoder = {
 	lockUnlockNav: function() {
 		var lockIcon;
 
-		lockIcon = ICEcoder.filesFrame.contentWindow.document.getElementById('fmLock');
-		ICEcoder.lockedNav = !ICEcoder.lockedNav;
-		lockIcon.style.backgroundPosition = ICEcoder.lockedNav ? "0 0" : "-16px 0";
+		lockIcon = this.filesFrame.contentWindow.document.getElementById('fmLock');
+		this.lockedNav = !this.lockedNav;
+		lockIcon.style.backgroundPosition = this.lockedNav ? "0 0" : "-16px 0";
 	},
 
 	// Show/hide the plugins on demand
@@ -410,7 +408,7 @@ var ICEcoder = {
 		get('plugins').style.width = showHide=="show" ? '55px' : '3px';
 		get('plugins').style.background = showHide=="show" ? '#333' : 'transparent';
 		if (showHide=="show") {
-			ICEcoder.changeFilesW('expand');
+			this.changeFilesW('expand');
 		}
 	},
 
@@ -420,11 +418,11 @@ var ICEcoder = {
 
 	// On focus
 	cMonFocus: function(thisCM,cMinstance) {
-		ICEcoder.getCaretPosition();
-		ICEcoder.updateCharDisplay();
-		ICEcoder.updateByteDisplay();
-		ICEcoder.editorFocusInstance = cMinstance;
-		ICEcoder.getCaretPosition();
+		this.getCaretPosition();
+		this.updateCharDisplay();
+		this.updateByteDisplay();
+		this.editorFocusInstance = cMinstance;
+		this.getCaretPosition();
 	},
 
 	// On blur
@@ -437,30 +435,30 @@ var ICEcoder = {
 		if ("undefined" != typeof doFind) {
 			clearInterval(doFind);
 		}
-		doFind = setTimeout(function() {
-			ICEcoder.findReplace(get('find').value,true,false);
-		},500);
-		ICEcoder.getCaretPosition();
-		ICEcoder.updateCharDisplay();
-		ICEcoder.updateByteDisplay();
+		doFind = setTimeout(function(ic) {
+			ic.findReplace(get('find').value,true,false);
+		},500,this);
+		this.getCaretPosition();
+		this.updateCharDisplay();
+		this.updateByteDisplay();
 	},
 
 	// On cursor activity
 	cMonCursorActivity: function(thisCM,cMinstance) {
 		var thisCMPrevLine;
 
-		ICEcoder.getCaretPosition();
-		ICEcoder.updateCharDisplay();
-		ICEcoder.updateByteDisplay();
-		thisCM.removeLineClass(ICEcoder['cMActiveLine'+cMinstance], "background");
+		this.getCaretPosition();
+		this.updateCharDisplay();
+		this.updateByteDisplay();
+		thisCM.removeLineClass(this['cMActiveLine'+cMinstance], "background");
 		if(thisCM.getCursor('start').line == thisCM.getCursor().line) {
-			ICEcoder['cMActiveLine'+cMinstance] = thisCM.addLineClass(thisCM.getCursor().line, "background","cm-s-activeLine");
+			this['cMActiveLine'+cMinstance] = thisCM.addLineClass(thisCM.getCursor().line, "background","cm-s-activeLine");
 		}
-		if (ICEcoder.caretLocType=="CSS") {
-			ICEcoder.cssColorPreview();
+		if (this.caretLocType=="CSS") {
+			this.cssColorPreview();
 		}
 
-		thisCMPrevLine = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? ICEcoder.prevLineDiff : ICEcoder.prevLine;
+		thisCMPrevLine = this.editorFocusInstance.indexOf('diff') > -1 ? this.prevLineDiff : this.prevLine;
 		if (thisCMPrevLine != thisCM.getCursor().line &&
 			thisCM.getLine(thisCMPrevLine) &&
 			thisCM.getLine(thisCMPrevLine).length > 0 &&
@@ -468,31 +466,31 @@ var ICEcoder = {
 				thisCM.replaceRange("",{line: thisCMPrevLine, ch: 0},{line: thisCMPrevLine, ch: 1000000});
 		}
 		// Set the cursor to text height, not line height
-		setTimeout(function() {
+		setTimeout(function(ic) {
 			var paneMatch;
 
 			// Loop through styles to check if we have to adjust cursor height
-			for (var i=0; i<ICEcoder.renderLineStyle.length; i++) {
+			for (var i=0; i<ic.renderLineStyle.length; i++) {
 
 				// We have no matching pane to start with
 				paneMatch = false;
 
 				// Is the pane we need to set the cursor on this pane?
 				if (
-					(ICEcoder.renderLineStyle[i][0] != "diff" && cMinstance.indexOf("diff") == -1) ||
-					(ICEcoder.renderLineStyle[i][0] == "diff" && cMinstance.indexOf("diff") > -1)
+					(ic.renderLineStyle[i][0] != "diff" && cMinstance.indexOf("diff") == -1) ||
+					(ic.renderLineStyle[i][0] == "diff" && cMinstance.indexOf("diff") > -1)
 				)
 				{paneMatch = true;}
 
 				// If the pane matches & also the line we're on is the line we have a style set for, set that cursor height
-				if (paneMatch && thisCM.getCursor().line+1 == ICEcoder.renderLineStyle[i][1]) {
+				if (paneMatch && thisCM.getCursor().line+1 == ic.renderLineStyle[i][1]) {
 					thisCM.setOption("cursorHeight",thisCM.defaultTextHeight() / thisCM.lineInfo(thisCM.getCursor().line).handle.height);
 				} else {
 					thisCM.setOption("cursorHeight",1);
 				}
 
 			}
-		},0);
+		},0,this);
 	},
 
 	// On before change
@@ -515,8 +513,8 @@ var ICEcoder = {
 					if (tagInfo[tagOpp] !== null) {
 						thisData = tagInfo[tagOpp].tag + ";" + tagInfo[tagOpp].from.line + ":" + tagInfo[tagOpp].from.ch;
 						// Check that string firstly isn't in array and if not, push it in
-						if (ICEcoder.oppTagReplaceData.indexOf(thisData) == -1) {
-							ICEcoder.oppTagReplaceData.push(thisData);
+						if (this.oppTagReplaceData.indexOf(thisData) == -1) {
+							this.oppTagReplaceData.push(thisData);
 						}
 					}
 				}
@@ -532,32 +530,32 @@ var ICEcoder = {
 		sels = thisCM.listSelections();
 
 		// If we're not loading the file, it's a change, so update tab
-		if (!ICEcoder.loadingFile) {
-			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
+		if (!this.loadingFile) {
+			this.redoTabHighlight(this.selectedTab);
 		// File load needs to force a simple change to get minimap functional
 		} else {
-			setTimeout(function(){
+			setTimeout(function(ic){
 				thisCM.replaceRange('X',{line: 1, ch: 1},{line: 1, ch: 1});
 				thisCM.undo();
 				thisCM.clearHistory();
-				ICEcoder.savedPoints[ICEcoder.selectedTab-1] = thisCM.changeGeneration();
-				ICEcoder.savedContents[ICEcoder.selectedTab-1] = thisCM.getValue();
-			},0);
+				ic.savedPoints[ic.selectedTab-1] = thisCM.changeGeneration();
+				ic.savedContents[ic.selectedTab-1] = thisCM.getValue();
+			},0,this);
 
 		}
 
 		// Detect if we have a scrollbar & set layout again
-		setTimeout(function() {
-			ICEcoder.scrollBarVisible = thisCM.getScrollInfo().height > thisCM.getScrollInfo().clientHeight;
-			ICEcoder.setLayout();
-		},0);
+		setTimeout(function(ic) {
+			ic.scrollBarVisible = thisCM.getScrollInfo().height > thisCM.getScrollInfo().clientHeight;
+			ic.setLayout();
+		},0,this);
 
 		// If we're replacing opposite tag strings, do that
-		if ("undefined" != typeof ICEcoder.oppTagReplaceData[0]) {
+		if ("undefined" != typeof this.oppTagReplaceData[0]) {
 			// For each one of them, grab our data to work with
-			for (var i=0; i<ICEcoder.oppTagReplaceData.length; i++) {
+			for (var i=0; i<this.oppTagReplaceData.length; i++) {
 				// Extract data from that string
-				rData = ICEcoder.oppTagReplaceData[i].split(";");
+				rData = this.oppTagReplaceData[i].split(";");
 				theTag = rData[0];
 				thisLine = rData[1].split(":")[0]*1;
 				thisChar = rData[1].split(":")[1]*1;
@@ -592,7 +590,7 @@ var ICEcoder = {
 					thisCM.replaceRange(theTag, repl1, repl2);
 					// If at the close tag, don't autocomplete
 					if (tagInfo.at == "close") {
-						ICEcoder.autocompleteSkip = true;
+						this.autocompleteSkip = true;
 					}
 				}
 
@@ -600,54 +598,54 @@ var ICEcoder = {
 
 		}
 		// Reset our array for next time
-		ICEcoder.oppTagReplaceData = [];
+		this.oppTagReplaceData = [];
 
-		ICEcoder.getCaretPosition();
-		ICEcoder.updateCharDisplay();
-		ICEcoder.updateByteDisplay();
-		ICEcoder.updateNestingIndicator();
-		if (ICEcoder.findMode) {
-			ICEcoder.results.splice(ICEcoder.findResult,1);
-			get('results').innerHTML = ICEcoder.results.length + " " + t['results'];
-			ICEcoder.findMode = false;
+		this.getCaretPosition();
+		this.updateCharDisplay();
+		this.updateByteDisplay();
+		this.updateNestingIndicator();
+		if (this.findMode) {
+			this.results.splice(this.findResult,1);
+			get('results').innerHTML = this.results.length + " " + t['results'];
+			this.findMode = false;
 		}
 		// Update the list of functions and classes
-		ICEcoder.updateFunctionClassList();
+		this.updateFunctionClassList();
 		// Update the minimap nav
 		if ("undefined" != typeof doMiniNav) {
 			clearTimeout(doMiniNav);
 		}
-		if (ICEcoder.loadingFile) {
+		if (this.loadingFile) {
 			// Load event means set it straight away
-			ICEcoder.setMinimap();
+			this.setMinimap();
 		} else {
 			// Update event means do it after 1 sec of inactivity
-			doMiniNav = setTimeout(function() {
-				ICEcoder.setMinimap();
-			},1000);
+			doMiniNav = setTimeout(function(ic) {
+				ic.setMinimap();
+			},1000,this);
 		}
-		filepath = ICEcoder.openFiles[ICEcoder.selectedTab-1];
+		filepath = this.openFiles[this.selectedTab-1];
 		if (filepath) {
 			filename = filepath.substr(filepath.lastIndexOf("/")+1);
 			fileExt = filename.substr(filename.lastIndexOf(".")+1);
 		}
 		// Update diffs if we have a split pane
-		if (ICEcoder.splitPane) {
+		if (this.splitPane) {
 			// Need 0ms tickover so we handle char change first
-			setTimeout(function(){ICEcoder.updateDiffs();},0);
+			setTimeout(function(ic){ic.updateDiffs();},0,this);
 		}
 
 		// Highlight Git diff colors in gutter
-		if (ICEcoder.indexData) {
-			ICEcoder.highlightGitDiffs();
+		if (this.indexData) {
+			this.highlightGitDiffs();
 		}
 
 		// Update HTML edited files live
-		if (filepath && ICEcoder.previewWindow.location && filepath != "/[NEW]") {
-			ICEcoder.updatePreviewWindow(thisCM,filepath,filename,fileExt);
+		if (filepath && this.previewWindow.location && filepath != "/[NEW]") {
+			this.updatePreviewWindow(thisCM,filepath,filename,fileExt);
 		}
 		// Update the title tag to indicate any changes
-		ICEcoder.indicateChanges();
+		this.indicateChanges();
 	},
 
 	cMonUpdate: function(thisCM,cMinstance) {
@@ -656,20 +654,20 @@ var ICEcoder = {
 			get('docExplorer').style.background = window.getComputedStyle(thisCM.getWrapperElement(),null).getPropertyValue('background');
 		},0);
 		// Set the Minimap layout
-		ICEcoder.setMinimapLayout(thisCM,cMinstance);
+		this.setMinimapLayout(thisCM,cMinstance);
 	},
 
 	// On scroll
 	cMonScroll: function(thisCM,cMinstance) {
 		var cM, cMdiff, otherCM;
 
-		ICEcoder.mouseDown=false;
-		ICEcoder.mouseDownInCM=false;
+		this.mouseDown=false;
+		this.mouseDownInCM=false;
 
-		if (ICEcoder.splitPane) {
+		if (this.splitPane) {
 			// Get both main & diff instance and work out the instance we're not scrolling
-			cM = ICEcoder.getcMInstance();
-			cMdiff = ICEcoder.getcMdiffInstance();
+			cM = this.getcMInstance();
+			cMdiff = this.getcMdiffInstance();
 			otherCM = cMinstance.indexOf('diff') > -1 ? cM : cMdiff;
 
 			if (cM) {
@@ -678,20 +676,20 @@ var ICEcoder = {
 			}
 		}
 		// Set the Minimap layout
-		ICEcoder.setMinimapLayout(thisCM,cMinstance);
+		this.setMinimapLayout(thisCM,cMinstance);
 	},
 
 	// On input read
 	cMonInputRead: function(thisCM,cMinstance) {
-		if (ICEcoder.autoComplete == "keypress" && ICEcoder.codeAssist) {
+		if (this.autoComplete == "keypress" && this.codeAssist) {
 			// Debounce timeout wrapper left here for now, but can be removed in future if no negative effects seen
-			// clearTimeout(ICEcoder.debounce);
+			// clearTimeout(this.debounce);
 			if (!thisCM.state.completionActive) {
-				// ICEcoder.debounce = setTimeout(function() {
-					if (!ICEcoder.autocompleteSkip) {
-						ICEcoder.autocomplete();
+				// this.debounce = setTimeout(function() {
+					if (!this.autocompleteSkip) {
+						this.autocomplete();
 					} else {
-						ICEcoder.autocompleteSkip = false;
+						this.autocompleteSkip = false;
 					}
 				// },0);
 			}
@@ -700,12 +698,12 @@ var ICEcoder = {
 
 	// On gutter click
 	cMonGutterClick: function(thisCM,line,gutter,evt,cMinstance) {
-		ICEcoder.mouseDownInCM = "gutter";
+		this.mouseDownInCM = "gutter";
 	},
 
 	// On mouse down
 	cMonMouseDown: function(thisCM,cMinstance,evt) {
-		ICEcoder.mouseDownInCM = "editor";
+		this.mouseDownInCM = "editor";
 	},
 
 	// On context menu
@@ -716,7 +714,7 @@ var ICEcoder = {
 
             // If CTRL key down
             if (evt.ctrlKey) {
-                setTimeout(function() {
+                setTimeout(function(ic) {
                     // Get cM and word under mouse pointer
                     var cM = thisCM;
                     var word = (cM.getRange(cM.findWordAt(cM.getCursor()).anchor, cM.findWordAt(cM.getCursor()).head));
@@ -724,44 +722,44 @@ var ICEcoder = {
                     // Get result and number of results for word in functions and classes from index JSON object list
                     var result = null;
                     var numResults = 0;
-                    var filePath = ICEcoder.openFiles[ICEcoder.selectedTab-1];
+                    var filePath = ic.openFiles[ic.selectedTab-1];
 	            var filePathExt = filePath.substr(filePath.lastIndexOf(".")+1);
-                    for(i in ICEcoder.indexData.functions[filePathExt]) {
+                    for(i in ic.indexData.functions[filePathExt]) {
                         if (i === word) {
-                            result = ICEcoder.indexData.functions[filePathExt][i];
+                            result = ic.indexData.functions[filePathExt][i];
                             numResults++;
                         }
                     };
-                    for(i in ICEcoder.indexData.classes[filePathExt]) {
+                    for(i in ic.indexData.classes[filePathExt]) {
                         if (i === word) {
-                            result = ICEcoder.indexData.classes[filePathExt][i];
+                            result = ic.indexData.classes[filePathExt][i];
                             numResults++;
                         }
                     };
 
                     // If we have a single result and the cursor isn't already on the definition of it we can jump to where it's defined
                     if (numResults === 1 && [null,"def"].indexOf(cM.getTokenTypeAt(cM.getCursor())) === -1) {
-                        ICEcoder.openFile(result.filePath.replace(docRoot,""));
-                        ICEcoder.goFindAfterOpenInt = setInterval(function(result){
-                            if (ICEcoder.openFiles[ICEcoder.selectedTab-1] == result.filePath.replace(docRoot,"") && !ICEcoder.loadingFile) {
-                                cM = ICEcoder.getcMInstance();
+                        ic.openFile(result.filePath.replace(docRoot,""));
+                        ic.goFindAfterOpenInt = setInterval(function(result){
+                            if (ic.openFiles[ic.selectedTab-1] == result.filePath.replace(docRoot,"") && !ic.loadingFile) {
+                                cM = ic.getcMInstance();
 				setTimeout(function(result) {
-					ICEcoder.goToLine(result.range.from.line+1);
+					ic.goToLine(result.range.from.line+1);
 					cM.setSelection({line: result.range.from.line, ch: result.range.from.ch}, {line: result.range.to.line, ch: result.range.to.ch});
 				},20,result);
-                                clearInterval(ICEcoder.goFindAfterOpenInt);
+                                clearInterval(ic.goFindAfterOpenInt);
                             }
                         },20,result);
                     }
 
-                    ICEcoder.mouseDownInCM = "editor";
-                },0);
+                    ic.mouseDownInCM = "editor";
+                },0,this);
             }
         },
 
 	// On drag over
 	cMonDragOver: function(thisCM,evt,cMinstance) {
-		ICEcoder.setDragCursor(evt,'editor');
+		this.setDragCursor(evt,'editor');
 	},
 
 	// On render line
@@ -769,21 +767,21 @@ var ICEcoder = {
 		var paneMatch;
 
 		// Loop through styles to use when rendering lines
-		for (var i=0; i<ICEcoder.renderLineStyle.length; i++) {
+		for (var i=0; i<this.renderLineStyle.length; i++) {
 
 			// We have no matching pane to start with
 			paneMatch = false;
 
 			// Is the pane we need to style this pane?
 			if (
-				(ICEcoder.renderLineStyle[i][0] != "diff" && cMinstance.indexOf("diff") == -1) ||
-				(ICEcoder.renderLineStyle[i][0] == "diff" && cMinstance.indexOf("diff") > -1)
+				(this.renderLineStyle[i][0] != "diff" && cMinstance.indexOf("diff") == -1) ||
+				(this.renderLineStyle[i][0] == "diff" && cMinstance.indexOf("diff") > -1)
 			)
 			{paneMatch = true;}
 
 			// If the pane matches & also the line we're rendering is the line we have a style set for, set that style
-			if (paneMatch && thisCM.lineInfo(line).line+1 == ICEcoder.renderLineStyle[i][1]) {
-				element.style[ICEcoder.renderLineStyle[i][2]] = ICEcoder.renderLineStyle[i][3];
+			if (paneMatch && thisCM.lineInfo(line).line+1 == this.renderLineStyle[i][1]) {
+				element.style[this.renderLineStyle[i][2]] = this.renderLineStyle[i][3];
 			}
 
 		}
@@ -791,17 +789,17 @@ var ICEcoder = {
 
 	// Show function args tooltip
 	functionArgsTooltip: function(e, area) {
-	    if (ICEcoder.indexData) {
+	    if (this.indexData) {
 		// If we have no files open, return early
-                if (ICEcoder.openFiles.length === 0) {
+                if (this.openFiles.length === 0) {
                     get('tooltip').style.display = "none";
                     return true;
                 }
 
             	var i;
                 // Get cM instance, and the word under mouse pointer
-                var cM = ICEcoder.getcMInstance();
-                var coordsChar = cM.coordsChar({left: ICEcoder.mouseX-ICEcoder.maxFilesW, top: ICEcoder.mouseY-72});
+                var cM = this.getcMInstance();
+                var coordsChar = cM.coordsChar({left: this.mouseX-this.maxFilesW, top: this.mouseY-72});
                 var word = (cM.getRange(cM.findWordAt(coordsChar).anchor, cM.findWordAt(coordsChar).head));
 
 		// If it's not a word, return early
@@ -813,11 +811,11 @@ var ICEcoder = {
                 // Get result and number of results for word in functions from index JSON object list
                 var result = null;
                 var numResults = 0;
-                var filePath = ICEcoder.openFiles[ICEcoder.selectedTab-1];
+                var filePath = this.openFiles[this.selectedTab-1];
                 var filePathExt = filePath.substr(filePath.lastIndexOf(".")+1);
-                for(i in ICEcoder.indexData.functions[filePathExt]) {
+                for(i in this.indexData.functions[filePathExt]) {
                     if (i === word) {
-                        result = ICEcoder.indexData.functions[filePathExt][i];
+                        result = this.indexData.functions[filePathExt][i];
                         numResults++;
                     }
                 };
@@ -825,8 +823,8 @@ var ICEcoder = {
                 // If we have a single result and the mouse pointer is not over the definition of it (that would be pointless), show tooltip
                 if (numResults === 1 && [null,"def"].indexOf(cM.getTokenTypeAt(coordsChar)) === -1) {
                     get('tooltip').style.display = "block";
-                    get('tooltip').style.left = (ICEcoder.mouseX-ICEcoder.maxFilesW+10) + "px";
-                    get('tooltip').style.top = (ICEcoder.mouseY-30) + "px";
+                    get('tooltip').style.left = (this.mouseX-this.maxFilesW+10) + "px";
+                    get('tooltip').style.top = (this.mouseY-30) + "px";
                     get('tooltip').style.zIndex = "1";
                     get('tooltip').innerHTML = result.params;
                 // Else hide it
@@ -841,11 +839,11 @@ var ICEcoder = {
 		var cM, cMdiff, mainText, diffText, sm, opcodes, cMmarks, cMdiffMarks, amt, sDiffs;
 
 		// Reset the style array container and main vs diff pane shift difference
-		ICEcoder.renderLineStyle = [];
-		ICEcoder.renderPaneShiftAmount = 0;
+		this.renderLineStyle = [];
+		this.renderPaneShiftAmount = 0;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
 
 		// Get the baseText and newText values from the two textboxes, and split them into lines
 		mainText = cM ? difflib.stringAsLines(cM.getValue()) : "";
@@ -884,7 +882,7 @@ var ICEcoder = {
 					// Replacing? Pad out main pane line to match equivalent last line in diff pane
 					if (opcodes[i][0] == "replace") {
 						// Line amount is diff between end of both panes at this point in our loop, plus 1 line and our overall document shift, multiplied by font size
-						amt = ((opcodes[i][4] - opcodes[i][2] + 1 + ICEcoder.renderPaneShiftAmount) * cM.defaultTextHeight());
+						amt = ((opcodes[i][4] - opcodes[i][2] + 1 + this.renderPaneShiftAmount) * cM.defaultTextHeight());
 						// Add on the extra heights for any wrapped lines
 						for (var j=opcodes[i][4]-1; j<=opcodes[i][2]-1; j++) {
 							if (cMdiff.getLineHandle(j).height > cM.defaultTextHeight()) {
@@ -893,14 +891,14 @@ var ICEcoder = {
 						}
 						// If we have an height greater than the default text height, add a new style
 						if (amt > cM.defaultTextHeight()) {
-							ICEcoder.renderLineStyle.push(["main", opcodes[i][2], "height", amt + "px"]);
+							this.renderLineStyle.push(["main", opcodes[i][2], "height", amt + "px"]);
 						}
 						// Mark text in 2 colours, for each line
 						for (var j=0; j<(opcodes[i][2]) - (opcodes[i][1]); j++)  {
-							sDiffs = (ICEcoder.findStringDiffs(cM.getLine(opcodes[i][1]+j),cMdiff.getLine(opcodes[i][3]+j)));
-							cM.markText({line: opcodes[i][1]+j, ch: 0}, {line: opcodes[i][3]+j + ICEcoder.renderPaneShiftAmount, ch: sDiffs[0]}, {className: "diffGreyLighter"});
-							cM.markText({line: opcodes[i][1]+j, ch: sDiffs[0]}, {line: opcodes[i][3]+j + ICEcoder.renderPaneShiftAmount, ch: sDiffs[0]+sDiffs[1]}, {className: "diffGrey"});
-							cM.markText({line: opcodes[i][1]+j, ch: sDiffs[0]+sDiffs[1]}, {line: opcodes[i][3]+j + ICEcoder.renderPaneShiftAmount, ch: 1000000}, {className: "diffGreyLighter"});
+							sDiffs = (this.findStringDiffs(cM.getLine(opcodes[i][1]+j),cMdiff.getLine(opcodes[i][3]+j)));
+							cM.markText({line: opcodes[i][1]+j, ch: 0}, {line: opcodes[i][3]+j + this.renderPaneShiftAmount, ch: sDiffs[0]}, {className: "diffGreyLighter"});
+							cM.markText({line: opcodes[i][1]+j, ch: sDiffs[0]}, {line: opcodes[i][3]+j + this.renderPaneShiftAmount, ch: sDiffs[0]+sDiffs[1]}, {className: "diffGrey"});
+							cM.markText({line: opcodes[i][1]+j, ch: sDiffs[0]+sDiffs[1]}, {line: opcodes[i][3]+j + this.renderPaneShiftAmount, ch: 1000000}, {className: "diffGreyLighter"});
 						}
 					// Inserting
 					} else {
@@ -909,7 +907,7 @@ var ICEcoder = {
 
 					// If inserting or deleting and the main pane hasn't changed, we need to pad out the line in that pane
 					if (opcodes[i][0] != "replace" && opcodes[i][1] == opcodes[i][2]) {
-						ICEcoder.renderLineStyle.push(["main", opcodes[i][2], "height", ((opcodes[i][4] - opcodes[i][3] + 1) * cM.defaultTextHeight()) + "px"]);
+						this.renderLineStyle.push(["main", opcodes[i][2], "height", ((opcodes[i][4] - opcodes[i][3] + 1) * cM.defaultTextHeight()) + "px"]);
 						// Mark the range with empty class
 						cM.markText({line: opcodes[i][2]-1, ch: 0}, {line: opcodes[i][2]-1, ch: 1000000}, {className: "diffNone"});
 					}
@@ -921,7 +919,7 @@ var ICEcoder = {
 					// Replacing? Pad out diff pane line to match equivalent last line in main pane
 					if (opcodes[i][0] == "replace") {
 						// Line amount is diff between end of both panes at this point in our loop, plus 1 line and our overall document shift, multiplied by font size
-						amt = ((opcodes[i][2] - opcodes[i][4] + 1 - ICEcoder.renderPaneShiftAmount) * cM.defaultTextHeight());
+						amt = ((opcodes[i][2] - opcodes[i][4] + 1 - this.renderPaneShiftAmount) * cM.defaultTextHeight());
 						// Add on the extra heights for any wrapped lines
 						for (var j=opcodes[i][4]-1; j<=opcodes[i][2]-1; j++) {
 							if (cM.getLineHandle(j).height > cM.defaultTextHeight()) {
@@ -930,14 +928,14 @@ var ICEcoder = {
 						}
 						// If we have an height greater than the default text height, add a new style
 						if (amt > cM.defaultTextHeight()) {
-							ICEcoder.renderLineStyle.push(["diff", opcodes[i][4], "height", amt + "px"]);
+							this.renderLineStyle.push(["diff", opcodes[i][4], "height", amt + "px"]);
 						}
 						// Mark text in 2 colours, for each line
 						for (var j=0; j<(opcodes[i][4]) - (opcodes[i][3]); j++)  {
-							sDiffs = (ICEcoder.findStringDiffs(cM.getLine(opcodes[i][1]+j),cMdiff.getLine(opcodes[i][3]+j)));
-							cMdiff.markText({line: opcodes[i][1]+j - ICEcoder.renderPaneShiftAmount, ch: 0}, {line: opcodes[i][3]+j, ch: sDiffs[0]}, {className: "diffGreyLighter"});
-							cMdiff.markText({line: opcodes[i][1]+j - ICEcoder.renderPaneShiftAmount, ch: sDiffs[0]}, {line: opcodes[i][3]+j, ch: sDiffs[0]+sDiffs[2]}, {className: "diffGrey"});
-							cMdiff.markText({line: opcodes[i][1]+j - ICEcoder.renderPaneShiftAmount, ch: sDiffs[0]+sDiffs[2]}, {line: opcodes[i][3]+j, ch: 1000000}, {className: "diffGreyLighter"});
+							sDiffs = (this.findStringDiffs(cM.getLine(opcodes[i][1]+j),cMdiff.getLine(opcodes[i][3]+j)));
+							cMdiff.markText({line: opcodes[i][1]+j - this.renderPaneShiftAmount, ch: 0}, {line: opcodes[i][3]+j, ch: sDiffs[0]}, {className: "diffGreyLighter"});
+							cMdiff.markText({line: opcodes[i][1]+j - this.renderPaneShiftAmount, ch: sDiffs[0]}, {line: opcodes[i][3]+j, ch: sDiffs[0]+sDiffs[2]}, {className: "diffGrey"});
+							cMdiff.markText({line: opcodes[i][1]+j - this.renderPaneShiftAmount, ch: sDiffs[0]+sDiffs[2]}, {line: opcodes[i][3]+j, ch: 1000000}, {className: "diffGreyLighter"});
 						}
 					// Deleting
 					} else {
@@ -946,13 +944,13 @@ var ICEcoder = {
 
 					// If inserting or deleting and the diff pane hasn't changed, we need to pad out the line in that pane
 					if (opcodes[i][0] != "replace" && opcodes[i][3] == opcodes[i][4]) {
-						ICEcoder.renderLineStyle.push(["diff", opcodes[i][4], "height", ((opcodes[i][2] - opcodes[i][1] + 1) * cM.defaultTextHeight()) + "px"]);
+						this.renderLineStyle.push(["diff", opcodes[i][4], "height", ((opcodes[i][2] - opcodes[i][1] + 1) * cM.defaultTextHeight()) + "px"]);
 						// Mark the range with empty class
 						cMdiff.markText({line: opcodes[i][4]-1, ch: 0}, {line: opcodes[i][4]-1, ch: 1000000}, {className: "diffNone"});
 					}
 
 					// Finally, set the last amount shifted for this change
-					ICEcoder.renderPaneShiftAmount = (opcodes[i][2] - opcodes[i][4]);
+					this.renderPaneShiftAmount = (opcodes[i][2] - opcodes[i][4]);
 				}
 			}
 		}
@@ -980,16 +978,15 @@ var ICEcoder = {
 			clearTimeout(highlightGitDiffTimeout);
 		}
 		// If we have index data & Git data, after a timeout, if we have a matching path in that Git data
-		if (ICEcoder.indexData && ICEcoder.indexData.gitContent) {
-			highlightGitDiffTimeout = setTimeout(function() {
-				if (ICEcoder.indexData.gitContent[docRoot+ICEcoder.openFiles[ICEcoder.selectedTab-1]]) {
+		if (this.indexData && this.indexData.gitContent) {
+			highlightGitDiffTimeout = setTimeout(function(ic) {
+				if (ic.indexData.gitContent[docRoot+ic.openFiles[ic.selectedTab-1]]) {
 					// Get the CodeMirror instance and clear the gutter for it
-					cM = ICEcoder.getcMInstance();
+					cM = ic.getcMInstance();
 					cM.clearGutter("CodeMirror-linenumbers");
-
 					// Get the baseText and gitText values from the two sources, and split them into lines
 					var mainText = cM ? difflib.stringAsLines(cM.getValue()) : "";
-					var gitText = difflib.stringAsLines(ICEcoder.indexData.gitContent[docRoot+ICEcoder.openFiles[ICEcoder.selectedTab-1]].lastHashContent);
+					var gitText = difflib.stringAsLines(ic.indexData.gitContent[docRoot+ic.openFiles[ic.selectedTab-1]].lastHashContent ?? "");
 
 					// Create a SequenceMatcher instance that diffs the two sets of lines
 					var sm = new difflib.SequenceMatcher(gitText, mainText);
@@ -1050,19 +1047,19 @@ var ICEcoder = {
 						}
 					}
 				}
-			},ICEcoder.loadingFile ? 100 : 0);
+			},this.loadingFile ? 100 : 0, this);
 		}
 	},
 
 	// Update Git diff pane (the diffs between saved content and git commits)
 	updateGitDiffPane: function() {
 		var gitDiffList = "";
-		for (var i=0; i<ICEcoder.indexData.gitDiff.paths.length; i++) {
+		for (var i=0; i<this.indexData.gitDiff.paths.length; i++) {
 			gitDiffList +=
-			'<div class="link" onclick="ICEcoder.toolShowHideToggle(\'git\'); ICEcoder.openFile(\'/' +
-			ICEcoder.indexData.gitDiff.paths[i] +
+			'<div class="link" onclick="this.toolShowHideToggle(\'git\'); this.openFile(\'/' +
+			this.indexData.gitDiff.paths[i] +
 			"')\">" +
-			ICEcoder.indexData.gitDiff.paths[i] +
+			this.indexData.gitDiff.paths[i] +
 			"</div>" +
 			"\n";
 			get("git").innerHTML = gitDiffList + "<br><br>";
@@ -1071,14 +1068,14 @@ var ICEcoder = {
 
 	// Update preview window content
 	updatePreviewWindow: function(thisCM,filepath,filename,fileExt) {
-		if (ICEcoder.previewWindow.location.pathname==filepath) {
+		if (this.previewWindow.location.pathname==filepath) {
 			if (["htm","html","txt"].indexOf(fileExt) > -1) {
-				ICEcoder.previewWindow.document.documentElement.innerHTML = thisCM.getValue();
+				this.previewWindow.document.documentElement.innerHTML = thisCM.getValue();
 			} else if (["md"].indexOf(fileExt) > -1) {
-				ICEcoder.previewWindow.document.documentElement.innerHTML = mmd(thisCM.getValue());
+				this.previewWindow.document.documentElement.innerHTML = mmd(thisCM.getValue());
 			}
 		} else if (["css"].indexOf(fileExt) > -1) {
-			if (ICEcoder.previewWindow.document.documentElement.innerHTML.indexOf(filename) > -1) {
+			if (this.previewWindow.document.documentElement.innerHTML.indexOf(filename) > -1) {
 				var css = thisCM.getValue();
 				var style = document.createElement('style');
 				style.type = 'text/css';
@@ -1088,18 +1085,18 @@ var ICEcoder = {
 				} else {
 					style.appendChild(document.createTextNode(css));
 				}
-				if (ICEcoder.previewWindow.document.getElementById(style.id)) {
-					ICEcoder.previewWindow.document.documentElement.removeChild(ICEcoder.previewWindow.document.getElementById(style.id));
+				if (this.previewWindow.document.getElementById(style.id)) {
+					this.previewWindow.document.documentElement.removeChild(this.previewWindow.document.getElementById(style.id));
 				}
-				ICEcoder.previewWindow.document.documentElement.appendChild(style);
+				this.previewWindow.document.documentElement.appendChild(style);
 			}
 		}
 		// Do the pesticide plugin if it exists
-		try {ICEcoder.doPesticide();} catch(err) {};
+		try {this.doPesticide();} catch(err) {};
 		// Do the stats.js plugin if it exists
-		try {ICEcoder.doStatsJS('update');} catch(err) {};
+		try {this.doStatsJS('update');} catch(err) {};
 		// Do the responsive plugin if it exists
-		try {ICEcoder.doResponsive();} catch(err) {};
+		try {this.doResponsive();} catch(err) {};
 	},
 
 	// Clean up our loaded code
@@ -1107,26 +1104,26 @@ var ICEcoder = {
 		var cM, cMdiff, thisCM, content;
 
 		// Replace any temp /textarea value
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		content = thisCM.getValue();
 		content = content.replace(/<ICEcoder:\/:textarea>/g,'<\/textarea>');
 
 		// Then set the content in the editor & clear the history
 		thisCM.setValue(content);
 		thisCM.clearHistory();
-		ICEcoder.savedPoints[ICEcoder.selectedTab-1] = thisCM.changeGeneration();
-		ICEcoder.savedContents[ICEcoder.selectedTab-1] = thisCM.getValue();
+		this.savedPoints[this.selectedTab-1] = thisCM.changeGeneration();
+		this.savedContents[this.selectedTab-1] = thisCM.getValue();
 	},
 
 	// Undo last change
 	undo: function() {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		thisCM.undo();
 	},
 
@@ -1134,9 +1131,9 @@ var ICEcoder = {
 	redo: function() {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		thisCM.redo();
 	},
 
@@ -1144,13 +1141,13 @@ var ICEcoder = {
 	indent: function(moreLess) {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		if (moreLess=="more") {
-			ICEcoder.content.contentWindow.CodeMirror.commands.indentMore(thisCM);
+			this.content.contentWindow.CodeMirror.commands.indentMore(thisCM);
 		} else {
-			ICEcoder.content.contentWindow.CodeMirror.commands.indentLess(thisCM);
+			this.content.contentWindow.CodeMirror.commands.indentLess(thisCM);
 		}
 	},
 
@@ -1158,9 +1155,9 @@ var ICEcoder = {
 	moveLines: function(dir) {
 		var cM, cMdiff, thisCM, lineStart, lineEnd, swapLineNo, swapLine;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
 		// Get start & end lines plus the line we'll swap with
 		lineStart = thisCM.getCursor('start');
@@ -1199,9 +1196,9 @@ var ICEcoder = {
 	highlightLine: function(line) {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		thisCM.setSelection({line:line,ch:0}, {line:line,ch:thisCM.lineInfo(line).text.length});
 	},
 
@@ -1210,8 +1207,8 @@ var ICEcoder = {
 		var cM, cMdiff, thisCM;
 
 		if (!(/iPhone|iPad|iPod/i.test(navigator.userAgent))) {
-			cM = ICEcoder.getcMInstance();
-			cMdiff = ICEcoder.getcMdiffInstance();
+			cM = this.getcMInstance();
+			cMdiff = this.getcMdiffInstance();
 			thisCM = diff ? cMdiff : cM;
 			if (thisCM) {
 				thisCM.focus();
@@ -1226,31 +1223,31 @@ var ICEcoder = {
 		lineNo = lineNo ? lineNo-1 : get('goToLineNo').value-1;
 		charNo = charNo ? charNo : 0;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
-		ICEcoder.scrollingOnLine = thisCM.getCursor().line;
+		this.scrollingOnLine = thisCM.getCursor().line;
 
 		// Scroll cursor into middle of view
-		if ("undefined" != typeof ICEcoder.scrollInt) {
-			clearInterval(ICEcoder.scrollInt);
+		if ("undefined" != typeof this.scrollInt) {
+			clearInterval(this.scrollInt);
 		}
 
-		ICEcoder.scrollInt = setInterval(function() {
-			ICEcoder.scrollingOnLine = ICEcoder.scrollingOnLine+((lineNo-ICEcoder.scrollingOnLine)/5);
-			thisCM.scrollTo(0,(thisCM.defaultTextHeight()*ICEcoder.scrollingOnLine)-(thisCM.getScrollInfo().clientHeight/10));
-			ICEcoder.setMinimapLayout(thisCM);
-			if (Math.round(ICEcoder.scrollingOnLine) == lineNo) {
-				clearInterval(ICEcoder.scrollInt);
+		this.scrollInt = setInterval(function(ic) {
+			ic.scrollingOnLine = ic.scrollingOnLine+((lineNo-ic.scrollingOnLine)/5);
+			thisCM.scrollTo(0,(thisCM.defaultTextHeight()*ic.scrollingOnLine)-(thisCM.getScrollInfo().clientHeight/10));
+			ic.setMinimapLayout(thisCM);
+			if (Math.round(ic.scrollingOnLine) == lineNo) {
+				clearInterval(ic.scrollInt);
 			}
-		},10);
+		},10,this);
 
 		thisCM.setCursor(lineNo, charNo);
 		if (!noFocus) {
-			ICEcoder.focus();
+			this.focus();
 			// Also do this after a 0ms tickover incase DOM wasn't ready
-			setTimeout(function(){ICEcoder.focus();},0);
+			setTimeout(function(ic){ic.focus();},0,this);
 		}
 		return false;
 	},
@@ -1259,25 +1256,25 @@ var ICEcoder = {
 	lineCommentToggle: function() {
 		var cM, cMdiff, thisCM, cursorPos, linePos, lineContent, lCLen;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
 		cursorPos = thisCM.getCursor().ch;
 		linePos = thisCM.getCursor().line;
 		lineContent = thisCM.getLine(linePos);
 		lCLen = lineContent.length;
 
-		ICEcoder.lineCommentToggleSub(thisCM, cursorPos, linePos, lineContent, lCLen);
+		this.lineCommentToggleSub(thisCM, cursorPos, linePos, lineContent, lCLen);
 	},
 
 	// Wrap our selected text/cursor with tags
 	tagWrapper: function(tag) {
 		var cM, cMdiff, thisCM, tagStart, tagEnd, startLine, endLine;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		tagStart = tag;
 		tagEnd = tag;
 		if (tag=='div') {
@@ -1310,9 +1307,9 @@ var ICEcoder = {
 	addLineBreakAtEnd: function(line) {
 		var cM,cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		if (!line) {line = thisCM.getCursor().line};
 		thisCM.replaceRange(thisCM.getLine(line)+"<br>",{line:line,ch:0},{line:line,ch:1000000});
 	},
@@ -1321,9 +1318,9 @@ var ICEcoder = {
 	insertLineBefore: function(line) {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		if (!line) {line = thisCM.getCursor().line};
 		thisCM.operation(function() {
 			thisCM.replaceRange("\n"+thisCM.getLine(line),{line:line,ch:0},{line:line,ch:1000000});
@@ -1336,9 +1333,9 @@ var ICEcoder = {
 	insertLineAfter: function(line) {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		if (!line) {line = thisCM.getCursor().line};
 		thisCM.operation(function() {
 			thisCM.replaceRange(thisCM.getLine(line)+"\n",{line:line,ch:0},{line:line,ch:1000000});
@@ -1350,9 +1347,9 @@ var ICEcoder = {
 	duplicateLines: function(line) {
 		var cM, cMdiff, thisCM, ch, lineExtra, userSelStart, userSelEnd, lineBreak;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		if (!line && thisCM.somethingSelected()) {
 			userSelStart = thisCM.getCursor('start');
 			userSelEnd = thisCM.getCursor('end');
@@ -1371,9 +1368,9 @@ var ICEcoder = {
 	removeLines: function(line) {
 		var cM, cMdiff, thisCM, ch;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		if (!line && thisCM.somethingSelected()) {
 			thisCM.replaceSelection("","end");
 		} else {
@@ -1388,15 +1385,15 @@ var ICEcoder = {
 	jumpToDefinition: function() {
 		var cM, cMdiff, thisCM, tokenString, defVars;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		tokenString = thisCM.getTokenAt(thisCM.getCursor()).string;
 
-		if (thisCM.somethingSelected() && ICEcoder.origCurorPos) {
-			thisCM.setCursor(ICEcoder.origCurorPos);
+		if (thisCM.somethingSelected() && this.origCurorPos) {
+			thisCM.setCursor(this.origCurorPos);
 		} else {
-			ICEcoder.origCurorPos = thisCM.getCursor();
+			this.origCurorPos = thisCM.getCursor();
 			defVars = [
 				"var "+tokenString,
 				"function "+tokenString,
@@ -1408,7 +1405,7 @@ var ICEcoder = {
 				"def "+tokenString,
 				"class "+tokenString];
 			for (var i=0; i<defVars.length; i++) {
-				if (ICEcoder.findReplace(defVars[i],false,false)) {
+				if (this.findReplace(defVars[i],false,false)) {
 					break;
 				}
 			}
@@ -1419,24 +1416,24 @@ var ICEcoder = {
 	updateFunctionClassList: function() {
 		var cM, functionClassList;
 
-		cM = ICEcoder.getcMInstance();
-		ICEcoder.functionClassList = [];
+		cM = this.getcMInstance();
+		this.functionClassList = [];
 
 		if(cM) {
 			// For each line, establish if there's a function or class item on it
 			cM.doc.eachLine(function(handle){ICEcoder.updateFunctionClassListItems(handle)});
-			// Update the list displayed
-			setTimeout(function() {
+			// // Update the list displayed
+			setTimeout(function(ic) {
 				functionClassList = '';
 				// For each of the items in our array, if it's verified, add it into string
-				for (var i=0; i<ICEcoder.functionClassList.length; i++) {
-					if (ICEcoder.functionClassList[i]['verified']) {
-						functionClassList += '<div onclick="ICEcoder.goToLine('+(ICEcoder.functionClassList[i]['line']+1)+')" class="functionClassListItem"><span class="name">'+ICEcoder.functionClassList[i]['name']+'</span><br><span class="params">'+ICEcoder.functionClassList[i]['params']+'</span></div>';
+				for (var i=0; i<ic.functionClassList.length; i++) {
+					if (ic.functionClassList[i]['verified']) {
+						functionClassList += '<div onclick="this.goToLine('+(ic.functionClassList[i]['line']+1)+')" class="functionClassListItem"><span class="name">'+ic.functionClassList[i]['name']+'</span><br><span class="params">'+ic.functionClassList[i]['params']+'</span></div>';
 					}
 				}
 				// Update our list
 				get('functionClassList').innerHTML = functionClassList;
-			},0);
+			},0,this);
 		}
 	},
 
@@ -1444,7 +1441,7 @@ var ICEcoder = {
 	updateFunctionClassListItems: function(handle) {
 		var cM, functionClassText;
 
-		cM = ICEcoder.getcMInstance();
+		cM = this.getcMInstance();
 		functionClassText = "";
 		// Get function declaration lines
 		if (handle.text.indexOf("function ") > -1 && handle.text.replace(/\$function/g,"").indexOf("function ") > -1) {
@@ -1459,24 +1456,24 @@ var ICEcoder = {
 
 		// Push items into array
 		if (functionClassText[0] != "") {
-			ICEcoder.functionClassList.push({
+			this.functionClassList.push({
 				line: cM.getLineNumber(handle),
 				name: functionClassText[0],
 				params: "("+(functionClassText[1] ? functionClassText[1].replace(/[,]/g,", ") : ""),
 				verified: false
 			});
 			// After a 0ms tickover, verify the item
-			setTimeout(function() {
+			setTimeout(function(ic) {
 				// If we're defining a function/class
 				if (!handle.styles || (handle.styles && handle.styles.indexOf('def') > -1 && cM.getLineNumber(handle))) {
 					// Find our item in the array and mark it as verified
-					for (var i=0; i< ICEcoder.functionClassList.length; i++) {
-						if (ICEcoder.functionClassList[i]['line'] == cM.getLineNumber(handle)) {
-							ICEcoder.functionClassList[i]['verified'] = true;
+					for (var i=0; i< ic.functionClassList.length; i++) {
+						if (ic.functionClassList[i]['line'] == cM.getLineNumber(handle)) {
+							ic.functionClassList[i]['verified'] = true;
 						}
 					};
 				}
-			},0);
+			},0,this);
 		}
 	},
 
@@ -1484,19 +1481,19 @@ var ICEcoder = {
 	setMinimap: function() {
 		var cM;
 
-		cM = ICEcoder.getcMInstance();
+		cM = this.getcMInstance();
 
 		if(cM) {
 			// Get syntax formatted content and output to miniMapContent
-			ICEcoder.content.contentWindow.CodeMirror.runMode(cM.getValue(),cM.getOption('mode'),get('miniMapContent'));
+			this.content.contentWindow.CodeMirror.runMode(cM.getValue(),cM.getOption('mode'),get('miniMapContent'));
 			// white-space: pre vs pre-wrap depending on line wrapping
-			get('miniMapContent').innerHTML = '<div class="cm-s-'+ICEcoder.theme+'" style="font-family: monospace; white-space: '+(ICEcoder.lineWrapping == true ? 'pre-wrap' : 'pre')+'; font-size: 2px; line-height: 2px">'+get('miniMapContent').innerHTML+'</div>';
+			get('miniMapContent').innerHTML = '<div class="cm-s-'+this.theme+'" style="font-family: monospace; white-space: '+(this.lineWrapping == true ? 'pre-wrap' : 'pre')+'; font-size: 2px; line-height: 2px">'+get('miniMapContent').innerHTML+'</div>';
 			get('miniMapContent').innerHTML = get('miniMapContent').innerHTML.replace(/\<span /g,'<span style="font-size: 2px; font-family: monospace" ');
 
 			get('miniMapContainer').innerHTML = '<div style="position: absolute; display: inline-block; top: '+
-				ICEcoder.miniMapBoxTop+
+				this.miniMapBoxTop+
 				'px; left: 0; width: 200px; height: '+
-				ICEcoder.miniMapBoxHeight+'px; background: rgba(0,198,255,0.1); z-index: 1; cursor: pointer" id="miniMapBox"></div>';
+				this.miniMapBoxHeight+'px; background: rgba(0,198,255,0.1); z-index: 1; cursor: pointer" id="miniMapBox"></div>';
 
 			var elem = get('miniMapBox');
 			var draggie = new Draggabilly( elem, {
@@ -1509,18 +1506,18 @@ var ICEcoder = {
 				maxHeight = parseInt(get('docExplorer').style.height,10) <= parseInt(get('miniMapContent').getBoundingClientRect().height,10)
 					? parseInt(get('docExplorer').style.height,10)
 					: parseInt(get('miniMapContent').getBoundingClientRect().height,10);
-				newPerc = (this.position.y/(maxHeight-ICEcoder.miniMapBoxHeight));
+				newPerc = (this.position.y/(maxHeight-this.miniMapBoxHeight));
 				yPos = (cM.getScrollInfo().height-cM.getScrollInfo().clientHeight)*newPerc;
 				cM.scrollTo(0,yPos); // this.position.y
 			});
 			draggie.on( 'pointerDown', function( event, pointer ) {
-				ICEcoder.mouseDownMinimap = true;
+				this.mouseDownMinimap = true;
 			});
 			draggie.on( 'pointerUp', function( event, pointer ) {
-				ICEcoder.mouseDownMinimap = false;
+				this.mouseDownMinimap = false;
 			});
 
-			ICEcoder.setMinimapLayout(cM);
+			this.setMinimapLayout(cM);
 
 			get('docExplorer').style.right = "-220px";
 		}
@@ -1533,7 +1530,7 @@ var ICEcoder = {
 		if (get('miniMapBox') && thisCM) {
 
 			// Get CM instance and percentage through document
-			cM = ICEcoder.getcMInstance();
+			cM = this.getcMInstance();
 			percThru = thisCM.getScrollInfo().top/(thisCM.getScrollInfo().height-thisCM.getScrollInfo().clientHeight);
 
 			// If content to display has a greater height than docExplorer
@@ -1541,10 +1538,10 @@ var ICEcoder = {
 				// Set the minimap container to same height
 				get('miniMapContainer').style.height = parseInt(get('docExplorer').style.height,10)+"px";
 				// Set box height relative to font height
-				ICEcoder.miniMapBoxHeight = (parseInt(get('docExplorer').style.height,10)/cM.defaultTextHeight()*2);
-				get('miniMapBox').style.height = ICEcoder.miniMapBoxHeight + "px";
+				this.miniMapBoxHeight = (parseInt(get('docExplorer').style.height,10)/cM.defaultTextHeight()*2);
+				get('miniMapBox').style.height = this.miniMapBoxHeight + "px";
 				// Set top position of it according to percentage through document and account for height of nav box
-				ICEcoder.miniMapBoxTop = (percThru*parseInt(get('docExplorer').style.height,10)) - (percThru*ICEcoder.miniMapBoxHeight);
+				this.miniMapBoxTop = (percThru*parseInt(get('docExplorer').style.height,10)) - (percThru*this.miniMapBoxHeight);
 				// Set the minimap position according to scroll position (used if we move cursor in document)
 				get('miniMapContent').style.marginTop = (-(parseInt(get('miniMapContent').getBoundingClientRect().height,10) - parseInt(get('docExplorer').style.height,10))*percThru) + "px";
 			// If less than the docExplorer height
@@ -1552,16 +1549,16 @@ var ICEcoder = {
 				// Set height of container to that of the content
 				get('miniMapContainer').style.height = parseInt(get('miniMapContent').getBoundingClientRect().height,10)+"px";
 				// Set box height relative to font height
-				ICEcoder.miniMapBoxHeight = (parseInt(get('docExplorer').style.height,10)/cM.defaultTextHeight()*2);
-				get('miniMapBox').style.height = ICEcoder.miniMapBoxHeight + "px";
+				this.miniMapBoxHeight = (parseInt(get('docExplorer').style.height,10)/cM.defaultTextHeight()*2);
+				get('miniMapBox').style.height = this.miniMapBoxHeight + "px";
 				// Set top position of it according to percentage through minimap and account for height of nav box
-				ICEcoder.miniMapBoxTop = (percThru*parseInt(get('miniMapContainer').getBoundingClientRect().height,10)) - (percThru*ICEcoder.miniMapBoxHeight);
+				this.miniMapBoxTop = (percThru*parseInt(get('miniMapContainer').getBoundingClientRect().height,10)) - (percThru*this.miniMapBoxHeight);
 				// Set the minimap position to 0
 				get('miniMapContent').style.marginTop = 0;
 			}
 			// Can set the Minimap nav position if not dragging it (let Draggabilly handle that)
-			if (!ICEcoder.mouseDownMinimap) {
-				get('miniMapBox').style.top = ICEcoder.miniMapBoxTop + "px";
+			if (!this.mouseDownMinimap) {
+				get('miniMapBox').style.top = this.miniMapBoxTop + "px";
 			}
 		}
 	},
@@ -1570,20 +1567,20 @@ var ICEcoder = {
 	autocomplete: function() {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
-		ICEcoder.content.contentWindow.CodeMirror.commands.autocomplete(thisCM);
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		this.content.contentWindow.CodeMirror.commands.autocomplete(thisCM);
 	},
 
 	// Paste a URL, locally or absolutely if CTRL/Cmd key down
 	pasteURL: function(url) {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
-		if(ICEcoder.draggingWithKey == "CTRL") {
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		if(this.draggingWithKey == "CTRL") {
 			url = window.location.protocol + "//" + window.location.hostname + url;
 		}
 		thisCM.replaceSelection(url,"around");
@@ -1593,18 +1590,18 @@ var ICEcoder = {
 	searchForSelected: function() {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
-		if (ICEcoder.caretLocType) {
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		if (this.caretLocType) {
 			if (thisCM.getSelection() != "") {
-				var searchPrefix = ICEcoder.caretLocType.toLowerCase()+" ";
-				if (ICEcoder.caretLocType=="Content") {
+				var searchPrefix = this.caretLocType.toLowerCase()+" ";
+				if (this.caretLocType=="Content") {
 					searchPrefix = "";
 				}
 				window.open("http://www.google.com/#output=search&q="+searchPrefix+thisCM.getSelection());
 			} else {
-				ICEcoder.message(t['No text selected...']);
+				this.message(t['No text selected...']);
 			}
 		}
 	},
@@ -1618,7 +1615,7 @@ var ICEcoder = {
 		var selElem, sPN, fileFolder, goElem,
 
 		// Get selected elem, the parent node of that, if it's a file/folder and set elem to go to next
-		selElem = get('filesFrame').contentWindow.document.getElementById(ICEcoder.selectedFiles[ICEcoder.selectedFiles.length-1]+"_perms").parentNode;
+		selElem = get('filesFrame').contentWindow.document.getElementById(this.selectedFiles[this.selectedFiles.length-1]+"_perms").parentNode;
 		sPN = selElem.parentNode;
 		fileFolder = selElem.onmouseover.toString().indexOf("'folder'") > -1 ? "folder" : "file";
 		goElem = false;
@@ -1646,17 +1643,17 @@ var ICEcoder = {
 		}
 		if (action == "left") {
 			if (fileFolder == "folder" && sPN.parentNode.previousSibling) {
-				ICEcoder.openCloseDir(selElem,false);				// contract dir
+				this.openCloseDir(selElem,false);				// contract dir
 			}
 		}
 		if (action == "right" || action == "enter") {
 			fileFolder == "folder"
-				? ICEcoder.openCloseDir(selElem,true)				// expand dir
-				: ICEcoder.openFile(selElem.childNodes[1].id.replace(/\|/g,"/"));	// open file
+				? this.openCloseDir(selElem,true)				// expand dir
+				: this.openFile(selElem.childNodes[1].id.replace(/\|/g,"/"));	// open file
 		}
 		if (goElem && goElem.childNodes[1]) {
-			ICEcoder.overFileFolder(fileFolder, goElem.childNodes[1].id);		// If we have an elem to go to, select it
-			ICEcoder.selectFileFolder(evt);
+			this.overFileFolder(fileFolder, goElem.childNodes[1].id);		// If we have an elem to go to, select it
+			this.selectFileFolder(evt);
 		}
 	},
 
@@ -1665,8 +1662,8 @@ var ICEcoder = {
 		var node, d;
 
 		dir.onclick = function(event) {
-			if(!event.ctrlKey && !ICEcoder.cmdKey) {
-				ICEcoder.openCloseDir(this,!load);
+			if(!event.ctrlKey && !this.cmdKey) {
+				this.openCloseDir(this,!load);
 			}
 		};
 		node = dir.parentNode;
@@ -1677,7 +1674,7 @@ var ICEcoder = {
 			dir.parentNode.className = dir.className = d ? "pft-directory dirOpen" : "pft-directory";
 		}
 		if (load) {
-			ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href = iceLoc+"/lib/get-branch.php?location="+dir.childNodes[1].id+"&csrf="+ICEcoder.csrf;
+			this.filesFrame.contentWindow.frames['fileControl'].location.href = iceLoc+"/lib/get-branch.php?location="+dir.childNodes[1].id+"&csrf="+this.csrf;
 		} else if(node.tagName == "UL") {
 			node.parentNode.removeChild(node);
 		}
@@ -1686,8 +1683,8 @@ var ICEcoder = {
 
 	// Note which files or folders we are over on mouseover/mouseout
 	overFileFolder: function(type, link) {
-		ICEcoder.thisFileFolderType=type;
-		ICEcoder.thisFileFolderLink=link;
+		this.thisFileFolderType=type;
+		this.thisFileFolderLink=link;
 	},
 
 	// Detect and return dir/file/false for this DOM ref (false for not found)
@@ -1709,30 +1706,30 @@ var ICEcoder = {
 		var tgtFile, shortURL, selecting, dirList, lastFileClicked, startFile, endFile, thisFileObj;
 
 		// If we've clicked somewhere other than a file/folder
-		if (ICEcoder.thisFileFolderLink=="") {
-			if (!ctrlSim && !evt.ctrlKey && !ICEcoder.cmdKey) {
-				ICEcoder.deselectAllFiles();
+		if (this.thisFileFolderLink=="") {
+			if (!ctrlSim && !evt.ctrlKey && !this.cmdKey) {
+				this.deselectAllFiles();
 			}
-		} else if (ICEcoder.thisFileFolderLink) {
+		} else if (this.thisFileFolderLink) {
 			// Get file URL, with pipes instead of slashes & target DOM elem
-			shortURL = ICEcoder.thisFileFolderLink.replace(/\//g,"|");
-			tgtFile = ICEcoder.filesFrame.contentWindow.document.getElementById(shortURL);
+			shortURL = this.thisFileFolderLink.replace(/\//g,"|");
+			tgtFile = this.filesFrame.contentWindow.document.getElementById(shortURL);
 
 			// If we have the CTRL/Cmd key down
-			if (ctrlSim || evt.ctrlKey || ICEcoder.cmdKey) {
+			if (ctrlSim || evt.ctrlKey || this.cmdKey) {
 				// Deselect or select file
-				if (ICEcoder.selectedFiles.indexOf(shortURL)>-1) {
-					ICEcoder.selectDeselectFile('deselect',tgtFile);
-					ICEcoder.selectedFiles.splice(ICEcoder.selectedFiles.indexOf(shortURL),1);
+				if (this.selectedFiles.indexOf(shortURL)>-1) {
+					this.selectDeselectFile('deselect',tgtFile);
+					this.selectedFiles.splice(this.selectedFiles.indexOf(shortURL),1);
 				} else {
-					ICEcoder.selectDeselectFile('select',tgtFile);
-					ICEcoder.selectedFiles.push(shortURL);
+					this.selectDeselectFile('select',tgtFile);
+					this.selectedFiles.push(shortURL);
 				}
 			// Select from last click to this one
 			} else if (shiftSim || evt.shiftKey) {
 				selecting = false;
 				dirList = tgtFile.parentNode.parentNode.parentNode;
-				lastFileClicked = ICEcoder.selectedFiles[ICEcoder.selectedFiles.length-1];
+				lastFileClicked = this.selectedFiles[this.selectedFiles.length-1];
 
 				// Prefix numbers with up to 20 leading zeros
 				// This is so we can have some kind of natural comparison on the regex below
@@ -1743,62 +1740,62 @@ var ICEcoder = {
 				startFile = shortURL.replace(/\d+/g, prefixer) < lastFileClicked.replace(/\d+/g, prefixer) ? shortURL : lastFileClicked;
 				endFile = shortURL.replace(/\d+/g, prefixer) > lastFileClicked.replace(/\d+/g, prefixer) ? shortURL : lastFileClicked;
 
-				if (ICEcoder.selectedFiles.length > 0 && startFile.substr(0,startFile.lastIndexOf("|")) == endFile.substr(0,endFile.lastIndexOf("|"))) {
+				if (this.selectedFiles.length > 0 && startFile.substr(0,startFile.lastIndexOf("|")) == endFile.substr(0,endFile.lastIndexOf("|"))) {
 					for (var i=0; i<1000000; i+=2) {
 						if(dirList.childNodes[i].nodeName != "LI") {i++;};
 						thisFileObj = dirList.childNodes[i].childNodes[0].childNodes[1];
 						if (thisFileObj.id == startFile) {
 							selecting = true;
 						}
-						if (selecting==true && ICEcoder.selectedFiles.indexOf(thisFileObj.id)==-1) {
-							ICEcoder.selectDeselectFile('select',thisFileObj);
-							ICEcoder.selectedFiles.push(thisFileObj.id);
+						if (selecting==true && this.selectedFiles.indexOf(thisFileObj.id)==-1) {
+							this.selectDeselectFile('select',thisFileObj);
+							this.selectedFiles.push(thisFileObj.id);
 						}
 						if (thisFileObj.id == endFile) {
 							break;
 						}
 					}
 				} else {
-					ICEcoder.selectDeselectFile('select',tgtFile);
-					ICEcoder.selectedFiles.push(shortURL);
+					this.selectDeselectFile('select',tgtFile);
+					this.selectedFiles.push(shortURL);
 				}
 			// We are single clicking
 			} else {
-				ICEcoder.deselectAllFiles();
+				this.deselectAllFiles();
 
 				// Add our URL and highlight the file
-				ICEcoder.selectDeselectFile('select',tgtFile);
-				ICEcoder.selectedFiles.push(shortURL);
+				this.selectDeselectFile('select',tgtFile);
+				this.selectedFiles.push(shortURL);
 			}
 		}
 
 		// If in GitHub mode, update the selected count and button colours
-		if (ICEcoder.githubDiff) {
-			get('githubNavSelectedCount').innerHTML	= "Selected: " + ICEcoder.selectedFiles.length;
-			get('githubNavCommit').style.color		= ICEcoder.selectedFiles.length > 0 ? "#fff" : "#333";
-			get('githubNavCommit').style.background	= ICEcoder.selectedFiles.length > 0 ? "#2187e7" : "#555";
-			get('githubNavSelectedCount').style.color	= ICEcoder.selectedFiles.length > 0 ? "#fff" : "#333";
-			get('githubNavPull').style.color		= ICEcoder.selectedFiles.length > 0 ? "#fff" : "#333";
-			get('githubNavPull').style.background	= ICEcoder.selectedFiles.length > 0 ? "#2187e7" : "#555";
+		if (this.githubDiff) {
+			get('githubNavSelectedCount').innerHTML	= "Selected: " + this.selectedFiles.length;
+			get('githubNavCommit').style.color		= this.selectedFiles.length > 0 ? "#fff" : "#333";
+			get('githubNavCommit').style.background	= this.selectedFiles.length > 0 ? "#2187e7" : "#555";
+			get('githubNavSelectedCount').style.color	= this.selectedFiles.length > 0 ? "#fff" : "#333";
+			get('githubNavPull').style.color		= this.selectedFiles.length > 0 ? "#fff" : "#333";
+			get('githubNavPull').style.background	= this.selectedFiles.length > 0 ? "#2187e7" : "#555";
 		}
 
 		// Adjust the file & replace select dropdown values accordingly
-		document.findAndReplace.target[2].innerHTML = !ICEcoder.selectedFiles[0] ? t['all files'] : t['selected files'];
-		document.findAndReplace.target[3].innerHTML = !ICEcoder.selectedFiles[0] ? t['all filenames'] : t['selected filenames'];
+		document.findAndReplace.target[2].innerHTML = !this.selectedFiles[0] ? t['all files'] : t['selected files'];
+		document.findAndReplace.target[3].innerHTML = !this.selectedFiles[0] ? t['all filenames'] : t['selected filenames'];
 
 		// Hide the file menu incase it's showing
-		ICEcoder.hideFileMenu();
+		this.hideFileMenu();
 	},
 
 	// Deselect all files
 	deselectAllFiles: function() {
 		var tgtFile;
 
-		for (var i=0;i<ICEcoder.selectedFiles.length;i++) {
-			tgtFile = ICEcoder.filesFrame.contentWindow.document.getElementById(ICEcoder.selectedFiles[i]);
-			ICEcoder.selectDeselectFile('deselect',tgtFile);
+		for (var i=0;i<this.selectedFiles.length;i++) {
+			tgtFile = this.filesFrame.contentWindow.document.getElementById(this.selectedFiles[i]);
+			this.selectDeselectFile('deselect',tgtFile);
 		}
-		ICEcoder.selectedFiles.length = 0;
+		this.selectedFiles.length = 0;
 	},
 
 	// Select or deselect file
@@ -1806,17 +1803,17 @@ var ICEcoder = {
 		var isOpen;
 
 		if (file) {
-			isOpen = ICEcoder.openFiles.indexOf(file.id.replace(/\|/g,"/")) > -1 ? true : false;
+			isOpen = this.openFiles.indexOf(file.id.replace(/\|/g,"/")) > -1 ? true : false;
 
-			if (ICEcoder.openFiles[ICEcoder.selectedTab-1] == file.id.replace(/\|/g,"/")) {
+			if (this.openFiles[this.selectedTab-1] == file.id.replace(/\|/g,"/")) {
 				file.style.backgroundColor = action=="select"
-				? ICEcoder.tabBGselected : ICEcoder.tabBGcurrent;
+				? this.tabBGselected : this.tabBGcurrent;
 			} else {
 				file.style.backgroundColor = action=="select"
-				? ICEcoder.tabBGselected : file.style.backgroundColor = isOpen
-				? ICEcoder.tabBGopen : ICEcoder.tabBGnormal;
+				? this.tabBGselected : file.style.backgroundColor = isOpen
+				? this.tabBGopen : this.tabBGnormal;
 			}
-			file.style.color = action=="select" ? ICEcoder.tabFGselected : ICEcoder.tabFGnormalFile;
+			file.style.color = action=="select" ? this.tabFGselected : this.tabFGnormalFile;
 		}
 	},
 
@@ -1824,40 +1821,40 @@ var ICEcoder = {
 	boxSelect: function(evt, mouseAction) {
 		var fmDragBox, positive;
 
-		fmDragBox = ICEcoder.filesFrame.contentWindow.document.getElementById('fmDragBox');
+		fmDragBox = this.filesFrame.contentWindow.document.getElementById('fmDragBox');
 
 		// On mouse down, set start X & Y and reset first and last items in box area select
 		if (mouseAction == "down") {
-			ICEcoder.fmDragBoxStartX = ICEcoder.mouseX;
-			ICEcoder.fmDragBoxStartY = ICEcoder.mouseY;
-			ICEcoder.fmDragSelectFirst = "";
-			ICEcoder.fmDragSelectLast = "";
+			this.fmDragBoxStartX = this.mouseX;
+			this.fmDragBoxStartY = this.mouseY;
+			this.fmDragSelectFirst = "";
+			this.fmDragSelectLast = "";
 		}
 
 		// On mouse drag, state we're dragging, set the box size and position properties and select files
-		if(ICEcoder.mouseDown && !ICEcoder.mouseDownInCM && mouseAction == "drag") {
-			ICEcoder.fmDraggedBox = true;
+		if(this.mouseDown && !this.mouseDownInCM && mouseAction == "drag") {
+			this.fmDraggedBox = true;
 
 			// Handle X-axis properties
-			positive = ICEcoder.mouseX-ICEcoder.fmDragBoxStartX > 0;
-			fmDragBox.style.left = (positive ? ICEcoder.fmDragBoxStartX : ICEcoder.mouseX) + "px";
-			fmDragBox.style.width = Math.abs(ICEcoder.mouseX-ICEcoder.fmDragBoxStartX) + "px";
+			positive = this.mouseX-this.fmDragBoxStartX > 0;
+			fmDragBox.style.left = (positive ? this.fmDragBoxStartX : this.mouseX) + "px";
+			fmDragBox.style.width = Math.abs(this.mouseX-this.fmDragBoxStartX) + "px";
 
 			// Handle Y-axis properties
-			positive = ICEcoder.mouseY-ICEcoder.fmDragBoxStartY > 0;
-			fmDragBox.style.top = (positive ? ICEcoder.fmDragBoxStartY-70 : ICEcoder.mouseY-70) + "px";
-			fmDragBox.style.height = Math.abs(ICEcoder.mouseY-ICEcoder.fmDragBoxStartY) + "px";
+			positive = this.mouseY-this.fmDragBoxStartY > 0;
+			fmDragBox.style.top = (positive ? this.fmDragBoxStartY-70 : this.mouseY-70) + "px";
+			fmDragBox.style.height = Math.abs(this.mouseY-this.fmDragBoxStartY) + "px";
 
 			// Select the files
-			if (ICEcoder.thisFileFolderLink != "") {
-				if (ICEcoder.fmDragSelectFirst == "") {
-					ICEcoder.fmDragSelectFirst = ICEcoder.thisFileFolderLink;
-					ICEcoder.overFileFolder(ICEcoder.thisFileFolderLink.indexOf('.') > 0 ? 'file' : 'folder', ICEcoder.fmDragSelectFirst);
-					ICEcoder.selectFileFolder(evt);
+			if (this.thisFileFolderLink != "") {
+				if (this.fmDragSelectFirst == "") {
+					this.fmDragSelectFirst = this.thisFileFolderLink;
+					this.overFileFolder(this.thisFileFolderLink.indexOf('.') > 0 ? 'file' : 'folder', this.fmDragSelectFirst);
+					this.selectFileFolder(evt);
 				} else {
-					ICEcoder.fmDragSelectLast = ICEcoder.thisFileFolderLink;
-					ICEcoder.overFileFolder(ICEcoder.thisFileFolderLink.indexOf('.') > 0 ? 'file' : 'folder', ICEcoder.fmDragSelectLast);
-					ICEcoder.selectFileFolder(evt,false,'shiftSim');
+					this.fmDragSelectLast = this.thisFileFolderLink;
+					this.overFileFolder(this.thisFileFolderLink.indexOf('.') > 0 ? 'file' : 'folder', this.fmDragSelectLast);
+					this.selectFileFolder(evt,false,'shiftSim');
 				}
 			}
 		}
@@ -1871,19 +1868,19 @@ var ICEcoder = {
 
 	// Create a new file (start & instant save)
 	newFile: function() {
-		ICEcoder.newTab('alsoSave');
+		this.newTab('alsoSave');
 	},
 
 	// Create a new folder
 	newFolder: function() {
 		var shortURL, newFolder;
 
-		shortURL = ICEcoder.selectedFiles[ICEcoder.selectedFiles.length-1].replace(/\|/g,"/");
-		newFolder = ICEcoder.getInput('Enter new folder name at '+shortURL,'');
+		shortURL = this.selectedFiles[this.selectedFiles.length-1].replace(/\|/g,"/");
+		newFolder = this.getInput('Enter new folder name at '+shortURL,'');
 		if (newFolder) {
 			newFolder = (shortURL + "/" + newFolder).replace(/\/\//,"/");
-			ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=newFolder&csrf="+ICEcoder.csrf,encodeURIComponent(newFolder.replace(/\//g,"|")));
-			ICEcoder.serverMessage('<b>'+t['Creating Folder']+'</b><br>'+newFolder);
+			this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=newFolder&csrf="+this.csrf,encodeURIComponent(newFolder.replace(/\//g,"|")));
+			this.serverMessage('<b>'+t['Creating Folder']+'</b><br>'+newFolder);
 		}
 	},
 
@@ -1917,44 +1914,44 @@ var ICEcoder = {
 		var flSplit, line, shortURL, canOpenFile;
 
 		if ("undefined" != typeof fileLink) {
-			flSplit = ICEcoder.returnFileAndLine(fileLink);
+			flSplit = this.returnFileAndLine(fileLink);
 			fileLink = flSplit[0];
 			line     = flSplit[1];
 		}
 
 		if (fileLink) {
-			ICEcoder.thisFileFolderLink=fileLink;
-			ICEcoder.thisFileFolderType="file";
+			this.thisFileFolderLink=fileLink;
+			this.thisFileFolderType="file";
 		}
-		if (ICEcoder.thisFileFolderLink != "/[NEW]" && ICEcoder.isOpen(ICEcoder.thisFileFolderLink)!==false) {
-			ICEcoder.switchTab(ICEcoder.isOpen(ICEcoder.thisFileFolderLink)+1);
+		if (this.thisFileFolderLink != "/[NEW]" && this.isOpen(this.thisFileFolderLink)!==false) {
+			this.switchTab(this.isOpen(this.thisFileFolderLink)+1);
 			if (line > 1){
-				ICEcoder.goToLine(line);
+				this.goToLine(line);
 			}
-		} else if (ICEcoder.thisFileFolderLink!="" && ICEcoder.thisFileFolderType=="file") {
+		} else if (this.thisFileFolderLink!="" && this.thisFileFolderType=="file") {
 
 			// work out a shortened URL for the file
-			shortURL = ICEcoder.thisFileFolderLink.replace(/\|/g,"/");
+			shortURL = this.thisFileFolderLink.replace(/\|/g,"/");
 			// No reason why we can't open a file (so far)
 			canOpenFile = true;
 			// Limit to 100 files open at a time
-			if (ICEcoder.openFiles.length>=100) {
-				ICEcoder.message(t['Sorry you can...']);
+			if (this.openFiles.length>=100) {
+				this.message(t['Sorry you can...']);
 				canOpenFile = false;
 			}
 
 			// if we're still OK to open it...
 			if (canOpenFile) {
-				ICEcoder.shortURL = shortURL;
+				this.shortURL = shortURL;
 
 				if (shortURL!="/[NEW]") {
-					ICEcoder.thisFileFolderLink = ICEcoder.thisFileFolderLink.replace(/\//g,"|");
-					ICEcoder.serverQueue("add",iceLoc+"/lib/file-control.php?action=load&file="+encodeURIComponent(ICEcoder.thisFileFolderLink)+"&csrf="+ICEcoder.csrf+"&lineNumber="+line);
-					ICEcoder.serverMessage('<b>'+t['Opening File']+'</b><br>'+ICEcoder.shortURL);
+					this.thisFileFolderLink = this.thisFileFolderLink.replace(/\//g,"|");
+					this.serverQueue("add",iceLoc+"/lib/file-control.php?action=load&file="+encodeURIComponent(this.thisFileFolderLink)+"&csrf="+this.csrf+"&lineNumber="+line);
+					this.serverMessage('<b>'+t['Opening File']+'</b><br>'+this.shortURL);
 				} else {
-					ICEcoder.createNewTab('new');
+					this.createNewTab('new');
 				}
-				ICEcoder.fMIconVis('fMView',1);
+				this.fMIconVis('fMView',1);
 			}
 		}
 	},
@@ -1962,9 +1959,9 @@ var ICEcoder = {
 	// Open selected files
 	openFilesFromList: function(fileList) {
 		for (var i=0;i<fileList.length;i++) {
-			ICEcoder.thisFileFolderLink=fileList[i].replace('|','/');
-			ICEcoder.thisFileFolderType='file';
-			ICEcoder.openFile();
+			this.thisFileFolderLink=fileList[i].replace('|','/');
+			this.thisFileFolderType='file';
+			this.openFile();
 		}
 	},
 
@@ -1972,10 +1969,10 @@ var ICEcoder = {
 	openPrompt: function() {
 		var fileLink;
 
-		if(fileLink = ICEcoder.getInput(t['Enter relative file...'],'')) {
+		if(fileLink = this.getInput(t['Enter relative file...'],'')) {
 			fileLink.indexOf("://")>-1
-			? ICEcoder.getRemoteFile(fileLink)
-			: ICEcoder.openFile(fileLink);
+			? this.getRemoteFile(fileLink)
+			: this.openFile(fileLink);
 		}
 	},
 
@@ -1984,23 +1981,23 @@ var ICEcoder = {
 		var flSplit, line;
 
 		if ("undefined" != typeof remoteFile) {
-			flSplit = ICEcoder.returnFileAndLine(remoteFile);
+			flSplit = this.returnFileAndLine(remoteFile);
 			remoteFile = flSplit[0];
 			line       = flSplit[1];
 		}
 
-		ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=getRemoteFile&csrf="+ICEcoder.csrf+"&lineNumber="+line,encodeURIComponent(remoteFile));
-		ICEcoder.serverMessage('<b>'+t['Getting']+'</b><br>'+remoteFile);
+		this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=getRemoteFile&csrf="+this.csrf+"&lineNumber="+line,encodeURIComponent(remoteFile));
+		this.serverMessage('<b>'+t['Getting']+'</b><br>'+remoteFile);
 	},
 
 	// Get changes to save (used when simply saving, gets diff changes between current and last known version)
 	getChangesToSave: function() {
 		var cM, savedText, newText, sm, opcodes;
 
-		cM = ICEcoder.getcMInstance();
+		cM = this.getcMInstance();
 
 		// Get the last known saved version of file from array
-		savedText = ICEcoder.savedContents[ICEcoder.selectedTab-1];
+		savedText = this.savedContents[this.selectedTab-1];
 
 		// Get the text values and split it into lines
 		newText = difflib.stringAsLines(cM.getValue());
@@ -2037,23 +2034,22 @@ var ICEcoder = {
 	// Save a file
 	saveFile: function(saveAs) {
 		var changes, saveType, filePath, pathPrefix;
-
 		// If we're not 'saving as', establish changes between current and known saved version from array
 		if (!saveAs) {
-			changes = ICEcoder.getChangesToSave();
+			changes = this.getChangesToSave();
 		}
 
 		saveType = saveAs ? "saveAs" : "save";
-		filePath = ICEcoder.openFiles[ICEcoder.selectedTab-1].replace(iceRoot,"").replace(/\//g,"|");
-		if (filePath=="|[NEW]" && ICEcoder.selectedFiles.length>0) {
-			pathPrefix = ICEcoder.selectedFiles[0];
+		filePath = this.openFiles[this.selectedTab-1].replace(iceRoot,"").replace(/\//g,"|");
+		if (filePath=="|[NEW]" && this.selectedFiles.length>0) {
+			pathPrefix = this.selectedFiles[0];
 			filePath = pathPrefix.lastIndexOf(".") == -1 || pathPrefix.lastIndexOf(".") < pathPrefix.lastIndexOf("|")
 			? pathPrefix+filePath
 			: "|[NEW]";
 		}
 		filePath = filePath.replace("||","|");
-		ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=save&fileMDT="+ICEcoder.openFileMDTs[ICEcoder.selectedTab-1]+"&fileVersion="+ICEcoder.openFileVersions[ICEcoder.selectedTab-1]+"&saveType="+saveType+"&csrf="+ICEcoder.csrf,encodeURIComponent(filePath),changes);
-		ICEcoder.serverMessage('<b>'+t['Saving']+'</b><br>'+ICEcoder.openFiles[ICEcoder.selectedTab-1].replace(iceRoot,""));
+		this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=save&fileMDT="+this.openFileMDTs[this.selectedTab-1]+"&fileVersion="+this.openFileVersions[this.selectedTab-1]+"&saveType="+saveType+"&csrf="+this.csrf,encodeURIComponent(filePath),changes);
+		this.serverMessage('<b>'+t['Saving']+'</b><br>'+this.openFiles[this.selectedTab-1].replace(iceRoot,""));
 	},
 
 	// Prompt a rename dialog
@@ -2061,28 +2057,28 @@ var ICEcoder = {
 		var shortURL, fileName, i;
 
 		if (!oldName) {
-			shortURL = ICEcoder.selectedFiles[ICEcoder.selectedFiles.length-1].replace(/\|/g,"/");
-			oldName = ICEcoder.selectedFiles[ICEcoder.selectedFiles.length-1].replace(/\|/g,"/");
+			shortURL = this.selectedFiles[this.selectedFiles.length-1].replace(/\|/g,"/");
+			oldName = this.selectedFiles[this.selectedFiles.length-1].replace(/\|/g,"/");
 		} else {
 			shortURL = oldName.replace(/\|/g,"/");
 		}
 		if (!newName) {
-			newName = ICEcoder.getInput(t['Please enter the...'],shortURL);
+			newName = this.getInput(t['Please enter the...'],shortURL);
 		}
 		if (newName) {
-			i = ICEcoder.openFiles.indexOf(shortURL.replace(/\|/g,"/"));
+			i = this.openFiles.indexOf(shortURL.replace(/\|/g,"/"));
 			if(i>-1) {
 				// rename array item and the tab
-				ICEcoder.openFiles[i] = newName;
-				closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; ICEcoder.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; ICEcoder.overCloseLink=false"></a>';
-				fileName = ICEcoder.openFiles[i];
+				this.openFiles[i] = newName;
+				closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; this.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; this.overCloseLink=false"></a>';
+				fileName = this.openFiles[i];
 				get('tab'+(i+1)).innerHTML = closeTabLink + " " + fileName.slice(fileName.lastIndexOf("/")).replace(/\//,"");
 				get('tab'+(i+1)).title = newName;
 			}
-		ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=rename&oldFileName="+encodeURIComponent(oldName.replace(/\|/g,"/"))+"&csrf="+ICEcoder.csrf,encodeURIComponent(newName));
-		ICEcoder.serverMessage('<b>'+t['Renaming to']+'</b><br>'+newName);
+		this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=rename&oldFileName="+encodeURIComponent(oldName.replace(/\|/g,"/"))+"&csrf="+this.csrf,encodeURIComponent(newName));
+		this.serverMessage('<b>'+t['Renaming to']+'</b><br>'+newName);
 
-		ICEcoder.setPreviousFiles();
+		this.setPreviousFiles();
 		}
 	},
 
@@ -2091,21 +2087,21 @@ var ICEcoder = {
 		var fileName, i;
 
 		if (newName && newName != oldName) {
-			i = ICEcoder.openFiles.indexOf(oldName.replace(/\|/g,"/"));
+			i = this.openFiles.indexOf(oldName.replace(/\|/g,"/"));
 			if(i>-1) {
 				// rename array item and the tab
-				ICEcoder.openFiles[i] = newName;
-				closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; ICEcoder.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; ICEcoder.overCloseLink=false"></a>';
-				fileName = ICEcoder.openFiles[i];
+				this.openFiles[i] = newName;
+				closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; this.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; this.overCloseLink=false"></a>';
+				fileName = this.openFiles[i];
 				get('tab'+(i+1)).innerHTML = closeTabLink + " " + fileName.slice(fileName.lastIndexOf("/")).replace(/\//,"");
 				get('tab'+(i+1)).title = newName;
 			}
-			if (ICEcoder.ask("Are you sure you want to move file " + oldName + " to " + newName + " ?")){
-				ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=move&oldFileName="+encodeURIComponent(oldName.replace(/\//g,"|"))+"&csrf="+ICEcoder.csrf,encodeURIComponent(newName.replace(/\//g,"|")));
-				ICEcoder.serverMessage('<b>'+t['Moving to']+'</b><br>'+newName);
+			if (this.ask("Are you sure you want to move file " + oldName + " to " + newName + " ?")){
+				this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=move&oldFileName="+encodeURIComponent(oldName.replace(/\//g,"|"))+"&csrf="+this.csrf,encodeURIComponent(newName.replace(/\//g,"|")));
+				this.serverMessage('<b>'+t['Moving to']+'</b><br>'+newName);
 			}
 
-			ICEcoder.setPreviousFiles();
+			this.setPreviousFiles();
 		}
 	},
 
@@ -2113,41 +2109,41 @@ var ICEcoder = {
 	deleteFiles: function(fileList) {
 		var tgtFiles, tgtListDisplay;
 
-		tgtFiles = fileList ? fileList : ICEcoder.selectedFiles;
+		tgtFiles = fileList ? fileList : this.selectedFiles;
 		tgtListDisplay = tgtFiles.toString().replace(/\|/g,"/").replace(/,/g,"\n");
-		if (tgtFiles.length>0 && ICEcoder.ask('Delete:\n\n'+tgtListDisplay+'?')) {
-			ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=delete&&csrf="+ICEcoder.csrf,encodeURIComponent(tgtFiles.join(";")));
-			ICEcoder.serverMessage('<b>'+t['Deleting File']+'</b><br>'+tgtListDisplay);
+		if (tgtFiles.length>0 && this.ask('Delete:\n\n'+tgtListDisplay+'?')) {
+			this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=delete&&csrf="+this.csrf,encodeURIComponent(tgtFiles.join(";")));
+			this.serverMessage('<b>'+t['Deleting File']+'</b><br>'+tgtListDisplay);
 		};
 	},
 
 	// Copy files
 	copyFiles: function(fileList,dontShowPaste,dontHide) {
-		ICEcoder.copiedFiles = [];
+		this.copiedFiles = [];
 		for (var i=0; i<fileList.length; i++) {
-			ICEcoder.copiedFiles[i] = fileList[i];
+			this.copiedFiles[i] = fileList[i];
 		}
 		if (!dontShowPaste) {
 			get('fmMenuPasteOption').style.display = "block";
 		}
 		if (!dontHide) {
-			ICEcoder.hideFileMenu();
+			this.hideFileMenu();
 		}
 	},
 
 	// Paste files
 	pasteFiles: function(location) {
-		if (ICEcoder.copiedFiles) {
-			for (var i=0; i<ICEcoder.copiedFiles.length; i++) {
-				if (ICEcoder.copiedFiles[i]!="|") {
-					ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=paste&location="+location+"&csrf="+ICEcoder.csrf,encodeURIComponent(ICEcoder.copiedFiles[i]));
-					ICEcoder.serverMessage('<b>'+t['Pasting File']+'</b><br>'+ICEcoder.copiedFiles[i].toString().replace(/\|/g,"/").replace(/,/g,"\n"));
+		if (this.copiedFiles) {
+			for (var i=0; i<this.copiedFiles.length; i++) {
+				if (this.copiedFiles[i]!="|") {
+					this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=paste&location="+location+"&csrf="+this.csrf,encodeURIComponent(this.copiedFiles[i]));
+					this.serverMessage('<b>'+t['Pasting File']+'</b><br>'+this.copiedFiles[i].toString().replace(/\|/g,"/").replace(/,/g,"\n"));
 				} else {
-					ICEcoder.message(t['Sorry cannot paste...']);
+					this.message(t['Sorry cannot paste...']);
 				}
 			}
 		} else {
-			ICEcoder.message(t['Nothing to paste...']);
+			this.message(t['Nothing to paste...']);
 		}
 	},
 
@@ -2156,17 +2152,17 @@ var ICEcoder = {
 		var copiedFiles, location;
 
 		// Take a snapshot of copied files
-		if (ICEcoder.copiedFiles) {
-			copiedFiles = ICEcoder.copiedFiles;
+		if (this.copiedFiles) {
+			copiedFiles = this.copiedFiles;
 		}
 
-		ICEcoder.copyFiles(fileList,'dontShowPaste','dontHide');
+		this.copyFiles(fileList,'dontShowPaste','dontHide');
 		location = fileList[0].substr(0,fileList[0].lastIndexOf("|"));
-		ICEcoder.pasteFiles(location);
+		this.pasteFiles(location);
 
 		// Restore copied files back to the snapshot
 		if ("undefined" != typeof copiedFiles) {
-			ICEcoder.copiedFiles = copiedFiles;
+			this.copiedFiles = copiedFiles;
 		}
 	},
 
@@ -2177,7 +2173,7 @@ var ICEcoder = {
 	},
 	uploadFilesSubmit: function(obj) {
 		if (get('fileInput').value!="") {
-			ICEcoder.showHide('show',get('loadingMask'));
+			this.showHide('show',get('loadingMask'));
 			get('uploadFilesForm').submit();
 			event.preventDefault();
 		}
@@ -2187,15 +2183,15 @@ var ICEcoder = {
 	showHideFileNav: function(vis,elem) {
 		var options = ["optionsFile","optionsEdit","optionsSource","optionsHelp"];
 		if (vis=="hide") {
-			fileNavInt = setTimeout(function() {
+			fileNavInt = setTimeout(function(ic) {
 				for (var i=0; i<options.length; i++) {
-					ICEcoder.showHide('hide',get(options[i]));
+					ic.showHide('hide',get(options[i]));
 					get(options[i]+'Nav').style.color = '';
 				}
-			},150);
+			},150,this);
 		} else {
 			for (var i=0; i<options.length; i++) {
-				ICEcoder.showHide('hide',get(options[i]));
+				this.showHide('hide',get(options[i]));
 				get(options[i]+'Nav').style.color = '';
 			}
 		}
@@ -2204,7 +2200,7 @@ var ICEcoder = {
 			if ("undefined" != typeof fileNavInt) {
 				clearTimeout(fileNavInt);
 			}
-			ICEcoder.showHide(vis,get(elem));
+			this.showHide(vis,get(elem));
 			get(elem+'Nav').style.color = '#fff';
 			get('fileOptions').style.opacity = 1;
 		}
@@ -2213,8 +2209,8 @@ var ICEcoder = {
 	// Is a specified path a folder? (Note: path is string encoded path with / replaced with |)
 	isPathFolder: function(path){
 		// let's enumerate all folders to find whether clicked file is a folder or not
-		var dir = ICEcoder.filesFrame.contentDocument.getElementsByClassName("pft-directory");
-		var thisFileId = ICEcoder.selectedFiles[0];
+		var dir = this.filesFrame.contentDocument.getElementsByClassName("pft-directory");
+		var thisFileId = this.selectedFiles[0];
 		var liNode, aNode, spanNode;
 		for (var i = 0 ; i < dir.length; i++){
 			liNode = dir[i];
@@ -2247,7 +2243,7 @@ var ICEcoder = {
 
 		// Start a seperate XHR call. We run seperately rather than add into the serverQueue because we may need to run
 		// immediately, eg need to if a file/dir exists mid flow in 'Save As' function, so can't go into queue
-		xhr = ICEcoder.xhrObj();
+		xhr = this.xhrObj();
 		xhr.onreadystatechange=function() {
 			if (xhr.readyState==4) {
 				// OK reponse?
@@ -2260,38 +2256,38 @@ var ICEcoder = {
 					statusObj.action.timeTaken = statusObj.action.timeEnd - statusObj.action.timeStart;
 
 					// User wanted raw (or both) output of the response?
-					if (["raw","both"].indexOf(ICEcoder.fileDirResOutput) >= 0) {
+					if (["raw","both"].indexOf(this.fileDirResOutput) >= 0) {
 						console.log(xhr.responseText);
 					}
 					// User wanted object (or both) output of the response?
-					if (["object","both"].indexOf(ICEcoder.fileDirResOutput) >= 0) {
+					if (["object","both"].indexOf(this.fileDirResOutput) >= 0) {
 						console.log(statusObj);
 					}
 
 					// Also store the statusObj
-					ICEcoder.lastFileDirCheckStatusObj = statusObj;
+					this.lastFileDirCheckStatusObj = statusObj;
 
 					// If error, show that, otherwise do whatever we're required to do next
 					if (statusObj.status.error) {
-						ICEcoder.message(statusObj.status.errorMsg);
+						this.message(statusObj.status.errorMsg);
 						console.log("ICEcoder error info for your request...");
 						console.log(statusObj);
-						ICEcoder.serverMessage();
-						ICEcoder.serverQueue('del',0);
+						this.serverMessage();
+						this.serverQueue('del',0);
 					} else {
 						eval(statusObj.action.doNext);
 					}
 				// Some other response? Display a message about that
 				} else {
-					ICEcoder.message(t['Sorry there was...']);
+					this.message(t['Sorry there was...']);
 					console.log("ICEcoder error info for your request...");
 					console.log(statusObj);
-					ICEcoder.serverMessage();
-					ICEcoder.serverQueue('del',0);
+					this.serverMessage();
+					this.serverQueue('del',0);
 				}
 			}
 		};
-		xhr.open("POST",iceLoc+"/lib/file-control-xhr.php?action=checkExists&csrf="+ICEcoder.csrf,true);
+		xhr.open("POST",iceLoc+"/lib/file-control-xhr.php?action=checkExists&csrf="+this.csrf,true);
 		xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
 		timeStart = new Date().getTime();
 		xhr.send('timeStart='+timeStart+'&file='+encodeURIComponent(path));
@@ -2301,30 +2297,30 @@ var ICEcoder = {
 	showMenu: function(evt) {
 		var menuType, menuHeight, winH, fmYPos;
 
-		if (	ICEcoder.selectedFiles.length == 0 ||
-			ICEcoder.selectedFiles.indexOf(ICEcoder.selectedFiles[ICEcoder.selectedFiles.length-1].replace(/\//g,"|")) == -1) {
-			ICEcoder.selectFileFolder(evt);
+		if (	this.selectedFiles.length == 0 ||
+			this.selectedFiles.indexOf(this.selectedFiles[this.selectedFiles.length-1].replace(/\//g,"|")) == -1) {
+			this.selectFileFolder(evt);
 		}
 
 		menuHeight = 124+5; // general options height in px plus 5px space
 		winH = window.innerHeight;
-		if ("undefined" != typeof ICEcoder.thisFileFolderLink && ICEcoder.thisFileFolderLink!="") {
-			menuType = this.isPathFolder(ICEcoder.selectedFiles[0]) ? "folder" : "file";
-			get('folderMenuItems').style.display = menuType == "folder" && ICEcoder.selectedFiles.length == 1 ? "block" : "none";
-			if (menuType == "folder" && ICEcoder.selectedFiles.length == 1) {
+		if ("undefined" != typeof this.thisFileFolderLink && this.thisFileFolderLink!="") {
+			menuType = this.isPathFolder(this.selectedFiles[0]) ? "folder" : "file";
+			get('folderMenuItems').style.display = menuType == "folder" && this.selectedFiles.length == 1 ? "block" : "none";
+			if (menuType == "folder" && this.selectedFiles.length == 1) {
 				menuHeight += 20+20+1+23+1+2; // new file, new folder, hr, upload files(s), hr, padding
 				if (get('fmMenuPasteOption').style.display == "block") {
 					menuHeight += 19;
 				}
 			}
-			get('singleFileMenuItems').style.display = ICEcoder.selectedFiles.length > 1 ? "none" : "block";
-			if (ICEcoder.selectedFiles.length == 1) {
+			get('singleFileMenuItems').style.display = this.selectedFiles.length > 1 ? "none" : "block";
+			if (this.selectedFiles.length == 1) {
 				menuHeight += 43;
 			}
 			get('fileMenu').style.display = "inline-block";
 			setTimeout(function() {get('fileMenu').style.opacity = "1"},4);
-			get('fileMenu').style.left = (ICEcoder.mouseX+20) + "px";
-			fmYPos = ICEcoder.mouseY-ICEcoder.filesFrame.contentWindow.document.body.scrollTop-10;
+			get('fileMenu').style.left = (this.mouseX+20) + "px";
+			fmYPos = this.mouseY-this.filesFrame.contentWindow.document.body.scrollTop-10;
 			if (fmYPos+menuHeight > winH) {
 				fmYPos -= (fmYPos+menuHeight-winH);
 			}
@@ -2354,7 +2350,7 @@ var ICEcoder = {
 			// Is this is a file or folder and based on that, set the CSS styling & link
 			actionElemType = fileOrFolder;
 			cssStyle = actionElemType=="file" ? "pft-file ext-" + file.substr(file.indexOf(".")+1) : "pft-directory";
-			perms = actionElemType=="file" ? ICEcoder.newFilePerms : ICEcoder.newDirPerms;
+			perms = actionElemType=="file" ? this.newFilePerms : this.newDirPerms;
 
 			// Identify our target element & the first child element in it's location
 			if (!location) {location="/"}
@@ -2364,15 +2360,15 @@ var ICEcoder = {
 			locNest = targetElem.parentNode.parentNode.nextSibling;
 			newText = document.createTextNode("\n");
 			permColors = perms == 777 ? 'background: #800; color: #eee' : 'color: #888';
-			innerLI = '<a nohref title="'+location.replace(/\/$/, "")+"/"+file+'" onMouseOver="parentNode.draggable=true;ICEcoder.overFileFolder(\''+actionElemType+'\',this.childNodes[1].id)" onMouseOut="parentNode.draggable=false;ICEcoder.overFileFolder(\''+actionElemType+'\',\'\')" '+
+			innerLI = '<a nohref title="'+location.replace(/\/$/, "")+"/"+file+'" onMouseOver="parentNode.draggable=true;this.overFileFolder(\''+actionElemType+'\',this.childNodes[1].id)" onMouseOut="parentNode.draggable=false;this.overFileFolder(\''+actionElemType+'\',\'\')" '+
 
-					(actionElemType == "folder" ? 'ondragover="if(parentNode.nextSibling && parentNode.nextSibling.tagName != \'UL\' && ICEcoder.thisFileFolderLink != this.childNodes[1].id) {ICEcoder.openCloseDir(this,true);}"':'')+
+					(actionElemType == "folder" ? 'ondragover="if(parentNode.nextSibling && parentNode.nextSibling.tagName != \'UL\' && this.thisFileFolderLink != this.childNodes[1].id) {this.openCloseDir(this,true);}"':'')+
 
-					' onClick="if(!event.ctrlKey && !ICEcoder.cmdKey) {'+
+					' onClick="if(!event.ctrlKey && !this.cmdKey) {'+
 
-					(actionElemType == "folder" ? 'ICEcoder.openCloseDir(this,'+(actionElemType=="folder" ? 'true' : 'false')+');':'')+
+					(actionElemType == "folder" ? 'this.openCloseDir(this,'+(actionElemType=="folder" ? 'true' : 'false')+');':'')+
 
-					' if (/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) {ICEcoder.openFile()}}" style="position: relative; left:-22px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id="'+location.replace(/\/$/, "").replace(/\//g,"|")+"|"+file+'">'+file+'</span> <span style="'+permColors+'; font-size: 8px" id="'+location.replace(/\/$/, "").replace(/\//g,"|")+"|"+file+'_perms">'+perms+'</span></a>';
+					' if (/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)) {this.openFile()}}" style="position: relative; left:-22px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id="'+location.replace(/\/$/, "").replace(/\//g,"|")+"|"+file+'">'+file+'</span> <span style="'+permColors+'; font-size: 8px" id="'+location.replace(/\/$/, "").replace(/\//g,"|")+"|"+file+'_perms">'+perms+'</span></a>';
 
 			// If we don't have a locNest or at least 3 DOM items in there, it's an empty folder
 			if(!locNest || locNest.childNodes.length<3) {
@@ -2385,10 +2381,10 @@ var ICEcoder = {
 				newLI = document.createElement("li");
 				newLI.className = cssStyle;
 				newLI.draggable = false;
-				newLI.ondragstart = function(event) {ICEcoder.addDefaultDragData(this,event)};
-				newLI.ondrag = function(event) {ICEcoder.draggingWithKeyTest(event);if(ICEcoder.getcMInstance()){ICEcoder.editorFocusInstance.indexOf('diff') == -1 ? ICEcoder.getcMInstance().focus() : ICEcoder.getcMdiffInstance().focus()}};
-				newLI.ondragover = function(event) {ICEcoder.setDragCursor(event,actionElemType=="folder" ? 'folder' : 'file')};
-				newLI.ondragend = function() {ICEcoder.dropFile(this)};
+				newLI.ondragstart = function(event) {this.addDefaultDragData(this,event)};
+				newLI.ondrag = function(event) {this.draggingWithKeyTest(event);if(this.getcMInstance()){this.editorFocusInstance.indexOf('diff') == -1 ? this.getcMInstance().focus() : this.getcMdiffInstance().focus()}};
+				newLI.ondragover = function(event) {this.setDragCursor(event,actionElemType=="folder" ? 'folder' : 'file')};
+				newLI.ondragend = function() {this.dropFile(this)};
 				newLI.innerHTML = innerLI
 				locNest.nextSibling.appendChild(newLI);
 				locNest.nextSibling.appendChild(newText);
@@ -2408,10 +2404,10 @@ var ICEcoder = {
 							newLI = document.createElement("li");
 							newLI.className = cssStyle;
 							newLI.draggable = false;
-							newLI.ondragstart = function(event) {ICEcoder.addDefaultDragData(this,event)};
-							newLI.ondrag = function(event) {ICEcoder.draggingWithKeyTest(event);if(ICEcoder.getcMInstance()){ICEcoder.editorFocusInstance.indexOf('diff') == -1 ? ICEcoder.getcMInstance().focus() : ICEcoder.getcMdiffInstance().focus()}};
-							newLI.ondragover = function(event) {ICEcoder.setDragCursor(event,actionElemType=="folder" ? 'folder' : 'file')};
-							newLI.ondragend = function() {ICEcoder.dropFile(this)};
+							newLI.ondragstart = function(event) {this.addDefaultDragData(this,event)};
+							newLI.ondrag = function(event) {this.draggingWithKeyTest(event);if(this.getcMInstance()){this.editorFocusInstance.indexOf('diff') == -1 ? this.getcMInstance().focus() : this.getcMdiffInstance().focus()}};
+							newLI.ondragover = function(event) {this.setDragCursor(event,actionElemType=="folder" ? 'folder' : 'file')};
+							newLI.ondragend = function() {this.dropFile(this)};
 							newLI.innerHTML = innerLI;
 							// Append or insert depending on which of the above if statements is true
 							if (i==locNest.childNodes.length-1) {
@@ -2428,7 +2424,7 @@ var ICEcoder = {
 			}
 			// If we added a new file, we've saved it under a new filename, so set that
 			if (actionElemType=="file" && !uploaded) {
-				ICEcoder.openFiles[ICEcoder.selectedTab-1]=location+file;
+				this.openFiles[this.selectedTab-1]=location+file;
 			}
 		}
 
@@ -2445,19 +2441,19 @@ var ICEcoder = {
 			targetElemPerms = get('filesFrame').contentWindow.document.getElementById(shortURL+"_perms");
 			targetElemPerms.id = location.replace(/\//g,"|") + "|" + file + "_perms";
 			// Finally, rename also within any children
-			ICEcoder.renameInChildren(targetElem, oldName, location, file);
+			this.renameInChildren(targetElem, oldName, location, file);
 		}
 
 		// Moving files
 		if (action=="move") {
-			ICEcoder.updateFileManagerList("add",location,file,false,false,false,fileOrFolder);
-			ICEcoder.updateFileManagerList("delete",oldName.substr(0,oldName.lastIndexOf("/")),file);
+			this.updateFileManagerList("add",location,file,false,false,false,fileOrFolder);
+			this.updateFileManagerList("delete",oldName.substr(0,oldName.lastIndexOf("/")),file);
 		}
 
 		// Chmod on files
 		if (action=="chmod") {
 			// Get short URL for our file and get our target elem based on this
-			shortURL = ICEcoder.selectedFiles[ICEcoder.selectedFiles.length-1].replace(/\|/g,"/");
+			shortURL = this.selectedFiles[this.selectedFiles.length-1].replace(/\|/g,"/");
 			targetElem = get('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|")+"_perms");
 			// Set the color for the perms
 			targetElem.style.background = perms == 777 ? '#800' : 'none';
@@ -2474,7 +2470,7 @@ var ICEcoder = {
 			location = location.replace(/\/$/, "").replace(/\//g,"|");
 			targetElem = (location +"|"+file).replace("||","|");
 			targetElem = get('filesFrame').contentWindow.document.getElementById(targetElem).parentNode.parentNode;
-			ICEcoder.openCloseDir(targetElem.childNodes[0],false);
+			this.openCloseDir(targetElem.childNodes[0],false);
 			targetElem.parentNode.removeChild(targetElem);
 		}
 	},
@@ -2499,7 +2495,7 @@ var ICEcoder = {
 					targetElemPerms = get('filesFrame').contentWindow.document.getElementById(targetElem.id).nextSibling.nextSibling;
 					targetElemPerms.id = targetElem.id + "_perms";
 					// Finally, test this node for ULs next to it also, incase it's a dir
-					ICEcoder.renameInChildren(targetElem, oldName, location, file);
+					this.renameInChildren(targetElem, oldName, location, file);
 				}
 			}
 		}
@@ -2507,10 +2503,10 @@ var ICEcoder = {
 
 	// Refresh file manager
 	refreshFileManager: function() {
-		ICEcoder.showHide('show',get('loadingMask'));
-		ICEcoder.filesFrame.contentWindow.location.reload(true);
-		ICEcoder.filesFrame.style.opacity="0";
-		ICEcoder.filesFrame.onload = function() {
+		this.showHide('show',get('loadingMask'));
+		this.filesFrame.contentWindow.location.reload(true);
+		this.filesFrame.style.opacity="0";
+		this.filesFrame.onload = function() {
 			ICEcoder.filesFrame.style.opacity="1";
 			ICEcoder.showHide('hide',get('loadingMask'));
 		}
@@ -2524,10 +2520,10 @@ var ICEcoder = {
 
 		// Mac command key handling (224 = Moz, 91/93 = Webkit Left/Right Apple)
 		if (key==224 || key==91 || key==93) {
-			ICEcoder.cmdKey = true;
+			this.cmdKey = true;
 		}
 
-		ICEcoder.draggingWithKey = evt.ctrlKey||ICEcoder.cmdKey ? "CTRL" : false;
+		this.draggingWithKey = evt.ctrlKey||this.cmdKey ? "CTRL" : false;
 	},
 
 	// Add default drag data (dragging in Firefox on DOM elems not possible otherwise)
@@ -2541,15 +2537,15 @@ var ICEcoder = {
 
 		// Prevent the default and establish if CTRL key is down
 		evt.preventDefault();
-		ICEcoder.draggingWithKeyTest(evt);
+		this.draggingWithKeyTest(evt);
 		// Establish the cursor to show
 		cursorIcon =
 			dropType == "editor"
-				? ICEcoder.draggingWithKey == "CTRL"
+				? this.draggingWithKey == "CTRL"
 					? "copy"
 					: "link"
 				: dropType == "folder"
-					? ICEcoder.draggingWithKey == "CTRL"
+					? this.draggingWithKey == "CTRL"
 						? "copy"
 						: "move"
 					: "none";
@@ -2563,22 +2559,22 @@ var ICEcoder = {
 
 		filePath = elem.childNodes[0].childNodes[1].id.replace(/\|/g,"/");
 		fileName = filePath.substr(filePath.lastIndexOf("/")+1);
-		if (ICEcoder.area=='editor') {
-			ICEcoder.pasteURL(filePath);
+		if (this.area=='editor') {
+			this.pasteURL(filePath);
 		};
-		if (ICEcoder.area=='files') {
+		if (this.area=='files') {
 			setTimeout(function() {
-				tgtPath = ICEcoder.thisFileFolderType == "folder" ? ICEcoder.thisFileFolderLink : ICEcoder.thisFileFolderLink.substr(0,ICEcoder.thisFileFolderLink.lastIndexOf("|"));
-				if(ICEcoder.draggingWithKey == "CTRL") {
-					ICEcoder.copyFiles(ICEcoder.selectedFiles);
-					ICEcoder.pasteFiles(tgtPath);
+				tgtPath = ic.thisFileFolderType == "folder" ? ic.thisFileFolderLink : ic.thisFileFolderLink.substr(0,ic.thisFileFolderLink.lastIndexOf("|"));
+				if(ic.draggingWithKey == "CTRL") {
+					ic.copyFiles(ic.selectedFiles);
+					ic.pasteFiles(tgtPath);
 				} else {
-					ICEcoder.moveFile(filePath,tgtPath.replace(/\|/g,"/") + "/" + fileName);
+					ic.moveFile(filePath,tgtPath.replace(/\|/g,"/") + "/" + fileName);
 				}
-			},4);
+			},4,this);
 		};
-		ICEcoder.mouseDown=false;
-		ICEcoder.mouseDownInCM=false;
+		this.mouseDown=false;
+		this.mouseDownInCM=false;
 	},
 
 // ==============
@@ -2601,7 +2597,7 @@ var ICEcoder = {
 		if (isCancel){
 			// Deselect by setting value to itself, then focus on editor
 			get('find').value = get('find').value;
-			ICEcoder.focus();
+			this.focus();
 			return;
 		}
 		// Set findPrevious to false if not passed in
@@ -2615,9 +2611,9 @@ var ICEcoder = {
 		results		= get('results');
 
 		// If we have something to find in currrent document
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		if (thisCM && find.length>0 && document.findAndReplace.target.value==t['this document']) {
 			content = thisCM.getValue().toLowerCase();
 			// Find & replace the next instance, or all?
@@ -2632,65 +2628,65 @@ var ICEcoder = {
 
 			// Get the content again, as it might of changed
 			content = thisCM.getValue().toLowerCase();
-			if (!ICEcoder.findMode||find!=ICEcoder.lastsearch) {
-				ICEcoder.results = [];
-				ICEcoder.resultsLines = [];
+			if (!this.findMode||find!=this.lastsearch) {
+				this.results = [];
+				this.resultsLines = [];
 
 				for (var i=0;i<content.length;i++) {
-					if (content.substr(i,find.length)==find && ICEcoder.results.indexOf(i) == -1) {
-						ICEcoder.results.push(i);
-						if (ICEcoder.resultsLines.indexOf(thisCM.posFromIndex(i).line+1)==-1) {
-							ICEcoder.resultsLines.push(thisCM.posFromIndex(i).line+1);
+					if (content.substr(i,find.length)==find && this.results.indexOf(i) == -1) {
+						this.results.push(i);
+						if (this.resultsLines.indexOf(thisCM.posFromIndex(i).line+1)==-1) {
+							this.resultsLines.push(thisCM.posFromIndex(i).line+1);
 						}
 					}
 				}
 
 				// Also remember the last search term made
-				ICEcoder.lastsearch = find;
+				this.lastsearch = find;
 			}
 
 			// If we have results
-			if (ICEcoder.results.length>0) {
+			if (this.results.length>0) {
 
 				// Show results only
 				if (resultsOnly) {
-					results.innerHTML = ICEcoder.results.length + " results";
+					results.innerHTML = this.results.length + " results";
 				// We need to take action instead
 				} else {
 					// Find our cursor position relative to results
 					// Go next
 					if (!findPrevious) {
-						ICEcoder.findResult = 0;
-						for (var i=0;i<ICEcoder.results.length;i++) {
-							if (ICEcoder.results[i]<thisCM.indexFromPos({"ch": thisCM.getCursor().ch+1, "line": thisCM.getCursor().line})) {
-								ICEcoder.findResult++;
+						this.findResult = 0;
+						for (var i=0;i<this.results.length;i++) {
+							if (this.results[i]<thisCM.indexFromPos({"ch": thisCM.getCursor().ch+1, "line": thisCM.getCursor().line})) {
+								this.findResult++;
 							}
 						}
 					// Go previous
 					} else {
-						if("undefined" == typeof ICEcoder.findResult) {
-							ICEcoder.findResult = ICEcoder.results.length+1;
+						if("undefined" == typeof this.findResult) {
+							this.findResult = this.results.length+1;
 						} else {
-							ICEcoder.findResult = ICEcoder.results.length;
+							this.findResult = this.results.length;
 						}
-						for (var i=ICEcoder.results.length-1;i>=0;i--) {
-							if (ICEcoder.results[i]>thisCM.indexFromPos({"ch": thisCM.getCursor().ch-1, "line": thisCM.getCursor().line})) {
-								ICEcoder.findResult--;
+						for (var i=this.results.length-1;i>=0;i--) {
+							if (this.results[i]>thisCM.indexFromPos({"ch": thisCM.getCursor().ch-1, "line": thisCM.getCursor().line})) {
+								this.findResult--;
 							}
 						}
 					}
 
 					// Loop round to start
-					if (!findPrevious && ICEcoder.findResult>ICEcoder.results.length-1) {
-						ICEcoder.findResult = 0
+					if (!findPrevious && this.findResult>this.results.length-1) {
+						this.findResult = 0
 					}
 					// Loop round to end
-					if (findPrevious && ICEcoder.findResult==1) {
-						ICEcoder.findResult = ICEcoder.results.length+1;
+					if (findPrevious && this.findResult==1) {
+						this.findResult = this.results.length+1;
 					}
 
 					// Update results display
-					results.innerHTML = "Highlighted result "+(ICEcoder.findResult+(!findPrevious ? 1 : -1))+" of "+ICEcoder.results.length+" results";
+					results.innerHTML = "Highlighted result "+(this.findResult+(!findPrevious ? 1 : -1))+" of "+this.results.length+" results";
 
 					// Now actually perform the movement in the editor
 					if (!findPrevious) {
@@ -2714,28 +2710,28 @@ var ICEcoder = {
 					}
 					// Finally, highlight our selection
 					thisCM.setSelection(cursor.from(), cursor.to());
-					ICEcoder.focus();
-					ICEcoder.findMode = true;
+					this.focus();
+					this.findMode = true;
 				}
 
 				// Display the find results bar
 				// The avg block is either line height or fraction of space available
-				avgBlockH = !ICEcoder.scrollBarVisible ? thisCM.defaultTextHeight() : parseInt(ICEcoder.content.style.height,10)/thisCM.lineCount();
+				avgBlockH = !this.scrollBarVisible ? thisCM.defaultTextHeight() : parseInt(this.content.style.height,10)/thisCM.lineCount();
 				// Need to add padding if there's no scrollbar, so current line highlighting lines up with it
-				addPadding = !ICEcoder.scrollBarVisible ? thisCM.heightAtLine(0) : 0;
+				addPadding = !this.scrollBarVisible ? thisCM.heightAtLine(0) : 0;
 				rBlocks = "";
 				for (var i=1; i<=thisCM.lineCount(); i++) {
-					blockColor = ICEcoder.resultsLines.indexOf(i)>-1 ? thisCM.getCursor().line+1 == i ? "#b00" : "#888" : "transparent"
+					blockColor = this.resultsLines.indexOf(i)>-1 ? thisCM.getCursor().line+1 == i ? "#b00" : "#888" : "transparent"
 					rBlocks += '<div style="position: absolute; display: block; width: 5px; height:'+avgBlockH+'px; background: '+blockColor+'; top: '+parseInt((avgBlockH*(i-1))+addPadding,10)+'px"></div>';
 				}
-				ICEcoder.content.contentWindow.document.getElementById('resultsBar').innerHTML = rBlocks;
-				ICEcoder.content.contentWindow.document.getElementById('resultsBar').style.display = "inline-block";
+				this.content.contentWindow.document.getElementById('resultsBar').innerHTML = rBlocks;
+				this.content.contentWindow.document.getElementById('resultsBar').style.display = "inline-block";
 				return true;
 
 			} else {
 				results.innerHTML = "No results";
-				ICEcoder.content.contentWindow.document.getElementById('resultsBar').innerHTML = "";
-				ICEcoder.content.contentWindow.document.getElementById('resultsBar').style.display = "none";
+				this.content.contentWindow.document.getElementById('resultsBar').innerHTML = "";
+				this.content.contentWindow.document.getElementById('resultsBar').style.display = "none";
 				return false;
 			}
 		} else {
@@ -2751,25 +2747,25 @@ var ICEcoder = {
 					targetQS = "&target="+document.findAndReplace.target.value.replace(/ /g,"-");
 				}
 				if (document.findAndReplace.target.value==t['selected files']) {
-					filesQS = "&selectedFiles="+ICEcoder.selectedFiles.join(":");
+					filesQS = "&selectedFiles="+this.selectedFiles.join(":");
 				}
 				find = find.replace(/\'/g, '\&#39;');
 				find != encodeURIComponent(find) ? find = 'ICEcoder:'+encodeURIComponent(find) : find;
-				ICEcoder.showHide('show',get('loadingMask'));
-				get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/multiple-results.php?find='+find+replaceQS+targetQS+filesQS+'&csrf='+ICEcoder.csrf+'" class="whiteGlow" style="width: 700px; height: 500px"></iframe>';
+				this.showHide('show',get('loadingMask'));
+				get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/multiple-results.php?find='+find+replaceQS+targetQS+filesQS+'&csrf='+this.csrf+'" class="whiteGlow" style="width: 700px; height: 500px"></iframe>';
 			// We have nothing to search for, blank it all out
 			} else {
 				results.innerHTML = "No results";
-				ICEcoder.content.contentWindow.document.getElementById('resultsBar').innerHTML = "";
-				ICEcoder.content.contentWindow.document.getElementById('resultsBar').style.display = "none";
+				this.content.contentWindow.document.getElementById('resultsBar').innerHTML = "";
+				this.content.contentWindow.document.getElementById('resultsBar').style.display = "none";
 			}
 		}
 	},
 
 	// Replace text in a file
 	replaceInFile: function(fileRef,find,replace) {
-		ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=replaceText&find="+find+"&replace="+replace+"&csrf="+ICEcoder.csrf,encodeURIComponent(fileRef.replace(/\//g,"|")));
-		ICEcoder.serverMessage('<b>'+t['Replacing text in']+'</b><br>'+fileRef);
+		this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=replaceText&find="+find+"&replace="+replace+"&csrf="+this.csrf,encodeURIComponent(fileRef.replace(/\//g,"|")));
+		this.serverMessage('<b>'+t['Replacing text in']+'</b><br>'+fileRef);
 	},
 
 // ==============
@@ -2780,9 +2776,9 @@ var ICEcoder = {
 	getCaretPosition: function() {
 		var cM, cMdiff, thisCM, line, ch, chPos;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
 		line = thisCM.getCursor().line;
 		ch = thisCM.getCursor().ch;
@@ -2790,26 +2786,26 @@ var ICEcoder = {
 		for (var i=0;i<line;i++) {
 			chPos += thisCM.getLine(i).length+1;
 		}
-		ICEcoder.caretPos=(chPos+ch-1);
+		this.caretPos=(chPos+ch-1);
 	},
 
 	// Update the code type, line & character display
 	updateCharDisplay: function() {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
-		ICEcoder.caretLocationType();
-		ICEcoder.charDisplay.innerHTML = ICEcoder.caretLocType + ", Line: " + (thisCM.getCursor().line+1) + ", Char: " + thisCM.getCursor().ch;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		this.caretLocationType();
+		this.charDisplay.innerHTML = this.caretLocType + ", Line: " + (thisCM.getCursor().line+1) + ", Char: " + thisCM.getCursor().ch;
 	},
 
 	// Update version display
 	updateVersionsDisplay: function() {
-		var versionsCount = ICEcoder.openFileVersions[ICEcoder.selectedTab-1];
+		var versionsCount = this.openFileVersions[this.selectedTab-1];
 
 		get('versionsDisplay').innerHTML = "undefined" != typeof versionsCount
-			? ICEcoder.openFileVersions[ICEcoder.selectedTab-1] + " backup" +
+			? this.openFileVersions[this.selectedTab-1] + " backup" +
 				(versionsCount != 1 ? "s" : "")
 			: "";
 	},
@@ -2818,16 +2814,16 @@ var ICEcoder = {
 	updateByteDisplay: function() {
 		var cM, cMdiff, thisCM;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
-		ICEcoder.byteDisplay.innerHTML = thisCM.getValue().length.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + " bytes";
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		this.byteDisplay.innerHTML = thisCM.getValue().length.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + " bytes";
 	},
 
 	// Toggle the char/byte display
 	showDisplay: function(show) {
-		ICEcoder.byteDisplay.style.display = show == "byte" ? "inline-block" : "none";
-		ICEcoder.charDisplay.style.display = show == "char" ? "inline-block" : "none";
+		this.byteDisplay.style.display = show == "byte" ? "inline-block" : "none";
+		this.charDisplay.style.display = show == "char" ? "inline-block" : "none";
 	},
 
 	// Show & hide target element
@@ -2837,27 +2833,37 @@ var ICEcoder = {
 
 	// Determine the CodeMirror instance we're using
 	getcMInstance: function(tab) {
-		return parent.ICEcoder.content.contentWindow[
+		ic = this;
+		if (!ic.content) {
+			ic = parent.ICEcoder;
+		}
+		if (!ic.content) {
+			ic = parent.ICEcoder;
+		}
+		return ic.content.contentWindow[
 			// target specific tab
 			!isNaN(tab)
 			? 'cM'+ICEcoder.cMInstances[tab-1]
 			// new tab or selected tab
-			: tab=="new"||(tab!="new" && ICEcoder.openFiles.length>0)
-			? 'cM'+ICEcoder.cMInstances[ICEcoder.selectedTab-1]
+			: tab=="new"||(tab!="new" && this.openFiles.length>0)
+			? 'cM'+ICEcoder.cMInstances[this.selectedTab-1]
 			// fallback to first tab
 			: 'cM1'
 		];
 	},
 
 	// Determine the CodeMirror instance we're using
-	getcMdiffInstance: function(tab) {
-		return parent.ICEcoder.content.contentWindow[
+	getcMdiffInstance: function(tab, context) {
+		if ("undefined" === typeof context) {
+			context = ICEcoder;
+		}
+		return context.content.contentWindow[
 			(// target specific tab
 			!isNaN(tab)
 			? 'cM'+ICEcoder.cMInstances[tab-1]
 			// new tab or selected tab
-			: tab=="new"||(tab!="new" && ICEcoder.openFiles.length>0)
-			? 'cM'+ICEcoder.cMInstances[ICEcoder.selectedTab-1]
+			: tab=="new"||(tab!="new" && this.openFiles.length>0)
+			? 'cM'+ICEcoder.cMInstances[this.selectedTab-1]
 			// fallback to first tab
 			: 'cM1')
 			+ 'diff'
@@ -2868,18 +2874,18 @@ var ICEcoder = {
 	getMouseXY: function(e,area) {
 		var tempX, tempY;
 
-		ICEcoder.mouseX = e.pageX ? e.pageX : e.clientX + document.body.scrollLeft;
-		ICEcoder.mouseY = e.pageY ? e.pageY : e.clientY + document.body.scrollTop;
+		this.mouseX = e.pageX ? e.pageX : e.clientX + document.body.scrollLeft;
+		this.mouseY = e.pageY ? e.pageY : e.clientY + document.body.scrollTop;
 
-		ICEcoder.area = area;
+		this.area = area;
 		if (area!="top") {
-			ICEcoder.mouseY += 25 + 45;
+			this.mouseY += 25 + 45;
 		}
 		if (area=="editor") {
-			ICEcoder.mouseX += ICEcoder.filesW;
+			this.mouseX += this.filesW;
 		}
-		ICEcoder.dragCursorTest();
-		if (ICEcoder.mouseY>62) {ICEcoder.setTabWidths();};
+		this.dragCursorTest();
+		if (this.mouseY>62) {this.setTabWidths();};
 	},
 
 	// Test if we need to show a drag cursor or not
@@ -2887,26 +2893,26 @@ var ICEcoder = {
 		var diffX, winH, cursorName, zone;
 
 		// Dragging tabs, started after dragging for 10px from origin
-		diffX = ICEcoder.mouseX - ICEcoder.diffStartX;
-		if (ICEcoder.draggingTab!==false && ICEcoder.diffStartX && (diffX <= -10 || diffX >= 10)) {
-			if (ICEcoder.mouseX > parseInt(ICEcoder.files.style.width,10)) {
-				ICEcoder.tabDragMouseX = ICEcoder.mouseX - parseInt(ICEcoder.files.style.width,10) - ICEcoder.tabDragMouseXStart;
-				ICEcoder.tabDragMove();
+		diffX = this.mouseX - this.diffStartX;
+		if (this.draggingTab!==false && this.diffStartX && (diffX <= -10 || diffX >= 10)) {
+			if (this.mouseX > parseInt(this.files.style.width,10)) {
+				this.tabDragMouseX = this.mouseX - parseInt(this.files.style.width,10) - this.tabDragMouseXStart;
+				this.tabDragMove();
 			}
 		}
 
 		// Dragging file manager, possible within 7px of file manager edge
-		if (ICEcoder.ready) {
+		if (this.ready) {
 			winH = window.innerHeight;
-			if (!ICEcoder.mouseDown) {ICEcoder.draggingFilesW = false};
+			if (!this.mouseDown) {this.draggingFilesW = false};
 
-			cursorName = (!ICEcoder.draggingTab && ((ICEcoder.mouseX > ICEcoder.filesW-7 && ICEcoder.mouseX < ICEcoder.filesW+7) || ICEcoder.draggingFilesW))
+			cursorName = (!this.draggingTab && ((this.mouseX > this.filesW-7 && this.mouseX < this.filesW+7) || this.draggingFilesW))
 				? "w-resize"
 				: "auto";
-			if (ICEcoder.content.contentWindow.document && ICEcoder.filesFrame.contentWindow) {
+			if (this.content.contentWindow.document && this.filesFrame.contentWindow) {
 				document.body.style.cursor = cursorName;
-				if (zone = ICEcoder.content.contentWindow.document.body)	{zone.style.cursor = cursorName};
-				if (zone = ICEcoder.filesFrame.contentWindow.document.body)	{zone.style.cursor = cursorName};
+				if (zone = this.content.contentWindow.document.body)	{zone.style.cursor = cursorName};
+				if (zone = this.filesFrame.contentWindow.document.body)	{zone.style.cursor = cursorName};
 			}
 		}
 	},
@@ -2917,7 +2923,7 @@ var ICEcoder = {
 
 		serverMessage =	parent.get('serverMessage');
 		if (message) {
-			serverMessage.innerHTML = ICEcoder.xssClean(message).replace(/\&lt;b\&gt;/g,"<b>").replace(/\&lt;\/b\&gt;/g,"</b>").replace(/\&lt;br\&gt;/g,"<br>");
+			serverMessage.innerHTML = this.xssClean(message).replace(/\&lt;b\&gt;/g,"<b>").replace(/\&lt;\/b\&gt;/g,"</b>").replace(/\&lt;br\&gt;/g,"<br>");
 			serverMessage.style.left = "0";
 		} else {
 			setTimeout(function() {serverMessage.style.left = "2000px";},200);
@@ -2929,9 +2935,9 @@ var ICEcoder = {
 	cssColorPreview: function() {
 		var cM, cMdiff, thisCM, string, rx, match, oldBlock, newBlock;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
 		if (thisCM) {
 			string = thisCM.getLine(thisCM.getCursor().line);
@@ -2941,7 +2947,7 @@ var ICEcoder = {
 
 			oldBlock = get('content').contentWindow.document.getElementById('cssColor');
 			if (oldBlock) {oldBlock.parentNode.removeChild(oldBlock)};
-			if (ICEcoder.codeAssist && ICEcoder.caretLocType=="CSS") {
+			if (this.codeAssist && this.caretLocType=="CSS") {
 				newBlock = document.createElement("div");
 				newBlock.id = "cssColor";
 				newBlock.style.position = "absolute";
@@ -2950,7 +2956,7 @@ var ICEcoder = {
 				newBlock.style.zIndex = "1000";
 				newBlock.style.background = match ? match[0] : '';
 				newBlock.style.cursor = "pointer";
-				newBlock.onclick = function() {ICEcoder.showColorPicker(match[0])};
+				newBlock.onclick = function() {this.showColorPicker(match[0])};
 				if (newBlock.style.backgroundColor=="") {newBlock.style.display = "none"};
 				get('header').appendChild(newBlock);
 				thisCM.addWidget(thisCM.getCursor(), get('cssColor'), true);
@@ -2963,9 +2969,9 @@ var ICEcoder = {
 		get('blackMask').style.visibility = "visible";
 		get('mediaContainer').innerHTML = 	'<div id="picker" class="picker"></div><br><br>'+
 							'<input type="text" id="color" name="color" value="#000" class="colorValue">'+
-							'<input type="button" onClick="ICEcoder.insertColorValue(get(\'color\').value)" value="insert &gt;" class="insertColorValue"><br>'+
+							'<input type="button" onClick="this.insertColorValue(get(\'color\').value)" value="insert &gt;" class="insertColorValue"><br>'+
 							'<input type="text" id="colorRGB" name="colorRGB" value="rgb(0,0,0)" class="colorValue">'+
-							'<input type="button" onClick="ICEcoder.insertColorValue(get(\'colorRGB\').value)" value="insert &gt;" class="insertColorValue">';
+							'<input type="button" onClick="this.insertColorValue(get(\'colorRGB\').value)" value="insert &gt;" class="insertColorValue">';
 		farbtastic('picker','color');
 		if (color) {
 			get('picker').farbtastic.setColor(color);
@@ -3031,7 +3037,7 @@ var ICEcoder = {
 			B = imgData[2];
 			rgb = R+','+G+','+B;
 	 		// Get hex from RGB value
-			hex = ICEcoder.rgbToHex(R,G,B);
+			hex = this.rgbToHex(R,G,B);
 			// set the values & BG colours of the input boxes
 			get('rgbMouseXY').value = rgb;
 			get('hexMouseXY').value = '#' + hex;
@@ -3041,8 +3047,8 @@ var ICEcoder = {
 
 			// Move the floating container to follow mouse pointer
 			fcElem = get('floatingContainer');
-			fcElem.style.left = ICEcoder.mouseX+20 + "px";
-			fcElem.style.top = ICEcoder.mouseY + "px";
+			fcElem.style.left = this.mouseX+20 + "px";
+			fcElem.style.top = this.mouseY + "px";
 			// Move the background image for the container to match also
 			// 5 x zoom, account for scaling down of large images and shift 25px of the hover div size
 			// (55px is the 11x11 grid of pixels), minus 5px for centre row/col
@@ -3062,7 +3068,7 @@ var ICEcoder = {
 
 	// Convert RGB values to Hex
 	rgbToHex: function(R,G,B) {
-		return ICEcoder.toHex(R)+ICEcoder.toHex(G)+ICEcoder.toHex(B);
+		return this.toHex(R)+this.toHex(G)+this.toHex(B);
 	},
 
 	// Return numbers as hex equivalent
@@ -3077,9 +3083,9 @@ var ICEcoder = {
 	insertColorValue: function(color) {
 		var cM, cMdiff, thisCM, cursor;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		cursor = thisCM.getTokenAt(thisCM.getCursor());
 		thisCM.replaceRange(color,{line:thisCM.getCursor().line,ch:cursor.start},{line:thisCM.getCursor().line,ch:1000000});
 	},
@@ -3098,7 +3104,7 @@ var ICEcoder = {
 		var i;
 
 		file = file.replace(/\|/g, "/").replace(docRoot+iceRoot,"");
-		i = ICEcoder.openFiles.indexOf(file);
+		i = this.openFiles.indexOf(file);
 		// return the array position or false
 		return i!=-1 ? i : false;
 	},
@@ -3111,41 +3117,41 @@ var ICEcoder = {
 	startPluginIntervals: function(plugRef,plugURL,plugTarget,plugTimer) {
 		// Add CSRF to URL if it has QS params
 		if (plugURL.indexOf("?") > -1) {
-			plugURL = plugURL+"&csrf="+ICEcoder.csrf;
+			plugURL = plugURL+"&csrf="+this.csrf;
 		}
-		ICEcoder['plugTimer'+plugRef] =
+		this['plugTimer'+plugRef] =
 		// This window instances
 			["_parent","_top","_self",""].indexOf(plugTarget) > -1
-			? ICEcoder['plugTimer'+plugRef] = setInterval('window.location=\''+plugURL+'\'',plugTimer*1000*60)
+			? this['plugTimer'+plugRef] = setInterval('window.location=\''+plugURL+'\'',plugTimer*1000*60)
 		// fileControl iframe instances
 			: plugTarget.indexOf("fileControl") == 0
-			? ICEcoder['plugTimer'+plugRef] = setInterval(function() {
-				ICEcoder.serverQueue("add",plugURL);ICEcoder.serverMessage(plugTarget.split(":")[1]);
-				},plugTimer*1000*60)
+			? this['plugTimer'+plugRef] = setInterval(function(ic) {
+					ic.serverQueue("add",plugURL);ic.serverMessage(plugTarget.split(":")[1]);
+				},plugTimer*1000*60,this)
 		// _blank or named target window instances
-			: ICEcoder['plugTimer'+plugRef] = setInterval('window.open(\''+plugURL+'\',\''+plugTarget+'\')',plugTimer*1000*60);
+			: this['plugTimer'+plugRef] = setInterval('window.open(\''+plugURL+'\',\''+plugTarget+'\')',plugTimer*1000*60);
 
 		// push the plugin ref into our array
-		ICEcoder.pluginIntervalRefs.push(plugRef);
+		this.pluginIntervalRefs.push(plugRef);
 	},
 
 	// Turning on/off the Code Assist
 	codeAssistToggle: function() {
 		var cM, cMdiff, fileName, fileExt;
 
-		ICEcoder.codeAssist = !ICEcoder.codeAssist;
-		get('codeAssistDisplay').style.backgroundPosition = ICEcoder.codeAssist ? "0 0" : "-16px 0";
-		ICEcoder.cssColorPreview();
-		ICEcoder.focus(ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? 'diff' : false);
+		this.codeAssist = !this.codeAssist;
+		get('codeAssistDisplay').style.backgroundPosition = this.codeAssist ? "0 0" : "-16px 0";
+		this.cssColorPreview();
+		this.focus(this.editorFocusInstance.indexOf('diff') > -1 ? 'diff' : false);
 
-		for (i=0;i<ICEcoder.cMInstances.length;i++) {
-			fileName = ICEcoder.openFiles[i];
+		for (i=0;i<this.cMInstances.length;i++) {
+			fileName = this.openFiles[i];
 			fileExt = fileName.split(".");
 			fileExt = fileExt[fileExt.length-1];
 			if (fileExt == "js" || fileExt == "json") {
-				cM = ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]];
-				cMdiff = ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'];
-				if (!ICEcoder.codeAssist) {
+				cM = this.content.contentWindow['cM'+this.cMInstances[i]];
+				cMdiff = this.content.contentWindow['cM'+this.cMInstances[i]+'diff'];
+				if (!this.codeAssist) {
 					cM.clearGutter("CodeMirror-lint-markers");
 					cM.setOption("lint",false);
 					cMdiff.clearGutter("CodeMirror-lint-markers");
@@ -3161,28 +3167,26 @@ var ICEcoder = {
 	// Queue items up for processing in turn
 	serverQueue: function(action,item,file,changes) {
 		var cM, nextSaveID, txtArea, topSaveID, element, xhr, statusObj, timeStart;
-
 		// If we have this exact item URL, it's almost certain we've got a repetitive save
 		// situation and so clear the message and server queue item to avoid save jamming
-		if (ICEcoder.serverQueueItems.indexOf(item) !== -1) {
-			ICEcoder.serverMessage();
-			ICEcoder.serverQueue("del",0);
+		if (this.serverQueueItems.indexOf(item) !== -1) {
+			this.serverMessage();
+			this.serverQueue("del",0);
 			return;
 		}
 
-		cM = ICEcoder.getcMInstance();
+		cM = this.getcMInstance();
 		// Firstly, work out how many saves we have to carry out
 		nextSaveID=0;
-		for (var i=0;i<ICEcoder.serverQueueItems.length;i++) {
-			if (ICEcoder.serverQueueItems[i].indexOf('action=save')>0) {
+		for (var i=0;i<this.serverQueueItems.length;i++) {
+			if (this.serverQueueItems[i].indexOf('action=save')>0) {
 				nextSaveID++;
 			}
 		}
 		nextSaveID++;
-
 		// Add to end of array or remove from beginning on demand, plus add or remove if necessary
 		if (action=="add") {
-			ICEcoder.serverQueueItems.push(item);
+			this.serverQueueItems.push(item);
 			if (item.indexOf('action=save')>0) {
 				txtArea = document.createElement('textarea');
 				txtArea.setAttribute('id', 'saveTemp'+nextSaveID);
@@ -3196,7 +3200,8 @@ var ICEcoder = {
 				}
 			}
 		} else if (action=="del") {
-			if (ICEcoder.serverQueueItems[0] && ICEcoder.serverQueueItems[0].indexOf('action=save')>0) {
+			// console.log(this);
+			if (this.serverQueueItems[0] && this.serverQueueItems[0].indexOf('action=save')>0) {
 				topSaveID = nextSaveID-1;
 				for (var i=1;i<topSaveID;i++) {
 					get('saveTemp'+i).value = get('saveTemp'+(i+1)).value;
@@ -3204,15 +3209,15 @@ var ICEcoder = {
 				element = get('saveTemp'+topSaveID);
 				element.parentNode.removeChild(element);
 			}
-			ICEcoder.serverQueueItems.splice(0,1);
+			this.serverQueueItems.splice(0,1);
 		}
 
 		// If we've just removed from the array and there's another action queued up, or we're triggering for the first time
 		// then do the next requested process, stored at array pos 0
-		if (action=="del" && ICEcoder.serverQueueItems.length>=1 || ICEcoder.serverQueueItems.length==1) {
+		if (action=="del" && this.serverQueueItems.length>=1 || this.serverQueueItems.length==1) {
 			// If we have an item, we're not saving previous file refs and not loading
 			if (item && (item.indexOf('saveFiles=')==-1 && item.indexOf('action=load')==-1)) {
-				xhr = ICEcoder.xhrObj();
+				xhr = this.xhrObj();
 				xhr.onreadystatechange=function() {
 					if (xhr.readyState==4) {
 						// OK reponse?
@@ -3225,34 +3230,34 @@ var ICEcoder = {
 							statusObj.action.timeTaken = statusObj.action.timeEnd - statusObj.action.timeStart;
 
 							// User wanted raw (or both) output of the response?
-							if (["raw","both"].indexOf(ICEcoder.fileDirResOutput) >= 0) {
+							if (["raw","both"].indexOf(this.fileDirResOutput) >= 0) {
 								console.log(xhr.responseText);
 							}
 							// User wanted object (or both) output of the response?
-							if (["object","both"].indexOf(ICEcoder.fileDirResOutput) >= 0) {
+							if (["object","both"].indexOf(this.fileDirResOutput) >= 0) {
 								console.log(statusObj);
 							}
 							// If error, show that, otherwise do whatever we're required to do next
 							if (statusObj.status.error) {
-								ICEcoder.message(statusObj.status.errorMsg);
+								this.message(statusObj.status.errorMsg);
 								console.log("ICEcoder error info for your request...");
 								console.log(statusObj);
-								ICEcoder.serverMessage();
-								ICEcoder.serverQueue('del',0);
+								this.serverMessage();
+								this.serverQueue('del',0);
 							} else {
 								eval(statusObj.action.doNext);
 							}
 						// Some other response? Display a message about that
 						} else {
-							ICEcoder.message(t['Sorry there was...']);
+							this.message(t['Sorry there was...']);
 							console.log("ICEcoder error info for your request...");
 							console.log(statusObj);
-							ICEcoder.serverMessage();
-							ICEcoder.serverQueue('del',0);
+							this.serverMessage();
+							this.serverQueue('del',0);
 						}
 					}
 				};
-				xhr.open("POST",ICEcoder.serverQueueItems[0],true);
+				xhr.open("POST",this.serverQueueItems[0],true);
 				xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
 				timeStart = new Date().getTime();
 
@@ -3268,11 +3273,11 @@ var ICEcoder = {
 				}
 			} else {
 
-				setTimeout(function() {
-					if ("undefined" != typeof ICEcoder.serverQueueItems[0]) {
-						ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href=ICEcoder.serverQueueItems[0];
+				setTimeout(function(ic) {
+					if ("undefined" != typeof ic.serverQueueItems[0]) {
+						ic.filesFrame.contentWindow.frames['fileControl'].location.href=ic.serverQueueItems[0];
 					}
-				},1);
+				},1,this);
 
 			}
 		}
@@ -3282,23 +3287,23 @@ var ICEcoder = {
 	cancelAllActions: function() {
 		// Stop whatever the parent may be loading and clear tasks other than the current one
 		window.stop();
-		if (ICEcoder.serverQueueItems.length>0) {
-			ICEcoder.serverQueueItems.splice(1,ICEcoder.serverQueueItems.length);
+		if (this.serverQueueItems.length>0) {
+			this.serverQueueItems.splice(1,this.serverQueueItems.length);
 		}
-		ICEcoder.showHide('hide',get('loadingMask'));
-		ICEcoder.serverMessage('<b style="color: #d00">'+t['Cancelled tasks']+'</b>');
-		setTimeout(function() {ICEcoder.serverMessage();},2000);
+		this.showHide('hide',get('loadingMask'));
+		this.serverMessage('<b style="color: #d00">'+t['Cancelled tasks']+'</b>');
+		setTimeout(function(ic) {ic.serverMessage();},2000,this);
 	},
 
 	// Set the current previousFiles in the settings file
 	setPreviousFiles: function() {
 		var previousFiles;
 
-		previousFiles = ICEcoder.openFiles.join(',').replace(/\//g,"|").replace(/(\|\[NEW\])|(,\|\[NEW\])/g,"").replace(/(^,)|(,$)/g,"");
+		previousFiles = this.openFiles.join(',').replace(/\//g,"|").replace(/(\|\[NEW\])|(,\|\[NEW\])/g,"").replace(/(^,)|(,$)/g,"");
 		if (previousFiles=="") {previousFiles="CLEAR"};
 		// Then send through to the settings page to update setting
-		ICEcoder.serverQueue("add",iceLoc+"/lib/settings.php?saveFiles="+encodeURIComponent(previousFiles)+"&csrf="+ICEcoder.csrf);
-		ICEcoder.updateLast10List(previousFiles);
+		this.serverQueue("add",iceLoc+"/lib/settings.php?saveFiles="+encodeURIComponent(previousFiles)+"&csrf="+this.csrf);
+		this.updateLast10List(previousFiles);
 	},
 
 	// Update the list of 10 previous files in browser
@@ -3311,10 +3316,10 @@ var ICEcoder = {
 		for (var i=0; i<previousFiles.length; i++) {
 			if (previousFiles[i] != "CLEAR") {
 				// Set the new file LI item to maybe insert at top of the list, including trailing new line to split on in future
-				newFile = "<li class=\"pft-file ext-"+previousFiles[i].substring(previousFiles[i].lastIndexOf(".")+1)+"\" style=\"margin-left: -21px\"><a style=\"cursor:pointer\" onclick=\"ICEcoder.openFile('"+previousFiles[i].replace(/\|/g,"/")+"')\">"+previousFiles[i].replace(/\|/g,"/")+"</a></li>\n";
+				newFile = "<li class=\"pft-file ext-"+previousFiles[i].substring(previousFiles[i].lastIndexOf(".")+1)+"\" style=\"margin-left: -21px\"><a style=\"cursor:pointer\" onclick=\"this.openFile('"+previousFiles[i].replace(/\|/g,"/")+"')\">"+previousFiles[i].replace(/\|/g,"/")+"</a></li>\n";
 
 				// Get DOM elem for last 10 files
-				last10Files = ICEcoder.content.contentWindow.document.getElementById('last10Files');
+				last10Files = this.content.contentWindow.document.getElementById('last10Files');
 
 				// If the innerHTML of that doesn't contain our new item, we can insert it
 				if(last10Files.innerHTML.indexOf(newFile) == -1) {
@@ -3336,11 +3341,11 @@ var ICEcoder = {
 
 	// Opens the last files we had open
 	autoOpenFiles: function() {
-		if (ICEcoder.previousFiles.length>0 && ICEcoder.ask(t['Open previous files']+'\n\n'+ICEcoder.previousFiles.length+' files:\n'+ICEcoder.previousFiles.join('\n').replace(/\|/g,"/").replace(new RegExp(docRoot+iceRoot,'gi'),""))) {
-			for (var i=0;i<ICEcoder.previousFiles.length;i++) {
-				ICEcoder.thisFileFolderLink=ICEcoder.previousFiles[i].replace('|','/');
-				ICEcoder.thisFileFolderType='file';
-				ICEcoder.openFile();
+		if (this.previousFiles.length>0 && this.ask(t['Open previous files']+'\n\n'+this.previousFiles.length+' files:\n'+this.previousFiles.join('\n').replace(/\|/g,"/").replace(new RegExp(docRoot+iceRoot,'gi'),""))) {
+			for (var i=0;i<this.previousFiles.length;i++) {
+				this.thisFileFolderLink=this.previousFiles[i].replace('|','/');
+				this.thisFileFolderType='file';
+				this.openFile();
 			}
 		}
 	},
@@ -3350,19 +3355,19 @@ var ICEcoder = {
 		if (!hide) {
 			get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/settings-screen.php" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
 		}
-		ICEcoder.showHide(hide?'hide':'show',get('blackMask'));
+		this.showHide(hide?'hide':'show',get('blackMask'));
 	},
 
 	// Show the help screen
 	helpScreen: function() {
 		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/help.php" class="whiteGlow" style="width: 840px; height: 485px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Show the backup versions screen
 	versionsScreen: function(file,versions) {
-		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/backup-versions.php?file='+file+'&csrf='+ICEcoder.csrf+'" class="whiteGlow" style="width: 970px; height: 640px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/backup-versions.php?file='+file+'&csrf='+this.csrf+'" class="whiteGlow" style="width: 970px; height: 640px"></iframe>';
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Show the ICEcoder manual, loaded remotely
@@ -3370,43 +3375,43 @@ var ICEcoder = {
 		var sectionExtra;
 
 		sectionExtra = section ? "#"+section : "";
-		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/https://icecoder.net/manual?version='+version+sectionExtra+'" class="whiteGlow" style="width: 800px; height: 470px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/https://this.net/manual?version='+version+sectionExtra+'" class="whiteGlow" style="width: 800px; height: 470px"></iframe>';
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Show the properties screen
 	propertiesScreen: function(fileName) {
-		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/properties.php?fileName='+fileName.replace(/\//g,"|")+'&csrf='+ICEcoder.csrf+'" class="whiteGlow" style="width: 660px; height: 330px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/properties.php?fileName='+fileName.replace(/\//g,"|")+'&csrf='+this.csrf+'" class="whiteGlow" style="width: 660px; height: 330px"></iframe>';
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Show the auto-logout warning screen
 	autoLogoutWarningScreen: function() {
 		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/auto-logout-warning.php" id="autoLogoutIFrame" class="whiteGlow" style="width: 400px; height: 160px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Show the plugins manager
 	pluginsManager: function() {
 		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/plugins-manager.php" class="whiteGlow" style="width: 800px; height: 450px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Go to localhost root
 	goLocalhostRoot: function() {
-		ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href = iceLoc+"/lib/go-localhost-root.php";
+		this.filesFrame.contentWindow.frames['fileControl'].location.href = iceLoc+"/lib/go-localhost-root.php";
 	},
 
 	// Show the GitHub commit screen
 	githubAction: function(action) {
-		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/github.php?action='+action+'&selectedFiles='+ICEcoder.selectedFiles.join(";")+'&csrf='+ICEcoder.csrf+'" class="whiteGlow" style="width: 340px; height: 340px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/github.php?action='+action+'&selectedFiles='+this.selectedFiles.join(";")+'&csrf='+this.csrf+'" class="whiteGlow" style="width: 340px; height: 340px"></iframe>';
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Ask user for GitHub token
 	githubTokenAsk: function(goNext) {
-		if (githubAuthToken = ICEcoder.getInput(t['Please enter your...'],'')) {
-			ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href = iceLoc+"/lib/github.php?action=auth&token="+githubAuthToken+"&goNext="+goNext+"&csrf="+ICEcoder.csrf;
+		if (githubAuthToken = this.getInput(t['Please enter your...'],'')) {
+			this.filesFrame.contentWindow.frames['fileControl'].location.href = iceLoc+"/lib/github.php?action=auth&token="+githubAuthToken+"&goNext="+goNext+"&csrf="+this.csrf;
 			// Clear the token from the var for security
 			githubAuthToken = "";
 		}
@@ -3421,11 +3426,11 @@ var ICEcoder = {
 	// Show the GitHub manager
 	githubManager: function() {
 		var githubAuthToken;
-		if (ICEcoder.githubAuthTokenSet) {
+		if (this.githubAuthTokenSet) {
 			get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/github-manager.php" class="whiteGlow" style="width: 660px; height: 450px"></iframe>';
-			ICEcoder.showHide('show',get('blackMask'));
+			this.showHide('show',get('blackMask'));
 		} else {
-			ICEcoder.githubTokenAsk('showManager');
+			this.githubTokenAsk('showManager');
 		}
 	},
 
@@ -3433,20 +3438,20 @@ var ICEcoder = {
 	githubDiffToggle: function() {
 		var gHDiff;
 
-		if (!ICEcoder.githubAuthTokenSet) {
-			ICEcoder.githubTokenAsk('loadFiles');
-		} else if (ICEcoder.githubDiff || ICEcoder.ask(t['This will compare...'])) {
-			ICEcoder.githubDiff = !ICEcoder.githubDiff;
-			gHDiff = ICEcoder.githubDiff ? "true" : "false";
+		if (!this.githubAuthTokenSet) {
+			this.githubTokenAsk('loadFiles');
+		} else if (this.githubDiff || this.ask(t['This will compare...'])) {
+			this.githubDiff = !this.githubDiff;
+			gHDiff = this.githubDiff ? "true" : "false";
 
-			ICEcoder.filesFrame.src = "files.php?githubDiff="+gHDiff+"&csrf="+ICEcoder.csrf;
+			this.filesFrame.src = "files.php?githubDiff="+gHDiff+"&csrf="+this.csrf;
 		}
 	},
 
 	// Show the FTP manager
 	ftpManager: function() {
 		get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/ftp-manager.php" class="whiteGlow" style="width: 660px; height: 550px"></iframe>';
-		ICEcoder.showHide('show',get('blackMask'));
+		this.showHide('show',get('blackMask'));
 	},
 
 	// Update the settings used when we make a change to them
@@ -3458,42 +3463,42 @@ var ICEcoder = {
 		// find out new theme name without leading path and trailing ".css"
 		var newTheme = cleanThemeUrl.slice(cleanThemeUrl.lastIndexOf("/")+1,cleanThemeUrl.lastIndexOf("."));
 		// if theme was not changed - no need to do all these tricks
-		if (ICEcoder.theme !== newTheme){
+		if (this.theme !== newTheme){
 			// Add new stylesheet for selected theme to editor
-			ICEcoder.theme = newTheme;
-			if (ICEcoder.theme=="editor") {ICEcoder.theme="icecoder"};
+			this.theme = newTheme;
+			if (this.theme=="editor") {this.theme="icecoder"};
 			styleNode = document.createElement('link');
 			styleNode.setAttribute('rel', 'stylesheet');
 			styleNode.setAttribute('type', 'text/css');
 			styleNode.setAttribute('href', themeURL);
-			ICEcoder.content.contentWindow.document.getElementsByTagName('head')[0].appendChild(styleNode);
+			this.content.contentWindow.document.getElementsByTagName('head')[0].appendChild(styleNode);
 			// Add new stylesheet for selected theme to top level (used by Minimap)
 			styleNode = document.createElement('link');
 			styleNode.setAttribute('rel', 'stylesheet');
 			styleNode.setAttribute('type', 'text/css');
 			styleNode.setAttribute('href', themeURL);
 			document.getElementsByTagName('head')[0].appendChild(styleNode);
-			if (["3024-day","base16-light","eclipse","elegant","mdn-like","neat","neo","paraiso-light","solarized","the-matrix","xq-light"].indexOf(ICEcoder.theme)>-1) {
+			if (["3024-day","base16-light","eclipse","elegant","mdn-like","neat","neo","paraiso-light","solarized","the-matrix","xq-light"].indexOf(this.theme)>-1) {
 				activeLineBG = "#ccc";
-			} else if (["3024-night","blackboard","colorforth","liquibyte","night","tomorrow-night-bright","tomorrow-night-eighties","vibrant-ink"].indexOf(ICEcoder.theme)>-1) {
+			} else if (["3024-night","blackboard","colorforth","liquibyte","night","tomorrow-night-bright","tomorrow-night-eighties","vibrant-ink"].indexOf(this.theme)>-1) {
 				activeLineBG = "#888";
 			} else {
 				activeLineBG = "#000";
 			}
-			ICEcoder.switchTab(ICEcoder.selectedTab);
+			this.switchTab(this.selectedTab);
 		}
 
 		// Check/uncheck Code Assist setting
-		if (codeAssist != ICEcoder.codeAssist) {
+		if (codeAssist != this.codeAssist) {
 			get('codeAssist').checked = codeAssist;
-			ICEcoder.codeAssistToggle();
+			this.codeAssistToggle();
 		}
 
 		// Unlock/lock the file manager
-		if (lockedNav != ICEcoder.lockedNav) {
-			ICEcoder.lockUnlockNav();
-			ICEcoder.changeFilesW(!lockedNav ? 'contract' : 'expand');
-			ICEcoder.hideFileMenu();
+		if (lockedNav != this.lockedNav) {
+			this.lockUnlockNav();
+			this.changeFilesW(!lockedNav ? 'contract' : 'expand');
+			this.hideFileMenu();
 		};
 
 		// Update font size at top level
@@ -3502,97 +3507,97 @@ var ICEcoder = {
 		thisCSS[strCSS][0].style['fontSize'] = fontSize;
 
 		// Update font size in file manager
-		thisCSS = ICEcoder.filesFrame.contentWindow.document.styleSheets[3];
+		thisCSS = this.filesFrame.contentWindow.document.styleSheets[3];
 		strCSS = thisCSS.rules ? 'rules' : 'cssRules';
 		thisCSS[strCSS][0].style['fontSize'] = fontSize;
 
 		// Update styles in editor
-		thisCSS = ICEcoder.content.contentWindow.document.styleSheets[6];
+		thisCSS = this.content.contentWindow.document.styleSheets[6];
 		strCSS = thisCSS.rules ? 'rules' : 'cssRules';
 		thisCSS[strCSS][0].style['fontSize'] = fontSize;
 		thisCSS[strCSS][4].style['border-left-width'] = visibleTabs ? '1px' : '0';
 		thisCSS[strCSS][4].style['margin-left'] = visibleTabs ? '-1px' : '0';
 		thisCSS[strCSS][2].style.cssText = "background-color: " + activeLineBG + " !important";
 
-		ICEcoder.lineWrapping = lineWrapping;
-		ICEcoder.lineNumbers = lineNumbers;
-		ICEcoder.showTrailingSpace = showTrailingSpace;
-		ICEcoder.matchBrackets = matchBrackets;
-		ICEcoder.autoCloseTags = autoCloseTags;
-		ICEcoder.autoCloseBrackets = autoCloseBrackets;
-		ICEcoder.indentWithTabs = indentWithTabs;
-		ICEcoder.indentSize = indentSize;
-		ICEcoder.indentAuto = indentAuto;
-		for (var i=0;i<ICEcoder.cMInstances.length;i++) {
+		this.lineWrapping = lineWrapping;
+		this.lineNumbers = lineNumbers;
+		this.showTrailingSpace = showTrailingSpace;
+		this.matchBrackets = matchBrackets;
+		this.autoCloseTags = autoCloseTags;
+		this.autoCloseBrackets = autoCloseBrackets;
+		this.indentWithTabs = indentWithTabs;
+		this.indentSize = indentSize;
+		this.indentAuto = indentAuto;
+		for (var i=0;i<this.cMInstances.length;i++) {
 			// Main pane
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("lineWrapping", ICEcoder.lineWrapping);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("lineNumbers", ICEcoder.lineNumbers);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("showTrailingSpace", ICEcoder.showTrailingSpace);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("matchBrackets", ICEcoder.matchBrackets);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("autoCloseTags", ICEcoder.autoCloseTags);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("autoCloseBrackets", ICEcoder.autoCloseBrackets);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("indentWithTabs", ICEcoder.indentWithTabs);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("indentUnit", ICEcoder.indentSize);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].setOption("tabSize", ICEcoder.indentSize);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].refresh();
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("lineWrapping", this.lineWrapping);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("lineNumbers", this.lineNumbers);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("showTrailingSpace", this.showTrailingSpace);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("matchBrackets", this.matchBrackets);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("autoCloseTags", this.autoCloseTags);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("autoCloseBrackets", this.autoCloseBrackets);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("indentWithTabs", this.indentWithTabs);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("indentUnit", this.indentSize);
+			this.content.contentWindow['cM'+this.cMInstances[i]].setOption("tabSize", this.indentSize);
+			this.content.contentWindow['cM'+this.cMInstances[i]].refresh();
 			// Diff pane
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("lineWrapping", ICEcoder.lineWrapping);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("lineNumbers", ICEcoder.lineNumbers);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("showTrailingSpace", ICEcoder.showTrailingSpace);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("matchBrackets", ICEcoder.matchBrackets);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("autoCloseTags", ICEcoder.autoCloseTags);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("autoCloseBrackets", ICEcoder.autoCloseBrackets);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("indentWithTabs", ICEcoder.indentWithTabs);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("indentUnit", ICEcoder.indentSize);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].setOption("tabSize", ICEcoder.indentSize);
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].refresh();
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("lineWrapping", this.lineWrapping);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("lineNumbers", this.lineNumbers);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("showTrailingSpace", this.showTrailingSpace);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("matchBrackets", this.matchBrackets);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("autoCloseTags", this.autoCloseTags);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("autoCloseBrackets", this.autoCloseBrackets);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("indentWithTabs", this.indentWithTabs);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("indentUnit", this.indentSize);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].setOption("tabSize", this.indentSize);
+			this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].refresh();
 		}
 
-		if (tagWrapperCommand != ICEcoder.tagWrapperCommand) {
-			ICEcoder.tagWrapperCommand = tagWrapperCommand;
+		if (tagWrapperCommand != this.tagWrapperCommand) {
+			this.tagWrapperCommand = tagWrapperCommand;
 		}
 
-		if (autoComplete != ICEcoder.autoComplete) {
-			ICEcoder.autoComplete = autoComplete;
+		if (autoComplete != this.autoComplete) {
+			this.autoComplete = autoComplete;
 		}
 
 		get('plugins').style.left = pluginPanelAligned == "left" ? "0" : "auto";
 		get('plugins').style.right = pluginPanelAligned == "right" ? "0" : "auto";
 
 		// Restart bug checking
-		ICEcoder.bugFilePaths = bugFilePaths;
-		ICEcoder.bugFileCheckTimer = bugFileCheckTimer;
-		ICEcoder.bugFileMaxLines = bugFileMaxLines;
+		this.bugFilePaths = bugFilePaths;
+		this.bugFileCheckTimer = bugFileCheckTimer;
+		this.bugFileMaxLines = bugFileMaxLines;
 
-		if (ICEcoder.bugFilePaths[0] != "") {
-			ICEcoder.startBugChecking();
+		if (this.bugFilePaths[0] != "") {
+			this.startBugChecking();
 		} else {
-			if ("undefined" != typeof ICEcoder.bugFileCheckInt) {
-				clearInterval(ICEcoder.bugFileCheckInt);
+			if ("undefined" != typeof this.bugFileCheckInt) {
+				clearInterval(this.bugFileCheckInt);
 			}
 		}
 
 		// Update diffs if we have a split pane
-		if (ICEcoder.splitPane) {
-			ICEcoder.updateDiffs();
+		if (this.splitPane) {
+			this.updateDiffs();
 		}
 
 		// Set the flag to indicate if the GitHub auth token is set
-		ICEcoder.githubAuthTokenSet = githubAuthTokenSet;
+		this.githubAuthTokenSet = githubAuthTokenSet;
 
 		// Set the flag to indicate if we update diff pane on save
-		ICEcoder.updateDiffOnSave = updateDiffOnSave;
+		this.updateDiffOnSave = updateDiffOnSave;
 
 		// Set the auto-logout mins value
-		ICEcoder.autoLogoutMins = autoLogoutMins;
+		this.autoLogoutMins = autoLogoutMins;
 
 		// Finally, refresh the file manager if we need to
-		if (refreshFM) {ICEcoder.refreshFileManager()};
+		if (refreshFM) {this.refreshFileManager()};
 	},
 
 	// Update and show/hide found results display?
 	updateResultsDisplay: function(showHide) {
-		ICEcoder.findReplace(get('find').value,true,false);
+		this.findReplace(get('find').value,true,false);
 		get('results').style.display = showHide=="show" ? 'inline-block' : 'none';
 	},
 
@@ -3613,51 +3618,51 @@ var ICEcoder = {
 	// Pass target file/folder to Zip It!
 	zipIt: function(tgt) {
 		tgt=tgt.replace(/\//g,"|");
-		ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href="plugins/zip-it/index.php?zip="+tgt+"&csrf="+ICEcoder.csrf;
+		this.filesFrame.contentWindow.frames['fileControl'].location.href="plugins/zip-it/index.php?zip="+tgt+"&csrf="+this.csrf;
 	},
 
 	// Prompt to download our file
 	downloadFile: function(file) {
 		file=file.replace(/\//g,"|");
-		ICEcoder.filesFrame.contentWindow.frames['fileControl'].location.href=iceLoc+"/lib/download.php?file="+file+"&csrf="+ICEcoder.csrf;
+		this.filesFrame.contentWindow.frames['fileControl'].location.href=iceLoc+"/lib/download.php?file="+file+"&csrf="+this.csrf;
 	},
 
 	// Change permissions on a file/folder
 	chmod: function(file,perms) {
 		file = file.replace(iceRoot,"");
-		ICEcoder.showHide('hide',get('blackMask'));
-		ICEcoder.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=perms&perms="+perms+"&csrf="+ICEcoder.csrf,encodeURIComponent(file));
-		ICEcoder.serverMessage('<b>chMod '+perms+' on </b><br>'+file.replace(/\|/g,"/"));
+		this.showHide('hide',get('blackMask'));
+		this.serverQueue("add",iceLoc+"/lib/file-control-xhr.php?action=perms&perms="+perms+"&csrf="+this.csrf,encodeURIComponent(file));
+		this.serverMessage('<b>chMod '+perms+' on </b><br>'+file.replace(/\|/g,"/"));
 	},
 
 	// Open/show the preview window
 	openPreviewWindow: function() {
-		if (ICEcoder.openFiles.length>0) {
+		if (this.openFiles.length>0) {
 			var cM, cMdiff, thisCM, filepath, filename, fileExt;
 
-			filepath = ICEcoder.openFiles[ICEcoder.selectedTab-1];
+			filepath = this.openFiles[this.selectedTab-1];
 			filename = filepath.substr(filepath.lastIndexOf("/")+1);
 			fileExt = filename.substr(filename.lastIndexOf(".")+1);
-			cM = ICEcoder.getcMInstance();
-			cMdiff = ICEcoder.getcMdiffInstance();
-			thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+			cM = this.getcMInstance();
+			cMdiff = this.getcMdiffInstance();
+			thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
-			ICEcoder.previewWindowLoading = true;
-			ICEcoder.previewWindow = window.open(filepath,"previewWindow",500,500);
+			this.previewWindowLoading = true;
+			this.previewWindow = window.open(filepath,"previewWindow",500,500);
 			if (["md"].indexOf(fileExt) > -1) {
-				ICEcoder.previewWindow.onload = function() {
-					ICEcoder.previewWindowLoading = false;
-					ICEcoder.previewWindow.document.documentElement.innerHTML = mmd(thisCM.getValue())
+				this.previewWindow.onload = function() {
+					this.previewWindowLoading = false;
+					this.previewWindow.document.documentElement.innerHTML = mmd(thisCM.getValue())
 				};
 			} else {
-				ICEcoder.previewWindow.onload = function() {
-					ICEcoder.previewWindowLoading = false;
+				this.previewWindow.onload = function() {
+					this.previewWindowLoading = false;
 					// Do the pesticide plugin if it exists
-					try {ICEcoder.doPesticide();} catch(err) {};
+					try {this.doPesticide();} catch(err) {};
 					// Do the stats.js plugin if it exists
-					try {ICEcoder.doStatsJS('open');} catch(err) {};
+					try {this.doStatsJS('open');} catch(err) {};
 					// Do the responsive plugin if it exists
-					try {ICEcoder.doResponsive();} catch(err) {};
+					try {this.doResponsive();} catch(err) {};
 				}
 			}
 		}
@@ -3665,20 +3670,20 @@ var ICEcoder = {
 
 	// Reset auto-logout timer
 	resetAutoLogoutTimer: function() {
-		if(ICEcoder.autoLogoutMins > 1 && ICEcoder.autoLogoutTimer > (ICEcoder.autoLogoutMins*60)-60) {
-			ICEcoder.showHide('hide',get('blackMask'));
+		if(this.autoLogoutMins > 1 && this.autoLogoutTimer > (this.autoLogoutMins*60)-60) {
+			this.showHide('hide',get('blackMask'));
 		}
-		ICEcoder.autoLogoutTimer = 0;
+		this.autoLogoutTimer = 0;
 	},
 
 	// Logout of ICEcoder
 	logout: function(type) {
-		window.location = window.location + "?logout&"+(type ? "type="+type+"&" : "")+"csrf="+ICEcoder.csrf;
+		window.location = window.location + "?logout&"+(type ? "type="+type+"&" : "")+"csrf="+this.csrf;
 	},
 
 	// Show a message
 	outputMsg: function(msg) {
-		ICEcoder.output.innerHTML += msg + "<br>";
+		this.output.innerHTML += msg + "<br>";
 	},
 
 	// Show a message
@@ -3700,7 +3705,7 @@ var ICEcoder = {
 	dataMessage: function(message) {
 		var dM;
 
-		dM = ICEcoder.content.contentWindow.document.getElementById('dataMessage');
+		dM = this.content.contentWindow.document.getElementById('dataMessage');
 		dM.style.display = "block";
 		dM.innerHTML = message;
 	},
@@ -3711,18 +3716,18 @@ var ICEcoder = {
 
 		autoUpdate = confirm(t['Please note for...']);
 		if (autoUpdate) {
-			ICEcoder.showHide('show',get('loadingMask'));
+			this.showHide('show',get('loadingMask'));
 			window.location = iceLoc+"/lib/updater.php";
 		} else {
-			window.open("https://icecoder.net");
+			window.open("https://this.net");
 		}
 	},
 
 	// ICEcoder just updated
 	updated: function() {
 		get('blackMask').style.visibility = "visible";
-		get('mediaContainer').innerHTML 	= '<h1 style="color: #fff; cursor: default">Thanks for updating to v'+ICEcoder.versionNo+'!</h1>'
-							+ '<h2 style="color: #888; cursor: default">Click anywhere to continue using ICEcoder...</h2>';
+		get('mediaContainer').innerHTML 	= '<h1 style="color: #fff; cursor: default">Thanks for updating to v'+this.versionNo+'!</h1>'
+							+ '<h2 style="color: #888; cursor: default">Click anywhere to continue using this...</h2>';
 	},
 
 	// XHR object
@@ -3740,23 +3745,23 @@ var ICEcoder = {
 	openBugReport: function() {
 		var bugReportOpenFilePos;
 
-		if(ICEcoder.bugReportStatus=="off") {
-			ICEcoder.message(t['You can start...']);
+		if(this.bugReportStatus=="off") {
+			this.message(t['You can start...']);
 		}
-		if(ICEcoder.bugReportStatus=="error") {
-			ICEcoder.message(t['Error cannot find...']);
+		if(this.bugReportStatus=="error") {
+			this.message(t['Error cannot find...']);
 		}
-		if(ICEcoder.bugReportStatus=="ok") {
-			ICEcoder.message(t['No new errors...']);
+		if(this.bugReportStatus=="ok") {
+			this.message(t['No new errors...']);
 		}
-		if(ICEcoder.bugReportStatus=="bugs") {
+		if(this.bugReportStatus=="bugs") {
 			// Close bug-report without saving previousFiles and without confirming close if we made changes on the bug report
-			var bugReportOpenFilePos = ICEcoder.openFiles.indexOf(ICEcoder.bugReportPath.replace(/\|/g,"/"));
+			var bugReportOpenFilePos = this.openFiles.indexOf(this.bugReportPath.replace(/\|/g,"/"));
 			if (bugReportOpenFilePos > -1) {
-				ICEcoder.closeTab(bugReportOpenFilePos+1,'dontSetPV','dontAsk');
+				this.closeTab(bugReportOpenFilePos+1,'dontSetPV','dontAsk');
 			}
-			ICEcoder.openFile(ICEcoder.bugReportPath);
-			ICEcoder.bugFilesSizesSeen = ICEcoder.bugFilesSizesActual;
+			this.openFile(this.bugReportPath);
+			this.bugFilesSizesSeen = this.bugFilesSizesActual;
 		}
 	},
 
@@ -3764,28 +3769,28 @@ var ICEcoder = {
 	startBugChecking: function() {
 		var bugCheckURL;
 
-		if (ICEcoder.bugFileCheckTimer !== 0) {
+		if (this.bugFileCheckTimer !== 0) {
 			// Clear any existing interval
-			if ("undefined" != typeof ICEcoder.bugFileCheckInt) {
-				clearInterval(ICEcoder.bugFileCheckInt);
+			if ("undefined" != typeof this.bugFileCheckInt) {
+				clearInterval(this.bugFileCheckInt);
 			}
 			// Start a new timer
-			ICEcoder.bugFilesSizesSeen = [];
-			ICEcoder.bugFileCheckInt = setInterval(function() {
+			this.bugFilesSizesSeen = [];
+			this.bugFileCheckInt = setInterval(function(ic) {
 				bugCheckURL =  iceLoc+"/lib/bug-files-check.php?";
-				bugCheckURL += "files="+(ICEcoder.bugFilePaths[0] !== "" ? ICEcoder.bugFilePaths.join() : "null").replace(/\//g,"|");
+				bugCheckURL += "files="+(ic.bugFilePaths[0] !== "" ? ic.bugFilePaths.join() : "null").replace(/\//g,"|");
 				bugCheckURL += "&filesSizesSeen=";
-				if (ICEcoder.bugFilesSizesSeen.length != ICEcoder.bugFilePaths.length) {
+				if (ic.bugFilesSizesSeen.length != ic.bugFilePaths.length) {
 					// Fill the array with nulls
-					for (var i=0; i<ICEcoder.bugFilePaths.length; i++) {
-						ICEcoder.bugFilesSizesSeen[i] = "null";
+					for (var i=0; i<ic.bugFilePaths.length; i++) {
+						ic.bugFilesSizesSeen[i] = "null";
 					}
 				}
-				bugCheckURL += ICEcoder.bugFilesSizesSeen.join();
-				bugCheckURL += "&maxLines="+ICEcoder.bugFileMaxLines;
-				bugCheckURL += "&csrf="+ICEcoder.csrf;
+				bugCheckURL += ic.bugFilesSizesSeen.join();
+				bugCheckURL += "&maxLines="+ic.bugFileMaxLines;
+				bugCheckURL += "&csrf="+ic.csrf;
 
-				var xhr = ICEcoder.xhrObj();
+				var xhr = ic.xhrObj();
 
 				xhr.onreadystatechange=function() {
 					if (xhr.readyState==4 && xhr.status==200) {
@@ -3798,12 +3803,12 @@ var ICEcoder = {
 						statusArray['result'] == "ok" ? "-32px 0" :
 						statusArray['result'] == "bugs" ? "-48px 0" :
 						"-16px 0"; // if the result is 'error' or another value
-						ICEcoder.bugReportStatus = statusArray['result'];
-						if (ICEcoder.bugFilesSizesSeen[0]=="null") {
-							ICEcoder.bugFilesSizesSeen = statusArray['filesSizesSeen'];
+						ic.bugReportStatus = statusArray['result'];
+						if (ic.bugFilesSizesSeen[0]=="null") {
+							ic.bugFilesSizesSeen = statusArray['filesSizesSeen'];
 						}
-						ICEcoder.bugFilesSizesActual = statusArray['filesSizesSeen'];
-						ICEcoder.bugReportPath = statusArray['bugReportPath'];
+						ic.bugFilesSizesActual = statusArray['filesSizesSeen'];
+						ic.bugReportPath = statusArray['bugReportPath'];
 
 					}
 				};
@@ -3811,12 +3816,12 @@ var ICEcoder = {
 				xhr.open("GET",bugCheckURL,true);
 				xhr.send();
 
-			},parseInt(ICEcoder.bugFileCheckTimer*1000,10));
+			},parseInt(this.bugFileCheckTimer*1000,10),this);
 			// State that we're checking for bugs
-			ICEcoder.bugReportStatus = "ok";
+			this.bugReportStatus = "ok";
 		} else {
-			if ("undefined" != typeof ICEcoder.bugFileCheckInt) {
-				clearInterval(ICEcoder.bugFileCheckInt);
+			if ("undefined" != typeof this.bugFileCheckInt) {
+				clearInterval(this.bugFileCheckInt);
 			}
 		}
 	},
@@ -3835,12 +3840,12 @@ var ICEcoder = {
 	printCode: function() {
 		var cM, cMdiff, thisCM, printIFrame;
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
-		printIFrame = ICEcoder.filesFrame.contentWindow.frames['fileControl'];
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		printIFrame = this.filesFrame.contentWindow.frames['fileControl'];
 		// Print page content injected into iFrame, escaped with pre and xssClean
-		printIFrame.window.document.body.innerHTML = '<!DOCTYPE html><head><title>ICEcoder code output</title></head><body><pre style="white-space: pre-wrap">'+ICEcoder.xssClean(thisCM.getValue())+'</pre></body></html>';
+		printIFrame.window.document.body.innerHTML = '<!DOCTYPE html><head><title>ICEcoder code output</title></head><body><pre style="white-space: pre-wrap">'+this.xssClean(thisCM.getValue())+'</pre></body></html>';
 		printIFrame.focus();
 		printIFrame.print();
 		// Focus back on code
@@ -3851,10 +3856,10 @@ var ICEcoder = {
 	indicateChanges: function() {
 		var winTitle;
 
-		if (!ICEcoder.loadingFile) {
-			winTitle = "ICEcoder v "+ICEcoder.versionNo;
-			for(var i=1;i<=ICEcoder.savedPoints.length;i++) {
-				if (ICEcoder.savedPoints[i-1]!=ICEcoder.getcMInstance(i).changeGeneration()) {
+		if (!this.loadingFile) {
+			winTitle = "ICEcoder v "+this.versionNo;
+			for(var i=1;i<=this.savedPoints.length;i++) {
+				if (this.savedPoints[i-1]!=this.getcMInstance(i).changeGeneration()) {
 					// We have an unsaved tab, indicate that in the title
 					winTitle += " \u2744";
 					break;
@@ -3873,67 +3878,67 @@ var ICEcoder = {
 		var cM, cMdiff, thisCM;
 
 		// If we're not switching to same tab (for some reason), note the previous tab
-		if (newTab !== ICEcoder.selectedTab) {
-			ICEcoder.prevTab = ICEcoder.selectedTab;
+		if (newTab !== this.selectedTab) {
+			this.prevTab = this.selectedTab;
 		}
 
 		// Identify tab that's currently selected & get the instance
-		ICEcoder.selectedTab = newTab;
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		this.selectedTab = newTab;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
 		if (thisCM) {
 			// Switch mode to HTML, PHP, CSS etc
-			ICEcoder.switchMode();
+			this.switchMode();
 
 			// Set all cM instances to be hidden, then make our selected instance visible
-			for (var i=0;i<ICEcoder.cMInstances.length;i++) {
-				ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].getWrapperElement().style.display = "none";
-				ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]+'diff'].getWrapperElement().style.display = "none";
+			for (var i=0;i<this.cMInstances.length;i++) {
+				this.content.contentWindow['cM'+this.cMInstances[i]].getWrapperElement().style.display = "none";
+				this.content.contentWindow['cM'+this.cMInstances[i]+'diff'].getWrapperElement().style.display = "none";
 			}
-			cM.setOption('theme',ICEcoder.theme);
-			cMdiff.setOption('theme',ICEcoder.theme + " diff");
+			cM.setOption('theme',this.theme);
+			cMdiff.setOption('theme',this.theme + " diff");
 			cM.getWrapperElement().style.display = "block";
 			cMdiff.getWrapperElement().style.display = "block";
 
 			// Redo our diffs if split pane
-			if (ICEcoder.splitPane) {
-				ICEcoder.updateDiffs();
+			if (this.splitPane) {
+				this.updateDiffs();
 			}
 
 			// Focus on & refresh our selected instance
-			if (!noFocus) {setTimeout(function() {ICEcoder.focus();},4);}
+			if (!noFocus) {setTimeout(function(ic) {ic.focus();},4,this);}
 			cM.refresh();
 			cMdiff.refresh();
 
-			ICEcoder.updateFunctionClassList();
+			this.updateFunctionClassList();
 			// Update the minimap nav
 			if ("undefined" != typeof doMiniNav) {
 				clearTimeout(doMiniNav);
 			}
-			doMiniNav = setTimeout(function() {
-				ICEcoder.setMinimap();
-			},ICEcoder.loadingFile ? 0 : 100);
+			doMiniNav = setTimeout(function(ic) {
+				ic.setMinimap();
+			},this.loadingFile ? 0 : 100, this);
 			get('docExplorer').style.display = "block";
 			get('docExplorer').style.right = "-400px";
 
-			ICEcoder.highlightGitDiffs();
+			this.highlightGitDiffs();
 
 			// Highlight the selected tab
-			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
+			this.redoTabHighlight(this.selectedTab);
 
 			// Redo our find display
-			ICEcoder.findMode = false;
-			ICEcoder.findReplace(get('find').value,true,false);
+			this.findMode = false;
+			this.findReplace(get('find').value,true,false);
 
 			// Update our versions display
-			ICEcoder.updateVersionsDisplay();
+			this.updateVersionsDisplay();
 
 			// Finally, update the cursor display
-			ICEcoder.getCaretPosition();
-			ICEcoder.updateCharDisplay();
-			ICEcoder.updateByteDisplay();
+			this.getCaretPosition();
+			this.updateCharDisplay();
+			this.updateByteDisplay();
 		}
 	},
 
@@ -3941,26 +3946,26 @@ var ICEcoder = {
 	newTab: function(alsoSave) {
 		var cM;
 
-		ICEcoder.cMInstances.push(ICEcoder.nextcMInstance);
-		ICEcoder.selectedTab = ICEcoder.cMInstances.length;
-		ICEcoder.showHide('show',ICEcoder.content);
-		ICEcoder.content.contentWindow.createNewCMInstance(ICEcoder.nextcMInstance);
-		ICEcoder.setLayout();
+		this.cMInstances.push(this.nextcMInstance);
+		this.selectedTab = this.cMInstances.length;
+		this.showHide('show',this.content);
+		this.content.contentWindow.createNewCMInstance(this.nextcMInstance);
+		this.setLayout();
 
-		ICEcoder.thisFileFolderType='file';
-		ICEcoder.thisFileFolderLink='/[NEW]';
-		ICEcoder.openFile();
+		this.thisFileFolderType='file';
+		this.thisFileFolderLink='/[NEW]';
+		this.openFile();
 
-		cM = ICEcoder.getcMInstance('new');
-		ICEcoder.switchTab(ICEcoder.openFiles.length);
+		cM = this.getcMInstance('new');
+		this.switchTab(this.openFiles.length);
 
-		cM.removeLineClass(ICEcoder['cMActiveLinecM'+ICEcoder.cMInstances[ICEcoder.selectedTab-1]], "background");
-		ICEcoder['cMActiveLinecM'+ICEcoder.selectedTab] = cM.addLineClass(0, "background", "cm-s-activeLine");
-		ICEcoder.nextcMInstance++;
+		cM.removeLineClass(this['cMActiveLinecM'+this.cMInstances[this.selectedTab-1]], "background");
+		this['cMActiveLinecM'+this.selectedTab] = cM.addLineClass(0, "background", "cm-s-activeLine");
+		this.nextcMInstance++;
 
 		// Also save?
 		if (alsoSave) {
-			ICEcoder.saveFile();
+			this.saveFile();
 		}
 	},
 
@@ -3969,28 +3974,28 @@ var ICEcoder = {
 		var closeTabLink, fileName;
 
 		// Push new file into array
-		ICEcoder.openFiles.push(ICEcoder.shortURL);
+		this.openFiles.push(this.shortURL);
 
 		// Setup a new tab
-		closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; ICEcoder.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; ICEcoder.overCloseLink=false"></a>';
-		get('tab'+(ICEcoder.openFiles.length)).style.display = "inline-block";
-		fileName = ICEcoder.openFiles[ICEcoder.openFiles.length-1];
-		get('tab'+(ICEcoder.openFiles.length)).innerHTML = closeTabLink + " " + fileName.slice(fileName.lastIndexOf("/")).replace(/\//,"");
-		get('tab'+(ICEcoder.openFiles.length)).title = "/" + ICEcoder.openFiles[ICEcoder.openFiles.length-1].replace(/\//,"");
+		closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; this.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; this.overCloseLink=false"></a>';
+		get('tab'+(this.openFiles.length)).style.display = "inline-block";
+		fileName = this.openFiles[this.openFiles.length-1];
+		get('tab'+(this.openFiles.length)).innerHTML = closeTabLink + " " + fileName.slice(fileName.lastIndexOf("/")).replace(/\//,"");
+		get('tab'+(this.openFiles.length)).title = "/" + this.openFiles[this.openFiles.length-1].replace(/\//,"");
 
 		// Set the widths
-		ICEcoder.setTabWidths();
+		this.setTabWidths();
 
 		// Highlight it and state it's selected
-		ICEcoder.redoTabHighlight(ICEcoder.openFiles.length);
-		ICEcoder.selectedTab=ICEcoder.openFiles.length;
+		this.redoTabHighlight(this.openFiles.length);
+		this.selectedTab=this.openFiles.length;
 
 		// Add a new value ready to indicate if this content has been changed
-		ICEcoder.savedPoints.push(0);
-		ICEcoder.savedContents.push("");
+		this.savedPoints.push(0);
+		this.savedContents.push("");
 
 		if (!isNew) {
-			ICEcoder.setPreviousFiles();
+			this.setPreviousFiles();
 		}
 	},
 
@@ -3998,16 +4003,16 @@ var ICEcoder = {
 	nextTab: function() {
 		var goToTab;
 
-		goToTab = ICEcoder.selectedTab+1 <= ICEcoder.openFiles.length ? ICEcoder.selectedTab+1 : 1;
-		ICEcoder.switchTab(goToTab,'noFocus');
+		goToTab = this.selectedTab+1 <= this.openFiles.length ? this.selectedTab+1 : 1;
+		this.switchTab(goToTab,'noFocus');
 	},
 
 	// Cycle to next tab
 	previousTab: function() {
 		var goToTab;
 
-		goToTab = ICEcoder.selectedTab-1 >= 1 ? ICEcoder.selectedTab-1 : ICEcoder.openFiles.length;
-		ICEcoder.switchTab(goToTab,'noFocus');
+		goToTab = this.selectedTab-1 >= 1 ? this.selectedTab-1 : this.openFiles.length;
+		this.switchTab(goToTab,'noFocus');
 	},
 
 	// Create a new tab for a file
@@ -4015,35 +4020,35 @@ var ICEcoder = {
 		var closeTabLink, fileName;
 
 		// Push new file into array
-		ICEcoder.openFiles[tabNum-1] = newName;
+		this.openFiles[tabNum-1] = newName;
 
 		// Setup a new tab
-		closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; ICEcoder.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; ICEcoder.overCloseLink=false"></a>';
-		fileName = ICEcoder.openFiles[tabNum-1];
+		closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3),10))"><img src="'+iceLoc+'/images/nav-close.gif" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'; this.overCloseLink=true" onMouseOut="this.style.backgroundColor=prevBG; this.overCloseLink=false"></a>';
+		fileName = this.openFiles[tabNum-1];
 		get('tab'+tabNum).innerHTML = closeTabLink + " " + fileName.slice(fileName.lastIndexOf("/")).replace(/\//,"");
-		get('tab'+tabNum).title = "/" + ICEcoder.openFiles[tabNum-1].replace(/\//,"");
+		get('tab'+tabNum).title = "/" + this.openFiles[tabNum-1].replace(/\//,"");
 	},
 
 	// Reset all tabs to be without a highlight and then highlight the selected
 	redoTabHighlight: function(selectedTab) {
 		var tColor, fileLink;
 
-		for(var i=1;i<=ICEcoder.savedPoints.length;i++) {
+		for(var i=1;i<=this.savedPoints.length;i++) {
 			if (get('tab'+i).childNodes[0]) {
-				get('tab'+i).childNodes[0].childNodes[0].style.backgroundColor = ICEcoder.savedPoints[i-1]!=ICEcoder.getcMInstance(i).changeGeneration()
+				get('tab'+i).childNodes[0].childNodes[0].style.backgroundColor = this.savedPoints[i-1]!=this.getcMInstance(i).changeGeneration()
 				? "#b00" : "transparent";
 			}
 
-			tColor = i==selectedTab ? ICEcoder.tabFGselected : ICEcoder.tabFGnormalTab;
-			if ("undefined" != typeof ICEcoder.openFiles[i-1] && ICEcoder.openFiles[i-1] != "/[NEW]") {
-				fileLink = ICEcoder.filesFrame.contentWindow.document.getElementById(ICEcoder.openFiles[i-1].replace(/\//g,"|"));
+			tColor = i==selectedTab ? this.tabFGselected : this.tabFGnormalTab;
+			if ("undefined" != typeof this.openFiles[i-1] && this.openFiles[i-1] != "/[NEW]") {
+				fileLink = this.filesFrame.contentWindow.document.getElementById(this.openFiles[i-1].replace(/\//g,"|"));
 				if (fileLink) {
-					fileLink.style.backgroundColor = i==selectedTab ? ICEcoder.tabBGcurrent : ICEcoder.tabBGopen;
-					fileLink.style.color = i==selectedTab ? ICEcoder.tabFGcurrent : ICEcoder.tabFGopenFile;
+					fileLink.style.backgroundColor = i==selectedTab ? this.tabBGcurrent : this.tabBGopen;
+					fileLink.style.color = i==selectedTab ? this.tabFGcurrent : this.tabFGopenFile;
 				};
 			}
 			get('tab'+i).style.color = tColor;
-			get('tab'+i).style.background = i==selectedTab ? ICEcoder.tabBGcurrent : ICEcoder.tabBGopen;
+			get('tab'+i).style.background = i==selectedTab ? this.tabBGcurrent : this.tabBGopen;
 		}
 	},
 
@@ -4052,103 +4057,103 @@ var ICEcoder = {
 		var cM, cMdiff, thisCM, okToRemove, closeFileName;
 
 		// If we haven't specified, close current tab
-		if (!closeTabNum) {closeTabNum = ICEcoder.selectedTab};
+		if (!closeTabNum) {closeTabNum = this.selectedTab};
 
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
 		okToRemove = true;
-		if (!dontAsk && ICEcoder.savedPoints[closeTabNum-1]!=ICEcoder.getcMInstance(closeTabNum).changeGeneration()) {
-			okToRemove = ICEcoder.ask(t['You have made...']);
+		if (!dontAsk && this.savedPoints[closeTabNum-1]!=this.getcMInstance(closeTabNum).changeGeneration()) {
+			okToRemove = this.ask(t['You have made...']);
 		}
 
 		if (okToRemove) {
 			// Get the filename of tab we're closing
-			closeFileName = ICEcoder.openFiles[closeTabNum-1];
+			closeFileName = this.openFiles[closeTabNum-1];
 
 			// recursively copy over all tabs & data from the tab to the right, if there is one
-			for (var i=closeTabNum;i<ICEcoder.openFiles.length;i++) {
+			for (var i=closeTabNum;i<this.openFiles.length;i++) {
 				get('tab'+i).innerHTML = get('tab'+(i+1)).innerHTML;
 				get('tab'+i).title = get('tab'+(i+1)).title;
-				ICEcoder.openFiles[i-1] = ICEcoder.openFiles[i];
-				ICEcoder.openFileMDTs[i-1] = ICEcoder.openFileMDTs[i];
-				ICEcoder.openFileVersions[i-1] = ICEcoder.openFileVersions[i];
+				this.openFiles[i-1] = this.openFiles[i];
+				this.openFileMDTs[i-1] = this.openFileMDTs[i];
+				this.openFileVersions[i-1] = this.openFileVersions[i];
 			}
 			// hide the instance we're closing by setting the hide class and removing from the array
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[closeTabNum-1]].getWrapperElement().style.display = "none";
-			ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[closeTabNum-1]+'diff'].getWrapperElement().style.display = "none";
-			ICEcoder.cMInstances.splice(closeTabNum-1,1);
+			this.content.contentWindow['cM'+this.cMInstances[closeTabNum-1]].getWrapperElement().style.display = "none";
+			this.content.contentWindow['cM'+this.cMInstances[closeTabNum-1]+'diff'].getWrapperElement().style.display = "none";
+			this.cMInstances.splice(closeTabNum-1,1);
 			// clear the rightmost tab (or only one left in a 1 tab scenario) & remove from the array
-			get('tab'+ICEcoder.openFiles.length).style.display = "none";
-			get('tab'+ICEcoder.openFiles.length).innerHTML = "";
-			get('tab'+ICEcoder.openFiles.length).title = "";
-			ICEcoder.openFiles.pop();
-			ICEcoder.openFileMDTs.pop();
-			ICEcoder.openFileVersions.pop();
+			get('tab'+this.openFiles.length).style.display = "none";
+			get('tab'+this.openFiles.length).innerHTML = "";
+			get('tab'+this.openFiles.length).title = "";
+			this.openFiles.pop();
+			this.openFileMDTs.pop();
+			this.openFileVersions.pop();
 			// If we're closing the selected tab, determin the new selectedTab number, reduced by 1 if we have some tabs, 0 for a reset state
-			if (ICEcoder.selectedTab==closeTabNum) {
-				ICEcoder.openFiles.length>0 ? ICEcoder.selectedTab-=1 : ICEcoder.selectedTab = 0;
+			if (this.selectedTab==closeTabNum) {
+				this.openFiles.length>0 ? this.selectedTab-=1 : this.selectedTab = 0;
 			}
-			if (ICEcoder.openFiles.length>0 && ICEcoder.selectedTab==0) {ICEcoder.selectedTab=1};
+			if (this.openFiles.length>0 && this.selectedTab==0) {this.selectedTab=1};
 
 			// grey out the view icon
-			if (ICEcoder.openFiles.length==0) {
-				ICEcoder.fMIconVis('fMView',0.3);
+			if (this.openFiles.length==0) {
+				this.fMIconVis('fMView',0.3);
 				get('docExplorer').style.display = "none";
 			} else {
 				// Switch the mode & the tab
-				ICEcoder.switchMode();
-				ICEcoder.switchTab(ICEcoder.selectedTab);
+				this.switchMode();
+				this.switchTab(this.selectedTab);
 			}
 			// Highlight the selected tab after splicing the change state out of the array
-			ICEcoder.savedPoints.splice(closeTabNum-1,1);
-			ICEcoder.savedContents.splice(closeTabNum-1,1);
-			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
+			this.savedPoints.splice(closeTabNum-1,1);
+			this.savedContents.splice(closeTabNum-1,1);
+			this.redoTabHighlight(this.selectedTab);
 
 			// Remove any highlighting from the file manager
-			ICEcoder.selectDeselectFile('deselect',ICEcoder.filesFrame.contentWindow.document.getElementById(closeFileName.replace(/\//g,"|")));
+			this.selectDeselectFile('deselect',this.filesFrame.contentWindow.document.getElementById(closeFileName.replace(/\//g,"|")));
 
 			if (!dontSetPV) {
-				ICEcoder.setPreviousFiles();
+				this.setPreviousFiles();
 			}
 
 			// Update the versions display
-			ICEcoder.updateVersionsDisplay();
+			this.updateVersionsDisplay();
 
 			// Update the title tag to indicate any changes
-			ICEcoder.indicateChanges();
+			this.indicateChanges();
 		}
 		// Lastly, stop it from trying to also switch tab
-		ICEcoder.canSwitchTabs=false;
+		this.canSwitchTabs=false;
 		// and set the widths
-		ICEcoder.setTabWidths('posOnlyNewTab');
-		setTimeout(function() {ICEcoder.canSwitchTabs=true;},100);
+		this.setTabWidths('posOnlyNewTab');
+		setTimeout(function(ic) {ic.canSwitchTabs=true;},100,this);
 	},
 
 	// Close all tabs
 	closeAllTabs: function() {
-		if (ICEcoder.cMInstances.length>0 && ICEcoder.ask(t['Close all tabs'])) {
-			for (var i=ICEcoder.cMInstances.length; i>0; i--) {
-				ICEcoder.closeTab(i, i>1? true:false);
+		if (this.cMInstances.length>0 && this.ask(t['Close all tabs'])) {
+			for (var i=this.cMInstances.length; i>0; i--) {
+				this.closeTab(i, i>1? true:false);
 			}
 		}
 		// Update the title tag to indicate any changes
-		ICEcoder.indicateChanges();
+		this.indicateChanges();
 	},
 
 	// Set the tabs width
 	setTabWidths: function(posOnlyNewTab) {
 		var availWidth, avgWidth, tabWidth, lastLeft, lastWidth;
 
-		if (ICEcoder.ready) {
-			availWidth = parseInt(ICEcoder.content.style.width,10)-53-22-10; // - left margin - new tab - right margin
-			avgWidth = (availWidth/ICEcoder.openFiles.length)-18;
+		if (this.ready) {
+			availWidth = parseInt(this.content.style.width,10)-53-22-10; // - left margin - new tab - right margin
+			avgWidth = (availWidth/this.openFiles.length)-18;
 			tabWidth = -18; // Incl 18px offset
 			lastLeft = 53;
 			lastWidth = 0;
-			ICEcoder.tabLeftPos = [];
-			for (var i=0;i<ICEcoder.openFiles.length;i++) {
-				if (posOnlyNewTab) {i=ICEcoder.openFiles.length};
-				tabWidth = ICEcoder.openFiles.length*(150+18) > availWidth ? parseInt(avgWidth*i,10) - parseInt(avgWidth*(i-1),10) : 150;
+			this.tabLeftPos = [];
+			for (var i=0;i<this.openFiles.length;i++) {
+				if (posOnlyNewTab) {i=this.openFiles.length};
+				tabWidth = this.openFiles.length*(150+18) > availWidth ? parseInt(avgWidth*i,10) - parseInt(avgWidth*(i-1),10) : 150;
 				lastLeft = i==0 ? 53 : parseInt(get('tab'+(i)).style.left,10);
 				lastWidth = i==0 ? 0 : parseInt(get('tab'+(i)).style.width,10)+18;
 				if (!posOnlyNewTab) {
@@ -4157,7 +4162,7 @@ var ICEcoder = {
 				} else {
 					tabWidth = -18;
 				}
-				ICEcoder.tabLeftPos.push(lastLeft+lastWidth);
+				this.tabLeftPos.push(lastLeft+lastWidth);
 			}
 			get('newTab').style.left = (lastLeft+lastWidth+tabWidth+18) + "px";
 		}
@@ -4165,13 +4170,13 @@ var ICEcoder = {
 
 	// Tab dragging start
 	tabDragStart: function(tab) {
-		ICEcoder.draggingTab = tab;
-		ICEcoder.diffStartX = ICEcoder.mouseX;
-		ICEcoder.tabDragMouseXStart = (ICEcoder.mouseX - (parseInt(ICEcoder.files.style.width,10)+53+18)) % 150;
+		this.draggingTab = tab;
+		this.diffStartX = this.mouseX;
+		this.tabDragMouseXStart = (this.mouseX - (parseInt(this.files.style.width,10)+53+18)) % 150;
 		// Put tab we're dragging over others
 		get('tab'+tab).style.zIndex = 2;
 		// Set classes for other tabs (tabSlide) and the one we're dragging (tabDrag)
-		for (var i=1; i<=ICEcoder.openFiles.length; i++) {
+		for (var i=1; i<=this.openFiles.length; i++) {
 			get('tab'+i).className = i!==tab
 			? "tab tabSlide"
 			: "tab tabDrag";
@@ -4182,30 +4187,30 @@ var ICEcoder = {
 	tabDragMove: function() {
 		var lastTabWidth, thisLeft, dragTabNo, tabWidth;
 
-		lastTabWidth = parseInt(get('tab'+ICEcoder.openFiles.length).style.width,10)+18;
+		lastTabWidth = parseInt(get('tab'+this.openFiles.length).style.width,10)+18;
 
 		// Set the left position but stay within left side (53) and new tab
-		ICEcoder.thisLeft = thisLeft = ICEcoder.tabDragMouseX >= 53
-		? ICEcoder.tabDragMouseX <= parseInt(get('newTab').style.left,10) - lastTabWidth
-		? ICEcoder.tabDragMouseX : (parseInt(get('newTab').style.left,10) - lastTabWidth) : 53;
+		this.thisLeft = thisLeft = this.tabDragMouseX >= 53
+		? this.tabDragMouseX <= parseInt(get('newTab').style.left,10) - lastTabWidth
+		? this.tabDragMouseX : (parseInt(get('newTab').style.left,10) - lastTabWidth) : 53;
 
-		get('tab'+ICEcoder.draggingTab).style.left = thisLeft + "px";
+		get('tab'+this.draggingTab).style.left = thisLeft + "px";
 
-		ICEcoder.dragTabNo = dragTabNo = ICEcoder.draggingTab;
+		this.dragTabNo = dragTabNo = this.draggingTab;
 
 		// Set the opacities of tabs then positions of tabs we're not dragging
-		for (var i=1; i<=ICEcoder.openFiles.length; i++) {
-			get('tab'+i).style.opacity = i == ICEcoder.draggingTab ? 1 : 0.5;
-			tabWidth = ICEcoder.tabLeftPos[i] ? ICEcoder.tabLeftPos[i] - ICEcoder.tabLeftPos[i-1] : tabWidth;
-			if (i!=ICEcoder.draggingTab) {
-				if (i < ICEcoder.draggingTab) {
-					get('tab'+i).style.left = thisLeft <= ICEcoder.tabLeftPos[i-1]
-					? ICEcoder.tabLeftPos[i-1]+tabWidth
-					: ICEcoder.tabLeftPos[i-1];
+		for (var i=1; i<=this.openFiles.length; i++) {
+			get('tab'+i).style.opacity = i == this.draggingTab ? 1 : 0.5;
+			tabWidth = this.tabLeftPos[i] ? this.tabLeftPos[i] - this.tabLeftPos[i-1] : tabWidth;
+			if (i!=this.draggingTab) {
+				if (i < this.draggingTab) {
+					get('tab'+i).style.left = thisLeft <= this.tabLeftPos[i-1]
+					? this.tabLeftPos[i-1]+tabWidth
+					: this.tabLeftPos[i-1];
 				} else {
-					get('tab'+i).style.left = thisLeft >= ICEcoder.tabLeftPos[i-1]
-					? ICEcoder.tabLeftPos[i-1]-tabWidth
-					: ICEcoder.tabLeftPos[i-1];
+					get('tab'+i).style.left = thisLeft >= this.tabLeftPos[i-1]
+					? this.tabLeftPos[i-1]-tabWidth
+					: this.tabLeftPos[i-1];
 				}
 			}
 		}
@@ -4216,15 +4221,15 @@ var ICEcoder = {
 		var swapWith, tempArray;
 
 		// Set the tab widths
-		ICEcoder.setTabWidths();
+		this.setTabWidths();
 		// Determin what tabs we've swapped and reset classname, opacity & z-index for all
-		for (var i=1; i<=ICEcoder.openFiles.length; i++) {
-			if (ICEcoder.thisLeft >= ICEcoder.tabLeftPos[i-1]) {
-				swapWith = ICEcoder.thisLeft == ICEcoder.tabLeftPos[0] ? 1 : ICEcoder.dragTabNo > i ? i+1 : i;
+		for (var i=1; i<=this.openFiles.length; i++) {
+			if (this.thisLeft >= this.tabLeftPos[i-1]) {
+				swapWith = this.thisLeft == this.tabLeftPos[0] ? 1 : this.dragTabNo > i ? i+1 : i;
 			}
 			get('tab'+i).className = "tab";
 			get('tab'+i).style.opacity = 1;
-			if (i!=ICEcoder.dragTabNo) {
+			if (i!=this.dragTabNo) {
 				get('tab'+i).style.zIndex = 1;
 			} else {
 				setTimeout(function() {
@@ -4232,21 +4237,21 @@ var ICEcoder = {
 				},150);
 			}
 		}
-		if (ICEcoder.thisLeft && ICEcoder.thisLeft!==false) {
+		if (this.thisLeft && this.thisLeft!==false) {
 			// Make a number ascending array
 			tempArray = [];
-			for (var i=1;i<=ICEcoder.openFiles.length;i++) {
+			for (var i=1;i<=this.openFiles.length;i++) {
 				tempArray.push(i);
 			}
 			// Then swap our tab numbers
-			tempArray.splice(ICEcoder.dragTabNo-1,1);
-			tempArray.splice(swapWith-1,0,ICEcoder.dragTabNo);
+			tempArray.splice(this.dragTabNo-1,1);
+			tempArray.splice(swapWith-1,0,this.dragTabNo);
 			// Now we have an order to sort against
-			ICEcoder.sortTabs(tempArray);
+			this.sortTabs(tempArray);
 		}
-		ICEcoder.setTabWidths();
-		ICEcoder.draggingTab = false;
-		ICEcoder.thisLeft = false;
+		this.setTabWidths();
+		this.draggingTab = false;
+		this.thisLeft = false;
 	},
 
 	// Sort tabs into new order
@@ -4254,7 +4259,7 @@ var ICEcoder = {
 		var a, b, savedPoints = [], savedContents = [], openFiles = [], openFileMDTs = [], openFileVersions = [], cMInstances = [], selectedTabWillBe;
 
 		// Setup an array of our actual arrays and the blank ones
-		a = [ICEcoder.savedPoints, ICEcoder.savedContents, ICEcoder.openFiles, ICEcoder.openFileMDTs, ICEcoder.openFileVersions, ICEcoder.cMInstances];
+		a = [this.savedPoints, this.savedContents, this.openFiles, this.openFileMDTs, this.openFileVersions, this.cMInstances];
 		b = [savedPoints, savedContents, openFiles, openFileMDTs, openFileVersions, cMInstances];
 		// Push the new order values into array b then set into array a
 		for (var i=0;i<a.length;i++) {
@@ -4266,7 +4271,7 @@ var ICEcoder = {
 		// Begin swapping tab id's around to an ascending order and work out new selectedTab
 		for (var i=0;i<newOrder.length;i++) {
 			get('tab'+newOrder[i]).id = "tab" + (i+1) + ".temp";
-			if (ICEcoder.selectedTab == newOrder[i]) {
+			if (this.selectedTab == newOrder[i]) {
 				selectedTabWillBe = (i+1);
 			}
 		}
@@ -4279,28 +4284,28 @@ var ICEcoder = {
 			get('tab'+selectedTabWillBe).className = "tab tabSlide";
 		}
 		// Finally, set the array values, tab widths and switch tab
-		ICEcoder.savedPoints = a[0];
-		ICEcoder.savedContents = a[1];
-		ICEcoder.openFiles = a[2];
-		ICEcoder.openFileMDTs = a[3];
-		ICEcoder.openFileVersions = a[4];
-		ICEcoder.cMInstances = a[5];
-		ICEcoder.setTabWidths();
-		ICEcoder.switchTab(selectedTabWillBe);
+		this.savedPoints = a[0];
+		this.savedContents = a[1];
+		this.openFiles = a[2];
+		this.openFileMDTs = a[3];
+		this.openFileVersions = a[4];
+		this.cMInstances = a[5];
+		this.setTabWidths();
+		this.switchTab(selectedTabWillBe);
 	},
 
 	// Alphabetize tabs
 	alphaTabs: function() {
-		if (ICEcoder.openFiles.length>0) {
+		if (this.openFiles.length>0) {
 			var currentArray, currentArrayFull, alphaArray, nextValue, nextPos;
 
 			currentArray = [];
 			currentArrayFull = [];
 			alphaArray = [];
 			// Get filenames, full paths and set classname for sliding
-			for (var i=0;i<ICEcoder.openFiles.length;i++) {
-				currentArray.push(ICEcoder.openFiles[i].slice(ICEcoder.openFiles[i].lastIndexOf('/')+1));
-				currentArrayFull.push(ICEcoder.openFiles[i]);
+			for (var i=0;i<this.openFiles.length;i++) {
+				currentArray.push(this.openFiles[i].slice(this.openFiles[i].lastIndexOf('/')+1));
+				currentArrayFull.push(this.openFiles[i]);
 				get('tab'+(i+1)).className = "tab tabSlide";
 			}
 			// Get our next value, which is the next filename alpha lowest value and full path
@@ -4311,17 +4316,17 @@ var ICEcoder = {
 				for (var i=0;i<currentArray.length;i++) {
 					if (currentArray[i] < nextValue) {
 						nextValue  = currentArray[i];
-						nextValueFull  = ICEcoder.openFiles[ICEcoder.openFiles.indexOf(currentArrayFull[i])];
+						nextValueFull  = this.openFiles[this.openFiles.indexOf(currentArrayFull[i])];
 						nextPos = i;
 					}
 				}
 				// When we've got it, push into alphaArray and splice out of arrays
-				alphaArray.push((ICEcoder.openFiles.indexOf(nextValueFull)+1));
+				alphaArray.push((this.openFiles.indexOf(nextValueFull)+1));
 				currentArray.splice(nextPos,1);
 				currentArrayFull.splice(nextPos,1);
 			}
 			// Once done, sort our tabs into new order
-			ICEcoder.sortTabs(alphaArray);
+			this.sortTabs(alphaArray);
 		}
 	},
 
@@ -4336,18 +4341,18 @@ var ICEcoder = {
 		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
 
 		// Reset the auto-logout timer
-		ICEcoder.resetAutoLogoutTimer();
+		this.resetAutoLogoutTimer();
 
 		// Detect if we type s,n,a,k,e keys with content saved, if so start snake game
-		if (!ICEcoder.last5Keys) {ICEcoder.last5Keys = [];}
-		ICEcoder.last5Keys.push(key);
-		if (ICEcoder.last5Keys.length == 6) {
-			ICEcoder.last5Keys.shift();
+		if (!this.last5Keys) {this.last5Keys = [];}
+		this.last5Keys.push(key);
+		if (this.last5Keys.length == 6) {
+			this.last5Keys.shift();
 		}
-		if (ICEcoder.last5Keys.join() == "83,78,65,75,69") {
-			setTimeout(function() {
+		if (this.last5Keys.join() == "83,78,65,75,69") {
+			setTimeout(function(ic) {
 				// Undo back to pre 'snake' word
-				cM = ICEcoder.getcMInstance();
+				cM = ic.getcMInstance();
 				var undoCounts = 0;
 				var startCG = cM.changeGeneration();
 				while (cM.changeGeneration() > startCG-5) {
@@ -4355,45 +4360,45 @@ var ICEcoder = {
 					undoCounts++;
 				}
 				// If we have content saved
-				if (ICEcoder.savedPoints[ICEcoder.selectedTab-1] == cM.changeGeneration()) {
+				if (ic.savedPoints[ic.selectedTab-1] == cM.changeGeneration()) {
 					// Start snake game
-					ICEcoder.startSnake();
+					ic.startSnake();
 				// If we don't, redo snake word
 				} else {
 					for (var i=1; i<=undoCounts; i++) {
 						cM.redo();
 					}
 				}
-			},0);
+			},0,this);
 		}
 
 		// Detect arrow keys if playing snake
-		if (ICEcoder.snakePlaying) {
-			if (key==37) {ICEcoder.snakeDir = 'left'}
-			if (key==39) {ICEcoder.snakeDir = 'right'}
-			if (key==38) {ICEcoder.snakeDir = 'up'}
-			if (key==40) {ICEcoder.snakeDir = 'down'}
+		if (this.snakePlaying) {
+			if (key==37) {this.snakeDir = 'left'}
+			if (key==39) {this.snakeDir = 'right'}
+			if (key==38) {this.snakeDir = 'up'}
+			if (key==40) {this.snakeDir = 'down'}
 			return false;
 		}
 
 		// Mac command key handling (224 = Moz, 91/93 = Webkit Left/Right Apple)
 		if (key==224 || key==91 || key==93) {
-			ICEcoder.cmdKey = true;
+			this.cmdKey = true;
 		}
 
 		// F1 (zoom code out non declaration lines)
 		if (key === 112) {
-			if (ICEcoder.codeZoomedOut) {
+			if (this.codeZoomedOut) {
 				return;
 			}
-			ICEcoder.codeZoomedOut = true;
+			this.codeZoomedOut = true;
 
-			cM = ICEcoder.getcMInstance();
+			cM = this.getcMInstance();
 			// For every line in the current editor, add code-zoomed-out class if not a function/class declaration line
 			for (var i=0; i<cM.lineCount(); i++) {
 				var nonDeclareLine = true;
-				for (var j=0; j<ICEcoder.functionClassList.length; j++) {
-					if (ICEcoder.functionClassList[j].line == i) {
+				for (var j=0; j<this.functionClassList.length; j++) {
+					if (this.functionClassList[j].line == i) {
 						nonDeclareLine = false;
 					}
 				}
@@ -4408,39 +4413,39 @@ var ICEcoder = {
 
 		// DEL (Delete file)
 		if (key==46 && area == "files") {
-			ICEcoder.deleteFiles();
+			this.deleteFiles();
 	        	return false;
 		};
 
 		// Alt key down?
 		if (evt.altKey) {
 			// detect alt right
-			var isAltRight	= (evt.ctrlKey||ICEcoder.cmdKey) ? true:false;
+			var isAltRight	= (evt.ctrlKey||this.cmdKey) ? true:false;
 
 			// tag wrapper, add line break at end or focus on file manager
 			if (
-				(ICEcoder.tagWrapperCommand=="ctrl+alt" && isAltRight) // CTRL/Cmd + alt left + key || alt right + key
-				|| (ICEcoder.tagWrapperCommand=="alt-left" && !isAltRight) // alt left + key
+				(this.tagWrapperCommand=="ctrl+alt" && isAltRight) // CTRL/Cmd + alt left + key || alt right + key
+				|| (this.tagWrapperCommand=="alt-left" && !isAltRight) // alt left + key
 			) {
 				if (area=="content") {
-					if (key==68) {ICEcoder.tagWrapper('div'); return false;}
-					else if (key==83) {ICEcoder.tagWrapper('span'); return false;}
-					else if (key==80) {ICEcoder.tagWrapper('p'); return false;}
-					else if (key==65) {ICEcoder.tagWrapper('a'); return false;}
-					else if (key==49) {ICEcoder.tagWrapper('h1'); return false;}
-					else if (key==50) {ICEcoder.tagWrapper('h2'); return false;}
-					else if (key==51) {ICEcoder.tagWrapper('h3'); return false;}
-					else if (key==13) {ICEcoder.addLineBreakAtEnd(); return false;}
-					else if (key==37) {ICEcoder.filesFrame.contentWindow.focus();return false;}
+					if (key==68) {this.tagWrapper('div'); return false;}
+					else if (key==83) {this.tagWrapper('span'); return false;}
+					else if (key==80) {this.tagWrapper('p'); return false;}
+					else if (key==65) {this.tagWrapper('a'); return false;}
+					else if (key==49) {this.tagWrapper('h1'); return false;}
+					else if (key==50) {this.tagWrapper('h2'); return false;}
+					else if (key==51) {this.tagWrapper('h3'); return false;}
+					else if (key==13) {this.addLineBreakAtEnd(); return false;}
+					else if (key==37) {this.filesFrame.contentWindow.focus();return false;}
 					else {return key;}
 				}
 				// Focus on file manager (outside of content area) or last editor pane
-				if (key==37) {ICEcoder.filesFrame.contentWindow.focus();return false;}
-				else if (key==39) {ICEcoder.focus(ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? true : false);return false;}
+				if (key==37) {this.filesFrame.contentWindow.focus();return false;}
+				else if (key==39) {this.focus(this.editorFocusInstance.indexOf('diff') > -1 ? true : false);return false;}
 				else {return key;}
 			// Alt+Enter (Insert Line After)
 			} else if (key==13) {
-				ICEcoder.insertLineAfter();
+				this.insertLineAfter();
 				return false;
 			} else {return key;}
 
@@ -4448,17 +4453,17 @@ var ICEcoder = {
 
 			// Shift+Enter (Insert Line Before)
 			if(key==13 && evt.shiftKey) {
-				ICEcoder.insertLineBefore();
+				this.insertLineBefore();
 	        		return false;
 
 			// CTRL/Cmd+F (Find next)
 			// and
 			// CTRL/Cmd+G (Find previous)
-			} else if((key==70||key==71) && (evt.ctrlKey||ICEcoder.cmdKey)) {
+			} else if((key==70||key==71) && (evt.ctrlKey||this.cmdKey)) {
 				var find = get('find');
-				cM = ICEcoder.getcMInstance();
-				cMdiff = ICEcoder.getcMdiffInstance();
-				thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+				cM = this.getcMInstance();
+				cMdiff = this.getcMdiffInstance();
+				thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 				var selections = thisCM.getSelections();
 				if (selections.length > 0){
 					if (selections[0].length > 0){
@@ -4477,12 +4482,12 @@ var ICEcoder = {
 					get('findReplaceSubmit').click();
 				} else {
 					// Find previous
-					ICEcoder.findReplace(document.getElementById('find').value,false,true,false,'findPrevious');
+					this.findReplace(document.getElementById('find').value,false,true,false,'findPrevious');
 				}
 	        		return false;
 
 			// CTRL/Cmd+L (Go to line)
-			} else if(key==76 && (evt.ctrlKey||ICEcoder.cmdKey)) {
+			} else if(key==76 && (evt.ctrlKey||this.cmdKey)) {
 				var goToLineInput = get('goToLineNo');
 				goToLineInput.select();
 				// this is trick for Chrome - after you have used Ctrl-F once, when
@@ -4493,85 +4498,85 @@ var ICEcoder = {
 	        		return false;
 
 			// CTRL/Cmd+I (Get info)
-			} else if(key==73 && (evt.ctrlKey||ICEcoder.cmdKey) && area == "content") {
-				ICEcoder.searchForSelected();
+			} else if(key==73 && (evt.ctrlKey||this.cmdKey) && area == "content") {
+				this.searchForSelected();
 	        		return false;
 
 			// CTRL/Cmd+backspace arrow (Go to previous tab selected)
-			} else if(key==8 && (evt.ctrlKey||ICEcoder.cmdKey)) {
-				if (ICEcoder.prevTab !== 0) {
-					ICEcoder.switchTab(ICEcoder.prevTab);
+			} else if(key==8 && (evt.ctrlKey||this.cmdKey)) {
+				if (this.prevTab !== 0) {
+					this.switchTab(this.prevTab);
 				}
 	        		return false;
 
 			// CTRL/Cmd+right arrow (Tab to right)
-			} else if(key==39 && (evt.ctrlKey||ICEcoder.cmdKey) && area!="content") {
-				ICEcoder.nextTab();
+			} else if(key==39 && (evt.ctrlKey||this.cmdKey) && area!="content") {
+				this.nextTab();
 	        		return false;
 
 			// CTRL/Cmd+left arrow (Tab to left)
-			} else if(key==37 && (evt.ctrlKey||ICEcoder.cmdKey) && area!="content") {
-				ICEcoder.previousTab();
+			} else if(key==37 && (evt.ctrlKey||this.cmdKey) && area!="content") {
+				this.previousTab();
 	        		return false;
 
 			// CTRL/Cmd+up arrow (Move line up)
-			} else if(key==38 && (evt.ctrlKey||ICEcoder.cmdKey) && area=="content") {
-				ICEcoder.moveLines('up');
+			} else if(key==38 && (evt.ctrlKey||this.cmdKey) && area=="content") {
+				this.moveLines('up');
 	        		return false;
 
 			// CTRL/Cmd+down arrow (Move line down)
-			} else if(key==40 && (evt.ctrlKey||ICEcoder.cmdKey) && area=="content") {
-				ICEcoder.moveLines('down');
+			} else if(key==40 && (evt.ctrlKey||this.cmdKey) && area=="content") {
+				this.moveLines('down');
 	        		return false;
 
 			// CTRL/Cmd+numeric plus (New tab)
-			} else if((key==107 || key==187) && (evt.ctrlKey||ICEcoder.cmdKey)) {
+			} else if((key==107 || key==187) && (evt.ctrlKey||this.cmdKey)) {
 				area=="content"
-				? ICEcoder.duplicateLines()
-				: ICEcoder.newTab();
+				? this.duplicateLines()
+				: this.newTab();
 	        		return false;
 
 			// CTRL/Cmd+numeric minus (Close tab)
-			} else if((key==109 || key==189) && (evt.ctrlKey||ICEcoder.cmdKey)) {
+			} else if((key==109 || key==189) && (evt.ctrlKey||this.cmdKey)) {
 				area=="content"
-				? ICEcoder.removeLines()
-				: ICEcoder.closeTab(ICEcoder.selectedTab);
+				? this.removeLines()
+				: this.closeTab(this.selectedTab);
 	        		return false;
 
 			// CTRL/Cmd+S (Save), CTRL/Cmd+Shift+S (Save As)
-			} else if(key==83 && (evt.ctrlKey||ICEcoder.cmdKey)) {
+			} else if(key==83 && (evt.ctrlKey||this.cmdKey)) {
 				if(evt.shiftKey) {
-					ICEcoder.saveFile('saveAs');
+					this.saveFile('saveAs');
 				} else {
-					ICEcoder.saveFile();
+					this.saveFile();
 				}
 	        		return false;
 
 			// CTRL/Cmd+Enter (Open Webpage)
-			} else if(key==13 && (evt.ctrlKey||ICEcoder.cmdKey) && ICEcoder.openFiles[ICEcoder.selectedTab-1] != "/[NEW]") {
-				ICEcoder.resetKeys(evt);
-				window.open(ICEcoder.openFiles[ICEcoder.selectedTab-1]);
+			} else if(key==13 && (evt.ctrlKey||this.cmdKey) && this.openFiles[this.selectedTab-1] != "/[NEW]") {
+				this.resetKeys(evt);
+				window.open(this.openFiles[this.selectedTab-1]);
 	        		return false;
 
 			// Enter (Expand dir/open file)
 			} else if(key==13 && area=="files") {
-				if(!evt.ctrlKey && !ICEcoder.cmdKey) {
-					if (ICEcoder.selectedFiles.length == 0) {
-						ICEcoder.overFileFolder('folder', '|');
-						ICEcoder.selectFileFolder('init');
+				if(!evt.ctrlKey && !this.cmdKey) {
+					if (this.selectedFiles.length == 0) {
+						this.overFileFolder('folder', '|');
+						this.selectFileFolder('init');
 					}
-					ICEcoder.fmAction(evt,'enter');
+					this.fmAction(evt,'enter');
 				}
 				return false;
 
 			// Up/down/left/right arrows (Traverse files)
 			} else if((key==38||key==40||key==37||key==39) && area=="files") {
-				if(!evt.ctrlKey && !ICEcoder.cmdKey) {
-					if (ICEcoder.selectedFiles.length == 0) {
-						ICEcoder.overFileFolder('folder', '|');
-						ICEcoder.selectFileFolder('init');
+				if(!evt.ctrlKey && !this.cmdKey) {
+					if (this.selectedFiles.length == 0) {
+						this.overFileFolder('folder', '|');
+						this.selectFileFolder('init');
 					}
-					ICEcoder.fmAction(evt,
+					this.fmAction(evt,
 						key==38 ?	'up' :
 						key==40 ?	'down' :
 						key==37 ?	'left' :
@@ -4580,51 +4585,51 @@ var ICEcoder = {
 	        		return false;
 
 			// CTRL/Cmd+O (Open Prompt)
-			} else if(key==79 && (evt.ctrlKey||ICEcoder.cmdKey)) {
-				ICEcoder.openPrompt();
+			} else if(key==79 && (evt.ctrlKey||this.cmdKey)) {
+				this.openPrompt();
 	        		return false;
 
 			// CTRL/Cmd+Space (Add snippet)
-			} else if(key==32 && (evt.ctrlKey||ICEcoder.cmdKey) && area=="content") {
-				ICEcoder.addSnippet();
+			} else if(key==32 && (evt.ctrlKey||this.cmdKey) && area=="content") {
+				this.addSnippet();
 	        		return false;
 
 			// CTRL/Cmd+J (Jump to definition/back again)
-			} else if(key==74 && (evt.ctrlKey||ICEcoder.cmdKey) && area=="content") {
-				ICEcoder.jumpToDefinition();
+			} else if(key==74 && (evt.ctrlKey||this.cmdKey) && area=="content") {
+				this.jumpToDefinition();
 	        		return false;
 
 			// CTRL + Tab (lock/unlock file manager)
-			} else if(key==223 && (evt.ctrlKey||ICEcoder.cmdKey)) {
-				ICEcoder.lockUnlockNav();
-				ICEcoder.changeFilesW(ICEcoder.lockedNav ? 'expand' : 'contract');
+			} else if(key==223 && (evt.ctrlKey||this.cmdKey)) {
+				this.lockUnlockNav();
+				this.changeFilesW(this.lockedNav ? 'expand' : 'contract');
 				return false;
 
 			// CTRL + . (Fold/unfold current line)
-			} else if(key==190 && (evt.ctrlKey||ICEcoder.cmdKey)) {
-				cM = ICEcoder.getcMInstance();
-				cMdiff = ICEcoder.getcMdiffInstance();
-				thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+			} else if(key==190 && (evt.ctrlKey||this.cmdKey)) {
+				cM = this.getcMInstance();
+				cMdiff = this.getcMdiffInstance();
+				thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 				var line = thisCM.getCursor().line;
 
 				return false;
 
 			// ESC in content area (Comment/Uncomment line)
        			} else if(key==27 && area == "content") {
-				cM = ICEcoder.getcMInstance();
-				cMdiff = ICEcoder.getcMdiffInstance();
-				thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+				cM = this.getcMInstance();
+				cMdiff = this.getcMdiffInstance();
+				thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 
 				if (thisCM.getSelections().length > 1) {
 					thisCM.execCommand("singleSelection");
 				} else {
-					ICEcoder.lineCommentToggle();
+					this.lineCommentToggle();
 				}
 	        		return false;
 
 			// ESC not in content area (Cancel all actions)
 	       		} else if(key==27 && area != "content") {
-				ICEcoder.cancelAllActions();
+				this.cancelAllActions();
 		        	return false;
 
 			// Any other key
@@ -4640,13 +4645,13 @@ var ICEcoder = {
 
 		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
 
-		if (key == 112 && ICEcoder.codeZoomedOut) {
-			cM = ICEcoder.getcMInstance();
+		if (key == 112 && this.codeZoomedOut) {
+			cM = this.getcMInstance();
 			// For every line in the current editor, remove code-zoomed-out class if not a function/class declaration line
 			for (var i=0; i<cM.lineCount(); i++) {
 				var nonDeclareLine = true;
-				for (var j=0; j<ICEcoder.functionClassList.length; j++) {
-					if (ICEcoder.functionClassList[j].line == i) {
+				for (var j=0; j<this.functionClassList.length; j++) {
+					if (this.functionClassList[j].line == i) {
 						nonDeclareLine = false;
 					}
 				}
@@ -4659,11 +4664,11 @@ var ICEcoder = {
 
 			// Go to line chosen if any
 			var cursor = cM.getCursor();
-			ICEcoder.goToLine(cursor.line + 1, cursor.ch, false);
+			this.goToLine(cursor.line + 1, cursor.ch, false);
 
-			ICEcoder.codeZoomedOut = false;
+			this.codeZoomedOut = false;
 		}
-		ICEcoder.cmdKey = false;
+		this.cmdKey = false;
 	},
 
 	// Add snippet code completion
@@ -4671,21 +4676,21 @@ var ICEcoder = {
 		var cM, cMdiff, thisCM, lineNo, whiteSpace, content;
 
 		// Get line content after trimming whitespace
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		lineNo = thisCM.getCursor().line;
 		whiteSpace = thisCM.getLine(lineNo).length - thisCM.getLine(lineNo).replace(/^\s\s*/, '').length;
 		content = thisCM.getLine(lineNo).slice(whiteSpace);
 		// function snippet
 		if (content.slice(0,8)=="function") {
-			ICEcoder.doSnippet('function','function VAR() {\nINDENT\tCURSOR\nINDENT}');
+			this.doSnippet('function','function VAR() {\nINDENT\tCURSOR\nINDENT}');
 		// if snippet
 		} else if (content.slice(0,2)=="if") {
-			ICEcoder.doSnippet('if','if (CURSOR) {\nINDENT\t\nINDENT}');
+			this.doSnippet('if','if (CURSOR) {\nINDENT\t\nINDENT}');
 		// for snippet
 		} else if (content.slice(0,3)=="for") {
-			ICEcoder.doSnippet('for','for (var i=0; i<CURSOR; i++) {\nINDENT\t\nINDENT}');
+			this.doSnippet('for','for (var i=0; i<CURSOR; i++) {\nINDENT\t\nINDENT}');
 		}
 	},
 
@@ -4694,9 +4699,9 @@ var ICEcoder = {
 		var cM, cMdiff, thisCM, lineNo, lineContents, remainder, strPos, replacedLine, whiteSpace, curPos, sPos, lineNoCount;
 
 		// Get line contents
-		cM = ICEcoder.getcMInstance();
-		cMdiff = ICEcoder.getcMdiffInstance();
-		thisCM = ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
+		cM = this.getcMInstance();
+		cMdiff = this.getcMdiffInstance();
+		thisCM = this.editorFocusInstance.indexOf('diff') > -1 ? cMdiff : cM;
 		lineNo = thisCM.getCursor().line;
 		lineContents = thisCM.getLine(lineNo);
 
@@ -4730,38 +4735,38 @@ var ICEcoder = {
 			thisCM.replaceRange(replacedLine.replace("CURSOR",""),{line:lineNo,ch:0},{line:lineNo,ch:1000000});
 			thisCM.setCursor(lineNoCount,curPos);
 			// Finally, focus on the editor
-			ICEcoder.focus(ICEcoder.editorFocusInstance.indexOf('diff') > -1 ? true : false);
+			this.focus(this.editorFocusInstance.indexOf('diff') > -1 ? true : false);
 		}
 	},
 
 	// Snart snake
 	startSnake: function() {
-		ICEcoder.snakePlaying = true;
-		ICEcoder.showHide('show',get('blackMask'));
+		this.snakePlaying = true;
+		this.showHide('show',get('blackMask'));
 		get('mediaContainer').innerHTML = '<span style="font-size: 14px">Let\'s play<br><img src="'+iceLoc+'/images/snake.png" alt="snake"><br><br><br>Use arrow keys to eat your code<br><br>(it returns afterwards of course) :-)</span>';
-		setTimeout(function() {
-			ICEcoder.showHide('hide',get('blackMask'));
+		setTimeout(function(ic) {
+			ic.showHide('hide',get('blackMask'));
 			get('mediaContainer').innerHTML = '';
-			ICEcoder.playSnake();
-		},2000);
+			ic.playSnake();
+		},2000,this);
 	},
 
 	// Play snake
 	playSnake: function() {
 		var cM;
 
-		cM = ICEcoder.getcMInstance();
+		cM = this.getcMInstance();
 		cM.setOption('readOnly', 'nocursor');
 		cM.focus();
 
 		// Get state of editor at present
-		ICEcoder.snakePreHistory = cM.getHistory();
-		ICEcoder.snakePreContent = cM.getValue();
-		ICEcoder.snakePreCursor = cM.getCursor();
+		this.snakePreHistory = cM.getHistory();
+		this.snakePreContent = cM.getValue();
+		this.snakePreCursor = cM.getCursor();
 
 		// Pick a random point for snake to come in and set head and 4 body parts off screen
 		var randPos = Math.floor(Math.random()*50);
-		ICEcoder.snakePos = [
+		this.snakePos = [
 			[randPos,0],
 			[randPos,-1],
 			[randPos,-2],
@@ -4770,49 +4775,49 @@ var ICEcoder = {
 		];
 
 		// Show game layer, set direction and do 1st frame of snake
-		ICEcoder.content.contentWindow.document.getElementById('game').style.display = 'block';
-		ICEcoder.snakeDir = "down";
-		ICEcoder.doSnake();
+		this.content.contentWindow.document.getElementById('game').style.display = 'block';
+		this.snakeDir = "down";
+		this.doSnake();
 
 		// Every 0.1s, move snake
-		ICEcoder.snakeInt = setInterval(function() {
+		this.snakeInt = setInterval(function(ic) {
 			// Set new head X & Y pos according to direction
 			var newHead = [];
-			newHead[0] = ICEcoder.snakePos[0][0]+(ICEcoder.snakeDir == "right" ? 1 : ICEcoder.snakeDir == "left" ? -1 : 0);
-			newHead[1] = ICEcoder.snakePos[0][1]+(ICEcoder.snakeDir == "down" ? 1 : ICEcoder.snakeDir == "up" ? -1 : 0);
+			newHead[0] = ic.snakePos[0][0]+(ic.snakeDir == "right" ? 1 : ic.snakeDir == "left" ? -1 : 0);
+			newHead[1] = ic.snakePos[0][1]+(ic.snakeDir == "down" ? 1 : ic.snakeDir == "up" ? -1 : 0);
 			// Add new head and remove tail
-			ICEcoder.snakePos.unshift(newHead);
-			ICEcoder.snakePos.pop();
+			ic.snakePos.unshift(newHead);
+			ic.snakePos.pop();
 			// Do next frame of snake
-			ICEcoder.doSnake();
-		},100);
+			ic.doSnake();
+		},100,this);
 	},
 
 	doSnake: function() {
 		var cM, cW, cH, newInnerHTML, lineData, lineContent, spaceReplaceChars, collision, scrollInfo;
 
 		// Get CodeMirror instance, plus char width and height
-		cM = ICEcoder.getcMInstance();
+		cM = this.getcMInstance();
 		cW = cM.defaultCharWidth();
 		cH = cM.defaultTextHeight();
 
 		// Clear content of game layer
-		ICEcoder.content.contentWindow.document.getElementById('game').innerHTML = "";
+		this.content.contentWindow.document.getElementById('game').innerHTML = "";
 		// Start a new set of contents
 		newInnerHTML = "";
 		// For every part of snake, draw it's block in position
-		for (var i=0; i<ICEcoder.snakePos.length; i++) {
-			newInnerHTML += '<div style="position: absolute; diplay: inline-block; width: '+cW+'px; height: '+cH+'px; top: '+((ICEcoder.snakePos[i][1]*cH)+4)+'px; left: '+((ICEcoder.snakePos[i][0]*cW)+60)+'px; background: #fff"></div>';
+		for (var i=0; i<this.snakePos.length; i++) {
+			newInnerHTML += '<div style="position: absolute; diplay: inline-block; width: '+cW+'px; height: '+cH+'px; top: '+((this.snakePos[i][1]*cH)+4)+'px; left: '+((this.snakePos[i][0]*cW)+60)+'px; background: #fff"></div>';
 		}
 		// Set new content in game layer
-		ICEcoder.content.contentWindow.document.getElementById('game').innerHTML = newInnerHTML;
+		this.content.contentWindow.document.getElementById('game').innerHTML = newInnerHTML;
 
 		// Get line & ch value under snake head then line content
-		lineData = cM.coordsChar({top: ((ICEcoder.snakePos[0][1]*cH)+4), left: ((ICEcoder.snakePos[0][0]*cW)+60)});
+		lineData = cM.coordsChar({top: ((this.snakePos[0][1]*cH)+4), left: ((this.snakePos[0][0]*cW)+60)});
 		lineContent = cM.getLine(lineData.line);
 
 		// If not the last char on the line
-		if (ICEcoder.snakePos[0][0]-1 <= lineContent.length-2) {
+		if (this.snakePos[0][0]-1 <= lineContent.length-2) {
 			spaceReplaceChars = "";
 			// If char under snake head is a tab, replace string contains spaces of same width
 			if (lineContent.substr(lineData.ch,1) === "\t") {
@@ -4824,23 +4829,23 @@ var ICEcoder = {
 				spaceReplaceChars = " ";
 			}
 			// Push a duplicate of tail onto end, to increase snake length by 1 block
-			ICEcoder.snakePos.push([ICEcoder.snakePos[ICEcoder.snakePos.length-1][0],ICEcoder.snakePos[ICEcoder.snakePos.length-1][1]]);
+			this.snakePos.push([this.snakePos[this.snakePos.length-1][0],this.snakePos[this.snakePos.length-1][1]]);
 			// Replace char under head with nothing if end of line, else with our replacement string
-			cM.doc.replaceRange(ICEcoder.snakePos[0][0]-1 == lineContent.length-2 ? "" : spaceReplaceChars,lineData,{line: lineData.line, ch: lineData.ch+1});
+			cM.doc.replaceRange(this.snakePos[0][0]-1 == lineContent.length-2 ? "" : spaceReplaceChars,lineData,{line: lineData.line, ch: lineData.ch+1});
 			// Remove any trailing space at end
-			if (ICEcoder.snakePos[0][0]-1 == lineContent.length-2) {
+			if (this.snakePos[0][0]-1 == lineContent.length-2) {
 				cM.doc.replaceRange(cM.getLine(lineData.line).replace(/[ \t]+$/,''),{line: lineData.line, ch: 0},{line: lineData.line, ch: 1000000});
 			}
 		} else {
 			// Reduce snake length if over 5 chars and not on content
-			if (ICEcoder.snakePos.length >= 5) {
-				ICEcoder.snakePos.pop();
+			if (this.snakePos.length >= 5) {
+				this.snakePos.pop();
 			}
 		}
 		// Detect if snake head has collided into itself
 		collision = false;
-		for (var i=1; i<ICEcoder.snakePos.length; i++) {
-			if (ICEcoder.snakePos[i][0] == ICEcoder.snakePos[0][0] && ICEcoder.snakePos[i][1] == ICEcoder.snakePos[0][1]) {
+		for (var i=1; i<this.snakePos.length; i++) {
+			if (this.snakePos[i][0] == this.snakePos[0][0] && this.snakePos[i][1] == this.snakePos[0][1]) {
 				collision = true;
 			}
 		}
@@ -4848,28 +4853,28 @@ var ICEcoder = {
 		scrollInfo = cM.getScrollInfo();
 		if (
 			// If snake out of bounds or a collision, game over!
-			ICEcoder.snakePos[0][0] < 0 || ICEcoder.snakePos[0][1] < 0 ||
-			((ICEcoder.snakePos[0][0]*cW)+60) > scrollInfo.clientWidth || ((ICEcoder.snakePos[0][1]*cH)+4) > scrollInfo.clientHeight ||
+			this.snakePos[0][0] < 0 || this.snakePos[0][1] < 0 ||
+			((this.snakePos[0][0]*cW)+60) > scrollInfo.clientWidth || ((this.snakePos[0][1]*cH)+4) > scrollInfo.clientHeight ||
 			collision
 			) {
 			// Clear interval and hide game layer
-			clearInterval(ICEcoder.snakeInt);
-			ICEcoder.content.contentWindow.document.getElementById('game').style.display = 'none';
+			clearInterval(this.snakeInt);
+			this.content.contentWindow.document.getElementById('game').style.display = 'none';
 			// Set content, saved point, saved contents and history back to what they were pre game
-			cM.setValue(ICEcoder.snakePreContent);
-			ICEcoder.savedPoints[ICEcoder.selectedTab-1] = cM.changeGeneration();
-			ICEcoder.savedContents[ICEcoder.selectedTab-1] = ICEcoder.snakePreContent;
-			cM.setHistory(ICEcoder.snakePreHistory);
+			cM.setValue(this.snakePreContent);
+			this.savedPoints[this.selectedTab-1] = cM.changeGeneration();
+			this.savedContents[this.selectedTab-1] = this.snakePreContent;
+			cM.setHistory(this.snakePreHistory);
 			// Redo changes indicator in title tag and tab highlight save indicator also to what they are now (pre game state)
-			ICEcoder.indicateChanges();
-			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
+			this.indicateChanges();
+			this.redoTabHighlight(this.selectedTab);
 			// Set editor to be editable again
 			cM.setOption('readOnly', false);
 			// Set cursor back to what it was pre game and focus on editor
-			cM.setCursor(ICEcoder.snakePreCursor);
+			cM.setCursor(this.snakePreCursor);
 			cM.focus();
 			// State we are no longer playing snake
-			ICEcoder.snakePlaying = false;
+			this.snakePlaying = false;
 		}
 
 	}