diff --git a/colorSchemes/src/colorSchemes/WarmNeon.xml b/colorSchemes/src/colorSchemes/WarmNeon.xml
index 1c8b73189c71..55ae9e5db4d5 100644
--- a/colorSchemes/src/colorSchemes/WarmNeon.xml
+++ b/colorSchemes/src/colorSchemes/WarmNeon.xml
@@ -1,4 +1,4 @@
-<scheme name="WarmNeon" version="124" parent_scheme="Default">
+<scheme name="WarmNeon" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.1" />
   <option name="EDITOR_FONT_SIZE" value="11" />
   <option name="EDITOR_QUICK_DOC_FONT_SIZE" value="MEDIUM" />
@@ -67,6 +67,11 @@
         <option name="FOREGROUND" value="f2f0b5" />
       </value>
     </option>
+    <option name="CONSOLE_BLACK_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="ffffff" />
+      </value>
+    </option>
     <option name="CONSOLE_BLUE_BRIGHT_OUTPUT">
       <value>
         <option name="FOREGROUND" value="7a8fd9" />
@@ -255,6 +260,7 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option name="DEFAULT_ATTRIBUTE" baseAttributes="DEFAULT_IDENTIFIER" />
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
         <option name="FOREGROUND" value="b44141" />
@@ -287,6 +293,7 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option name="DEFAULT_IDENTIFIER" baseAttributes="TEXT" />
     <option name="DEFAULT_INSTANCE_FIELD">
       <value>
         <option name="FOREGROUND" value="b9b9b9" />
@@ -326,27 +333,19 @@
         <option name="FOREGROUND" value="f971bb" />
       </value>
     </option>
-    <option name="DEFAULT_PREDEFINED_SYMBOL">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="DEFAULT_STATIC_FIELD">
       <value>
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="DEFAULT_STATIC_METHOD">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="DEFAULT_STRING">
       <value>
         <option name="FOREGROUND" value="34b434" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option name="DEFAULT_TAG" baseAttributes="TEXT" />
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR" baseAttributes="TEXT" />
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="97e85a" />
@@ -461,13 +460,6 @@
         <option name="BACKGROUND" value="2a2a2a" />
       </value>
     </option>
-    <option name="ERRORS_ATTRIBUTES">
-      <value>
-        <option name="EFFECT_COLOR" value="ff0000" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
-        <option name="EFFECT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="eaed5b" />
@@ -707,6 +699,7 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
+    <option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
     <option name="JS.LINE_COMMENT">
       <value>
         <option name="FOREGROUND" value="d14c42" />
@@ -851,6 +844,7 @@
         <option name="BACKGROUND" value="2a526e" />
       </value>
     </option>
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
     <option name="PROPERTIES.LINE_COMMENT">
       <value>
         <option name="FOREGROUND" value="e75252" />
diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index 7bcbe7eece35..d424ec5a679a 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -1,32 +1,32 @@
-<scheme name="AllHallowsEve" parent_scheme="Default" version="1">
+<scheme name="AllHallowsEve" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Monaco" />
   <colors>
-    <option name="CONSOLE_BACKGROUND_KEY" value="000000" />
-    <option name="INDENT_GUIDE" value="404040" />
-    <option name="SELECTION_BACKGROUND" value="644d6e" />
+    <option name="CARET_COLOR" value="ffffff" />
     <option name="CARET_ROW_COLOR" value="333300" />
-    <option name="WHITESPACES" value="404040" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="LINE_NUMBERS_COLOR" value="FFFFFF" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="0" />
+    <option name="GUTTER_BACKGROUND" value="0" />
+    <option name="INDENT_GUIDE" value="404040" />
+    <option name="LINE_NUMBERS_COLOR" value="ffffff" />
     <option name="SELECTED_INDENT_GUIDE" value="404040" />
-    <option name="GUTTER_BACKGROUND" value="000000" />
+    <option name="SELECTION_BACKGROUND" value="644d6e" />
+    <option name="WHITESPACES" value="404040" />
   </colors>
   <attributes>
     <option name="APACHE_CONFIG.ARG_LEXEM">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="APACHE_CONFIG.COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="APACHE_CONFIG.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="BAD_CHARACTER">
@@ -41,35 +41,29 @@
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
-    <option name="OC.CLASS_REFERENCE">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
@@ -77,55 +71,43 @@
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.BRACE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.BRACKET">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value />
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COMMA">
       <value />
     </option>
-    <option name="COFFEESCRIPT.DOT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
@@ -133,37 +115,32 @@
     </option>
     <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-      </value>
-    </option>
-    <option name="COFFEESCRIPT.PARAMETER">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
@@ -171,27 +148,27 @@
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OBJECT_KEY">
@@ -199,57 +176,45 @@
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.PROTOTYPE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.RANGE">
-      <value />
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.SEMICOLON">
       <value />
     </option>
-    <option name="COFFEESCRIPT.SPLAT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
-      </value>
-    </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
-      <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
@@ -259,7 +224,7 @@
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
@@ -287,6 +252,9 @@
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
+    <option name="CONSOLE_RANGE_TO_EXECUTE">
+      <value />
+    </option>
     <option name="CONSOLE_RED_OUTPUT">
       <value>
         <option name="FOREGROUND" value="ff6767" />
@@ -308,14 +276,14 @@
         <option name="FOREGROUND" value="754200" />
       </value>
     </option>
-    <option name="CSS.COMMENT">
+    <option name="CSS.COLOR">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730" />
       </value>
     </option>
     <option name="CSS.IDENT">
@@ -323,38 +291,26 @@
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="cc7833" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="CC7833" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
-      <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
+      <value />
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
         <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="CSS.TAG_NAME">
-      <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="CSS.URL">
@@ -362,12 +318,7 @@
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
-      </value>
-    </option>
+    <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_INVALID_STRING_ESCAPE" />
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="e3e3ff" />
@@ -392,51 +343,24 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="CUSTOM_NUMBER_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
-    <option name="CUSTOM_STRING_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="66CC33" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="3387CC" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
+    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_LINE_COMMENT" />
+    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_BLOCK_COMMENT" />
+    <option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="DEFAULT_NUMBER" />
+    <option name="CUSTOM_STRING_ATTRIBUTES" baseAttributes="DEFAULT_STRING" />
+    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES" baseAttributes="DEFAULT_VALID_STRING_ESCAPE" />
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="Clojure Keyword">
-      <value />
-    </option>
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="Clojure Literal">
@@ -447,18 +371,101 @@
     </option>
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
+      </value>
+    </option>
+    <option name="DEFAULT_ATTRIBUTE">
+      <value>
+        <option name="EFFECT_COLOR" value="ffffff" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="DEFAULT_BLOCK_COMMENT">
+      <value>
+        <option name="FOREGROUND" value="9933cc" />
+      </value>
+    </option>
+    <option name="DEFAULT_CONSTANT" baseAttributes="DEFAULT_IDENTIFIER" />
+    <option name="DEFAULT_DOC_COMMENT">
+      <value>
+        <option name="FOREGROUND" value="9933cc" />
+      </value>
+    </option>
+    <option name="DEFAULT_DOC_COMMENT_TAG_VALUE">
+      <value>
+        <option name="FONT_TYPE" value="3" />
+      </value>
+    </option>
+    <option name="DEFAULT_DOC_MARKUP">
+      <value />
+    </option>
+    <option name="DEFAULT_ENTITY">
+      <value>
+        <option name="FOREGROUND" value="3387cc" />
+      </value>
+    </option>
+    <option name="DEFAULT_IDENTIFIER">
+      <value />
+    </option>
+    <option name="DEFAULT_INSTANCE_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
+    <option name="DEFAULT_INVALID_STRING_ESCAPE">
+      <value>
+        <option name="BACKGROUND" value="6e3b3b" />
+      </value>
+    </option>
+    <option name="DEFAULT_KEYWORD">
+      <value>
+        <option name="FOREGROUND" value="cc7833" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="DEFAULT_LABEL">
+      <value>
+        <option name="EFFECT_COLOR" value="808080" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="DEFAULT_LINE_COMMENT">
+      <value>
+        <option name="FOREGROUND" value="9933cc" />
+      </value>
+    </option>
+    <option name="DEFAULT_NUMBER">
+      <value>
+        <option name="FOREGROUND" value="3387cc" />
+      </value>
+    </option>
+    <option name="DEFAULT_OPERATION_SIGN">
+      <value>
+        <option name="FOREGROUND" value="cc7833" />
+      </value>
+    </option>
+    <option name="DEFAULT_STATIC_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
+    <option name="DEFAULT_STRING">
+      <value>
+        <option name="FOREGROUND" value="66cc33" />
+      </value>
+    </option>
+    <option name="DEFAULT_TAG">
+      <value />
+    </option>
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
+      <value />
+    </option>
+    <option name="DEFAULT_VALID_STRING_ESCAPE">
+      <value>
+        <option name="FOREGROUND" value="aaaaaa" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
         <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="EFFECT_TYPE" value="3" />
       </value>
     </option>
     <option name="DIFF_CONFLICT">
@@ -487,30 +494,27 @@
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730" />
       </value>
     </option>
-    <option name="DJANGO_ID">
-      <value />
-    </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
@@ -519,29 +523,21 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="DJANGO_TAG_START_END">
-      <value />
-    </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
         <option name="BACKGROUND" value="30322b" />
       </value>
     </option>
-    <option name="OC.ENUM_CONST">
-      <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
+        <option name="FOREGROUND" value="101" />
         <option name="BACKGROUND" value="c7c7ff" />
       </value>
     </option>
@@ -550,8 +546,8 @@
         <option name="FOREGROUND" value="3c3d3c" />
         <option name="BACKGROUND" value="101010" />
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
@@ -559,8 +555,8 @@
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="BACKGROUND" value="161717" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="First symbol in list">
@@ -570,148 +566,145 @@
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="aa4e00" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GHERKIN_TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
+        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="HAML_FILTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_FILTER_CONTENT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_ID">
       <value>
+        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
-    <option name="HAML_PARENTHS">
-      <value />
-    </option>
     <option name="HAML_RUBY_CODE">
       <value>
-        <option name="BACKGROUND" value="000000" />
+        <option name="BACKGROUND" value="0" />
       </value>
     </option>
     <option name="HAML_RUBY_START">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="HAML_TAG">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
@@ -720,57 +713,45 @@
     </option>
     <option name="HAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_WS_REMOVAL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="HAML_XHTML">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
-    <option name="HTML_ATTRIBUTE_NAME">
-      <value />
-    </option>
-    <option name="HTML_ATTRIBUTE_VALUE">
-      <value>
-        <option name="FOREGROUND" value="66CC33" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="HTML_TAG">
-      <value />
-    </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="ffffff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -786,9 +767,14 @@
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="333434" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="INI.KEY">
+      <value>
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
@@ -802,26 +788,14 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="OC.IVAR">
-      <value />
-    </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
@@ -832,13 +806,10 @@
     <option name="JAVA_DOC_TAG">
       <value>
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="80807f" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="68e868" />
@@ -847,38 +818,32 @@
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
@@ -886,81 +851,17 @@
         <option name="BACKGROUND" value="423535" />
       </value>
     </option>
-    <option name="JS.BADCHARACTER">
-      <value>
-        <option name="BACKGROUND" value="6e3b3b" />
-      </value>
-    </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
-      </value>
-    </option>
-    <option name="JS.BRACES">
-      <value />
-    </option>
-    <option name="JS.BRACKETS">
-      <value />
-    </option>
-    <option name="JS.COMMA">
-      <value />
-    </option>
-    <option name="JS.DOC_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933CC" />
-      </value>
-    </option>
-    <option name="JS.DOC_MARKUP">
-      <value>
-        <option name="BACKGROUND" value="223f22" />
-      </value>
-    </option>
-    <option name="JS.DOC_TAG">
-      <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="JS.DOT">
-      <value />
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="JS.GLOBAL_VARIABLE">
-      <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="3" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
+    <option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
         <option name="FOREGROUND" value="979748" />
       </value>
     </option>
-    <option name="JS.INSTANCE_MEMBER_VARIABLE">
-      <value>
-        <option name="FOREGROUND" value="fda5ff" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="JS.INVALID_STRING_ESCAPE">
-      <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="BACKGROUND" value="481515" />
-      </value>
-    </option>
-    <option name="JS.KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="CC7833" />
-      </value>
-    </option>
-    <option name="JS.LINE_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933CC" />
-      </value>
-    </option>
     <option name="JS.LOCAL_VARIABLE">
       <value>
         <option name="FOREGROUND" value="64a2a2" />
@@ -968,12 +869,12 @@
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="JS.PARAMETER">
@@ -981,12 +882,9 @@
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="JS.PARENTHS">
-      <value />
-    </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
     <option name="JS.SEMICOLON">
