diff --git a/Viewer/Makefile b/Viewer/Makefile
index 16ba6aa9..8c7318e3 100755
--- a/Viewer/Makefile
+++ b/Viewer/Makefile
@@ -266,6 +266,7 @@ DOMAIN_DIR = imagegrid
 FEATURES_DIR = features
 WORKERS_DIR = workers
 IMAGES_DIR = images
+ASSET_DIR := data
 
 LICENSE = LICENSE
 BUILD_INFO = $(BUILD_DIR)/INFO
@@ -611,6 +612,7 @@ $(BUILD_DIR)/$(APP_NAME)/: $(PROJECT_FILES) \
 	cp -r $(PROJECT_FILES) $(ROOT_JS_FILES) $(HTML_FILES) \
 		$(CFG_DIR) $(LIB_DIR) $(EXT_LIB_DIR) $(FEATURES_DIR) \
 		$(DOMAIN_DIR) $(WORKERS_DIR) $(CSS_DIR) $(IMAGES_DIR) \
+		$(ASSET_DIR) \
 		$(BUILD_INFO) \
 		$(LICENSE) \
 		"$(BUILD_DIR)/$(APP_NAME)"
diff --git a/Viewer/cfg/requirejs.js b/Viewer/cfg/requirejs.js
index 86d11f1c..6ce2aac5 100644
--- a/Viewer/cfg/requirejs.js
+++ b/Viewer/cfg/requirejs.js
@@ -3,9 +3,17 @@
 *
 *
 **********************************************************************/
+
 var requirejs_cfg = {
 	// NOTE: on electron v7+ the default seems to be '../', bug?
-	baseUrl: './',
+	//baseUrl: './',
+	baseUrl: typeof(document) != 'undefined' ?
+			document.baseURI
+				.replace(/^[a-zA-Z]+:\/\/\/?/, '')
+				.split(/[#&]/)[0].split(/[\\\/]/g).slice(0, -1).join('/')
+		: typeof(process) != 'undefined' ?
+			process.cwd().replace(/\\/g, '/')+'/'
+		: './',
 
 	// XXX this does not work on direct filesystem access...
 	//urlArgs: 'bust='+Date.now(),
diff --git a/Viewer/e.js b/Viewer/e.js
index 695ce0d8..fdebf18a 100644
--- a/Viewer/e.js
+++ b/Viewer/e.js
@@ -102,6 +102,7 @@ function createWindow(){
 		webPreferences: {
 			nodeIntegration: true,
 			contextIsolation: false,
+			enableRemoteModule: true,
 		},
 
 		// let the window to get ready before we show it to the user...