diff --git a/agent.js b/agent.js
index 0f3e12f1..d368880c 100644
--- a/agent.js
+++ b/agent.js
@@ -6,7 +6,8 @@
 
 global.PROCNAME = 'AGENT';
 global.ROOTPATH = __dirname;
-global.CORE_PATH = ROOTPATH + '/../core/';
+global.CORE_PATH = ROOTPATH + './node_modules/requarks-core/';
+//global.CORE_PATH = ROOTPATH + '/../core/';
 global.IS_DEBUG = process.env.NODE_ENV === 'development';
 
 // ----------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 3f4f42fe..2f235694 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -57,8 +57,8 @@ var paths = {
 			'./client/scss/*.scss'
 		],
 		includes: [
-			'../core',
-			//'./node_modules/requarks-core'
+			//'../core',
+			'./node_modules/requarks-core'
 		],
 		watch: [
 			'./client/scss/**/*.scss',
@@ -68,8 +68,8 @@ var paths = {
 	fonts: [
 		'./node_modules/font-awesome/fonts/*-webfont.*',
 		'!./node_modules/font-awesome/fonts/*-webfont.svg',
-		//'../node_modules/requarks-core/core-client/fonts/**/*'
-		'../core/core-client/fonts/**/*'
+		'../node_modules/requarks-core/core-client/fonts/**/*'
+		//'../core/core-client/fonts/**/*'
 	],
 	deploy: [
 		'./**/*',
diff --git a/server.js b/server.js
index 9e1369d1..781dc1ea 100644
--- a/server.js
+++ b/server.js
@@ -7,7 +7,8 @@
 
 global.PROCNAME = 'SERVER';
 global.ROOTPATH = __dirname;
-global.CORE_PATH = ROOTPATH + '/../core/';
+global.CORE_PATH = ROOTPATH + './node_modules/requarks-core/';
+//global.CORE_PATH = ROOTPATH + '/../core/';
 global.IS_DEBUG = process.env.NODE_ENV === 'development';
 
 // ----------------------------------------