@@ -1003,30 +901,15 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="JS.STRING">
-      <value>
-        <option name="FOREGROUND" value="66CC33" />
-      </value>
-    </option>
-    <option name="JS.VALID_STRING_ESCAPE">
-      <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
-    <option name="OC.LABEL">
-      <value>
-        <option name="FOREGROUND" value="CC7833" />
-      </value>
-    </option>
     <option name="LESS_INJECTED_CODE">
       <value>
-        <option name="BACKGROUND" value="000000" />
+        <option name="BACKGROUND" value="0" />
       </value>
     </option>
     <option name="LESS_JS_CODE_DELIM">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="000000" />
+        <option name="FOREGROUND" value="ffffff" />
+        <option name="BACKGROUND" value="0" />
       </value>
     </option>
     <option name="LESS_VARIABLE">
@@ -1034,180 +917,135 @@
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
-    <option name="OC.MACRONAME">
-      <value />
-    </option>
-    <option name="OC.MACRO_PARAMETER">
-      <value />
-    </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
-    <option name="OC.MESSAGE_ARGUMENT">
-      <value />
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="80807f" />
       </value>
     </option>
-    <option name="OC.BADCHARACTER">
-      <value />
-    </option>
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="OC.BRACES">
-      <value />
-    </option>
-    <option name="OC.BRACKETS">
-      <value />
-    </option>
-    <option name="OC.COMMA">
-      <value />
+    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="9933cc" />
+      </value>
     </option>
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="OC.DOT">
-      <value />
-    </option>
-    <option name="OC.EXTERN_VARIABLE">
-      <value />
-    </option>
-    <option name="OC.FUNCTION">
-      <value />
-    </option>
-    <option name="OC.FUNCTION">
-      <value />
-    </option>
-    <option name="OC.GLOBAL_VARIABLE">
-      <value />
+    <option name="OC.ENUM_CONST">
+      <value>
+        <option name="FOREGROUND" value="3387cc" />
+      </value>
     </option>
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
+      </value>
+    </option>
+    <option name="OC.LABEL">
+      <value>
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="OC.LOCAL_VARIABLE">
-      <value />
-    </option>
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
-    <option name="OC.OPERATION_SIGN">
-      <value />
-    </option>
     <option name="OC.PARAMETER">
       <value>
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="OC.PARENTHS">
-      <value />
-    </option>
-    <option name="OC.PROPERTY">
-      <value />
-    </option>
     <option name="OC.SELFSUPERTHIS">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="OC.SEMICOLON">
-      <value />
-    </option>
     <option name="OC.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="OC.STRUCT_FIELD">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PHP_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="PHP_BRACKETS">
-      <value />
-    </option>
     <option name="PHP_COMMA">
       <value />
     </option>
     <option name="PHP_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="PHP_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="PHP_DOC_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="PHP_DOC_TAG">
@@ -1217,17 +1055,17 @@
     </option>
     <option name="PHP_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="PHP_EXEC_COMMAND_ID">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="PHP_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="PHP_HEREDOC_ID">
@@ -1240,7 +1078,7 @@
     </option>
     <option name="PHP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PHP_MARKUP_ID">
@@ -1250,43 +1088,35 @@
     </option>
     <option name="PHP_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="PHP_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PHP_PREDEFINED SYMBOL">
       <value />
     </option>
-    <option name="PHP_SCRIPTING_BACKGROUND">
-      <value>
-        <option name="BACKGROUND" value="2a2d32" />
-      </value>
-    </option>
     <option name="PHP_SEMICOLON">
       <value />
     </option>
     <option name="PHP_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="PHP_TAG">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PHP_VAR">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="OC.PROTOCOL_REFERENCE">
-      <value />
-    </option>
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
@@ -1294,110 +1124,65 @@
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="PUPPET_BRACES">
-      <value />
-    </option>
-    <option name="PUPPET_BRACKETS">
-      <value />
-    </option>
     <option name="PUPPET_CLASS">
       <value>
+        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
-    <option name="PUPPET_COMMA">
-      <value />
-    </option>
-    <option name="PUPPET_DOT">
-      <value />
-    </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="PUPPET_PARENTH">
-      <value />
-    </option>
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
-    <option name="PUPPET_RESOURCE_REFERENCE">
-      <value />
-    </option>
-    <option name="PUPPET_SEMICOLON">
-      <value />
-    </option>
     <option name="PUPPET_SQ_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="PUPPET_VARIABLE">
-      <value />
-    </option>
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="PY.BRACES">
-      <value />
-    </option>
-    <option name="PY.BRACKETS">
-      <value />
-    </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730" />
       </value>
     </option>
-    <option name="PY.CLASS_DEFINITION">
-      <value />
-    </option>
-    <option name="PY.COMMA">
-      <value />
-    </option>
-    <option name="PY.DECORATOR">
-      <value />
-    </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="PY.DOT">
-      <value />
-    </option>
-    <option name="PY.FUNC_DEFINITION">
-      <value />
-    </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="68e868" />
@@ -1406,43 +1191,37 @@
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="PY.PARENTHS">
-      <value />
-    </option>
-    <option name="PY.PREDEFINED_DEFINITION">
-      <value />
-    </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
@@ -1450,15 +1229,9 @@
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="REGEXP.BRACES">
-      <value />
-    </option>
-    <option name="REGEXP.BRACKETS">
-      <value />
-    </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="REGEXP.COMMA">
@@ -1466,12 +1239,12 @@
     </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
@@ -1482,35 +1255,27 @@
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="REGEXP.PARENTHS">
-      <value />
-    </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
-    <option name="REST.BOLD">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="REST.FIXED">
@@ -1528,119 +1293,75 @@
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
-    <option name="REST.ITALIC">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="RHTML_EXPRESSION_END_ID">
-      <value />
-    </option>
-    <option name="RHTML_EXPRESSION_START_ID">
-      <value />
-    </option>
-    <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
-    </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
-        <option name="BACKGROUND" value="000000" />
+        <option name="BACKGROUND" value="0" />
       </value>
     </option>
-    <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
-    </option>
-    <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
-    </option>
-    <option name="RUBY_BAD_CHARACTER">
-      <value />
-    </option>
-    <option name="RUBY_BRACKETS">
-      <value />
-    </option>
-    <option name="RUBY_COLON">
-      <value />
-    </option>
-    <option name="RUBY_COMMA">
-      <value />
-    </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
+        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
-    <option name="RUBY_CVAR">
-      <value />
-    </option>
-    <option name="RUBY_DOT">
-      <value />
-    </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="RUBY_GVAR">
-      <value />
-    </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="RUBY_IDENTIFIER">
-      <value />
-    </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
@@ -1649,41 +1370,29 @@
         <option name="BACKGROUND" value="481515" />
       </value>
     </option>
-    <option name="RUBY_IVAR">
-      <value />
-    </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
-    <option name="RUBY_LOCAL_VAR_ID">
-      <value />
-    </option>
-    <option name="RUBY_METHOD_NAME">
-      <value />
-    </option>
-    <option name="RUBY_NTH_REF">
-      <value />
-    </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730" />
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
@@ -1693,48 +1402,42 @@
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="CCCC33" />
+        <option name="FOREGROUND" value="cccc33" />
       </value>
     </option>
-    <option name="RUBY_SEMICOLON">
-      <value />
-    </option>
-    <option name="RUBY_SPECIFIC_CALL">
-      <value />
-    </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="C83730" />
+        <option name="FOREGROUND" value="c83730" />
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
@@ -1742,36 +1445,15 @@
     </option>
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
-      </value>
-    </option>
-    <option name="SASS_KEYWORD">
-      <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value />
     </option>
-    <option name="SASS_NUMBER">
-      <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
-    <option name="SASS_PROPERTY_NAME">
-      <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="SASS_PROPERTY_VALUE">
-      <value>
-        <option name="FOREGROUND" value="68e868" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="SASS_TAG_NAME">
@@ -1794,153 +1476,109 @@
     </option>
     <option name="SLIM_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="SLIM_CALL">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
-    <option name="SLIM_CLASS">
-      <value />
-    </option>
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="SLIM_DOCTYPE_KWD">
-      <value />
-    </option>
-    <option name="SLIM_FILTER">
-      <value />
-    </option>
     <option name="SLIM_FILTER_CONTENT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
-    <option name="SLIM_ID">
-      <value />
-    </option>
     <option name="SLIM_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="SLIM_PARENTHS">
-      <value />
-    </option>
     <option name="SLIM_RUBY_CODE">
       <value>
-        <option name="BACKGROUND" value="000000" />
+        <option name="BACKGROUND" value="0" />
       </value>
     </option>
     <option name="SLIM_STATIC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
+        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
-    <option name="SLIM_TAG_ATTR_KEY">
-      <value />
-    </option>
     <option name="SLIM_TAG_START">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="434242" />
       </value>
     </option>
     <option name="SMARTY_BACKGROUND">
-      <value>
-        <option name="BACKGROUND" value="2a2d32" />
-      </value>
+      <value />
     </option>
     <option name="SMARTY_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="SMARTY_BRACKETS">
-      <value />
-    </option>
     <option name="SMARTY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="SMARTY_IDENTIFIER">
       <value />
     </option>
-    <option name="SMARTY_KEYWORD">
+    <option name="SPY-JS.EXCEPTION">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
-      </value>
-    </option>
-    <option name="SMARTY_NUMBER">
-      <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
-    <option name="SMARTY_OPERATION_SIGN">
-      <value>
-        <option name="FOREGROUND" value="CC7833" />
-      </value>
-    </option>
-    <option name="SMARTY_STRING">
-      <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="BACKGROUND" value="532b2e" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.FUNCTION_SCOPE">
       <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.EXCEPTION">
-      <value>
-        <option name="BACKGROUND" value="532B2E"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_ONE">
       <value>
-        <option name="BACKGROUND" value="425F44"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="425f44" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_TWO">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1"/>
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SPY-JS.PROGRAM_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.VALUE_HINT">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="0"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
@@ -1948,12 +1586,6 @@
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="SQL_BRACES">
-      <value />
-    </option>
-    <option name="SQL_BRACKETS">
-      <value />
-    </option>
     <option name="SQL_COLUMN">
       <value>
         <option name="FOREGROUND" value="fda5ff" />
@@ -1965,15 +1597,12 @@
     </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="SQL_DATABASE_OBJECT">
       <value />
     </option>
-    <option name="SQL_DOT">
-      <value />
-    </option>
     <option name="SQL_IDENT">
       <value />
     </option>
@@ -1982,7 +1611,7 @@
     </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SQL_LOCAL_ALIAS">
@@ -1990,15 +1619,12 @@
     </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="SQL_PARAMETER">
       <value />
     </option>
-    <option name="SQL_PARENS">
-      <value />
-    </option>
     <option name="SQL_PROCEDURE">
       <value>
         <option name="FONT_TYPE" value="2" />
@@ -2012,7 +1638,7 @@
     </option>
     <option name="SQL_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="SQL_SYNTHETIC_ENTITY">
@@ -2029,24 +1655,19 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="TAG_ATTR_KEY">
       <value />
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="000000" />
+        <option name="FOREGROUND" value="ffffff" />
+        <option name="BACKGROUND" value="0" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="ERROR_STRIPE_COLOR" value="ff00" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
@@ -2057,21 +1678,16 @@
       </value>
     </option>
     <option name="TWIG_BACKGROUND">
-      <value>
-        <option name="BACKGROUND" value="2a2d32" />
-      </value>
+      <value />
     </option>
     <option name="TWIG_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="TWIG_BRACKETS">
-      <value />
-    </option>
     <option name="TWIG_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="TWIG_IDENTIFIER">
@@ -2079,27 +1695,24 @@
     </option>
     <option name="TWIG_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="TWIG_NUMBER">
       <value>
-        <option name="FOREGROUND" value="3387CC" />
+        <option name="FOREGROUND" value="3387cc" />
       </value>
     </option>
     <option name="TWIG_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="TWIG_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
-    <option name="OC.TYPEDEF">
-      <value />
-    </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="583535" />
@@ -2108,9 +1721,9 @@
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="4a3f10" />
+        <option name="EFFECT_COLOR" value="ffffff" />
+        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -2124,30 +1737,6 @@
         <option name="BACKGROUND" value="623062" />
       </value>
     </option>
-    <option name="XML_ATTRIBUTE_NAME">
-      <value />
-    </option>
-    <option name="XML_ATTRIBUTE_VALUE">
-      <value>
-        <option name="FOREGROUND" value="66CC33" />
-      </value>
-    </option>
-    <option name="XML_COMMENT">
-      <value>
-        <option name="FOREGROUND" value="9933CC" />
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="XML_ENTITY_REFERENCE">
-      <value>
-        <option name="FOREGROUND" value="3387CC" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="XML_TAG">
       <value />
     </option>
