From 74bba098a0e817d8d54d10f56d8229376cfccf01 Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@jetbrains.com>
Date: Thu, 31 Jan 2013 19:54:49 +0400
Subject: [PATCH] official GitHub theme is now used, fixed name case

---
 colorSchemes/src/colorSchemes/github.xml | 662 +++++++++++++----------
 1 file changed, 367 insertions(+), 295 deletions(-)

diff --git a/colorSchemes/src/colorSchemes/github.xml b/colorSchemes/src/colorSchemes/github.xml
index 10ee41801d9e..ea6d3b4212b3 100644
--- a/colorSchemes/src/colorSchemes/github.xml
+++ b/colorSchemes/src/colorSchemes/github.xml
@@ -1,38 +1,39 @@
-<scheme name="Github" parent_scheme="Default" version="1">
+<scheme name="GitHub" parent_scheme="Default" version="1">
   <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="FFFFFF" />
-    <option name="INDENT_GUIDE" value="3B3A32" />
-    <option name="SELECTION_BACKGROUND" value="afc4da" />
-    <option name="CARET_ROW_COLOR" value="eeeeee" />
-    <option name="WHITESPACES" value="3B3A32" />
-    <option name="CARET_COLOR" value="615649" />
-    <option name="LINE_NUMBERS_COLOR" value="555555" />
-    <option name="SELECTED_INDENT_GUIDE" value="3B3A32" />
-    <option name="GUTTER_BACKGROUND" value="FFFFFF" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="F8F8FF" />
+    <option name="INDENT_GUIDE" value="BFBFBF" />
+    <option name="SELECTION_BACKGROUND" value="BCD5FA" />
+    <option name="CARET_ROW_COLOR" value="e6e6ed" />
+    <option name="WHITESPACES" value="BFBFBF" />
+    <option name="CARET_COLOR" value="000000" />
+    <option name="LINE_NUMBERS_COLOR" value="000000" />
+    <option name="SELECTED_INDENT_GUIDE" value="BFBFBF" />
+    <option name="GUTTER_BACKGROUND" value="F8F8FF" />
   </colors>
   <attributes>
     <option name="APACHE_CONFIG.ARG_LEXEM">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="APACHE_CONFIG.COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="APACHE_CONFIG.IDENTIFIER">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="BREAKPOINT_ATTRIBUTES">
@@ -42,27 +43,29 @@
     </option>
     <option name="BUILDOUT.KEY">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="BUILDOUT.KEY_VALUE_SEPARATOR">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="BUILDOUT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="BUILDOUT.SECTION_NAME">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="BUILDOUT.VALUE">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="CLASS_NAME_ATTRIBUTES">
@@ -70,25 +73,22 @@
     </option>
     <option name="CLASS_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="606aa1" />
+        <option name="FOREGROUND" value="445588" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BOOLEAN">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.BRACE">
@@ -104,7 +104,7 @@
     </option>
     <option name="COFFEESCRIPT.COLON">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.COMMA">
@@ -115,12 +115,13 @@
     </option>
     <option name="COFFEESCRIPT.ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXISTENTIAL">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.EXPRESSIONS_SUBSTITUTION_MARK">
@@ -128,14 +129,12 @@
     </option>
     <option name="COFFEESCRIPT.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="222222" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_BINDING">
       <value>
-        <option name="FOREGROUND" value="222222" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.FUNCTION_NAME">
@@ -145,48 +144,54 @@
     </option>
     <option name="COFFEESCRIPT.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREDOC_ID">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_CONTENT">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="COFFEESCRIPT.HEREGEX_ID">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="COFFEESCRIPT.IDENTIFIER">
       <value />
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_CONTENT">
-      <value />
+      <value>
+        <option name="BACKGROUND" value="f7e7f1" />
+      </value>
     </option>
     <option name="COFFEESCRIPT.JAVASCRIPT_ID">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="COFFEESCRIPT.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="COFFEESCRIPT.LOCAL_VARIABLE">
@@ -194,17 +199,15 @@
     </option>
     <option name="COFFEESCRIPT.NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="COFFEESCRIPT.OBJECT_KEY">
