diff --git a/server.dev/src/index.js b/server.dev/src/index.js
index 775d576a..0b832705 100644
--- a/server.dev/src/index.js
+++ b/server.dev/src/index.js
@@ -44,26 +44,10 @@ app.use( '/maps', express.static( path.resolve( __dirname, '../../maps' ) ) );
 
 // ---
 
-//io.listen( port, () => {
-//	const url       = `localhost:${ port }`;
-//	const data      = {
-//		url:  url,
-//		port: port
-//	};
-//	const eventName = 'server.listen';
-//	const txt       = `Euro Truck Simulator 2 dashboard is running at http://${ url }/`;
-//	io.emit( 'log', {
-//		eventName: eventName,
-//		rawData:   data
-//	} );
-//	console.log( `[${ eventName }] ${ txt }` );
-//} );
-
 io.on( 'connection', socket => {
 	const data = fs.readFileSync( dateFilename );
 	console.log( 'Update' );
 	setInterval( () => io.emit( 'update', JSON.parse( data.toString() ) ), interval() );
-	//io.emit( 'update', JSON.parse( data.toString() ) );
 } );
 
 server.listen( port, () => {
@@ -73,13 +57,7 @@ server.listen( port, () => {
 		port: port
 	};
 	
-	//	const url       = `localhost:${ port }`;
-	//	const data      = {
-	//		url:  url,
-	//		port: port
-	//	};
 	const eventName = 'server.listen';
-	//const txt       = `Euro Truck Simulator 2 dashboard is running at http://${ url }/`;
 	io.emit( 'log', {
 		eventName: eventName,
 		rawData:   data
diff --git a/server/src/helpers/server.helpers.mjs b/server/src/helpers/server.helpers.mjs
index 9ed1b883..571de6bd 100644
--- a/server/src/helpers/server.helpers.mjs
+++ b/server/src/helpers/server.helpers.mjs
@@ -12,10 +12,11 @@ import fs                from 'fs';
 import http              from 'http';
 import path              from 'path';
 import socketio          from 'socket.io';
+import cors              from 'cors';
 import truckSimTelemetry from 'trucksim-telemetry';
 import { logIt }         from './utils.helpers';
 
-let app, server, io, telemetry, port, config, interval, pathDist;
+let app, server, io, telemetry, port, config, interval, pathDist, pathMap;
 const configFilePath = path.resolve( process.cwd(), './config.ets2-dashboard-skin.json' );
 
 const init = () => {
@@ -33,10 +34,18 @@ const init = () => {
 			: 15;
 	};
 	pathDist  = path.resolve( __dirname, '../../../dist' );
+	pathMap   = path.resolve( process.cwd(), './maps' );
 	
 	app.use( bodyParser.json() );
+	app.use( cors( {
+		origin:      /http:\/\/localhost:\d+/,
+		credentials: true
+	} ) );
 	app.use( express.static( pathDist ) );
 	
+	if ( fs.existsSync( pathMap ) )
+		app.use( '/maps', express.static( pathMap ) );
+	
 	app.post( '/config', ( req, res ) => {
 		fs.writeFileSync( configFilePath, JSON.stringify( req.body, null, 2 ) );