@@ -2158,50 +1747,50 @@
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="e3e3ff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="ffffff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="9933CC" />
+        <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
+        <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="66CC33" />
+        <option name="FOREGROUND" value="66cc33" />
       </value>
     </option>
   </attributes>
-</scheme>
+</scheme>
\ No newline at end of file
diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
index 0621f887cd9b..a45822a53d91 100644
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -1,17 +1,17 @@
-<scheme name="Blackboard" parent_scheme="Default" version="1">
+<scheme name="Blackboard" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Menlo" />
   <colors>
-    <option name="CONSOLE_BACKGROUND_KEY" value="0C1021" />
-    <option name="INDENT_GUIDE" value="484b58" />
-    <option name="SELECTION_BACKGROUND" value="253B76" />
+    <option name="CARET_COLOR" value="ffffff" />
     <option name="CARET_ROW_COLOR" value="1a1e2e" />
-    <option name="WHITESPACES" value="484b58" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="LINE_NUMBERS_COLOR" value="F8F8F8" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="c1021" />
+    <option name="GUTTER_BACKGROUND" value="c1021" />
+    <option name="INDENT_GUIDE" value="484b58" />
+    <option name="LINE_NUMBERS_COLOR" value="f8f8f8" />
     <option name="SELECTED_INDENT_GUIDE" value="484b58" />
-    <option name="GUTTER_BACKGROUND" value="0C1021" />
+    <option name="SELECTION_BACKGROUND" value="253b76" />
+    <option name="WHITESPACES" value="484b58" />
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
@@ -26,32 +26,27 @@
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
-      </value>
-    </option>
-    <option name="OC.CLASS_REFERENCE">
-      <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
@@ -61,127 +56,122 @@
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
-      </value>
-    </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
-      <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
@@ -191,7 +181,7 @@
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
@@ -242,27 +232,27 @@
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
@@ -273,7 +263,7 @@
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
@@ -308,106 +298,106 @@
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="DEFAULT_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="DEFAULT_CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT_TAG">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="DEFAULT_DOC_MARKUP">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="DEFAULT_ENTITY">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_GLOBAL_VARIABLE">
@@ -417,52 +407,53 @@
     </option>
     <option name="DEFAULT_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
+    <option name="DEFAULT_INSTANCE_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
     <option name="DEFAULT_INSTANCE_METHOD">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_INTERFACE_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="DEFAULT_LABEL">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="DEFAULT_METADATA">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa" />
       </value>
     </option>
     <option name="DEFAULT_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="DEFAULT_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="DEFAULT_PREDEFINED_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="DEFAULT_STATIC_FIELD">
@@ -472,23 +463,29 @@
     </option>
     <option name="DEFAULT_STATIC_METHOD">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DEFAULT_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
+    <option name="DEFAULT_TAG">
+      <value />
+    </option>
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
+      <value />
+    </option>
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
         <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="EFFECT_TYPE" value="3" />
       </value>
     </option>
     <option name="DIFF_CONFLICT">
@@ -517,37 +514,37 @@
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa" />
       </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
@@ -555,21 +552,16 @@
         <option name="BACKGROUND" value="30322b" />
       </value>
     </option>
-    <option name="OC.ENUM_CONST">
-      <value>
-        <option name="FOREGROUND" value="D8FA3C" />
-      </value>
-    </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
+        <option name="FOREGROUND" value="101" />
         <option name="BACKGROUND" value="c7c7ff" />
       </value>
     </option>
@@ -578,8 +570,8 @@
         <option name="FOREGROUND" value="3c3d3c" />
         <option name="BACKGROUND" value="101010" />
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
@@ -587,8 +579,8 @@
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="BACKGROUND" value="161717" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="First symbol in list">
@@ -598,124 +590,124 @@
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="aa4e00" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa" />
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -731,9 +723,9 @@
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="333434" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
@@ -749,12 +741,12 @@
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
@@ -765,8 +757,8 @@
     <option name="JAVA_DOC_TAG">
       <value>
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="80807f" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
@@ -777,32 +769,32 @@
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
@@ -810,6 +802,7 @@
         <option name="BACKGROUND" value="423535" />
       </value>
     </option>
+    <option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
         <option name="FOREGROUND" value="979748" />
@@ -822,17 +815,7 @@
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
-      </value>
-    </option>
-    <option name="OC.LABEL">
-      <value>
-        <option name="FOREGROUND" value="FBDE2D" />
-      </value>
-    </option>
-    <option name="OC.MACRONAME">
-      <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
@@ -840,11 +823,6 @@
         <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
-    <option name="OC.MESSAGE_ARGUMENT">
-      <value>
-        <option name="FOREGROUND" value="FF6400" />
-      </value>
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="80807f" />
@@ -852,59 +830,90 @@
     </option>
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
+      </value>
+    </option>
+    <option name="OC.CLASS_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="ff6400" />
+      </value>
+    </option>
+    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
+      </value>
+    </option>
+    <option name="OC.ENUM_CONST">
+      <value>
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="OC.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION">
-      <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
+      </value>
+    </option>
+    <option name="OC.LABEL">
+      <value>
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
+      </value>
+    </option>
+    <option name="OC.MACRONAME">
+      <value>
+        <option name="FOREGROUND" value="ff6400" />
+      </value>
+    </option>
+    <option name="OC.MESSAGE_ARGUMENT">
+      <value>
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
-      </value>
-    </option>
-    <option name="OC.STRING">
-      <value>
-        <option name="FOREGROUND" value="61CE3C" />
-      </value>
-    </option>
-    <option name="OC.STRUCT_FIELD">
-      <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="OC.PROTOCOL_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
+    <option name="OC.STRING">
+      <value>
+        <option name="FOREGROUND" value="61ce3c" />
+      </value>
+    </option>
+    <option name="OC.STRUCT_FIELD">
+      <value>
+        <option name="FOREGROUND" value="d8fa3c" />
+      </value>
+    </option>
+    <option name="OC.TYPEDEF">
+      <value>
+        <option name="FOREGROUND" value="fbde2d" />
+      </value>
+    </option>
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
@@ -912,127 +921,122 @@
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="PUPPET_CLASS">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="PUPPET_SQ_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
-      </value>
-    </option>
-    <option name="REST.BOLD">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="REST.FIXED">
@@ -1050,199 +1054,194 @@
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
-    <option name="REST.ITALIC">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="SASS_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="SASS_PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="SASS_PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="SASS_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SASS_URL">
       <value>
-        <option name="FOREGROUND" value="8DA6CE" />
+        <option name="FOREGROUND" value="8da6ce" />
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
@@ -1252,89 +1251,88 @@
     </option>
     <option name="SLIM_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="9D1E15" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="9d1e15" />
       </value>
     </option>
     <option name="SLIM_CLASS">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="SLIM_DOCTYPE_KWD">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SLIM_FILTER">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SLIM_ID">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SLIM_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SLIM_TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
-      </value>
-    </option>
-    <option name="SPY-JS.FUNCTION_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="SPY-JS.EXCEPTION">
       <value>
-        <option name="BACKGROUND" value="532B2E"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="532b2e" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="SPY-JS.FUNCTION_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_ONE">
       <value>
-        <option name="BACKGROUND" value="425F44"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="425f44" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_TWO">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1"/>
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SPY-JS.PROGRAM_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.VALUE_HINT">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="0"/>
       </value>
     </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
@@ -1343,26 +1341,21 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="0C1021" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="c1021" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="ERROR_STRIPE_COLOR" value="ff00" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
@@ -1372,11 +1365,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff" />
       </value>
     </option>
-    <option name="OC.TYPEDEF">
-      <value>
-        <option name="FOREGROUND" value="FBDE2D" />
-      </value>
-    </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="583535" />
@@ -1385,9 +1373,9 @@
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="4a3f10" />
+        <option name="EFFECT_COLOR" value="f8f8f8" />
+        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="F8F8F8" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -1403,22 +1391,17 @@
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="D8FA3C" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="d8fa3c" />
       </value>
     </option>
     <option name="XML_TAG_DATA">
@@ -1428,48 +1411,48 @@
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="7F90AA" />
+        <option name="FOREGROUND" value="7f90aa" />
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="AEAEAE" />
+        <option name="FOREGROUND" value="aeaeae" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="FF6400" />
+        <option name="FOREGROUND" value="ff6400" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="FBDE2D" />
+        <option name="FOREGROUND" value="fbde2d" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="61CE3C" />
+        <option name="FOREGROUND" value="61ce3c" />
       </value>
     </option>
   </attributes>
-</scheme>
+</scheme>
\ No newline at end of file
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index 86c9b660aa11..9f1603ba89ce 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -1,23 +1,23 @@
-<scheme name="Cobalt" parent_scheme="Default" version="1">
+<scheme name="Cobalt" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Menlo" />
   <colors>
-    <option name="CONSOLE_BACKGROUND_KEY" value="002240" />
+    <option name="CARET_COLOR" value="ffffff" />
+    <option name="CARET_ROW_COLOR" value="1629" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="2240" />
+    <option name="GUTTER_BACKGROUND" value="2240" />
     <option name="INDENT_GUIDE" value="25425c" />
-    <option name="SELECTION_BACKGROUND" value="85533a" />
-    <option name="CARET_ROW_COLOR" value="001629" />
-    <option name="WHITESPACES" value="25425c" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="LINE_NUMBERS_COLOR" value="FFFFFF" />
+    <option name="LINE_NUMBERS_COLOR" value="ffffff" />
     <option name="SELECTED_INDENT_GUIDE" value="25425c" />
-    <option name="GUTTER_BACKGROUND" value="002240" />
+    <option name="SELECTION_BACKGROUND" value="85533a" />
+    <option name="WHITESPACES" value="25425c" />
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
@@ -27,242 +27,231 @@
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
-      </value>
-    </option>
-    <option name="OC.CLASS_REFERENCE">
-      <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BRACE">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BRACKET">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
-      </value>
-    </option>
-    <option name="COFFEESCRIPT.PARAMETER">
-      <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OBJECT_KEY">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.PARENTHESIS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="COFFEESCRIPT.RANGE">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.SPLAT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="FF80E1" />
-      </value>
-    </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
-      <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="ff80e1" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
@@ -272,7 +261,7 @@
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
@@ -300,6 +289,7 @@
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
+    <option name="CONSOLE_RANGE_TO_EXECUTE" baseAttributes="INJECTED_LANGUAGE_FRAGMENT" />
     <option name="CONSOLE_RED_OUTPUT">
       <value>
         <option name="FOREGROUND" value="ff6767" />
@@ -323,28 +313,28 @@
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054" />
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="80FFBB" />
+        <option name="FOREGROUND" value="80ffbb" />
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
@@ -355,18 +345,18 @@
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
@@ -393,263 +383,255 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="0088FF" />
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
-    <option name="CUSTOM_NUMBER_ATTRIBUTES">
-      <value>
-        <option name="FOREGROUND" value="FF628C" />
-      </value>
-    </option>
+    <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_LINE_COMMENT" />
+    <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES" baseAttributes="DEFAULT_BLOCK_COMMENT" />
+    <option name="CUSTOM_NUMBER_ATTRIBUTES" baseAttributes="DEFAULT_NUMBER" />
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="Clojure Keyword">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="Clojure Literal">
       <value>
-        <option name="FOREGROUND" value="FF80E1" />
+        <option name="FOREGROUND" value="ff80e1" />
       </value>
     </option>
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="DEFAULT_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="DEFAULT_BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="DEFAULT_CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="DEFAULT_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT_TAG">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
+    <option name="DEFAULT_DOC_COMMENT_TAG_VALUE">
+      <value>
+        <option name="FONT_TYPE" value="3" />
+      </value>
+    </option>
     <option name="DEFAULT_DOC_MARKUP">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="DEFAULT_ENTITY">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FF80E1" />
+        <option name="FOREGROUND" value="ff80e1" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_INSTANCE_FIELD">
       <value>
-        <option name="FOREGROUND" value="FF80E1" />
+        <option name="FOREGROUND" value="ff80e1" />
       </value>
     </option>
     <option name="DEFAULT_INSTANCE_METHOD">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_INTERFACE_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="DEFAULT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="DEFAULT_LABEL">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FF80E1" />
+        <option name="FOREGROUND" value="ff80e1" />
       </value>
     </option>
     <option name="DEFAULT_METADATA">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff" />
       </value>
     </option>
     <option name="DEFAULT_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="DEFAULT_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="DEFAULT_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="DEFAULT_PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="DEFAULT_PREDEFINED_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="80FFBB" />
+        <option name="FOREGROUND" value="80ffbb" />
       </value>
     </option>
     <option name="DEFAULT_SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="DEFAULT_STATIC_FIELD">
       <value>
-        <option name="FOREGROUND" value="FF80E1" />
+        <option name="FOREGROUND" value="ff80e1" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_STATIC_METHOD">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DEFAULT_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="DEFAULT_TAG">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR" baseAttributes="TEXT" />
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
         <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="EFFECT_TYPE" value="3" />
       </value>
     </option>
     <option name="DIFF_CONFLICT">