-      <value>
-        <option name="FOREGROUND" value="008080" />
-      </value>
+      <value />
     </option>
     <option name="COFFEESCRIPT.OPERATIONS">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="COFFEESCRIPT.PARENTHESIS">
@@ -220,17 +223,17 @@
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_CONTENT">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_FLAG">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="COFFEESCRIPT.REGULAR_EXPRESSION_ID">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="COFFEESCRIPT.SEMICOLON">
@@ -242,21 +245,23 @@
     <option name="COFFEESCRIPT.STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="COFFEESCRIPT.STRING_LITERAL">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="COFFEESCRIPT.THIS">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="CONDITIONALLY_NOT_COMPILED">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="CONSOLE_BLUE_OUTPUT">
@@ -317,12 +322,12 @@
     </option>
     <option name="CSS.COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="CSS.FUNCTION">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0086B3" />
       </value>
     </option>
     <option name="CSS.IDENT">
@@ -332,50 +337,48 @@
     </option>
     <option name="CSS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
         <option name="FONT_TYPE" value="1" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="222222" />
+        <option name="EFFECT_COLOR" value="000000" />
       </value>
     </option>
     <option name="CSS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="CSS.PROPERTY_NAME">
       <value>
-        <option name="FOREGROUND" value="445588" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="6666FF" />
       </value>
     </option>
     <option name="CSS.PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="8000" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="CSS.STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CSS.TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="CSS.URL">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
         <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="00A8C6" />
+        <option name="FOREGROUND" value="8000" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
@@ -404,51 +407,52 @@
     </option>
     <option name="CUSTOM_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_MULTI_LINE_COMMENT_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="CUSTOM_NUMBER_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="CUSTOM_STRING_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="80" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="Clojure Atom">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="Clojure Character">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="Clojure Keyword">
-      <value>
-        <option name="FOREGROUND" value="008080" />
-      </value>
+      <value />
     </option>
     <option name="Clojure Line comment">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="Clojure Literal">
@@ -459,12 +463,13 @@
     </option>
     <option name="Clojure Numbers">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="Clojure Strings">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="DEPRECATED_ATTRIBUTES">
@@ -499,32 +504,33 @@
     </option>
     <option name="DJANGO_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="DJANGO_FILTER">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0086B3" />
       </value>
     </option>
     <option name="DJANGO_ID">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0A8585" />
       </value>
     </option>
     <option name="DJANGO_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="DJANGO_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="DJANGO_STRING_LITERAL">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="DJANGO_TAG_NAME">
@@ -543,7 +549,7 @@
     </option>
     <option name="ENUM_CONST">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="AA2C8C" />
       </value>
     </option>
     <option name="ERRORS_ATTRIBUTES">
@@ -579,7 +585,6 @@
     </option>
     <option name="First symbol in list">
       <value>
-        <option name="FOREGROUND" value="008080" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
@@ -592,27 +597,30 @@
     </option>
     <option name="GHERKIN_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="GHERKIN_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="GHERKIN_OUTLINE_PARAMETER_SUBSTITUTION">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="GHERKIN_PYSTRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="GHERKIN_REGEXP_PARAMETER">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_CELL">
@@ -620,18 +628,17 @@
     </option>
     <option name="GHERKIN_TABLE_HEADER_CELL">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="GHERKIN_TABLE_PIPE">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="GHERKIN_TAG">
       <value>
-        <option name="FOREGROUND" value="222222" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="GHERKIN_TEXT">
@@ -639,32 +646,34 @@
     </option>
     <option name="GQL_ID">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="GQL_INT_LITERAL">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="GQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="GQL_STRING_LITERAL">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="HAML_CLASS">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="HAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="HAML_FILTER">
@@ -675,7 +684,7 @@
     </option>
     <option name="HAML_ID">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="HAML_LINE_CONTINUATION">
@@ -685,7 +694,9 @@
       <value />
     </option>
     <option name="HAML_RUBY_CODE">
-      <value />
+      <value>
+        <option name="BACKGROUND" value="F8F8FF" />
+      </value>
     </option>
     <option name="HAML_RUBY_START">
       <value />
@@ -693,19 +704,23 @@
     <option name="HAML_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="HAML_STRING_INTERPOLATED">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="HAML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="121289" />
