diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js
index 56b06659..6273139e 100644
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@@ -188,6 +188,11 @@ color:#BC9458;\
 \
 .ace-idle-fingers .ace_xml_pe {\
   \
+}\
+\
+.ace-idle-fingers .ace_collab.ace_user1 {\
+  color:#323232;\
+background-color:#FFF980;   \
 }";
 
     // import CSS once
diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js
index 2fe50e40..7c5b5629 100644
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@@ -64,9 +64,8 @@ define(function(require, exports, module) {
 }\
 \
 .ace-twilight .ace_print_margin {\
-  border-left: 1px solid #3C3C3C;\
-  width: 100%;\
-  background: #242424;\
+  width: 1px;\
+  background: #e8e8e8;\
 }\
 \
 .ace-twilight .ace_scroller {\
@@ -85,13 +84,6 @@ define(function(require, exports, module) {
 .ace-twilight .ace_cursor.ace_overwrite {\
   border-left: 0px;\
   border-bottom: 1px solid #A7A7A7;\
-}\
-.ace-twilight.normal-mode .ace_cursor.ace_overwrite {\
-  border: 1px solid #FFE300;\
-  background: #766B13;\
-}\
-.ace-twilight.normal-mode .ace_cursor-layer {\
-  z-index: 0;\
 }\
  \
 .ace-twilight .ace_marker-layer .ace_selection {\
@@ -204,4 +196,4 @@ color:#5F5A60;\
     dom.importCssString(cssText);
 
     exports.cssClass = "ace-twilight";
-});
+});
\ No newline at end of file
diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
index ab240e67..64270089 100644
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@@ -145,4 +145,8 @@
 
 .%cssClass% .ace_xml_pe {
   %xml_pe%
+}
+
+.%cssClass% .ace_collab.ace_user1 {
+  %collab.user1%   
 }
\ No newline at end of file
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index 018594eb..806d4b98 100644
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -83,7 +83,9 @@ var supportedScopes = {
    "variable": "variable",
    "variable.language": "variable.language",
    
-   "meta.tag.sgml.doctype": "xml_pe"
+   "meta.tag.sgml.doctype": "xml_pe",
+   
+   "collab.user1": "collab.user1"
 };
 
 function extractStyles(theme) {   
@@ -116,7 +118,7 @@ function extractStyles(theme) {
             }
         }
     }
-    
+
     return colors;
 };
 
diff --git a/tool/tmthemes/idleFingers.tmTheme b/tool/tmthemes/idleFingers.tmTheme
index 51666df3..d86a0edd 100644
--- a/tool/tmthemes/idleFingers.tmTheme
+++ b/tool/tmthemes/idleFingers.tmTheme
@@ -373,6 +373,19 @@
 				<string>#FFFFFF</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>name</key>
+			<string>User1</string>
+			<key>scope</key>
+			<string>collab.user1</string>
+			<key>settings</key>
+			<dict>
+				<key>background</key>
+				<string>#FFF980</string>
+				<key>foreground</key>
+				<string>#323232</string>
+			</dict>
+		</dict>
 	</array>
 	<key>uuid</key>
 	<string>95BEF169-A2E5-4041-A84A-AAFC1DD61558</string>