diff --git a/Gruntfile.js b/Gruntfile.js
index 53cd298..c8a2464 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,7 +17,6 @@ var proxyConfig = {
 		forward: {
 			'/socket.io/*': serverEndpoint,
 			'/socket.io': serverEndpoint,
-			'/cms-content': serverEndpoint,
 			'/api': serverEndpoint
 		}
 	}
@@ -106,6 +105,8 @@ module.exports = function (grunt) {
 							require('json-proxy').initialize(proxyConfig),
 							mountFolder(connect, '.grunt'),
 							mountFolder(connect, '.tmp'),
+							mountFolder(connect, config.publicDir),
+							mountFolder(connect, config.staticDir),
 							mountFolder(connect, 'app')
 						];
 					}
diff --git a/app/index.html b/app/index.html
index fbc37f0..b363b7f 100755
--- a/app/index.html
+++ b/app/index.html
@@ -50,7 +50,7 @@
   <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
   <link rel="stylesheet" href="styles/main.css">
   <!-- endbuild -->
-  <link rel="stylesheet" ng-href="{{App.config.cdn}}/bootswatch.com/{{App.theme | lowercase}}/bootstrap.min.css"/>
+  <link rel="stylesheet" ng-href="{{App.settings.cdn}}/bootswatch.com/{{App.theme | lowercase}}/bootstrap.min.css"/>
 
 </head>
 <body data-ng-class="App.route.current.scope.name">
@@ -138,12 +138,12 @@
 	<script src="scripts/controllers/help.js"></script>
 	<script src="scripts/controllers/app.js"></script>
   <script src="scripts/filters/gravatar.js"></script>
-	<script src="scripts/directives/cmsformgroup.js"></script>
-	<script src="scripts/directives/cmswidgets.js"></script>
-	<script src="scripts/directives/cmswidget.js"></script>
-	<script src="scripts/directives/cmsuploader.js"></script>
-	<script src="scripts/directives/cmsheader.js"></script>
-	<script src="scripts/directives/cmsgravatar.js"></script>
+	<script src="scripts/directives/cms-formgroup.js"></script>
+	<script src="scripts/directives/cms-widgets.js"></script>
+	<script src="scripts/directives/cms-widget.js"></script>
+	<script src="scripts/directives/cms-uploader.js"></script>
+	<script src="scripts/directives/cms-header.js"></script>
+	<script src="scripts/directives/cms-gravatar.js"></script>
 	<script src="scripts/services/dataservice.js"></script>
 	<!--script src="scripts/services/cmsdataserviceprovider.js"></script-->
 	<script src="scripts/services/cmsdataservicefactory.js"></script>
diff --git a/app/views/themes.html b/app/views/themes.html
index 5404a19..961ef57 100755
--- a/app/views/themes.html
+++ b/app/views/themes.html
@@ -5,37 +5,38 @@ <h1><i class="fa fa-1x fa-picture-o"></i> Themes</h1>
 <hr/>
 </div>
 <div class="well well-sm">
-<div class="row">
-<div class="col-sm-4 col-md-4 col-xs-4">
-<img 
-src="http://placehold.it/400x300"
-ng-src="{{App.config.cdn}}/bootswatch.com/{{App.theme | lowercase}}/thumbnail.png" 
-class="img-thumbnail">
-</div>
-<div class="col-md-8 col-sm-8 col-xs-8">
-<small class="text-muted">Current Theme</small>
-<h2>{{App.theme}} <small>1.0</small></h2>
-<p>This is going to be meta data for the theme.</p>
-<p class="text-muted"><span>OPTIONS:</span> <a href="#">Widgets</a> | <a href="#">Menus</a> | <a href="#">Header</a></p>
-</div>
-</div><!--/row-->
+	<div class="row">
+		<div class="col-sm-4 col-md-4 col-xs-4">
+			<img src="http://placehold.it/400x300"
+				ng-src="{{App.settings.cdn}}/bootswatch.com/{{App.theme | lowercase}}/thumbnail.png"
+				class="img-thumbnail">
+			</div>
+			<div class="col-md-8 col-sm-8 col-xs-8">
+				<small class="text-muted">Current Theme</small>
+				<h2>{{App.theme}} <small>1.0</small></h2>
+				<p>This is going to be meta data for the theme.</p>
+				<p class="text-muted">
+					<span>OPTIONS:</span>
+					<a href="#">Widgets</a> |
+					<a href="#">Menus</a> |
+					<a href="#">Header</a>
+				</p>
+			</div>
+		</div><!--/row-->
 </div><!--/well-->
-
-
-
-
 <!-- @TODO: [Themes List] -->
 <div class="row cms-themes">
 	<div class="col-sm-6 col-md-4 col-xs-6 theme-item" ng-repeat="theme in App.options.themes">
-		<a class="thumbnail theme" href="" ng-click="selectTheme(theme);" title="Change to {{theme}} theme" ng-cloak>
-			  <img 
-				alt="{{theme}}"
-				ng-src="{{App.config.cdn}}/bootswatch.com/{{theme | lowercase}}/thumbnail.png"
-				src="http://placehold.it/300x150">
+		<a class="thumbnail theme" href=""
+			ng-click="selectTheme(theme);"
+			title="Change to {{theme}} theme"
+			ng-cloak>
+			  <img alt="{{theme}}"
+					ng-src="{{App.settings.cdn}}/bootswatch.com/{{theme | lowercase}}/thumbnail.png"
+					src="http://placehold.it/300x150">
 		      <div class="caption hidden">
 		        <h3>{{theme}}</h3>
 		      </div>
 		</a>
 	</div>
-
 </div>