+      </value>
     </option>
     <option name="HAML_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="HAML_TEXT">
@@ -719,28 +734,31 @@
     </option>
     <option name="HTML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0A8585" />
       </value>
     </option>
     <option name="HTML_ATTRIBUTE_VALUE">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="HTML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="ff" />
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="HTML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="121289" />
+      </value>
     </option>
     <option name="HTML_TAG_NAME">
       <value>
@@ -787,12 +805,12 @@
     </option>
     <option name="IVAR">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="JAVA_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="JAVA_BRACES">
@@ -806,7 +824,8 @@
     </option>
     <option name="JAVA_DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_DOC_MARKUP">
@@ -826,28 +845,29 @@
     </option>
     <option name="JAVA_INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="FOREGROUND" value="008000" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="JAVA_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="JAVA_LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JAVA_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="JAVA_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="JAVA_PARENTH">
@@ -859,11 +879,13 @@
     <option name="JAVA_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="JAVA_VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="JS.ATTRIBUTE">
@@ -873,13 +895,12 @@
     </option>
     <option name="JS.BADCHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="JS.BLOCK_COMEMNT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="JS.BRACES">
@@ -893,7 +914,8 @@
     </option>
     <option name="JS.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JS.DOC_MARKUP">
@@ -933,18 +955,19 @@
     </option>
     <option name="JS.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="FOREGROUND" value="008000" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="JS.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="JS.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="JS.LOCAL_VARIABLE">
@@ -954,17 +977,16 @@
     </option>
     <option name="JS.NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="JS.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="JS.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -973,7 +995,7 @@
     </option>
     <option name="JS.REGEXP">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="JS.SEMICOLON">
@@ -993,62 +1015,70 @@
     <option name="JS.STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="JS.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="LABEL">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="LESS_INJECTED_CODE">
-      <value />
+      <value>
+        <option name="BACKGROUND" value="F8F8FF" />
+      </value>
     </option>
     <option name="LESS_JS_CODE_DELIM">
-      <value />
+      <value>
+        <option name="BACKGROUND" value="F8F8FF" />
+      </value>
     </option>
     <option name="LESS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="LOCALE.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="LOCALE.MSGCTXT_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="LOCALE.MSGID_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="LOCALE.MSGID_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="LOCALE.MSGSTR_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="LOCALE.MSGSTR_PLURAL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="LOCALE.STRING_LITERAL">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="LOCAL_VARIABLE_ATTRIBUTES">
@@ -1078,14 +1108,11 @@
       </value>
     </option>
     <option name="OC.BADCHARACTER">
-      <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
-      </value>
+      <value />
     </option>
     <option name="OC.BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="OC.BRACES">
@@ -1099,12 +1126,12 @@
     </option>
     <option name="OC.CPP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="OC.DIRECTIVE">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="OC.DOT">
@@ -1112,7 +1139,7 @@
     </option>
     <option name="OC.EXTERN_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="OC.FUNCTION">
@@ -1127,27 +1154,28 @@
     </option>
     <option name="OC.GLOBAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="OC.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="OC.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="OC.LOCAL_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="OC.NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="OC.OPERATION_SIGN">
@@ -1155,7 +1183,6 @@
     </option>
     <option name="OC.PARAMETER">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -1164,12 +1191,12 @@
     </option>
     <option name="OC.PROPERTY">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="OC.SELFSUPERTHIS">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="OC.SEMICOLON">
@@ -1178,16 +1205,18 @@
     <option name="OC.STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="OC.STRUCT_FIELD">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="AA2C8C" />
       </value>
     </option>
     <option name="OC_FORMAT_TOKEN">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PARAMETER_ATTRIBUTES">
@@ -1195,8 +1224,7 @@
     </option>
     <option name="PHP_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="PHP_BRACKETS">
@@ -1207,7 +1235,8 @@
     </option>
     <option name="PHP_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PHP_CONSTANT">
@@ -1215,7 +1244,8 @@
     </option>
     <option name="PHP_DOC_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PHP_DOC_TAG">
@@ -1225,17 +1255,20 @@
     </option>
     <option name="PHP_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="PHP_EXEC_COMMAND_ID">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PHP_HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PHP_HEREDOC_ID">
