diff --git a/Chrome Extension/script.js b/Chrome Extension/script.js
index 228dfbc6..2abad384 100644
--- a/Chrome Extension/script.js	
+++ b/Chrome Extension/script.js	
@@ -15,13 +15,26 @@ function ffz_init()
 
 	var debug = localStorage.ffzDebugMode == "true";
 
-	if ( debug )
-		script.src = "//localhost:8000/script/script.js";
-	else
-		script.src = "//cdn.frankerfacez.com/script/script.min.js";
+	if ( debug ) {
+		var xhr = new XMLHttpRequest();
+		xhr.open("GET", "http://localhost:8000/dev_server", true);
+		xhr.onload = function(e) {
+			var resp = JSON.parse(xhr.responseText);
+			console.log("FFZ: Development Server is present. Version " + resp.version + " running from: " + resp.path);
+			script.src = "//localhost:8000/script/script.js";
+			document.body.classList.add("ffz-dev");
+			document.head.appendChild(script);
+		};
+		xhr.onerror = function(e) {
+			console.log("FFZ: Development Server is not present. Using CDN.");
+			script.src = "//cdn.frankerfacez.com/script/script.min.js";
+			document.head.appendChild(script);
+		};
+		return xhr.send(null);
+	}
 
-	var head = document.getElementsByTagName('head')[0];
-	if(head) head.appendChild(script);
+	script.src = "//cdn.frankerfacez.com/script/script.min.js";
+	document.head.appendChild(script);
 }
 
 ffz_init();
\ No newline at end of file
diff --git a/src/constants.js b/src/constants.js
index 94047010..11f85158 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -1,5 +1,5 @@
 var SVGPATH = '<path d="m120.95 1.74c4.08-0.09 8.33-0.84 12.21 0.82 3.61 1.8 7 4.16 11.01 5.05 2.08 3.61 6.12 5.46 8.19 9.07 3.6 5.67 7.09 11.66 8.28 18.36 1.61 9.51 7.07 17.72 12.69 25.35 3.43 7.74 1.97 16.49 3.6 24.62 2.23 5.11 4.09 10.39 6.76 15.31 1.16 2 4.38 0.63 4.77-1.32 1.2-7.1-2.39-13.94-1.97-21.03 0.38-3.64-0.91-7.48 0.25-10.99 2.74-3.74 4.57-8.05 7.47-11.67 3.55-5.47 10.31-8.34 16.73-7.64 2.26 2.89 5.13 5.21 7.58 7.92 2.88 4.3 6.52 8.01 9.83 11.97 1.89 2.61 3.06 5.64 4.48 8.52 2.81 4.9 4 10.5 6.63 15.49 2.16 6.04 5.56 11.92 5.37 18.5 0.65 1.95 0.78 4 0.98 6.03 1.01 3.95 2.84 8.55 0.63 12.42-2.4 5.23-7.03 8.97-11.55 12.33-6.06 4.66-11.62 10.05-18.37 13.75-4.06 2.65-8.24 5.17-12.71 7.08-3.59 1.57-6.06 4.94-9.85 6.09-2.29 1.71-3.98 4.51-6.97 5.02-4.56 1.35-8.98-3.72-13.5-1.25-2.99 1.83-6.19 3.21-9.39 4.6-8.5 5.61-18.13 9.48-28.06 11.62-8.36-0.2-16.69 0.62-25.05 0.47-3.5-1.87-7.67-1.08-11.22-2.83-6.19-1.52-10.93-6.01-16.62-8.61-2.87-1.39-5.53-3.16-8.11-4.99-2.58-1.88-4.17-4.85-6.98-6.44-3.83-0.11-6.54 3.42-10.24 3.92-2.31 0.28-4.64 0.32-6.96 0.31-3.5-3.65-5.69-8.74-10.59-10.77-5.01-3.68-10.57-6.67-14.84-11.25-2.52-2.55-5.22-4.87-8.24-6.8-4.73-4.07-7.93-9.51-11.41-14.62-3.08-4.41-5.22-9.73-4.6-15.19 0.65-8.01 0.62-16.18 2.55-24.02 4.06-10.46 11.15-19.34 18.05-28.06 3.71-5.31 9.91-10.21 16.8-8.39 3.25 1.61 5.74 4.56 7.14 7.89 1.19 2.7 3.49 4.93 3.87 7.96 0.97 5.85 1.6 11.86 0.74 17.77-1.7 6.12-2.98 12.53-2.32 18.9 0.01 2.92 2.9 5.36 5.78 4.57 3.06-0.68 3.99-4.07 5.32-6.48 1.67-4.06 4.18-7.66 6.69-11.23 3.61-5.28 5.09-11.57 7.63-17.37 2.07-4.56 1.7-9.64 2.56-14.46 0.78-7.65-0.62-15.44 0.7-23.04 1.32-3.78 1.79-7.89 3.8-11.4 3.01-3.66 6.78-6.63 9.85-10.26 1.72-2.12 4.21-3.32 6.55-4.6 7.89-2.71 15.56-6.75 24.06-7z"/>',
-	DEBUG = localStorage.ffzDebugMode == "true";
+	DEBUG = localStorage.ffzDebugMode == "true" && document.body.classList.contains('ffz-dev');
 
 module.exports = {
 	DEBUG: DEBUG,
diff --git a/src/debug.js b/src/debug.js
index 1a87ef40..fe1d2093 100644
--- a/src/debug.js
+++ b/src/debug.js
@@ -1,11 +1,11 @@
 var FFZ = window.FrankerFaceZ;
 
 
-// --------------------
-// Debug Command
-// --------------------
+// -----------------------
+// Developer Mode Command
+// -----------------------
 
-FFZ.chat_commands.debug = function(room, args) {
+FFZ.chat_commands.developer_mode = function(room, args) {
 	var enabled, args = args && args.length ? args[0].toLowerCase() : null;
 	if ( args == "y" || args == "yes" || args == "true" || args == "on" )
 		enabled = true;
@@ -13,10 +13,10 @@ FFZ.chat_commands.debug = function(room, args) {
 		enabled = false;
 
 	if ( enabled === undefined )
-		enabled = !(localStorage.ffzDebugMode == "true");
+		return "Developer Mode is currently " + (localStorage.ffzDebugMode == "true" ? "enabled." : "disabled.");
 
 	localStorage.ffzDebugMode = enabled;
-	return "Debug Mode is now " + (enabled ? "enabled" : "disabled") + ". Please refresh your browser.";
+	return "Developer Mode is now " + (enabled ? "enabled" : "disabled") + ". Please refresh your browser.";
 }
 
-FFZ.chat_commands.debug.help = "Usage: /ffz debug [on|off]\nEnable or disable Debug Mode. When Debug Mode is enabled, the script will be reloaded from //localhost:8000/script.js instead of from the CDN.";
\ No newline at end of file
+FFZ.chat_commands.developer_mode.help = "Usage: /ffz developer_mode <on|off>\nEnable or disable Developer Mode. When Developer Mode is enabled, the script will be reloaded from //localhost:8000/script.js instead of from the CDN.";