diff --git a/src/selector_manager/config/config.js b/src/selector_manager/config/config.js
index 6fc3bedb7..620505f92 100644
--- a/src/selector_manager/config/config.js
+++ b/src/selector_manager/config/config.js
@@ -2,10 +2,10 @@ define(function () {
 	return {
 
     // Style prefix
-    stylePrefix     : 'clm-',
+    stylePrefix: 'clm-',
 
     // Default classes
-    selectors : [],
+    selectors: [],
 
     // Label for classes
     label: 'Classes',
@@ -21,4 +21,4 @@ define(function () {
     ],
 
 	};
-});
\ No newline at end of file
+});
diff --git a/src/selector_manager/main.js b/src/selector_manager/main.js
index 28a9540ea..39634186a 100644
--- a/src/selector_manager/main.js
+++ b/src/selector_manager/main.js
@@ -88,7 +88,10 @@ define(function(require) {
         if(ppfx)
           c.stylePrefix = ppfx + c.stylePrefix;
 
-        selectors = new Selectors(c.selectors);
+        selectors = new Selectors(c.selectors, {
+          em: c.em,
+          config: c,
+        });
         selectorTags = new ClassTagsView({
           collection: selectors,
           config: c,
diff --git a/src/selector_manager/model/Selector.js b/src/selector_manager/model/Selector.js
index 8f17945f9..fd2a68fc3 100644
--- a/src/selector_manager/model/Selector.js
+++ b/src/selector_manager/model/Selector.js
@@ -1,32 +1,32 @@
 define(['backbone'],
-	function (Backbone) {
-		return Backbone.Model.extend({
+  function (Backbone) {
+    return Backbone.Model.extend({
 
       idAttribute: 'name',
 
-			defaults: {
-				name: '',
+      defaults: {
+        name: '',
         label: '',
         type: 'class',
         active: true,
-			},
+      },
 
-			initialize: function() {
-			  this.set('name', this.escapeName(this.get('name')));
+      initialize: function() {
+        this.set('name', this.escapeName(this.get('name')));
         var label = this.get('label').trim();
         if(!label)
           this.set('label', this.get('name'));
-			},
+      },
 
-			/**
+      /**
        * Escape string
        * @param {string} name
        * @return {string}
        * @private
        */
       escapeName: function(name) {
-        return name.toLowerCase().replace(/([^a-z0-9\w]+)/gi, '-');
+        return name.replace(/([^a-z0-9\w]+)/gi, '-');
       },
 
-		});
+    });
 });
diff --git a/src/selector_manager/model/Selectors.js b/src/selector_manager/model/Selectors.js
index 10d4fd6f3..04e716cdb 100644
--- a/src/selector_manager/model/Selectors.js
+++ b/src/selector_manager/model/Selectors.js
@@ -3,7 +3,7 @@ define(['backbone','./Selector'],
 
     return Backbone.Collection.extend({
 
-      model:  Selector,
+      model: Selector,
 
     });
 });