@@ -1248,7 +1281,7 @@
     </option>
     <option name="PHP_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PHP_MARKUP_ID">
@@ -1258,12 +1291,12 @@
     </option>
     <option name="PHP_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="PHP_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PHP_PREDEFINED SYMBOL">
@@ -1280,42 +1313,46 @@
     <option name="PHP_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PHP_TAG">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PHP_VAR">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PROTOCOL_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="445588" />
       </value>
     </option>
     <option name="PUPPET_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="PUPPET_BLOCK_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="PUPPET_BRACES">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="000000" />
+      </value>
     </option>
     <option name="PUPPET_BRACKETS">
       <value />
     </option>
     <option name="PUPPET_CLASS">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="445588" />
+      </value>
     </option>
     <option name="PUPPET_COMMA">
       <value />
@@ -1325,30 +1362,33 @@
     </option>
     <option name="PUPPET_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="PUPPET_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PUPPET_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="PUPPET_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PUPPET_PARENTH">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="000000" />
+      </value>
     </option>
     <option name="PUPPET_REGEX">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="PUPPET_RESOURCE_REFERENCE">
@@ -1360,11 +1400,13 @@
     <option name="PUPPET_SQ_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PUPPET_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PUPPET_VARIABLE">
@@ -1373,6 +1415,7 @@
     <option name="PUPPET_VARIABLE_INTERPOLATION">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PY.BRACES">
@@ -1383,14 +1426,12 @@
     </option>
     <option name="PY.BUILTIN_NAME">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0086B3" />
       </value>
     </option>
     <option name="PY.CLASS_DEFINITION">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
-        <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="606aa1" />
+        <option name="FOREGROUND" value="445588" />
       </value>
     </option>
     <option name="PY.COMMA">
@@ -1403,7 +1444,8 @@
     </option>
     <option name="PY.DOC_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.DOT">
@@ -1416,29 +1458,29 @@
     </option>
     <option name="PY.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="FOREGROUND" value="008000" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="PY.KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PY.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="PY.NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="PY.OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="PY.PARENTHS">
@@ -1449,23 +1491,24 @@
     </option>
     <option name="PY.PREDEFINED_USAGE">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0086B3" />
       </value>
     </option>
     <option name="PY.STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="PY.VALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="REGEXP.BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="REGEXP.BRACES">
@@ -1476,7 +1519,8 @@
     </option>
     <option name="REGEXP.CHAR_CLASS">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="REGEXP.COMMA">
@@ -1484,23 +1528,25 @@
     </option>
     <option name="REGEXP.COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="REGEXP.ESC_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="REGEXP.INVALID_STRING_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="FOREGROUND" value="008000" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="REGEXP.META">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="REGEXP.PARENTHS">
@@ -1508,12 +1554,14 @@
     </option>
     <option name="REGEXP.QUOTE_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="REGEXP.REDUNDANT_ESCAPE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="REST.BOLD">
@@ -1523,12 +1571,12 @@
     </option>
     <option name="REST.EXPLICIT">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="REST.FIELD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="REST.FIXED">
@@ -1553,47 +1601,58 @@
     </option>
     <option name="REST.LINE_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="REST.REF.NAME">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="REST.SECTION.HEADER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="RHTML_COMMENT_ID">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="RHTML_EXPRESSION_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="999999" />
+      </value>
     </option>
     <option name="RHTML_EXPRESSION_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="999999" />
+      </value>
     </option>
     <option name="RHTML_OMIT_NEW_LINE_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="999999" />
+      </value>
     </option>
     <option name="RHTML_SCRIPTING_BACKGROUND_ID">
-      <value />
+      <value>
+        <option name="BACKGROUND" value="F8F8FF" />
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_END_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="999999" />
+      </value>
     </option>
     <option name="RHTML_SCRIPTLET_START_ID">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="999999" />
+      </value>
     </option>
     <option name="RUBY_BAD_CHARACTER">
-      <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
-      </value>
+      <value />
     </option>
     <option name="RUBY_BRACKETS">
       <value />
@@ -1606,22 +1665,21 @@
     </option>
     <option name="RUBY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="RUBY_CONSTANT">