@@ -678,43 +660,43 @@
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054" />
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff" />
       </value>
     </option>
     <option name="DJANGO_TAG_START_END">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
@@ -722,21 +704,16 @@
         <option name="BACKGROUND" value="30322b" />
       </value>
     </option>
-    <option name="OC.ENUM_CONST">
-      <value>
-        <option name="FOREGROUND" value="FF628C" />
-      </value>
-    </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
+        <option name="FOREGROUND" value="101" />
         <option name="BACKGROUND" value="c7c7ff" />
       </value>
     </option>
@@ -745,8 +722,8 @@
         <option name="FOREGROUND" value="3c3d3c" />
         <option name="BACKGROUND" value="101010" />
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
@@ -754,103 +731,103 @@
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="BACKGROUND" value="161717" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="First symbol in list">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="aa4e00" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80" />
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="HAML_PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="HAML_RUBY_CODE">
@@ -860,68 +837,68 @@
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="HAML_TAG">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff" />
       </value>
     </option>
     <option name="HAML_WS_REMOVAL">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_TAG">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff" />
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -937,9 +914,9 @@
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="333434" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
@@ -953,35 +930,30 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="OC.IVAR">
-      <value>
-        <option name="FOREGROUND" value="CCCCCC" />
-      </value>
-    </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="JAVA_BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="JAVA_COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -993,60 +965,60 @@
     <option name="JAVA_DOC_TAG">
       <value>
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="80807f" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="JAVA_DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="JAVA_PARENTH">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="JAVA_SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
@@ -1066,17 +1038,12 @@
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
-      </value>
-    </option>
-    <option name="OC.LABEL">
-      <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="LESS_INJECTED_CODE">
@@ -1086,18 +1053,13 @@
     </option>
     <option name="LESS_JS_CODE_DELIM">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="223545" />
       </value>
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
-      </value>
-    </option>
-    <option name="OC.MACRONAME">
-      <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
@@ -1105,11 +1067,6 @@
         <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
-    <option name="OC.MESSAGE_ARGUMENT">
-      <value>
-        <option name="FOREGROUND" value="FFDD00" />
-      </value>
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="80807f" />
@@ -1117,295 +1074,327 @@
     </option>
     <option name="OC.BADCHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="OC.CLASS_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="ffdd00" />
+      </value>
+    </option>
+    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
+      </value>
+    </option>
+    <option name="OC.ENUM_CONST">
+      <value>
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="OC.EXTERN_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="OC.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION">
-      <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="OC.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
+      </value>
+    </option>
+    <option name="OC.IVAR">
+      <value>
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
+      </value>
+    </option>
+    <option name="OC.LABEL">
+      <value>
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="OC.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
+      </value>
+    </option>
+    <option name="OC.MACRONAME">
+      <value>
+        <option name="FOREGROUND" value="ffdd00" />
+      </value>
+    </option>
+    <option name="OC.MESSAGE_ARGUMENT">
+      <value>
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="OC.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="OC.PROPERTY">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
-      </value>
-    </option>
-    <option name="OC.SELFSUPERTHIS">
-      <value>
-        <option name="FOREGROUND" value="FF80E1" />
-      </value>
-    </option>
-    <option name="OC.STRING">
-      <value>
-        <option name="FOREGROUND" value="3AD900" />
-      </value>
-    </option>
-    <option name="OC.STRUCT_FIELD">
-      <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="OC.PROTOCOL_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
+    <option name="OC.SELFSUPERTHIS">
+      <value>
+        <option name="FOREGROUND" value="ff80e1" />
+      </value>
+    </option>
+    <option name="OC.STRING">
+      <value>
+        <option name="FOREGROUND" value="3ad900" />
+      </value>
+    </option>
+    <option name="OC.STRUCT_FIELD">
+      <value>
+        <option name="FOREGROUND" value="ff628c" />
+      </value>
+    </option>
+    <option name="OC.TYPEDEF">
+      <value>
+        <option name="FOREGROUND" value="ffee80" />
+      </value>
+    </option>
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PUPPET_BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PUPPET_BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PUPPET_CLASS">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="PUPPET_COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PUPPET_DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="PUPPET_PARENTH">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="PUPPET_SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PUPPET_SQ_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="PY.BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PY.BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054" />
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="PY.COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="PY.PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
-      </value>
-    </option>
-    <option name="REST.BOLD">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="REST.FIXED">
@@ -1423,46 +1412,41 @@
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
-    <option name="REST.ITALIC">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
@@ -1472,267 +1456,267 @@
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
-      </value>
-    </option>
-    <option name="RUBY_BRACKETS">
-      <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="RUBY_BRACES">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
-    <option name="RUBY_PARENTHESES">
+    <option name="RUBY_BRACKETS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_COLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_COMMA">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="RUBY_DOT">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="223545" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="FFB054" />
+        <option name="FOREGROUND" value="ffb054" />
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
+      </value>
+    </option>
+    <option name="RUBY_PARENTHESES">
+      <value>
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="80FFC2" />
+        <option name="FOREGROUND" value="80ffc2" />
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="FFEE80" />
+        <option name="FOREGROUND" value="ffee80" />
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="EB939A" />
+        <option name="FOREGROUND" value="eb939a" />
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="SASS_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="SASS_PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="9DF39F" />
+        <option name="FOREGROUND" value="9df39f" />
       </value>
     </option>
     <option name="SASS_PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="EB939A" />
+        <option name="FOREGROUND" value="eb939a" />
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="SASS_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SASS_URL">
       <value>
-        <option name="FOREGROUND" value="EB939A" />
+        <option name="FOREGROUND" value="eb939a" />
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="CCCCCC" />
+        <option name="FOREGROUND" value="cccccc" />
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
@@ -1742,44 +1726,44 @@
     </option>
     <option name="SLIM_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
-        <option name="BACKGROUND" value="800F00" />
+        <option name="FOREGROUND" value="f8f8f8" />
+        <option name="BACKGROUND" value="800f00" />
       </value>
     </option>
     <option name="SLIM_CLASS">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SLIM_DOCTYPE_KWD">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SLIM_FILTER">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SLIM_ID">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SLIM_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="SLIM_PARENTHS">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="SLIM_RUBY_CODE">
@@ -1789,58 +1773,57 @@
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SLIM_TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="SLIM_TAG_START">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
-      </value>
-    </option>
-    <option name="SPY-JS.FUNCTION_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="SPY-JS.EXCEPTION">
       <value>
-        <option name="BACKGROUND" value="532B2E"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="532b2e" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="SPY-JS.FUNCTION_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_ONE">
       <value>
-        <option name="BACKGROUND" value="425F44"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="425f44" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_TWO">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1"/>
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SPY-JS.PROGRAM_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.VALUE_HINT">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="0"/>
       </value>
     </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
@@ -1849,26 +1832,21 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
-        <option name="BACKGROUND" value="002240" />
+        <option name="FOREGROUND" value="ffffff" />
+        <option name="BACKGROUND" value="2240" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="ERROR_STRIPE_COLOR" value="ff00" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
@@ -1878,11 +1856,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff" />
       </value>
     </option>
-    <option name="OC.TYPEDEF">
-      <value>
-        <option name="FOREGROUND" value="FFEE80" />
-      </value>
-    </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="583535" />
@@ -1891,9 +1864,9 @@
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="4a3f10" />
+        <option name="EFFECT_COLOR" value="ffffff" />
+        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="FFFFFF" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -1909,27 +1882,22 @@
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="FF628C" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="ff628c" />
       </value>
     </option>
     <option name="XML_TAG">
       <value>
-        <option name="FOREGROUND" value="E1EFFF" />
+        <option name="FOREGROUND" value="e1efff" />
       </value>
     </option>
     <option name="XML_TAG_DATA">
@@ -1939,49 +1907,49 @@
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9EFFFF" />
+        <option name="FOREGROUND" value="9effff" />
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="0088FF" />
+        <option name="FOREGROUND" value="88ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="FFDD00" />
+        <option name="FOREGROUND" value="ffdd00" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="FF9D00" />
+        <option name="FOREGROUND" value="ff9d00" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="3AD900" />
+        <option name="FOREGROUND" value="3ad900" />
       </value>
     </option>
   </attributes>
-</scheme>
+</scheme>
\ No newline at end of file
diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
index 9664ada6843a..7a0a83ddfdd0 100644
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
@@ -1,23 +1,23 @@
-<scheme name="Monokai" parent_scheme="Default" version="1">
+<scheme name="Monokai" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Menlo" />
   <colors>
+    <option name="CARET_COLOR" value="f8f8f0" />
+    <option name="CARET_ROW_COLOR" value="3e3d32" />
     <option name="CONSOLE_BACKGROUND_KEY" value="272822" />
-    <option name="INDENT_GUIDE" value="3B3A32" />
-    <option name="SELECTION_BACKGROUND" value="49483E" />
-    <option name="CARET_ROW_COLOR" value="3E3D32" />
-    <option name="WHITESPACES" value="3B3A32" />
-    <option name="CARET_COLOR" value="F8F8F0" />
-    <option name="LINE_NUMBERS_COLOR" value="F8F8F2" />
-    <option name="SELECTED_INDENT_GUIDE" value="3B3A32" />
     <option name="GUTTER_BACKGROUND" value="272822" />
+    <option name="INDENT_GUIDE" value="3b3a32" />
+    <option name="LINE_NUMBERS_COLOR" value="f8f8f2" />
+    <option name="SELECTED_INDENT_GUIDE" value="3b3a32" />
+    <option name="SELECTION_BACKGROUND" value="49483e" />
+    <option name="WHITESPACES" value="3b3a32" />
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
@@ -27,203 +27,181 @@
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-      </value>
-    </option>
-    <option name="OC.CLASS_REFERENCE">
-      <value>
-        <option name="FOREGROUND" value="A6E22E" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="A6E22E" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-      </value>
-    </option>
-    <option name="COFFEESCRIPT.PARAMETER">
-      <value>
-        <option name="FOREGROUND" value="FD971F" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FOREGROUND" value="fd971f" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-      </value>
-    </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
-      <value>
-        <option name="FOREGROUND" value="75715E" />
-      </value>
-    </option>
-    <option name="CONSOLE_BLACK_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="000000" />
-      </value>
-    </option>
-    <option name="CONSOLE_BLUE_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="0087D5" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="0AA5FF" />
+        <option name="FOREGROUND" value="aa5ff" />
       </value>
     </option>
-    <option name="CONSOLE_CYAN_OUTPUT">
+    <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="41E3F6" />
+        <option name="FOREGROUND" value="87d5" />
       </value>
     </option>
     <option name="CONSOLE_CYAN_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="63E9F8" />
+        <option name="FOREGROUND" value="63e9f8" />
       </value>
     </option>
-    <option name="CONSOLE_DARKGRAY_OUTPUT">
+    <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="555555" />
+        <option name="FOREGROUND" value="41e3f6" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
@@ -236,25 +214,24 @@
         <option name="FOREGROUND" value="a7a7a7" />
       </value>
     </option>
-    <option name="CONSOLE_GREEN_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="A3E131" />
-      </value>
-    </option>
     <option name="CONSOLE_GREEN_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="B8E85E" />
+        <option name="FOREGROUND" value="b8e85e" />
       </value>
     </option>
-    #A3E131
-    <option name="CONSOLE_MAGENTA_OUTPUT">
+    <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="8666CA" />
+        <option name="FOREGROUND" value="a3e131" />
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="9376D0" />
+        <option name="FOREGROUND" value="9376d0" />
+      </value>
+    </option>
+    <option name="CONSOLE_MAGENTA_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="8666ca" />
       </value>
     </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
@@ -262,14 +239,17 @@
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
-    <option name="CONSOLE_RED_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="f10000" />
-      </value>
+    <option name="CONSOLE_RANGE_TO_EXECUTE">
+      <value />
     </option>
     <option name="CONSOLE_RED_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="FF1F1F" />
+        <option name="FOREGROUND" value="ff1f1f" />
+      </value>
+    </option>
+    <option name="CONSOLE_RED_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="f10000" />
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
@@ -283,44 +263,39 @@
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="CONSOLE_WHITE_OUTPUT">
+    <option name="CONSOLE_YELLOW_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="e8e59c" />
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="DEDB74" />
-      </value>
-    </option>
-    <option name="CONSOLE_YELLOW_BRIGHT_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="E8E59C" />
+        <option name="FOREGROUND" value="dedb74" />
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -332,19 +307,19 @@
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
+        <option name="FOREGROUND" value="fd971f" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
@@ -373,96 +348,99 @@
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="DEFAULT_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
+    <option name="DEFAULT_CONSTANT">
+      <value />
+    </option>
     <option name="DEFAULT_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT_TAG">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="DEFAULT_DOC_MARKUP">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="DEFAULT_ENTITY">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="DEFAULT_GLOBAL_VARIABLE">
