diff --git a/app.js b/app.js
index 5527469..5e18d99 100644
--- a/app.js
+++ b/app.js
@@ -3,6 +3,18 @@ define(function(require){
 		_ = require('underscore'),
 		monster = require('monster');
 
+	require([
+		'./submodules/devices/devices',
+		'./submodules/groups/groups',
+		'./submodules/numbers/numbers',
+		'./submodules/strategy/strategy',
+		'./submodules/callLogs/callLogs',
+		'./submodules/users/users',
+		'./submodules/myOffice/myOffice',
+		'./submodules/featureCodes/featureCodes',
+		'./submodules/vmboxes/vmboxes'
+	]);
+
 	var app = {
 		name: 'voip',
 
diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 7bb6e6b..dd6b872 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -132,7 +132,7 @@ define(function(require){
 					mapFeatures: {
 						call_recording: {
 							icon: 'fa fa-microphone',
-							iconColor: 'monster-blue',
+							iconColor: 'monster-primary-color',
 							title: self.i18n.active().groups.callRecording.title
 						},
 						ringback: {
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 641e857..275e653 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -442,7 +442,7 @@ define(function(require){
 			});
 
 			var popup = monster.ui.dialog(dialogTemplate, {
-				title: '<i class="fa fa-question-circle monster-blue"></i>',
+				title: '<i class="fa fa-question-circle monster-primary-color"></i>',
 				position: ['center', 20],
 				dialogClass: 'monster-alert'
 			});
diff --git a/views/callLogs-cdrsList.html b/views/callLogs-cdrsList.html
index b494265..8c21a4a 100644
--- a/views/callLogs-cdrsList.html
+++ b/views/callLogs-cdrsList.html
@@ -48,7 +48,7 @@
 	</div>
 	<div class="extra-legs">
 		<div class="loading-container">
-			{{@root.i18n.callLogs.loading}} <i class="fa fa-spinner fa-spin monster-blue fa-lg"></i>
+			{{@root.i18n.callLogs.loading}} <i class="fa fa-spinner fa-spin monster-primary-color fa-lg"></i>
 		</div>
 	</div>
 </div>
diff --git a/views/myOffice-layout.html b/views/myOffice-layout.html
index df984ef..52b1c5a 100644
--- a/views/myOffice-layout.html
+++ b/views/myOffice-layout.html
@@ -35,7 +35,7 @@
 				</div>
 				<div class="left-section-content users-section-content">
 					{{#times totalUsers}}
-					<div class="users-element"><i class="fa-2x fa fa-male{{#compare this '<' ../totalChannels}} monster-blue{{/compare}}"></i></div>
+					<div class="users-element"><i class="fa-2x fa fa-male{{#compare this '<' ../totalChannels}} monster-primary-color{{/compare}}"></i></div>
 					{{/times}}
 				</div>
 			</div>
diff --git a/views/strategy-layout.html b/views/strategy-layout.html
index 9dc9feb..f2c102f 100644
--- a/views/strategy-layout.html
+++ b/views/strategy-layout.html
@@ -92,7 +92,7 @@
 					</span>
 					<i class="fa fa-play"></i>
 				</div>
-				<i class="fa fa-volume-up monster-blue custom-greeting-icon" data-original-title="{{i18n.strategy.customConferenceGreeting.tooltip}}" data-placement="top" data-toggle="tooltip" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
+				<i class="fa fa-volume-up monster-primary-color custom-greeting-icon" data-original-title="{{i18n.strategy.customConferenceGreeting.tooltip}}" data-placement="top" data-toggle="tooltip" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
 			</div>
 		</div>
 		<div class="element-content"></div>
diff --git a/views/strategy-popupRemoveFeatures.html b/views/strategy-popupRemoveFeatures.html
index 55c41fb..997a2fb 100644
--- a/views/strategy-popupRemoveFeatures.html
+++ b/views/strategy-popupRemoveFeatures.html
@@ -1,5 +1,5 @@
 <div id="action_confirmation">
-	<h4>{{i18n.strategy.popupRemoveFeatures.questionPartOne}} <span class="monster-blue">{{formatPhoneNumber phoneNumber}}</span> {{i18n.strategy.popupRemoveFeatures.questionPartTwo}}</h4>
+	<h4>{{i18n.strategy.popupRemoveFeatures.questionPartOne}} <span class="monster-primary-color">{{formatPhoneNumber phoneNumber}}</span> {{i18n.strategy.popupRemoveFeatures.questionPartTwo}}</h4>
 	<div class="table-wrapper">
 		<table class="table">
 		<thead>
diff --git a/views/users-row.html b/views/users-row.html
index de0d35c..f34dbc6 100644
--- a/views/users-row.html
+++ b/views/users-row.html
@@ -1,6 +1,6 @@
 <div class="grid-row" data-id="{{id}}" data-priv_level="{{priv_level}}" data-name="{{first_name}} {{last_name}}" data-search="{{first_name}} {{last_name}}{{#each extra.listCallerId}} {{formatPhoneNumber this}} {{this}}{{/each}}">
 	<div class="user-cells">
-		<div class="name grid-cell" data-type="name"><i class="{{#if extra.isAdmin}}icon-telicon-moderator monster-blue{{else}}icon-telicon-user monster-lightgrey{{/if}}"></i> {{ first_name }} {{ last_name }}</div>
+		<div class="name grid-cell" data-type="name"><i class="{{#if extra.isAdmin}}icon-telicon-moderator monster-primary-color{{else}}icon-telicon-user monster-lightgrey{{/if}}"></i> {{ first_name }} {{ last_name }}</div>
 		<div class="extension grid-cell" data-type="extensions">
 			{{#if extra.extension}}
 				{{ extra.extension }}