-      <value>
-        <option name="FOREGROUND" value="008080" />
-      </value>
+      <value />
     </option>
     <option name="RUBY_CONSTANT_DECLARATION">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="445588" />
       </value>
     </option>
     <option name="RUBY_CVAR">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="RUBY_DOT">
@@ -1629,69 +1687,70 @@
     </option>
     <option name="RUBY_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="000080" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="RUBY_EXPR_IN_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="RUBY_GVAR">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="RUBY_HASH_ASSOC">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_CONTENT">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="RUBY_HEREDOC_ID">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="RUBY_IDENTIFIER">
-      <value>
-        <option name="FOREGROUND" value="008080" />
-      </value>
+      <value />
     </option>
     <option name="RUBY_INTERPOLATED_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="RUBY_INVALID_ESCAPE_SEQUENCE">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="FOREGROUND" value="008000" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="RUBY_IVAR">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="108888" />
       </value>
     </option>
     <option name="RUBY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="RUBY_LINE_CONTINUATION">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="RUBY_LOCAL_VAR_ID">
-      <value>
-        <option name="FOREGROUND" value="008080" />
-      </value>
+      <value />
     </option>
     <option name="RUBY_METHOD_NAME">
       <value>
@@ -1703,28 +1762,27 @@
     </option>
     <option name="RUBY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="RUBY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="RUBY_PARAMDEF_CALL">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0086B3" />
       </value>
     </option>
     <option name="RUBY_PARAMETER_ID">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="RUBY_REGEXP">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009926" />
       </value>
     </option>
     <option name="RUBY_SEMICOLON">
@@ -1732,42 +1790,44 @@
     </option>
     <option name="RUBY_SPECIFIC_CALL">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="RUBY_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="RUBY_SYMBOL">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FOREGROUND" value="AA2C8C" />
       </value>
     </option>
     <option name="RUBY_WORDS">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="SASS_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
       </value>
     </option>
     <option name="SASS_DEFAULT">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SASS_EXTEND">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SASS_FUNCTION">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SASS_IDENTIFIER">
@@ -1777,53 +1837,50 @@
     </option>
     <option name="SASS_IMPORTANT">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SASS_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SASS_MIXIN">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0A8585" />
       </value>
     </option>
     <option name="SASS_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="SASS_PROPERTY_NAME">
-      <value>
-        <option name="FOREGROUND" value="445588" />
-        <option name="FONT_TYPE" value="2" />
-      </value>
+      <value />
     </option>
     <option name="SASS_PROPERTY_VALUE">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SASS_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="SASS_TAG_NAME">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="SASS_URL">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SASS_VARIABLE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
@@ -1833,32 +1890,30 @@
       </value>
     </option>
     <option name="SLIM_BAD_CHARACTER">
-      <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
-      </value>
+      <value />
     </option>
     <option name="SLIM_CALL">
       <value />
     </option>
     <option name="SLIM_CLASS">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="SLIM_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SLIM_DOCTYPE_KWD">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="SLIM_FILTER">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="SLIM_FILTER_CONTENT">
@@ -1866,19 +1921,22 @@
     </option>
     <option name="SLIM_ID">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="SLIM_INTERPOLATION">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="SLIM_PARENTHS">
       <value />
     </option>
     <option name="SLIM_RUBY_CODE">
-      <value />
+      <value>
+        <option name="BACKGROUND" value="F8F8FF" />
+      </value>
     </option>
     <option name="SLIM_STATIC_CONTENT">
       <value />
@@ -1886,20 +1944,23 @@
     <option name="SLIM_STRING_INTERPOLATED">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="SLIM_TAG">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="SLIM_TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0A8585" />
       </value>
     </option>
     <option name="SLIM_TAG_START">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="121289" />
+      </value>
     </option>
     <option name="SMARTY_BACKGROUND">
       <value>
@@ -1908,8 +1969,7 @@
     </option>
     <option name="SMARTY_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="SMARTY_BRACKETS">
@@ -1917,7 +1977,8 @@
     </option>
     <option name="SMARTY_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SMARTY_IDENTIFIER">
@@ -1925,28 +1986,28 @@
     </option>
     <option name="SMARTY_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SMARTY_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="SMARTY_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SMARTY_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="SQL_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="SQL_BRACES">