@@ -470,46 +448,50 @@
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
+    <option name="DEFAULT_IDENTIFIER">
+      <value />
+    </option>
+    <option name="DEFAULT_INSTANCE_FIELD" baseAttributes="DEFAULT_IDENTIFIER" />
     <option name="DEFAULT_INSTANCE_METHOD">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="DEFAULT_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="DEFAULT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="DEFAULT_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="DEFAULT_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="DEFAULT_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="DEFAULT_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
+        <option name="FOREGROUND" value="fd971f" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_PREDEFINED_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -520,23 +502,29 @@
     </option>
     <option name="DEFAULT_STATIC_METHOD">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="DEFAULT_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
+    <option name="DEFAULT_TAG">
+      <value />
+    </option>
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR">
+      <value />
+    </option>
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
         <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="EFFECT_TYPE" value="3" />
       </value>
     </option>
     <option name="DIFF_CONFLICT">
@@ -565,32 +553,32 @@
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
@@ -604,21 +592,16 @@
         <option name="BACKGROUND" value="30322b" />
       </value>
     </option>
-    <option name="OC.ENUM_CONST">
-      <value>
-        <option name="FOREGROUND" value="AE81FF" />
-      </value>
-    </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
+        <option name="FOREGROUND" value="101" />
         <option name="BACKGROUND" value="c7c7ff" />
       </value>
     </option>
@@ -627,8 +610,8 @@
         <option name="FOREGROUND" value="3c3d3c" />
         <option name="BACKGROUND" value="101010" />
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
@@ -636,8 +619,8 @@
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="BACKGROUND" value="161717" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="First symbol in list">
@@ -647,111 +630,127 @@
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="aa4e00" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
+      </value>
+    </option>
+    <option name="GRID_ERROR_VALUE">
+      <value>
+        <option name="EFFECT_COLOR" value="ff6767" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="GRID_IMAGE_VALUE">
+      <value>
+        <option name="FOREGROUND" value="3c3d3c" />
+        <option name="BACKGROUND" value="101010" />
+        <option name="FONT_TYPE" value="1" />
+        <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
@@ -765,8 +764,8 @@
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -782,9 +781,9 @@
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="333434" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
@@ -800,12 +799,12 @@
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
@@ -816,44 +815,44 @@
     <option name="JAVA_DOC_TAG">
       <value>
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="80807f" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
@@ -873,23 +872,13 @@
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
+        <option name="FOREGROUND" value="fd971f" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
-      </value>
-    </option>
-    <option name="OC.LABEL">
-      <value>
-        <option name="FOREGROUND" value="F92672" />
-      </value>
-    </option>
-    <option name="OC.MACRONAME">
-      <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
@@ -897,11 +886,6 @@
         <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
-    <option name="OC.MESSAGE_ARGUMENT">
-      <value>
-        <option name="FOREGROUND" value="A6E22E" />
-      </value>
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="80807f" />
@@ -909,204 +893,232 @@
     </option>
     <option name="OC.BADCHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
+      </value>
+    </option>
+    <option name="OC.CLASS_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="a6e22e" />
+        <option name="EFFECT_COLOR" value="a6e22e" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
+      </value>
+    </option>
+    <option name="OC.ENUM_CONST">
+      <value>
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="OC.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION">
-      <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
+      </value>
+    </option>
+    <option name="OC.LABEL">
+      <value>
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
+      </value>
+    </option>
+    <option name="OC.MACRONAME">
+      <value>
+        <option name="FOREGROUND" value="a6e22e" />
+      </value>
+    </option>
+    <option name="OC.MESSAGE_ARGUMENT">
+      <value>
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="OC.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
+        <option name="FOREGROUND" value="fd971f" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="OC.STRING">
-      <value>
-        <option name="FOREGROUND" value="E6DB74" />
-      </value>
-    </option>
-    <option name="OC.STRUCT_FIELD">
-      <value>
-        <option name="FOREGROUND" value="AE81FF" />
-      </value>
-    </option>
     <option name="OC.PROTOCOL_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
+      </value>
+    </option>
+    <option name="OC.STRING">
+      <value>
+        <option name="FOREGROUND" value="e6db74" />
+      </value>
+    </option>
+    <option name="OC.STRUCT_FIELD">
+      <value>
+        <option name="FOREGROUND" value="ae81ff" />
+      </value>
+    </option>
+    <option name="OC.TYPEDEF">
+      <value>
+        <option name="FOREGROUND" value="66d9ef" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PUPPET_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="PUPPET_SQ_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
+        <option name="EFFECT_COLOR" value="a6e22e" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="A6E22E" />
       </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
-      </value>
-    </option>
-    <option name="REST.BOLD">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="REST.FIXED">
@@ -1124,213 +1136,208 @@
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
-    <option name="REST.ITALIC">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
+        <option name="FOREGROUND" value="fd971f" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SASS_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="SASS_PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SASS_PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="SASS_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SASS_URL">
       <value>
-        <option name="FOREGROUND" value="66D9EF" />
+        <option name="FOREGROUND" value="66d9ef" />
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="FD971F" />
+        <option name="FOREGROUND" value="fd971f" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -1341,89 +1348,88 @@
     </option>
     <option name="SLIM_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f8f8f0" />
+        <option name="BACKGROUND" value="f92672" />
       </value>
     </option>
     <option name="SLIM_CLASS">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="SLIM_DOCTYPE_KWD">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SLIM_FILTER">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SLIM_ID">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SLIM_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="SLIM_TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
-      </value>
-    </option>
-    <option name="SPY-JS.FUNCTION_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="SPY-JS.EXCEPTION">
       <value>
-        <option name="BACKGROUND" value="532B2E"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="532b2e" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="SPY-JS.FUNCTION_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_ONE">
       <value>
-        <option name="BACKGROUND" value="425F44"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="425f44" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_TWO">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1"/>
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SPY-JS.PROGRAM_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.VALUE_HINT">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="0"/>
       </value>
     </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
@@ -1432,26 +1438,21 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="F8F8F2" />
+        <option name="FOREGROUND" value="f8f8f2" />
         <option name="BACKGROUND" value="272822" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="ERROR_STRIPE_COLOR" value="ff00" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
@@ -1461,12 +1462,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff" />
       </value>
     </option>
-    <option name="OC.TYPEDEF">
-      <value>
-        <option name="FOREGROUND" value="66D9EF" />
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="583535" />
@@ -1475,9 +1470,9 @@
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="4a3f10" />
+        <option name="EFFECT_COLOR" value="f8f8f2" />
+        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="F8F8F2" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -1493,22 +1488,17 @@
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="A6E22E" />
+        <option name="FOREGROUND" value="a6e22e" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="AE81FF" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="ae81ff" />
       </value>
     </option>
     <option name="XML_TAG_DATA">
@@ -1524,43 +1514,43 @@
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="75715E" />
+        <option name="FOREGROUND" value="75715e" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="F92672" />
+        <option name="FOREGROUND" value="f92672" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="E6DB74" />
+        <option name="FOREGROUND" value="e6db74" />
       </value>
     </option>
   </attributes>
-</scheme>
+</scheme>
\ No newline at end of file
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index 3cfaed546e34..2f2e87800358 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -1,22 +1,22 @@
-<scheme name="Railscasts" parent_scheme="Default" version="1">
+<scheme name="Railscasts" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Menlo" />
   <colors>
-    <option name="CONSOLE_BACKGROUND_KEY" value="2B2B2B" />
-    <option name="INDENT_GUIDE" value="404040" />
-    <option name="SELECTION_BACKGROUND" value="545c73" />
+    <option name="CARET_COLOR" value="ffffff" />
     <option name="CARET_ROW_COLOR" value="333435" />
-    <option name="WHITESPACES" value="404040" />
-    <option name="CARET_COLOR" value="FFFFFF" />
-    <option name="LINE_NUMBERS_COLOR" value="E6E1DC" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="2b2b2b" />
+    <option name="GUTTER_BACKGROUND" value="2b2b2b" />
+    <option name="INDENT_GUIDE" value="404040" />
+    <option name="LINE_NUMBERS_COLOR" value="e6e1dc" />
     <option name="SELECTED_INDENT_GUIDE" value="404040" />
-    <option name="GUTTER_BACKGROUND" value="2B2B2B" />
+    <option name="SELECTION_BACKGROUND" value="545c73" />
+    <option name="WHITESPACES" value="404040" />
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
@@ -27,183 +27,177 @@
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
-      </value>
-    </option>
-    <option name="OC.CLASS_REFERENCE">
-      <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="6E9CBE" />
+        <option name="FOREGROUND" value="6e9cbe" />
       </value>
     </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
-      </value>
-    </option>
-    <option name="COFFEESCRIPT.PARAMETER">
-      <value>
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="E6E1DC" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="EFFECT_COLOR" value="e6e1dc" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+    <option name="CONSOLE_BLACK_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
@@ -213,7 +207,7 @@
     </option>
     <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="06b8b8" />
+        <option name="FOREGROUND" value="6b8b8" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
@@ -241,6 +235,7 @@
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
+    <option name="CONSOLE_RANGE_TO_EXECUTE" baseAttributes="INJECTED_LANGUAGE_FRAGMENT" />
     <option name="CONSOLE_RED_OUTPUT">
       <value>
         <option name="FOREGROUND" value="ff6767" />
@@ -264,28 +259,28 @@
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939" />
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="6E9CBE" />
+        <option name="FOREGROUND" value="6e9cbe" />
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
@@ -296,7 +291,7 @@
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="CSS.URL">
@@ -307,7 +302,7 @@
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
@@ -337,206 +332,214 @@
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="Clojure Literal">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="DEFAULT_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="DEFAULT_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="6d9cbe" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT_TAG">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
+    <option name="DEFAULT_DOC_COMMENT_TAG_VALUE">
+      <value>
+        <option name="FONT_TYPE" value="3" />
+      </value>
+    </option>
     <option name="DEFAULT_DOC_MARKUP">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_ENTITY">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="6d9cbe" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="DEFAULT_GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
+    <option name="DEFAULT_IDENTIFIER" baseAttributes="TEXT" />
     <option name="DEFAULT_INSTANCE_FIELD">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="DEFAULT_INSTANCE_METHOD">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="DEFAULT_INTERFACE_NAME">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="DEFAULT_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="DEFAULT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="DEFAULT_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="DEFAULT_METADATA">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="DEFAULT_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="DEFAULT_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="DEFAULT_PREDEFINED_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="6E9CBE" />
+        <option name="FOREGROUND" value="6e9cbe" />
       </value>
     </option>
     <option name="DEFAULT_STATIC_FIELD">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_STATIC_METHOD">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="DEFAULT_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
+    <option name="DEFAULT_TAG" baseAttributes="TEXT" />
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR" baseAttributes="TEXT" />
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
         <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="EFFECT_TYPE" value="3" />
       </value>
     </option>
     <option name="DIFF_CONFLICT">
@@ -565,38 +568,38 @@
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939" />
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
@@ -604,21 +607,16 @@
         <option name="BACKGROUND" value="30322b" />
       </value>
     </option>
-    <option name="OC.ENUM_CONST">
-      <value>
-        <option name="FOREGROUND" value="6D9CBE" />
-      </value>
-    </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
+        <option name="FOREGROUND" value="101" />
         <option name="BACKGROUND" value="c7c7ff" />
       </value>
     </option>
@@ -627,8 +625,8 @@
         <option name="FOREGROUND" value="3c3d3c" />
         <option name="BACKGROUND" value="101010" />
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
@@ -636,8 +634,8 @@
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="BACKGROUND" value="161717" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="First symbol in list">
@@ -647,86 +645,86 @@
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="aa4e00" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="HAML_RUBY_CODE">
@@ -736,53 +734,53 @@
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="6d9cbe" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -798,9 +796,9 @@
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="333434" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
@@ -814,20 +812,15 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="OC.IVAR">
-      <value>
-        <option name="FOREGROUND" value="D0D0FF" />
-      </value>
-    </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -839,45 +832,45 @@
     <option name="JAVA_DOC_TAG">
       <value>
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="80807f" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
@@ -885,6 +878,7 @@
         <option name="BACKGROUND" value="423535" />
       </value>
     </option>
+    <option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
         <option name="FOREGROUND" value="979748" />
@@ -897,18 +891,13 @@
     </option>
     <option name="JS.PARAMETER">
       <value>
+        <option name="EFFECT_COLOR" value="e6e1dc" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="E6E1DC" />
       </value>
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
-      </value>
-    </option>
-    <option name="OC.LABEL">
-      <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="LESS_INJECTED_CODE">
@@ -923,12 +912,7 @@
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
-      </value>
-    </option>
-    <option name="OC.MACRONAME">
-      <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
@@ -936,11 +920,6 @@
         <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
