diff --git a/src/entry_ext.js b/src/entry_ext.js
index 4af4685f..4f32cc4e 100644
--- a/src/entry_ext.js
+++ b/src/entry_ext.js
@@ -6,7 +6,7 @@
 		return;
 
 	const HOST = location.hostname,
-		SERVER = browser.runtime.getURL("web/"),
+		SERVER = browser.runtime.getURL("web"),
 		script = document.createElement('script');
 
 	let FLAVOR =
@@ -22,5 +22,6 @@
 	script.crossOrigin = 'anonymous';
 	script.src = `${SERVER}/${FLAVOR}.js?_=${Date.now()}`;
 	script.dataset.path = SERVER;
+
 	document.head.appendChild(script);
 })();
diff --git a/src/sites/twitch-twilight/index.js b/src/sites/twitch-twilight/index.js
index 4f870ffb..72027834 100644
--- a/src/sites/twitch-twilight/index.js
+++ b/src/sites/twitch-twilight/index.js
@@ -21,8 +21,6 @@ import {has} from 'utilities/object';
 
 import MAIN_URL from 'site/styles/main.scss';
 
-console.log('!!!!!!!! MAIN_URL: !!!!!!!!!', MAIN_URL);
-
 
 // ============================================================================
 // The Site
diff --git a/src/utilities/constants.js b/src/utilities/constants.js
index f36aab11..d2b9ce62 100644
--- a/src/utilities/constants.js
+++ b/src/utilities/constants.js
@@ -6,8 +6,9 @@ import {make_enum} from 'utilities/object';
 export const DEBUG = localStorage.ffzDebugMode === 'true' && document.body.classList.contains('ffz-dev');
 export const EXTENSION = !!__extension__;
 export const SERVER = DEBUG ? '//localhost:8000' : 'https://cdn.frankerfacez.com';
+
 export const SERVER_OR_EXT = EXTENSION
-	? __extension__
+	? __webpack_public_path__
 	: `${SERVER}/script`;
 
 export const CLIENT_ID = 'a3bc9znoz6vi8ozsoca0inlcr4fcvkl';
diff --git a/webpack.config.js b/webpack.config.js
index 3ca4deee..8b5890f9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -175,7 +175,9 @@ const config = {
 				include: /src/,
 				type: 'asset/resource',
 				generator: {
-					filename: '[name].[contenthash:8].json'
+					filename: (FOR_EXTENSION || DEV_BUILD)
+						? '[name].json'
+						: '[name].[contenthash:8].json'
 				}
 			},
 			{