@@ -1966,7 +2027,8 @@
     </option>
     <option name="SQL_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="SQL_DATABASE_OBJECT">
@@ -1983,7 +2045,7 @@
     </option>
     <option name="SQL_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="SQL_LOCAL_ALIAS">
@@ -1991,7 +2053,7 @@
     </option>
     <option name="SQL_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="SQL_PARAMETER">
@@ -2014,6 +2076,7 @@
     <option name="SQL_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="SQL_SYNTETIC_ENTITY">
@@ -2037,13 +2100,13 @@
     </option>
     <option name="TAG_ATTR_KEY">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0A8585" />
       </value>
     </option>
     <option name="TEXT">
       <value>
-        <option name="FOREGROUND" value="555555" />
-        <option name="BACKGROUND" value="FFFFFF" />
+        <option name="FOREGROUND" value="000000" />
+        <option name="BACKGROUND" value="F8F8FF" />
       </value>
     </option>
     <option name="TEXT_SEARCH_RESULT_ATTRIBUTES">
@@ -2066,8 +2129,7 @@
     </option>
     <option name="TWIG_BAD_CHARACTER">
       <value>
-        <option name="FOREGROUND" value="F8F8F0" />
-        <option name="BACKGROUND" value="00A8C6" />
+        <option name="BACKGROUND" value="ffcccc" />
       </value>
     </option>
     <option name="TWIG_BRACKETS">
@@ -2075,7 +2137,8 @@
     </option>
     <option name="TWIG_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="TWIG_IDENTIFIER">
@@ -2083,28 +2146,28 @@
     </option>
     <option name="TWIG_KEYWORD">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="TWIG_NUMBER">
       <value>
-        <option name="FOREGROUND" value="DD1144" />
+        <option name="FOREGROUND" value="009999" />
       </value>
     </option>
     <option name="TWIG_OPERATION_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="TWIG_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="TYPEDEF">
       <value>
-        <option name="FOREGROUND" value="222222" />
-        <option name="FONT_TYPE" value="2" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="UNMATCHED_BRACE_ATTRIBUTES">
@@ -2116,7 +2179,7 @@
       <value>
         <option name="BACKGROUND" value="f6ebbc" />
         <option name="EFFECT_TYPE" value="1" />
-        <option name="EFFECT_COLOR" value="555555" />
+        <option name="EFFECT_COLOR" value="000000" />
         <option name="ERROR_STRIPE_COLOR" value="ffff00" />
       </value>
     </option>
@@ -2133,23 +2196,24 @@
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="445588" />
+        <option name="FOREGROUND" value="0A8585" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="XML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="DD1144" />
         <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="XML_ENTITY_REFERENCE">
       <value>
-        <option name="FOREGROUND" value="606aa1" />
+        <option name="FONT_TYPE" value="1" />
       </value>
     </option>
     <option name="XML_PROLOGUE">
@@ -2158,7 +2222,9 @@
       </value>
     </option>
     <option name="XML_TAG">
-      <value />
+      <value>
+        <option name="FOREGROUND" value="121289" />
+      </value>
     </option>
     <option name="XML_TAG_DATA">
       <value>
@@ -2173,42 +2239,48 @@
     </option>
     <option name="YAML_COMMENT">
       <value>
-        <option name="FOREGROUND" value="b8b6b1" />
+        <option name="FOREGROUND" value="999988" />
+        <option name="FONT_TYPE" value="2" />
       </value>
     </option>
     <option name="YAML_SCALAR_DSTRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="YAML_SCALAR_KEY">
       <value>
-        <option name="FOREGROUND" value="008080" />
+        <option name="FOREGROUND" value="121289" />
       </value>
     </option>
     <option name="YAML_SCALAR_LIST">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="YAML_SCALAR_STRING">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="YAML_SCALAR_VALUE">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
     <option name="YAML_SIGN">
       <value>
-        <option name="FOREGROUND" value="222222" />
+        <option name="FOREGROUND" value="000000" />
       </value>
     </option>
     <option name="YAML_TEXT">
       <value>
         <option name="FOREGROUND" value="DD1144" />
+        <option name="BACKGROUND" value="f7e7f1" />
       </value>
     </option>
   </attributes>