-    <option name="OC.MESSAGE_ARGUMENT">
-      <value>
-        <option name="FOREGROUND" value="FFC66D" />
-      </value>
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="80807f" />
@@ -948,235 +927,268 @@
     </option>
     <option name="OC.BADCHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="OC.CLASS_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="ffffff" />
+      </value>
+    </option>
+    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
+      </value>
+    </option>
+    <option name="OC.ENUM_CONST">
+      <value>
+        <option name="FOREGROUND" value="6d9cbe" />
       </value>
     </option>
     <option name="OC.EXTERN_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="OC.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION">
-      <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="OC.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
+      </value>
+    </option>
+    <option name="OC.IVAR">
+      <value>
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
+      </value>
+    </option>
+    <option name="OC.LABEL">
+      <value>
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="OC.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
+      </value>
+    </option>
+    <option name="OC.MACRONAME">
+      <value>
+        <option name="FOREGROUND" value="ffc66d" />
+      </value>
+    </option>
+    <option name="OC.MESSAGE_ARGUMENT">
+      <value>
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="OC.PROPERTY">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
-      </value>
-    </option>
-    <option name="OC.SELFSUPERTHIS">
-      <value>
-        <option name="FOREGROUND" value="D0D0FF" />
-      </value>
-    </option>
-    <option name="OC.STRING">
-      <value>
-        <option name="FOREGROUND" value="A5C261" />
-      </value>
-    </option>
-    <option name="OC.STRUCT_FIELD">
-      <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="OC.PROTOCOL_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
+    <option name="OC.SELFSUPERTHIS">
+      <value>
+        <option name="FOREGROUND" value="d0d0ff" />
+      </value>
+    </option>
+    <option name="OC.STRING">
+      <value>
+        <option name="FOREGROUND" value="a5c261" />
+      </value>
+    </option>
+    <option name="OC.STRUCT_FIELD">
+      <value>
+        <option name="FOREGROUND" value="6d9cbe" />
+      </value>
+    </option>
+    <option name="OC.TYPEDEF">
+      <value>
+        <option name="FOREGROUND" value="cc7833" />
+      </value>
+    </option>
+    <option name="PHP_EXEC_COMMAND_ID" baseAttributes="DEFAULT_STRING" />
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PUPPET_CLASS">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="PUPPET_SQ_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939" />
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
-      </value>
-    </option>
-    <option name="REST.BOLD">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="519f50" />
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="REST.FIXED">
@@ -1194,30 +1206,25 @@
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
-    <option name="REST.ITALIC">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -1228,201 +1235,201 @@
     </option>
     <option name="RUBY_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="6d9cbe" />
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="519F50" />
+        <option name="FOREGROUND" value="519f50" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="D0D0FF" />
+        <option name="FOREGROUND" value="d0d0ff" />
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="FFC66D" />
+        <option name="FOREGROUND" value="ffc66d" />
       </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="DA4939" />
+        <option name="FOREGROUND" value="da4939" />
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
+        <option name="FOREGROUND" value="6d9cbe" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SASS_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SASS_PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="6E9CBE" />
+        <option name="FOREGROUND" value="6e9cbe" />
       </value>
     </option>
     <option name="SASS_PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SASS_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SASS_URL">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
@@ -1432,39 +1439,39 @@
     </option>
     <option name="SLIM_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="990000" />
       </value>
     </option>
     <option name="SLIM_CLASS">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SLIM_DOCTYPE_KWD">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SLIM_FILTER">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SLIM_ID">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SLIM_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SLIM_RUBY_CODE">
@@ -1474,53 +1481,52 @@
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SLIM_TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
-      </value>
-    </option>
-    <option name="SPY-JS.FUNCTION_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="SPY-JS.EXCEPTION">
       <value>
-        <option name="BACKGROUND" value="532B2E"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="532b2e" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="SPY-JS.FUNCTION_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_ONE">
       <value>
-        <option name="BACKGROUND" value="425F44"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="425f44" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_TWO">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1"/>
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SPY-JS.PROGRAM_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.VALUE_HINT">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="0"/>
       </value>
     </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
@@ -1529,26 +1535,21 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="E6E1DC" />
-        <option name="BACKGROUND" value="2B2B2B" />
+        <option name="FOREGROUND" value="e6e1dc" />
+        <option name="BACKGROUND" value="2b2b2b" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="ERROR_STRIPE_COLOR" value="ff00" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
@@ -1558,11 +1559,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff" />
       </value>
     </option>
-    <option name="OC.TYPEDEF">
-      <value>
-        <option name="FOREGROUND" value="CC7833" />
-      </value>
-    </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="583535" />
@@ -1571,9 +1567,9 @@
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="4a3f10" />
+        <option name="EFFECT_COLOR" value="e6e1dc" />
+        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="E6E1DC" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -1589,22 +1585,17 @@
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="6D9CBE" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6d9cbe" />
       </value>
     </option>
     <option name="XML_TAG_DATA">
@@ -1614,49 +1605,49 @@
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="BC9458" />
+        <option name="FOREGROUND" value="bc9458" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="E8BF6A" />
+        <option name="FOREGROUND" value="e8bf6a" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="CC7833" />
+        <option name="FOREGROUND" value="cc7833" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="A5C261" />
+        <option name="FOREGROUND" value="a5c261" />
       </value>
     </option>
   </attributes>
-</scheme>
+</scheme>
\ No newline at end of file
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index f639078462d7..54a72ec4309b 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -1,17 +1,17 @@
-<scheme name="Twilight" parent_scheme="Default" version="1">
+<scheme name="Twilight" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="Menlo" />
   <colors>
-    <option name="CONSOLE_BACKGROUND_KEY" value="141414" />
-    <option name="INDENT_GUIDE" value="4e4e4e" />
-    <option name="SELECTION_BACKGROUND" value="3c3f42" />
+    <option name="CARET_COLOR" value="a7a7a7" />
     <option name="CARET_ROW_COLOR" value="1b1b1b" />
-    <option name="WHITESPACES" value="4e4e4e" />
-    <option name="CARET_COLOR" value="A7A7A7" />
-    <option name="LINE_NUMBERS_COLOR" value="F8F8F8" />
-    <option name="SELECTED_INDENT_GUIDE" value="4e4e4e" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="141414" />
     <option name="GUTTER_BACKGROUND" value="141414" />
+    <option name="INDENT_GUIDE" value="4e4e4e" />
+    <option name="LINE_NUMBERS_COLOR" value="f8f8f8" />
+    <option name="SELECTED_INDENT_GUIDE" value="4e4e4e" />
+    <option name="SELECTION_BACKGROUND" value="3c3f42" />
+    <option name="WHITESPACES" value="4e4e4e" />
   </colors>
   <attributes>
     <option name="BAD_CHARACTER">
@@ -26,33 +26,28 @@
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
-      </value>
-    </option>
-    <option name="OC.CLASS_REFERENCE">
-      <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
@@ -62,180 +57,169 @@
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
-      </value>
-    </option>
-    <option name="COFFEESCRIPT.PARAMETER">
-      <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OBJECT_KEY">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
+      </value>
+    </option>
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
-      </value>
-    </option>
-    <option name="OC.CONDITIONALLY_NOT_COMPILED">
-      <value>
-        <option name="FOREGROUND" value="5F5A60" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="CONSOLE_BLACK_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="000000" />
-      </value>
-    </option>
-    <option name="CONSOLE_BLUE_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="5A80B7" />
+        <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="8598B6" />
+        <option name="FOREGROUND" value="8598b6" />
       </value>
     </option>
-    <option name="CONSOLE_CYAN_OUTPUT">
+    <option name="CONSOLE_BLUE_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="6BA3AD" />
+        <option name="FOREGROUND" value="5a80b7" />
       </value>
     </option>
     <option name="CONSOLE_CYAN_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="98A9AC" />
+        <option name="FOREGROUND" value="98a9ac" />
       </value>
     </option>
-    <option name="CONSOLE_DARKGRAY_OUTPUT">
+    <option name="CONSOLE_CYAN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="555555" />
+        <option name="FOREGROUND" value="6ba3ad" />
       </value>
     </option>
     <option name="CONSOLE_ERROR_OUTPUT">
@@ -248,20 +232,14 @@
         <option name="FOREGROUND" value="a7a7a7" />
       </value>
     </option>
-    <option name="CONSOLE_GREEN_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="8CB053" />
-      </value>
-    </option>
     <option name="CONSOLE_GREEN_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="9AAF7C" />
+        <option name="FOREGROUND" value="9aaf7c" />
       </value>
     </option>
-    #A3E131
-    <option name="CONSOLE_MAGENTA_OUTPUT">
+    <option name="CONSOLE_GREEN_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="754273" />
+        <option name="FOREGROUND" value="8cb053" />
       </value>
     </option>
     <option name="CONSOLE_MAGENTA_BRIGHT_OUTPUT">
@@ -269,19 +247,25 @@
         <option name="FOREGROUND" value="755273" />
       </value>
     </option>
+    <option name="CONSOLE_MAGENTA_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="754273" />
+      </value>
+    </option>
     <option name="CONSOLE_NORMAL_OUTPUT">
       <value>
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
-    <option name="CONSOLE_RED_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="EC4A00" />
-      </value>
-    </option>
+    <option name="CONSOLE_RANGE_TO_EXECUTE" baseAttributes="INJECTED_LANGUAGE_FRAGMENT" />
     <option name="CONSOLE_RED_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="E87854" />
+        <option name="FOREGROUND" value="e87854" />
+      </value>
+    </option>
+    <option name="CONSOLE_RED_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="ec4a00" />
       </value>
     </option>
     <option name="CONSOLE_SYSTEM_OUTPUT">
@@ -295,45 +279,40 @@
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="CONSOLE_WHITE_OUTPUT">
+    <option name="CONSOLE_YELLOW_BRIGHT_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
+        <option name="FOREGROUND" value="f3cc6d" />
       </value>
     </option>
     <option name="CONSOLE_YELLOW_OUTPUT">
       <value>
-        <option name="FOREGROUND" value="F3CC6D" />
-      </value>
-    </option>
-    <option name="CONSOLE_YELLOW_BRIGHT_OUTPUT">
-      <value>
-        <option name="FOREGROUND" value="F3CC6D" />
+        <option name="FOREGROUND" value="f3cc6d" />
       </value>
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085" />
       </value>
     </option>
     <option name="CSS.IDENT">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="9B859D" />
+        <option name="FOREGROUND" value="9b859d" />
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
@@ -344,12 +323,12 @@
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="CUSTOM_INVALID_STRING_ESCAPE_ATTRIBUTES">
@@ -384,220 +363,222 @@
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="Clojure Keyword">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="Clojure Literal">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="DEFAULT_ATTRIBUTE">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_CLASS_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_DOC_COMMENT_TAG">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_DOC_MARKUP">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_ENTITY">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_CALL">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_FUNCTION_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_INSTANCE_FIELD">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="DEFAULT_INSTANCE_METHOD">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_INTERFACE_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="DEFAULT_LABEL">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="DEFAULT_METADATA">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b" />
       </value>
     </option>
     <option name="DEFAULT_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="DEFAULT_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="DEFAULT_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="DEFAULT_PREDEFINED_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="9B859D" />
+        <option name="FOREGROUND" value="9b859d" />
       </value>
     </option>
     <option name="DEFAULT_STATIC_FIELD">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DEFAULT_STATIC_METHOD">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DEFAULT_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
+    <option name="DEFAULT_TAG" baseAttributes="TEXT" />
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR" baseAttributes="TEXT" />
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="3" />
         <option name="EFFECT_COLOR" value="c0c0c0" />
+        <option name="EFFECT_TYPE" value="3" />
       </value>
     </option>
     <option name="DIFF_CONFLICT">
@@ -626,38 +607,38 @@
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085" />
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b" />
       </value>
     </option>
     <option name="DUPLICATE_FROM_SERVER">
@@ -665,21 +646,16 @@
         <option name="BACKGROUND" value="30322b" />
       </value>
     </option>
-    <option name="OC.ENUM_CONST">
-      <value>
-        <option name="FOREGROUND" value="CF6A4C" />
-      </value>
-    </option>
     <option name="ERRORS_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="ff6767" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="000101" />
+        <option name="FOREGROUND" value="101" />
         <option name="BACKGROUND" value="c7c7ff" />
       </value>
     </option>
@@ -688,8 +664,8 @@
         <option name="FOREGROUND" value="3c3d3c" />
         <option name="BACKGROUND" value="101010" />
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="3c3d3c" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="FOLLOWED_HYPERLINK_ATTRIBUTES">
@@ -697,149 +673,149 @@
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="BACKGROUND" value="161717" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="First symbol in list">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="aa4e00" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98" />
       </value>
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="HAML_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b" />
       </value>
     </option>
     <option name="HYPERLINK_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
         <option name="FONT_TYPE" value="2" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="c7c7ff" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -855,9 +831,9 @@
     </option>
     <option name="INFO_ATTRIBUTES">
       <value>
-        <option name="EFFECT_TYPE" value="2" />
         <option name="EFFECT_COLOR" value="333434" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
@@ -871,20 +847,15 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="OC.IVAR">
-      <value>
-        <option name="FOREGROUND" value="7587A6" />
-      </value>
-    </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -896,8 +867,8 @@
     <option name="JAVA_DOC_TAG">
       <value>
         <option name="FONT_TYPE" value="1" />
-        <option name="EFFECT_TYPE" value="1" />
         <option name="EFFECT_COLOR" value="80807f" />
+        <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
@@ -908,33 +879,33 @@
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="JAVA_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
@@ -942,6 +913,7 @@
         <option name="BACKGROUND" value="423535" />
       </value>
     </option>
+    <option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
         <option name="FOREGROUND" value="979748" />
@@ -954,17 +926,12 @@
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
-      </value>
-    </option>
-    <option name="OC.LABEL">
-      <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="LESS_INJECTED_CODE">
@@ -979,12 +946,7 @@
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
-      </value>
-    </option>
-    <option name="OC.MACRONAME">
-      <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
@@ -992,11 +954,6 @@
         <option name="BACKGROUND" value="3a6da0" />
       </value>
     </option>
-    <option name="OC.MESSAGE_ARGUMENT">
-      <value>
-        <option name="FOREGROUND" value="9B703F" />
-      </value>
-    </option>
     <option name="NOT_USED_ELEMENT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="80807f" />
@@ -1004,91 +961,129 @@
     </option>
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="OC.CLASS_REFERENCE">
+      <value>
+        <option name="FOREGROUND" value="9b703f" />
+      </value>
+    </option>
+    <option name="OC.CONDITIONALLY_NOT_COMPILED">
+      <value>
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
+      </value>
+    </option>
+    <option name="OC.ENUM_CONST">
+      <value>
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="OC.EXTERN_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="OC.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION">
-      <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="OC.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
+      </value>
+    </option>
+    <option name="OC.IVAR">
+      <value>
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
+      </value>
+    </option>
+    <option name="OC.LABEL">
+      <value>
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="OC.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
+      </value>
+    </option>
+    <option name="OC.MACRONAME">
+      <value>
+        <option name="FOREGROUND" value="9b703f" />
+      </value>
+    </option>
+    <option name="OC.MESSAGE_ARGUMENT">
+      <value>
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="OC.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="OC.PROPERTY">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
-      </value>
-    </option>
-    <option name="OC.SELFSUPERTHIS">
-      <value>
-        <option name="FOREGROUND" value="7587A6" />
-      </value>
-    </option>
-    <option name="OC.STRING">
-      <value>
-        <option name="FOREGROUND" value="8F9D6A" />
-      </value>
-    </option>
-    <option name="OC.STRUCT_FIELD">
-      <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="OC.PROTOCOL_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
+    <option name="OC.SELFSUPERTHIS">
+      <value>
+        <option name="FOREGROUND" value="7587a6" />
+      </value>
+    </option>
+    <option name="OC.STRING">
+      <value>
+        <option name="FOREGROUND" value="8f9d6a" />
+      </value>
+    </option>
+    <option name="OC.STRUCT_FIELD">
+      <value>
+        <option name="FOREGROUND" value="cf6a4c" />
+      </value>
+    </option>
+    <option name="OC.TYPEDEF">
+      <value>
+        <option name="FOREGROUND" value="f9ee98" />
+      </value>
+    </option>
+    <option name="PHP_EXEC_COMMAND_ID" baseAttributes="DEFAULT_STRING" />
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
@@ -1096,135 +1091,130 @@
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PUPPET_CLASS">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="PUPPET_SQ_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085" />
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="PY.DECORATOR">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
-      </value>
-    </option>
-    <option name="REST.BOLD">
-      <value>
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="REST.FIXED">
@@ -1242,30 +1232,25 @@
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
-    <option name="REST.ITALIC">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -1276,209 +1261,209 @@
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="RUBY_CONSTANT">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="RUBY_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="DAD085" />
+        <option name="FOREGROUND" value="dad085" />
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="E9C062" />
+        <option name="FOREGROUND" value="e9c062" />
       </value>
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="F9EE98" />
+        <option name="FOREGROUND" value="f9ee98" />
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="SASS_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="SASS_PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="C5AF75" />
+        <option name="FOREGROUND" value="c5af75" />
       </value>
     </option>
     <option name="SASS_PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="SASS_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SASS_URL">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="7587A6" />
+        <option name="FOREGROUND" value="7587a6" />
       </value>
     </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
@@ -1488,90 +1473,89 @@
     </option>
     <option name="SLIM_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
+        <option name="FOREGROUND" value="f8f8f8" />
         <option name="BACKGROUND" value="452645" />
       </value>
     </option>
     <option name="SLIM_CLASS">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SLIM_DOCTYPE_KWD">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SLIM_FILTER">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SLIM_ID">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SLIM_INTERPOLATION">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SLIM_TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
-      </value>
-    </option>
-    <option name="SPY-JS.FUNCTION_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="SPY-JS.EXCEPTION">
       <value>
-        <option name="BACKGROUND" value="532B2E"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="532b2e" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="SPY-JS.FUNCTION_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_ONE">
       <value>
-        <option name="BACKGROUND" value="425F44"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="425f44" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_TWO">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1"/>
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SPY-JS.PROGRAM_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.VALUE_HINT">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="0"/>
       </value>
     </option>
     <option name="STATIC_FIELD_ATTRIBUTES">
@@ -1580,26 +1564,21 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="F8F8F8" />
+        <option name="FOREGROUND" value="f8f8f8" />
         <option name="BACKGROUND" value="141414" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="5f5f00" />
-        <option name="ERROR_STRIPE_COLOR" value="00ff00" />
+        <option name="ERROR_STRIPE_COLOR" value="ff00" />
       </value>
     </option>
     <option name="TODO_DEFAULT_ATTRIBUTES">
@@ -1609,11 +1588,6 @@
         <option name="ERROR_STRIPE_COLOR" value="ff" />
       </value>
     </option>
-    <option name="OC.TYPEDEF">
-      <value>
-        <option name="FOREGROUND" value="F9EE98" />
-      </value>
-    </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="583535" />
@@ -1622,9 +1596,9 @@
     <option name="WARNING_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="4a3f10" />
+        <option name="EFFECT_COLOR" value="f8f8f8" />
+        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="F8F8F8" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -1640,22 +1614,17 @@
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="CF6A4C" />
-      </value>
-    </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="cf6a4c" />
       </value>
     </option>
     <option name="XML_TAG_DATA">
@@ -1665,49 +1634,49 @@
     </option>
     <option name="XML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="AC885B" />
+        <option name="FOREGROUND" value="ac885b" />
       </value>
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="5F5A60" />
+        <option name="FOREGROUND" value="5f5a60" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="9B703F" />
+        <option name="FOREGROUND" value="9b703f" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="CDA869" />
+        <option name="FOREGROUND" value="cda869" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
-        <option name="FOREGROUND" value="8F9D6A" />
+        <option name="FOREGROUND" value="8f9d6a" />
       </value>
     </option>
   </attributes>
-</scheme>
+</scheme>
\ No newline at end of file
diff --git a/colorSchemes/src/colorSchemes/vibrant_ink.xml b/colorSchemes/src/colorSchemes/vibrant_ink.xml
index 9b33e87c8c88..2d1596b94227 100644
--- a/colorSchemes/src/colorSchemes/vibrant_ink.xml
+++ b/colorSchemes/src/colorSchemes/vibrant_ink.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scheme name="VibrantInk" version="124" parent_scheme="Default">
+<scheme name="VibrantInk" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="12" />
   <option name="EDITOR_FONT_NAME" value="DejaVu Sans Mono" />
@@ -64,9 +63,6 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="CLASS_NAME_ATTRIBUTES">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
@@ -82,12 +78,6 @@
         <option name="FOREGROUND" value="339999" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.BRACE">
-      <value />
-    </option>
-    <option name="COFFEESCRIPT.BRACKET">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.CLASS_NAME">
       <value>
         <option name="FOREGROUND" value="ffcc00" />
@@ -101,9 +91,6 @@
     <option name="COFFEESCRIPT.COMMA">
       <value />
     </option>
-    <option name="COFFEESCRIPT.DOT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -114,9 +101,6 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -142,11 +126,6 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARAMETER">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
         <option name="FOREGROUND" value="66ff00" />
@@ -203,17 +182,16 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.PARENTHESIS">
-      <value />
+    <option name="COFFEESCRIPT.PARAMETER">
+      <value>
+        <option name="FONT_TYPE" value="2" />
+      </value>
     </option>
     <option name="COFFEESCRIPT.PROTOTYPE">
       <value>
         <option name="FOREGROUND" value="ffcc00" />
       </value>
     </option>
-    <option name="COFFEESCRIPT.RANGE">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
         <option name="FOREGROUND" value="44b4cc" />
@@ -232,9 +210,6 @@
     <option name="COFFEESCRIPT.SEMICOLON">
       <value />
     </option>
-    <option name="COFFEESCRIPT.SPLAT">
-      <value />
-    </option>
     <option name="COFFEESCRIPT.STRING">
       <value>
         <option name="FOREGROUND" value="66ff00" />
@@ -250,6 +225,11 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
+    <option name="CONSOLE_BLACK_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="ffffff" />
+      </value>
+    </option>
     <option name="CONSOLE_BLUE_OUTPUT">
       <value>
         <option name="FOREGROUND" value="c7c7ff" />
@@ -285,6 +265,7 @@
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
+    <option name="CONSOLE_RANGE_TO_EXECUTE" baseAttributes="INJECTED_LANGUAGE_FRAGMENT" />
     <option name="CONSOLE_RED_OUTPUT">
       <value>
         <option name="FOREGROUND" value="ff6767" />
@@ -430,9 +411,6 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="Clojure Keyword">
-      <value />
-    </option>
     <option name="Clojure Line comment">
       <value>
         <option name="FOREGROUND" value="9933cc" />
@@ -465,9 +443,6 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="DEFAULT_COMMA">
-      <value />
-    </option>
     <option name="DEFAULT_CONSTANT">
       <value>
         <option name="FOREGROUND" value="fda5ff" />
@@ -479,6 +454,11 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
+    <option name="DEFAULT_DOC_COMMENT_TAG_VALUE">
+      <value>
+        <option name="FONT_TYPE" value="3" />
+      </value>
+    </option>
     <option name="DEFAULT_DOC_MARKUP">
       <value>
         <option name="BACKGROUND" value="223f22" />
@@ -496,6 +476,7 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
+    <option name="DEFAULT_IDENTIFIER" baseAttributes="TEXT" />
     <option name="DEFAULT_INSTANCE_FIELD">
       <value>
         <option name="FOREGROUND" value="fda5ff" />
@@ -518,11 +499,6 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="DEFAULT_METADATA">
-      <value>
-        <option name="FOREGROUND" value="808000" />
-      </value>
-    </option>
     <option name="DEFAULT_NUMBER">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -533,9 +509,6 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="DEFAULT_SEMICOLON">
-      <value />
-    </option>
     <option name="DEFAULT_STATIC_FIELD">
       <value>
         <option name="FOREGROUND" value="fda5ff" />
@@ -548,6 +521,8 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option name="DEFAULT_TAG" baseAttributes="TEXT" />
+    <option name="DEFAULT_TEMPLATE_LANGUAGE_COLOR" baseAttributes="TEXT" />
     <option name="DEFAULT_VALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -588,9 +563,6 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="DJANGO_FILTER">
-      <value />
-    </option>
     <option name="DJANGO_ID">
       <value>
         <option name="FOREGROUND" value="99cc99" />
@@ -618,9 +590,6 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
-    <option name="DJANGO_TAG_START_END">
-      <value />
-    </option>
     <option name="DUPLICATE_FROM_SERVER">
       <value>
         <option name="BACKGROUND" value="30322b" />
@@ -629,8 +598,8 @@
     <option name="ERRORS_ATTRIBUTES">
       <value>
         <option name="EFFECT_COLOR" value="ff6767" />
+        <option name="ERROR_STRIPE_COLOR" value="cf5b56" />
         <option name="EFFECT_TYPE" value="2" />
-        <option name="ERROR_STRIPE_COLOR" value="ff0000" />
       </value>
     </option>
     <option name="EXECUTIONPOINT_ATTRIBUTES">
@@ -665,8 +634,8 @@
     <option name="GENERIC_SERVER_ERROR_OR_WARNING">
       <value>
         <option name="EFFECT_COLOR" value="aa4e00" />
-        <option name="EFFECT_TYPE" value="2" />
         <option name="ERROR_STRIPE_COLOR" value="f49810" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_COMMENT">
@@ -742,9 +711,6 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="GROOVY_KEYWORD">
-      <value />
-    </option>
     <option name="HAML_CLASS">
       <value />
     </option>
@@ -774,9 +740,6 @@
         <option name="BACKGROUND" value="f0f0f" />
       </value>
     </option>
-    <option name="HAML_PARENTHS">
-      <value />
-    </option>
     <option name="HAML_RUBY_CODE">
       <value />
     </option>
@@ -877,8 +840,8 @@
     <option name="INFO_ATTRIBUTES">
       <value>
         <option name="EFFECT_COLOR" value="333434" />
-        <option name="EFFECT_TYPE" value="2" />
         <option name="ERROR_STRIPE_COLOR" value="ffffcc" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="INJECTED_LANGUAGE_FRAGMENT">
@@ -897,15 +860,6 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="JAVA_BRACES">
-      <value />
-    </option>
-    <option name="JAVA_BRACKETS">
-      <value />
-    </option>
-    <option name="JAVA_COMMA">
-      <value />
-    </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933cc" />
@@ -923,9 +877,6 @@
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
-    <option name="JAVA_DOT">
-      <value />
-    </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
         <option name="FOREGROUND" value="68e868" />
@@ -952,12 +903,6 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="JAVA_PARENTH">
-      <value />
-    </option>
-    <option name="JAVA_SEMICOLON">
-      <value />
-    </option>
     <option name="JAVA_STRING">
       <value>
         <option name="FOREGROUND" value="66ff00" />
@@ -978,23 +923,10 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="JS.BRACES">
-      <value />
-    </option>
-    <option name="JS.BRACKETS">
-      <value />
-    </option>
     <option name="JS.COMMA">
       <value />
     </option>
-    <option name="JS.DOT">
-      <value />
-    </option>
-    <option name="JS.GLOBAL_FUNCTION">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
+    <option name="JS.GLOBAL_VARIABLE" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
     <option name="JS.INSTANCE_MEMBER_FUNCTION">
       <value>
         <option name="FOREGROUND" value="979748" />
@@ -1010,9 +942,6 @@
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
-    <option name="JS.PARENTHS">
-      <value />
-    </option>
     <option name="JS.SEMICOLON">
       <value />
     </option>
@@ -1072,9 +1001,6 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="LOCAL_VARIABLE_ATTRIBUTES">
-      <value />
-    </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="3a6da0" />
@@ -1085,17 +1011,11 @@
         <option name="FOREGROUND" value="80807f" />
       </value>
     </option>
-    <option name="PARAMETER_ATTRIBUTES">
-      <value />
-    </option>
     <option name="PHP_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="PHP_BRACKETS">
-      <value />
-    </option>
     <option name="PHP_COMMA">
       <value />
     </option>
@@ -1198,21 +1118,6 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="PUPPET_BRACES">
-      <value />
-    </option>
-    <option name="PUPPET_BRACKETS">
-      <value />
-    </option>
-    <option name="PUPPET_CLASS">
-      <value />
-    </option>
-    <option name="PUPPET_COMMA">
-      <value />
-    </option>
-    <option name="PUPPET_DOT">
-      <value />
-    </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -1233,20 +1138,11 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="PUPPET_PARENTH">
-      <value />
-    </option>
     <option name="PUPPET_REGEX">
       <value>
         <option name="FOREGROUND" value="44b4cc" />
       </value>
     </option>
-    <option name="PUPPET_RESOURCE_REFERENCE">
-      <value />
-    </option>
-    <option name="PUPPET_SEMICOLON">
-      <value />
-    </option>
     <option name="PUPPET_SQ_STRING">
       <value>
         <option name="FOREGROUND" value="66ff00" />
@@ -1257,32 +1153,17 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="PUPPET_VARIABLE">
-      <value />
-    </option>
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="PY.BRACES">
-      <value />
-    </option>
-    <option name="PY.BRACKETS">
-      <value />
-    </option>
-    <option name="PY.BUILTIN_NAME">
-      <value />
-    </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
         <option name="EFFECT_COLOR" value="ffffff" />
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
-    <option name="PY.COMMA">
-      <value />
-    </option>
     <option name="PY.DECORATOR">
       <value>
         <option name="FOREGROUND" value="ffcc00" />
@@ -1293,9 +1174,6 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="PY.DOT">
-      <value />
-    </option>
     <option name="PY.FUNC_DEFINITION">
       <value>
         <option name="FOREGROUND" value="ffcc00" />
@@ -1327,15 +1205,6 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="PY.PARENTHS">
-      <value />
-    </option>
-    <option name="PY.PREDEFINED_DEFINITION">
-      <value />
-    </option>
-    <option name="PY.PREDEFINED_USAGE">
-      <value />
-    </option>
     <option name="PY.STRING">
       <value>
         <option name="FOREGROUND" value="66ff00" />
@@ -1351,12 +1220,6 @@
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="REGEXP.BRACES">
-      <value />
-    </option>
-    <option name="REGEXP.BRACKETS">
-      <value />
-    </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -1386,9 +1249,6 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="REGEXP.PARENTHS">
-      <value />
-    </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -1399,11 +1259,6 @@
         <option name="FOREGROUND" value="339999" />
       </value>
     </option>
-    <option name="REST.BOLD">
-      <value>
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
     <option name="REST.EXPLICIT">
       <value>
         <option name="FOREGROUND" value="ff6600" />
@@ -1429,11 +1284,6 @@
         <option name="BACKGROUND" value="4d5d3d" />
       </value>
     </option>
-    <option name="REST.ITALIC">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="REST.LINE_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933cc" />
@@ -1454,38 +1304,11 @@
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="RHTML_EXPRESSION_END_ID">
-      <value />
-    </option>
-    <option name="RHTML_EXPRESSION_START_ID">
-      <value />
-    </option>
-    <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
-    </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
       <value>
         <option name="BACKGROUND" value="0" />
       </value>
     </option>
-    <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
-    </option>
-    <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
-    </option>
-    <option name="RUBY_BAD_CHARACTER">
-      <value />
-    </option>
-    <option name="RUBY_BRACKETS">
-      <value />
-    </option>
-    <option name="RUBY_COLON">
-      <value />
-    </option>
-    <option name="RUBY_COMMA">
-      <value />
-    </option>
     <option name="RUBY_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933cc" />
@@ -1496,17 +1319,11 @@
         <option name="FOREGROUND" value="339999" />
       </value>
     </option>
-    <option name="RUBY_CONSTANT_DECLARATION">
-      <value />
-    </option>
     <option name="RUBY_CVAR">
       <value>
         <option name="FOREGROUND" value="ffffff" />
       </value>
     </option>
-    <option name="RUBY_DOT">
-      <value />
-    </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -1537,9 +1354,6 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="RUBY_IDENTIFIER">
-      <value />
-    </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
         <option name="FOREGROUND" value="66ff00" />
@@ -1566,17 +1380,11 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="RUBY_LOCAL_VAR_ID">
-      <value />
-    </option>
     <option name="RUBY_METHOD_NAME">
       <value>
         <option name="FOREGROUND" value="ffcc00" />
       </value>
     </option>
-    <option name="RUBY_NTH_REF">
-      <value />
-    </option>
     <option name="RUBY_NUMBER">
       <value>
         <option name="FOREGROUND" value="339999" />
@@ -1587,9 +1395,6 @@
         <option name="FOREGROUND" value="ff6600" />
       </value>
     </option>
-    <option name="RUBY_PARAMDEF_CALL">
-      <value />
-    </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
         <option name="FONT_TYPE" value="2" />
@@ -1600,12 +1405,6 @@
         <option name="FOREGROUND" value="44b4cc" />
       </value>
     </option>
-    <option name="RUBY_SEMICOLON">
-      <value />
-    </option>
-    <option name="RUBY_SPECIFIC_CALL">
-      <value />
-    </option>
     <option name="RUBY_STRING">
       <value>
         <option name="FOREGROUND" value="66ff00" />
@@ -1716,40 +1515,22 @@
         <option name="BACKGROUND" value="f0f0f" />
       </value>
     </option>
-    <option name="SLIM_CLASS">
-      <value />
-    </option>
     <option name="SLIM_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933cc" />
       </value>
     </option>
-    <option name="SLIM_DOCTYPE_KWD">
-      <value />
-    </option>
-    <option name="SLIM_FILTER">
-      <value />
-    </option>
     <option name="SLIM_FILTER_CONTENT">
       <value>
         <option name="FOREGROUND" value="ffffff" />
         <option name="BACKGROUND" value="f0f0f" />
       </value>
     </option>
-    <option name="SLIM_ID">
-      <value />
-    </option>
     <option name="SLIM_INTERPOLATION">
       <value>
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="SLIM_PARENTHS">
-      <value />
-    </option>
-    <option name="SLIM_RUBY_CODE">
-      <value />
-    </option>
     <option name="SLIM_STATIC_CONTENT">
       <value>
         <option name="FOREGROUND" value="ffffff" />
@@ -1761,9 +1542,6 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="SLIM_TAG">
-      <value />
-    </option>
     <option name="SLIM_TAG_ATTR_KEY">
       <value>
         <option name="FOREGROUND" value="99cc99" />
@@ -1786,9 +1564,6 @@
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="SMARTY_BRACKETS">
-      <value />
-    </option>
     <option name="SMARTY_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933cc" />
@@ -1817,40 +1592,39 @@
         <option name="FOREGROUND" value="66ff00" />
       </value>
     </option>
-    <option name="SPY-JS.FUNCTION_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
-    <option name="SPY-JS.PROGRAM_SCOPE">
-      <value>
-        <option name="BACKGROUND" value="3A3A3A"/>
-        <option name="EFFECT_TYPE" value="2"/>
-      </value>
-    </option>
     <option name="SPY-JS.EXCEPTION">
       <value>
-        <option name="BACKGROUND" value="532B2E"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="532b2e" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="SPY-JS.FUNCTION_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_ONE">
       <value>
-        <option name="BACKGROUND" value="425F44"/>
-        <option name="EFFECT_TYPE" value="2"/>
+        <option name="BACKGROUND" value="425f44" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.PATH_LEVEL_TWO">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="1"/>
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="SPY-JS.PROGRAM_SCOPE">
+      <value>
+        <option name="BACKGROUND" value="3a3a3a" />
+        <option name="EFFECT_TYPE" value="2" />
       </value>
     </option>
     <option name="SPY-JS.VALUE_HINT">
       <value>
         <option name="EFFECT_COLOR" value="a9b7c6" />
-        <option name="EFFECT_TYPE" value="0"/>
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
@@ -1858,12 +1632,6 @@
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="SQL_BRACES">
-      <value />
-    </option>
-    <option name="SQL_BRACKETS">
-      <value />
-    </option>
     <option name="SQL_COLUMN">
       <value>
         <option name="FOREGROUND" value="fda5ff" />
@@ -1881,9 +1649,6 @@
     <option name="SQL_DATABASE_OBJECT">
       <value />
     </option>
-    <option name="SQL_DOT">
-      <value />
-    </option>
     <option name="SQL_IDENT">
       <value />
     </option>
@@ -1906,9 +1671,6 @@
     <option name="SQL_PARAMETER">
       <value />
     </option>
-    <option name="SQL_PARENS">
-      <value />
-    </option>
     <option name="SQL_PROCEDURE">
       <value>
         <option name="FONT_TYPE" value="2" />
@@ -1939,11 +1701,6 @@
         <option name="FONT_TYPE" value="3" />
       </value>
     </option>
-    <option name="STATIC_METHOD_ATTRIBUTES">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="TAG_ATTR_KEY">
       <value>
         <option name="FOREGROUND" value="99cc99" />
@@ -1979,9 +1736,6 @@
         <option name="BACKGROUND" value="6e3b3b" />
       </value>
     </option>
-    <option name="TWIG_BRACKETS">
-      <value />
-    </option>
     <option name="TWIG_COMMENT">
       <value>
         <option name="FOREGROUND" value="9933cc" />
@@ -2019,8 +1773,8 @@
       <value>
         <option name="BACKGROUND" value="4a3f10" />
         <option name="EFFECT_COLOR" value="ffffff" />
+        <option name="ERROR_STRIPE_COLOR" value="ebc700" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
     <option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
@@ -2056,11 +1810,6 @@
         <option name="FOREGROUND" value="339999" />
       </value>
     </option>
-    <option name="XML_PROLOGUE">
-      <value>
-        <option name="FONT_TYPE" value="2" />
-      </value>
-    </option>
     <option name="XML_TAG">
       <value />
     </option>
@@ -2114,4 +1863,4 @@
       </value>
     </option>
   </attributes>
-</scheme>
+</scheme>
\ No newline at end of file